svn merge https://nixos.org/repos/nix/nixpkgs/trunk

No conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
parent 14bbbbbed2 9e839d0184
commit b077940b3b
43 changed files with 350 additions and 178 deletions
--- a/maintainers/scripts/gnu/gnupdate
+++ b/maintainers/scripts/gnu/gnupdate
@@ -1065,7 +1065,10 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").

    (case selection
      ((stdenv)
-       gnu)
+       (filter (lambda (p)
+                 (member (package-source-output-path p)
+                         (force stdenv)))
+               gnu))
      ((non-stdenv)
       (filter (lambda (p)
                 (not (member (package-source-output-path p)