public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into closure-size

Browse Source
This commit is contained in:
Vladimír Čunát
2016-01-19 09:55:31 +01:00
parent f8472457a4 53b389327e
commit 716aac2519
1293 changed files with 75245 additions and 28520 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/drivers/hplip/3.15.9.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll
, pkgconfig
, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
, net_snmp, polkit
, qtSupport ? true, qt4, pyqt4
, withPlugin ? false
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
libusb1
pythonPackages.python
pythonPackages.wrapPython
saneBackends
sane-backends
dbus
net_snmp
] ++ stdenv.lib.optionals qtSupport [
pkgs/misc/drivers/hplip/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll
, pkgconfig
, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
, net_snmp, polkit
, qtSupport ? true, qt4, pyqt4
, withPlugin ? false
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
libusb1
pythonPackages.python
pythonPackages.wrapPython
saneBackends
sane-backends
dbus
net_snmp
] ++ stdenv.lib.optionals qtSupport [