diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c4691aa663f..9563dcbb343 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -61,6 +61,15 @@ was accordingly renamed to bomi + + + HPLIP (printer, scanner, and fax drivers for HP devices) has + been updated to version 3.15.4. This release + adds support for the arm6l-linux and + arm7l-linux platforms. + + + diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 7c4e6f45bb4..bb790be7c26 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -6,11 +6,11 @@ let - name = "hplip-3.15.2"; + name = "hplip-3.15.4"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0z7n62vdbr0p0kls1m2sr3nhvkhx3rawcbzd0zdl0lnq8fkyq0jz"; + sha256 = "0s1yiifp002n8qy0i4cv6j0hq9ikp4jabki5w3xzlaqgd4bjz1x3"; }; hplip_state = @@ -21,9 +21,17 @@ let version = (builtins.parseDrvName name).version; }; + hplip_arch = + { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "arm6l-linux" = "arm32"; + "arm7l-linux" = "arm32"; + }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}"); + plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1pzxv9yway1x1m5grz6042p54ldh7jcgv4qrkjhlcb4vr9plwql9"; + sha256 = "00zhaq48m7p6nrxfy16086hzghf2pfr32s53sndbpp2514v2j392"; }; in @@ -135,7 +143,7 @@ stdenv.mkDerivation { license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; maintainers = with maintainers; [ ttuegel jgeerds ]; }; }