From b6270a2d90f6b869e528f9238a4d7e49aca69ebd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 Jan 2021 10:23:16 +0200 Subject: [PATCH] hplip: 3.20.5 -> 3.20.11 --- pkgs/misc/drivers/hplip/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b740f5091fa..b29463d61dd 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -2,7 +2,7 @@ , pkgconfig , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils -, net-snmp, openssl, perl, nettools +, net-snmp, openssl, perl, nettools, avahi , bash, coreutils, util-linux # To remove references to gcc-unwrapped , removeReferencesTo, qt5 @@ -13,17 +13,17 @@ let - name = "hplip-${version}"; - version = "3.20.5"; + pname = "hplip"; + version = "3.20.11"; src = fetchurl { - url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "004bbd78487b7803cdcf2a96b00de938797227068c4de43ee7ad7d174c4e475a"; + url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz"; + sha256 = "CxZ1s9jnCaEyX+hj9arOO9NxB3mnPq6Gj3su6aVv2xE="; }; plugin = fetchurl { - url = "https://developers.hp.com/sites/default/files/${name}-plugin.run"; - sha256 = "ff3dedda3158be64b985efbf636890ddda5b271ae1f1fbd788219e1344a9c2e7"; + url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run"; + sha256 = "r8PoQQFfjdHKySPCFwtDR8Tl6v5Eag9gXpBAp6sCF9Q="; }; hplipState = substituteAll { @@ -50,7 +50,7 @@ assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; python3Packages.buildPythonApplication { - inherit name src; + inherit pname version src; format = "other"; buildInputs = [ @@ -65,6 +65,7 @@ python3Packages.buildPythonApplication { openssl perl zlib + avahi ]; nativeBuildInputs = [