Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging

https://github.com/NixOS/nixpkgs/pull/14766
This commit is contained in:
Tuomas Tynkkynen
2016-08-30 12:43:37 +03:00
239 changed files with 339 additions and 309 deletions
+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