Author: eelco
Date: Fri Jan 20 16:47:54 2012
New Revision: 31742
URL: https://nixos.org/websvn/nix/?rev=31742&sc=1
Log:
* Call all the stdenvs "stdenv" (rather than e.g. "stdenv-linux")
so that "nix-env -i stdenv" does the expected.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/native/default.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/nix/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix Fri Jan
20 16:42:16 2012 (r31741)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix Fri Jan
20 16:47:54 2012 (r31742)
@@ -1,4 +1,4 @@
-{ system, name, preHook ? "", initialPath, gcc, shell
+{ system, name ? "stdenv", preHook ? "", initialPath, gcc, shell
, extraAttrs ? {}, overrides ? (pkgs: {})
, # The `fetchurl' to use for downloading curl and its dependencies
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Fri Jan
20 16:42:16 2012 (r31741)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Fri Jan
20 16:47:54 2012 (r31742)
@@ -260,8 +260,6 @@
# dependency (`nix-store -qR') on bootstrapTools or the
# first binutils built.
stdenvLinux = import ../generic rec {
- name = "stdenv-linux";
-
inherit system;
preHook = commonPreHook;
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/native/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/native/default.nix Fri Jan
20 16:42:16 2012 (r31741)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/native/default.nix Fri Jan
20 16:47:54 2012 (r31742)
@@ -86,8 +86,6 @@
{ gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
import ../generic {
- name = "stdenv-native";
-
preHook =
if system == "i686-darwin" || system == "powerpc-darwin" || system ==
"x86_64-darwin" then prehookDarwin else
if system == "i686-freebsd" then prehookFreeBSD else
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/nix/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/nix/default.nix Fri Jan 20
16:42:16 2012 (r31741)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/nix/default.nix Fri Jan 20
16:47:54 2012 (r31742)
@@ -1,8 +1,6 @@
{ stdenv, pkgs }:
import ../generic rec {
- name = "stdenv-nix";
-
preHook =
''
export NIX_ENFORCE_PURITY=1
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
