diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-22 15:26:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-22 16:56:33 +0000 |
| commit | 542f80867c380b0ac79250b6e5358dda8bc49e0d (patch) | |
| tree | aa5903f228b2f32c524a9a6e4f6dd94f8c5b869e /nixpkgs/pkgs/misc/drivers/hplip/default.nix | |
| parent | f69898c7d5b757342e6ab90d5fcc7c9aea9f5ff4 (diff) | |
| parent | 90441b4b47fc7280de6a5bd1a228017caaa0f97f (diff) | |
| download | nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.gz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.bz2 nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.lz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.xz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.zst nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.zip | |
Merge commit '90441b4b47fc7280de6a5bd1a228017caaa0f97f'
Diffstat (limited to 'nixpkgs/pkgs/misc/drivers/hplip/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/misc/drivers/hplip/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/nixpkgs/pkgs/misc/drivers/hplip/default.nix index ecb74f39ab9a..a7e080ebce29 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/default.nix @@ -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 ]; }; } |