* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
parent 6f29bd14bc 15962e240e
commit 390695e73f
74 changed files with 2775 additions and 1291 deletions
--- a/pkgs/development/interpreters/python-new/2.5/default.nix
+++ b/pkgs/development/interpreters/python-new/2.5/default.nix
@@ -124,7 +124,7 @@ in
      buildPhase = ''python setup.py $setupFlags build'';
      installPhase = ''python setup.py $setupFlags install --prefix=$out'';
      mergeAttrBy = {
-        setupFlags = lib.concatList;
+        setupFlags = lib.concat;
      };
    };

@@ -219,8 +219,8 @@ in
        done
      '';
      mergeAttrBy = {
-        phases = lib.concatList;
-        pySrcs = lib.concatList;
+        phases = lib.concat;
+        pySrcs = lib.concat;
        pyCheck = x : y : "${x}\n${y}";
      };
    }