Author: viric
Date: Thu Oct 7 21:03:23 2010
New Revision: 24153
URL: https://svn.nixos.org/websvn/nix/?rev=24153&sc=1
Log:
Updating from trunk.
I had to fix conflicts in the pcre expression, and as usual, all-packages.nix
about stdenv2.
Modified:
nixos/branches/stdenv-updates/release.nix
Modified: nixos/branches/stdenv-updates/release.nix
==============================================================================
--- nixos/branches/stdenv-updates/release.nix Thu Oct 7 20:10:49 2010
(r24152)
+++ nixos/branches/stdenv-updates/release.nix Thu Oct 7 21:03:23 2010
(r24153)
@@ -1,4 +1,4 @@
-{ nixpkgs ? ../nixpkgs }:
+{ nixpkgs ? ../stdenv-updates-svn }:
let
@@ -66,6 +66,7 @@
description = "NixOS system tarball for ${system} -
${stdenv.platform.name}";
maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
};
+ inherit config;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
