Author: viric
Date: Wed Sep 8 16:52:15 2010
New Revision: 23688
URL: https://svn.nixos.org/websvn/nix/?rev=23688&sc=1
Log:
Making eval-config not pass 'platform' as a nixpkgs parameter, but expect a
nixpkgs config attribute.
Modified:
nixos/branches/stdenv-updates/lib/eval-config.nix
nixos/branches/stdenv-updates/modules/misc/nixpkgs.nix
Modified: nixos/branches/stdenv-updates/lib/eval-config.nix
==============================================================================
--- nixos/branches/stdenv-updates/lib/eval-config.nix Wed Sep 8 16:49:19
2010 (r23687)
+++ nixos/branches/stdenv-updates/lib/eval-config.nix Wed Sep 8 16:52:15
2010 (r23688)
@@ -60,7 +60,7 @@
in
{
inherit system;
- inherit (nixpkgsOptions) config platform;
+ inherit (nixpkgsOptions) config;
});
# Optionally check wether all config values have corresponding
Modified: nixos/branches/stdenv-updates/modules/misc/nixpkgs.nix
==============================================================================
--- nixos/branches/stdenv-updates/modules/misc/nixpkgs.nix Wed Sep 8
16:49:19 2010 (r23687)
+++ nixos/branches/stdenv-updates/modules/misc/nixpkgs.nix Wed Sep 8
16:52:15 2010 (r23688)
@@ -13,12 +13,5 @@
'';
};
- nixpkgs.platform = pkgs.lib.mkOption {
- default = pkgs.platforms.pc;
- description = ''
- The platform for the Nix Packages collection.
- '';
- };
-
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
