Merge pull request #76128 from Mic92/hplip

hplip: 3.19.6 -> 3.19.12
This commit is contained in:
Thomas Tuegel
2020-01-16 10:01:10 -06:00
committed by GitHub
2 changed files with 62 additions and 10 deletions
+6 -7
View File
@@ -12,11 +12,11 @@
let
name = "hplip-${version}";
version = "3.19.6";
version = "3.19.12";
src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz";
sha256 = "0vfnc6pg7wzs68qn5mlk3cyl969d8n55bydgydq2wzfikvpfvnpw";
sha256 = "0mdj0sqgfxjqa550adiw1gn4z9n6wcvn55slivgf0ndn5x89iwxp";
};
plugin = fetchurl {
@@ -34,12 +34,13 @@ let
x86_64-linux = "x86_64";
armv6l-linux = "arm32";
armv7l-linux = "arm32";
aarch64-linux = "aarch64";
};
hplipArch = hplipPlatforms.${stdenv.hostPlatform.system}
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
pluginArches = [ "x86_32" "x86_64" "arm32" ];
pluginArches = [ "x86_32" "x86_64" "arm32" "aarch64" ];
in
@@ -64,9 +65,7 @@ python3Packages.buildPythonApplication {
zlib
];
nativeBuildInputs = [
pkgconfig
];
nativeBuildInputs = [ pkgconfig ];
pythonPath = with python3Packages; [
dbus
@@ -226,7 +225,7 @@ python3Packages.buildPythonApplication {
license = if withPlugin
then licenses.unfree
else with licenses; [ mit bsd2 gpl2Plus ];
platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ ttuegel ];
};
}