Merge pull request #108464 from doronbehar/pkg/hplip

hplip: 3.20.5 -> 3.20.11
gstqt5
Sandro 2021-01-07 00:15:41 +01:00 committed by GitHub
commit f85194205d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions

View File

@ -2,7 +2,7 @@
, pkgconfig , pkgconfig
, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends
, dbus, file, ghostscript, usbutils , dbus, file, ghostscript, usbutils
, net-snmp, openssl, perl, nettools , net-snmp, openssl, perl, nettools, avahi
, bash, coreutils, util-linux , bash, coreutils, util-linux
# To remove references to gcc-unwrapped # To remove references to gcc-unwrapped
, removeReferencesTo, qt5 , removeReferencesTo, qt5
@ -13,17 +13,17 @@
let let
name = "hplip-${version}"; pname = "hplip";
version = "3.20.5"; version = "3.20.11";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz"; url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz";
sha256 = "004bbd78487b7803cdcf2a96b00de938797227068c4de43ee7ad7d174c4e475a"; sha256 = "CxZ1s9jnCaEyX+hj9arOO9NxB3mnPq6Gj3su6aVv2xE=";
}; };
plugin = fetchurl { plugin = fetchurl {
url = "https://developers.hp.com/sites/default/files/${name}-plugin.run"; url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run";
sha256 = "ff3dedda3158be64b985efbf636890ddda5b271ae1f1fbd788219e1344a9c2e7"; sha256 = "r8PoQQFfjdHKySPCFwtDR8Tl6v5Eag9gXpBAp6sCF9Q=";
}; };
hplipState = substituteAll { hplipState = substituteAll {
@ -50,7 +50,7 @@ assert withPlugin -> builtins.elem hplipArch pluginArches
|| throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}";
python3Packages.buildPythonApplication { python3Packages.buildPythonApplication {
inherit name src; inherit pname version src;
format = "other"; format = "other";
buildInputs = [ buildInputs = [
@ -65,6 +65,7 @@ python3Packages.buildPythonApplication {
openssl openssl
perl perl
zlib zlib
avahi
]; ];
nativeBuildInputs = [ nativeBuildInputs = [