diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-01 13:27:27 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-01 13:27:27 +0300 |
| commit | 8c4aeb17808e6d33515bb9178eaca942c588b31d (patch) | |
| tree | 202a33b2dd86ab28d168778b313f184a9ecc0bda /pkgs/misc | |
| parent | 003ab1d9fdaf2818a1e5a6e53825d31ac2e23621 (diff) | |
| parent | 838c75398cc46cf2acbe144b1f3866d736abe430 (diff) | |
| download | nixpkgs-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar nixpkgs-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.gz nixpkgs-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.bz2 nixpkgs-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.lz nixpkgs-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.xz nixpkgs-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.zst nixpkgs-8c4aeb17808e6d33515bb9178eaca942c588b31d.zip | |
Merge staging into master
Brings in:
- changed output order for multiple outputs:
https://github.com/NixOS/nixpkgs/pull/14766
- audit disabled by default
https://github.com/NixOS/nixpkgs/pull/17916
Conflicts:
pkgs/development/libraries/openldap/default.nix
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 6c717037777..38a22a01d95 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; # FIXME: the cups libraries contains some $out/share strings so can't be split. - outputs = [ "dev" "out" "man" ]; # TODO: above + outputs = [ "out" "dev" "man" ]; # TODO: above buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] |