Merging from trunk. I solved some trivial merge conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
parent e60ba9135a a6f1f87697
commit b48b2a7bb4
137 changed files with 1155 additions and 478 deletions
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+echo "let pkgs = import /etc/nixos/nixpkgs$2 {}; x = pkgs.callPackage $1 { $3 }; in ${4:-x}" |
+nix-instantiate --show-trace - |
+xargs nix-store -r -K