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

Merge staging into master

Browse Source 
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
This commit is contained in:
Tuomas Tynkkynen
2016-09-01 13:27:27 +03:00
parent 003ab1d9fd 838c75398c
commit 8c4aeb1780
270 changed files with 460 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/awstats/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
--replace /usr/share/awstats/ "$out/wwwroot/cgi-bin/"
'';
outputs = [ "out" "bin" "doc" ]; # bin just links the user-run executable
outputs = [ "bin" "out" "doc" ]; # bin just links the user-run executable
propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle
buildInputs = with perlPackages; [ ]; # plugins will need some