From 4971bdc930f3dd44162c419a2cfe30f5586ab473 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 24 Mar 2014 17:21:21 -0500 Subject: [PATCH 1/8] hplip version bump 3.11.1 -> 3.14.4 --- pkgs/misc/drivers/hplip/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 5b9ef87a129..c6bf3b6411c 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, cups, zlib, libjpeg, libusb, pythonPackages, saneBackends, dbus -, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp +{stdenv, fetchurl, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus +, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp, automake }: stdenv.mkDerivation rec { - name = "hplip-3.11.1"; + name = "hplip-3.14.4"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0y68s4xm5d0kv7p5j41qq0xglp4vdbjwbrjs89b4a21wwn69hp9g"; + sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f"; }; #preBuild='' @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { prePatch = '' sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in sed -i s,/etc/hp/,$out/etc/hp/, base/g.py + substituteInPlace Makefile.in \ + --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" \ + --replace "/usr/lib/systemd/system" "$out/lib/systemd/system" ''; # --disable-network-build Until we have snmp @@ -49,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg cups - libusb + libusb1 pythonPackages.python pythonPackages.wrapPython saneBackends From a0dc20719bbe1cdb8a66841556bf939614f94fb4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 May 2014 17:33:46 -0500 Subject: [PATCH 2/8] hplip: add binary plugin --- pkgs/misc/drivers/hplip/default.nix | 75 +++++++++++++++++++++++------ pkgs/misc/drivers/hplip/hplip.state | 4 ++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 65 insertions(+), 16 deletions(-) create mode 100644 pkgs/misc/drivers/hplip/hplip.state diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index c6bf3b6411c..90d5967a29c 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,5 +1,7 @@ -{stdenv, fetchurl, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus -, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp, automake +{ stdenv, fetchurl, automake, pkgconfig +, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus +, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp +, withPlugin ? false }: stdenv.mkDerivation rec { @@ -10,20 +12,23 @@ stdenv.mkDerivation rec { sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f"; }; - #preBuild='' - # makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model" - #''; + plugin = fetchurl { + url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; + sha256 = "0k1vpmy7babbm3c5v4dcbhq0jgyr8as722nylfs8zx0dy7kr8874"; + }; + + hplip_state = ./hplip.state; prePatch = '' - sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in - sed -i s,/etc/hp/,$out/etc/hp/, base/g.py - substituteInPlace Makefile.in \ - --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" \ - --replace "/usr/lib/systemd/system" "$out/lib/systemd/system" + # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. + find . -type f -exec sed -i s,/etc/hp,$out/etc/hp, {} \; + find . -type f -exec sed -i s,/etc/sane.d,$out/etc/sane.d, {} \; + find . -type f -exec sed -i s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, {} \; + find . -type f -exec sed -i s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, {} \; + find . -type f -exec sed -i s,/usr/lib/systemd/system,$out/lib/systemd/system, {} \; + find . -type f -exec sed -i s,/var/lib/hp,$out/var/lib/hp, {} \; ''; - # --disable-network-build Until we have snmp - preConfigure = '' export configureFlags="$configureFlags --with-cupsfilterdir=$out/lib/cups/filter @@ -36,18 +41,56 @@ stdenv.mkDerivation rec { export makeFlags=" halpredir=$out/share/hal/fdi/preprobe/10osvendor - hplip_statedir=$out/var rulesdir=$out/etc/udev/rules.d policykit_dir=$out/share/polkit-1/actions policykit_dbus_etcdir=$out/etc/dbus-1/system.d policykit_dbus_sharedir=$out/share/dbus-1/system-services hplip_confdir=$out/etc/hp + hplip_statedir=$out/var/lib/hp "; ''; - postInstall = '' + postInstall = + '' wrapPythonPrograms - ''; + '' + + (stdenv.lib.optionalString withPlugin + (let hplip_arch = + if builtins.currentSystem == "i686-linux" + then "x86_32" + else if builtins.currentSystem == "x86_64-linux" + then "x86_64" + else abort "Platform must be i686-linux or x86_64-linux!"; + in + '' + sh ${plugin} --noexec --keep + cd plugin_tmp + + cp plugin.spec $out/share/hplip/ + + mkdir -p $out/share/hplip/data/firmware + cp *.fw.gz $out/share/hplip/data/firmware + + mkdir -p $out/share/hplip/data/plugins + cp license.txt $out/share/hplip/data/plugins + + mkdir -p $out/share/hplip/prnt/plugins + for plugin in lj hbpl1; do + cp $plugin-${hplip_arch}.so $out/share/hplip/prnt/plugins + ln -s $out/share/hplip/prnt/plugins/$plugin-${hplip_arch}.so \ + $out/share/hplip/prnt/plugins/$plugin.so + done + + mkdir -p $out/share/hplip/scan/plugins + for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do + cp $plugin-${hplip_arch}.so $out/share/hplip/scan/plugins + ln -s $out/share/hplip/scan/plugins/$plugin-${hplip_arch}.so \ + $out/share/hplip/scan/plugins/$plugin.so + done + + mkdir -p $out/var/lib/hp + cp ${hplip_state} $out/var/lib/hp/hplip.state + '')); buildInputs = [ libjpeg @@ -70,7 +113,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = http://hplipopensource.com/; - license = "free"; # MIT/BSD/GPL + license = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL platforms = platforms.linux; }; } diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/misc/drivers/hplip/hplip.state new file mode 100644 index 00000000000..52679963f06 --- /dev/null +++ b/pkgs/misc/drivers/hplip/hplip.state @@ -0,0 +1,4 @@ +[plugin] +installed=1 +eula=1 +version=3.14.4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fa278924b6..5ae4e923e6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10604,6 +10604,8 @@ let hplip = callPackage ../misc/drivers/hplip { }; + hplipWithPlugin = hplip.override { withPlugin = true; }; + # using the new configuration style proposal which is unstable jack1d = callPackage ../misc/jackaudio/jack1.nix { }; From 2666dcd21869658c2d3038c417eb27556b2cd289 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 May 2014 21:56:28 -0500 Subject: [PATCH 3/8] hplip: assume maintainership --- pkgs/misc/drivers/hplip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 90d5967a29c..efa0b480319 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -115,5 +115,6 @@ stdenv.mkDerivation rec { homepage = http://hplipopensource.com/; license = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL platforms = platforms.linux; + maintainers = with maintainers; [ ttuegel ]; }; } From 56994ce2ebfac75f0e4bcc06e43b47bdbb51790a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 May 2014 22:16:13 -0500 Subject: [PATCH 4/8] hplip: add pillow and reportlab dependencies --- pkgs/misc/drivers/hplip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index efa0b480319..593b346fc3b 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -105,9 +105,11 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional qtSupport qt4; pythonPath = with pythonPackages; [ + pillow pythonDBus pygobject recursivePthLoader + reportlab ] ++ stdenv.lib.optional qtSupport pyqt4; meta = with stdenv.lib; { From b4c89810648cce7c2c55b06443d9f5373e9d7230 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 May 2014 13:30:33 -0500 Subject: [PATCH 5/8] sane: add mkSaneConfig --- pkgs/applications/graphics/sane/config.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/graphics/sane/config.nix diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix new file mode 100644 index 00000000000..fc1cd81ebc6 --- /dev/null +++ b/pkgs/applications/graphics/sane/config.nix @@ -0,0 +1,27 @@ +{ stdenv }: + +{ paths }: + +with stdenv.lib; +let installSanePath = path: '' + find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do + ln -s $backend $out/lib/sane/$(basename $backend) + done + + find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do + ln -s $conf $out/etc/sane.d/$(basename $conf) + done + + find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do + ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf) + done + ''; +in +stdenv.mkDerivation { + name = "sane-config"; + phases = "installPhase"; + + installPhase = '' + mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane + '' + concatMapStrings installSanePath paths; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ae4e923e6a..fbc3106afce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10735,6 +10735,8 @@ let hotplugSupport = config.sane.hotplugSupport or true; }; + mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; + saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { }; seafile-shared = callPackage ../misc/seafile-shared { }; From 4fb9c3700a2fcb5132994e8ecbbe07dc3574f9ab Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 May 2014 13:31:13 -0500 Subject: [PATCH 6/8] hplip: avoid name collision with sane config files --- pkgs/misc/drivers/hplip/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 593b346fc3b..50106dfb477 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -90,6 +90,9 @@ stdenv.mkDerivation rec { mkdir -p $out/var/lib/hp cp ${hplip_state} $out/var/lib/hp/hplip.state + + mkdir -p $out/etc/sane.d/dll.d + mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf '')); buildInputs = [ From 8df521bf0f73d2ac6a01aa912725b30d78973bcc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 May 2014 13:31:21 -0500 Subject: [PATCH 7/8] sane: use mkSaneConfig to set system environment --- nixos/modules/services/hardware/sane.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 01d910575bb..56e28b50350 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -5,6 +5,8 @@ with lib; let pkg = if config.hardware.sane.snapshot then pkgs.saneBackendsGit else pkgs.saneBackends; + backends = [ pkg ] ++ config.hardware.sane.extraBackends; + saneConfig = pkgs.mkSaneConfig { paths = backends; }; in @@ -26,6 +28,12 @@ in description = "Use a development snapshot of SANE scanner drivers."; }; + hardware.sane.extraBackends = mkOption { + type = types.listOf types.path; + default = []; + description = "Packages providing extra SANE backends to enable."; + }; + }; @@ -33,8 +41,12 @@ in config = mkIf config.hardware.sane.enable { - environment.systemPackages = [ pkg ]; - services.udev.packages = [ pkg ]; + environment.systemPackages = backends; + environment.variables = { + SANE_CONFIG_DIR = "${saneConfig}/etc/sane.d"; + LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; + }; + services.udev.packages = backends; users.extraGroups."scanner".gid = config.ids.gids.scanner; From 8ffd6af27e6dfae0a3b4d77db03409f62c5b8d98 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 20 May 2014 16:35:30 -0500 Subject: [PATCH 8/8] hplip: don't use udev rules to change device owner --- pkgs/misc/drivers/hplip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 50106dfb477..fcec3bf2675 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -93,6 +93,8 @@ stdenv.mkDerivation rec { mkdir -p $out/etc/sane.d/dll.d mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf + + rm $out/etc/udev/rules.d/56-hpmud.rules '')); buildInputs = [