Apply makeOverridable to stdenv

This removes the need for hacks like stdenv.regenerate.  It also
ensures that overrideGCC is now stackable (so ‘stdenv = useGoldLinker
clangStdenv’ works).
This commit is contained in:
Eelco Dolstra 2014-02-04 17:18:38 +01:00
parent 7703f04b75
commit c3d84d15ce
4 changed files with 141 additions and 160 deletions

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dev86-0.16.19"; name = "dev86-0.16.19";
src = fetchurl { src = fetchurl {
url = http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz; url = http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz;
sha256 = "33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e"; sha256 = "33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
'' ''
substituteInPlace makefile.in --replace "-O2" "" --replace "-O" "" substituteInPlace makefile.in --replace "-O2" "" --replace "-O" ""
''; '';
meta = { meta = {
description = "Linux 8086 development environment"; description = "Linux 8086 development environment";
homepage = http://www.debath.co.uk/; homepage = http://www.debath.co.uk/;

View file

@ -8,20 +8,14 @@ rec {
# Override the compiler in stdenv for specific packages. # Override the compiler in stdenv for specific packages.
overrideGCC = stdenv: gcc: stdenv // overrideGCC = stdenv: gcc: stdenv.override { inherit gcc; };
{ mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
inherit gcc;
};
# Add some arbitrary packages to buildInputs for specific packages. # Add some arbitrary packages to buildInputs for specific packages.
# Used to override packages in stdenv like Make. Should not be used # Used to override packages in stdenv like Make. Should not be used
# for other dependencies. # for other dependencies.
overrideInStdenv = stdenv: pkgs: stdenv // overrideInStdenv = stdenv: pkgs:
{ mkDerivation = args: stdenv.mkDerivation (args // stdenv.override (prev: { extraBuildInputs = prev.extraBuildInputs or [] ++ pkgs; });
{ buildInputs = args.buildInputs or [] ++ pkgs; }
);
};
# Override the setup script of stdenv. Useful for testing new # Override the setup script of stdenv. Useful for testing new
@ -32,7 +26,7 @@ rec {
# randomPkg = import ../bla { ... # randomPkg = import ../bla { ...
# stdenv = overrideSetup stdenv ../stdenv/generic/setup-latest.sh; # stdenv = overrideSetup stdenv ../stdenv/generic/setup-latest.sh;
# }; # };
overrideSetup = stdenv: setup: stdenv.regenerate setup; overrideSetup = stdenv: setupScript: stdenv.override { inherit setupScript; };
# Return a modified stdenv that uses dietlibc to create small # Return a modified stdenv that uses dietlibc to create small

View file

@ -1,9 +1,15 @@
let lib = import ../../../lib; in lib.makeOverridable (
{ system, name ? "stdenv", preHook ? "", initialPath, gcc, shell { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell
, extraAttrs ? {}, overrides ? (pkgs: {}), config , extraAttrs ? {}, overrides ? (pkgs: {}), config
, # The `fetchurl' to use for downloading curl and its dependencies , # The `fetchurl' to use for downloading curl and its dependencies
# (see all-packages.nix). # (see all-packages.nix).
fetchurlBoot fetchurlBoot
, setupScript ? ./setup.sh
, extraBuildInputs ? []
}: }:
if ! builtins ? langVersion then if ! builtins ? langVersion then
@ -14,169 +20,155 @@ else
let let
lib = import ../../../lib;
allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";
allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";
unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null); unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null);
stdenvGenerator = setupScript: rec { # The stdenv that we are producing.
result =
# The stdenv that we are producing. derivation {
result = inherit system name;
derivation { builder = shell;
inherit system name;
builder = shell; args = ["-e" ./builder.sh];
args = ["-e" ./builder.sh]; setup = setupScript;
setup = setupScript; inherit preHook initialPath gcc shell;
inherit preHook initialPath gcc shell; propagatedUserEnvPkgs = [gcc] ++
lib.filter lib.isDerivation initialPath;
propagatedUserEnvPkgs = [gcc] ++ __ignoreNulls = true;
lib.filter lib.isDerivation initialPath; }
__ignoreNulls = true; // rec {
}
// rec { meta = {
description = "The default build environment for Unix packages in Nixpkgs";
};
meta = { # Add a utility function to produce derivations that use this
description = "The default build environment for Unix packages in Nixpkgs"; # stdenv and its shell.
}; mkDerivation = attrs:
let
# Add a utility function to produce derivations that use this pos =
# stdenv and its shell. if attrs.meta.description or null != null then
mkDerivation = attrs: unsafeGetAttrPos "description" attrs.meta
let else
pos = unsafeGetAttrPos "name" attrs;
if attrs.meta.description or null != null then pos' = if pos != null then "" + pos.file + ":" + toString pos.line + "" else "«unknown-file»";
unsafeGetAttrPos "description" attrs.meta in
else if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then
unsafeGetAttrPos "name" attrs; throw "package ${attrs.name} in ${pos'} has an unfree license, refusing to evaluate"
pos' = if pos != null then "" + pos.file + ":" + toString pos.line + "" else "«unknown-file»"; else if !allowBroken && attrs.meta.broken or false then
in throw "you can't use package ${attrs.name} in ${pos'} because it has been marked as broken"
if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
throw "package ${attrs.name} in ${pos'} has an unfree license, refusing to evaluate" throw "the package ${attrs.name} in ${pos'} is not supported on ${result.system}"
else if !allowBroken && attrs.meta.broken or false then else
throw "you can't use package ${attrs.name} in ${pos'} because it has been marked as broken" lib.addPassthru (derivation (
else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then (removeAttrs attrs ["meta" "passthru" "crossAttrs"])
throw "the package ${attrs.name} in ${pos'} is not supported on ${result.system}" // (let
else buildInputs = attrs.buildInputs or [];
lib.addPassthru (derivation ( nativeBuildInputs = attrs.nativeBuildInputs or [];
(removeAttrs attrs ["meta" "passthru" "crossAttrs"]) propagatedBuildInputs = attrs.propagatedBuildInputs or [];
// (let propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [];
buildInputs = attrs.buildInputs or []; crossConfig = attrs.crossConfig or null;
nativeBuildInputs = attrs.nativeBuildInputs or []; in
propagatedBuildInputs = attrs.propagatedBuildInputs or [];
propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [];
crossConfig = attrs.crossConfig or null;
in
{
builder = attrs.realBuilder or shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
stdenv = result;
system = result.system;
userHook = config.stdenv.userHook or null;
# Inputs built by the cross compiler.
buildInputs = lib.optionals (crossConfig != null) buildInputs;
propagatedBuildInputs = lib.optionals (crossConfig != null)
propagatedBuildInputs;
# Inputs built by the usual native compiler.
nativeBuildInputs = nativeBuildInputs ++ lib.optionals
(crossConfig == null) buildInputs;
propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
lib.optionals (crossConfig == null) propagatedBuildInputs;
}))) (
{ {
# The meta attribute is passed in the resulting attribute set, builder = attrs.realBuilder or shell;
# but it's not part of the actual derivation, i.e., it's not args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
# passed to the builder and is not a dependency. But since we stdenv = result;
# include it in the result, it *is* available to nix-env for system = result.system;
# queries. We also a meta.position attribute here to userHook = config.stdenv.userHook or null;
# identify the source location of the package.
meta = attrs.meta or {} // (if pos != null then {
position = pos.file + ":" + (toString pos.line);
} else {});
passthru = attrs.passthru or {};
} //
# Pass through extra attributes that are not inputs, but
# should be made available to Nix expressions using the
# derivation (e.g., in assertions).
(attrs.passthru or {}));
# Utility flags to test the type of platform. # Inputs built by the cross compiler.
isDarwin = result.system == "x86_64-darwin"; buildInputs = lib.optionals (crossConfig != null) buildInputs ++ extraBuildInputs;
isLinux = result.system == "i686-linux" propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs;
|| result.system == "x86_64-linux" # Inputs built by the usual native compiler.
|| result.system == "powerpc-linux" nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) buildInputs;
|| result.system == "armv5tel-linux" propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
|| result.system == "armv6l-linux" lib.optionals (crossConfig == null) propagatedBuildInputs;
|| result.system == "armv7l-linux" }))) (
|| result.system == "mips64el-linux"; {
isGNU = result.system == "i686-gnu"; # GNU/Hurd # The meta attribute is passed in the resulting attribute set,
isGlibc = isGNU # useful for `stdenvNative' # but it's not part of the actual derivation, i.e., it's not
|| isLinux # passed to the builder and is not a dependency. But since we
|| result.system == "x86_64-kfreebsd-gnu"; # include it in the result, it *is* available to nix-env for
isSunOS = result.system == "i686-solaris" # queries. We also a meta.position attribute here to
|| result.system == "x86_64-solaris"; # identify the source location of the package.
isCygwin = result.system == "i686-cygwin"; meta = attrs.meta or {} // (if pos != null then {
isFreeBSD = result.system == "i686-freebsd" position = pos.file + ":" + (toString pos.line);
|| result.system == "x86_64-freebsd"; } else {});
isOpenBSD = result.system == "i686-openbsd" passthru = attrs.passthru or {};
|| result.system == "x86_64-openbsd"; } //
isBSD = result.system == "i686-freebsd" # Pass through extra attributes that are not inputs, but
|| result.system == "x86_64-freebsd" # should be made available to Nix expressions using the
|| result.system == "i686-openbsd" # derivation (e.g., in assertions).
|| result.system == "x86_64-openbsd"; (attrs.passthru or {}));
isi686 = result.system == "i686-linux"
|| result.system == "i686-gnu" # Utility flags to test the type of platform.
|| result.system == "i686-freebsd" isDarwin = result.system == "x86_64-darwin";
|| result.system == "i686-openbsd" isLinux = result.system == "i686-linux"
|| result.system == "i386-sunos"; || result.system == "x86_64-linux"
isx86_64 = result.system == "x86_64-linux" || result.system == "powerpc-linux"
|| result.system == "x86_64-darwin" || result.system == "armv5tel-linux"
|| result.system == "x86_64-freebsd"
|| result.system == "x86_64-openbsd"
|| result.system == "x86_64-solaris";
is64bit = result.system == "x86_64-linux"
|| result.system == "x86_64-darwin"
|| result.system == "x86_64-freebsd"
|| result.system == "x86_64-openbsd"
|| result.system == "x86_64-solaris";
isMips = result.system == "mips-linux"
|| result.system == "mips64el-linux";
isArm = result.system == "armv5tel-linux"
|| result.system == "armv6l-linux" || result.system == "armv6l-linux"
|| result.system == "armv7l-linux"; || result.system == "armv7l-linux"
|| result.system == "mips64el-linux";
isGNU = result.system == "i686-gnu"; # GNU/Hurd
isGlibc = isGNU # useful for `stdenvNative'
|| isLinux
|| result.system == "x86_64-kfreebsd-gnu";
isSunOS = result.system == "i686-solaris"
|| result.system == "x86_64-solaris";
isCygwin = result.system == "i686-cygwin";
isFreeBSD = result.system == "i686-freebsd"
|| result.system == "x86_64-freebsd";
isOpenBSD = result.system == "i686-openbsd"
|| result.system == "x86_64-openbsd";
isBSD = result.system == "i686-freebsd"
|| result.system == "x86_64-freebsd"
|| result.system == "i686-openbsd"
|| result.system == "x86_64-openbsd";
isi686 = result.system == "i686-linux"
|| result.system == "i686-gnu"
|| result.system == "i686-freebsd"
|| result.system == "i686-openbsd"
|| result.system == "i386-sunos";
isx86_64 = result.system == "x86_64-linux"
|| result.system == "x86_64-darwin"
|| result.system == "x86_64-freebsd"
|| result.system == "x86_64-openbsd"
|| result.system == "x86_64-solaris";
is64bit = result.system == "x86_64-linux"
|| result.system == "x86_64-darwin"
|| result.system == "x86_64-freebsd"
|| result.system == "x86_64-openbsd"
|| result.system == "x86_64-solaris";
isMips = result.system == "mips-linux"
|| result.system == "mips64el-linux";
isArm = result.system == "armv5tel-linux"
|| result.system == "armv6l-linux"
|| result.system == "armv7l-linux";
# Utility function: allow stdenv to be easily regenerated with # For convenience, bring in the library functions in lib/ so
# a different setup script. (See all-packages.nix for an # packages don't have to do that themselves.
# example.) inherit lib;
regenerate = stdenvGenerator;
# For convenience, bring in the library functions in lib/ so inherit fetchurlBoot;
# packages don't have to do that themselves.
inherit lib;
inherit fetchurlBoot; inherit overrides;
}
inherit overrides; # Propagate any extra attributes. For instance, we use this to
} # "lift" packages like curl from the final stdenv for Linux to
# all-packages.nix for that platform (meaning that it has a line
# like curl = if stdenv ? curl then stdenv.curl else ...).
// extraAttrs;
# Propagate any extra attributes. For instance, we use this to in result)
# "lift" packages like curl from the final stdenv for Linux to
# all-packages.nix for that platform (meaning that it has a line
# like curl = if stdenv ? curl then stdenv.curl else ...).
// extraAttrs;
}.result;
in stdenvGenerator ./setup.sh

View file

@ -782,12 +782,7 @@ let
despotify = callPackage ../development/libraries/despotify { }; despotify = callPackage ../development/libraries/despotify { };
dev86 = callPackage ../development/compilers/dev86 { dev86 = callPackage ../development/compilers/dev86 { };
/* Using GNU Make 3.82 leads to this:
make[4]: *** No rule to make target `__ldivmod.o)'
So use 3.81. */
stdenv = overrideInStdenv stdenv [gnumake381];
};
dnsmasq = callPackage ../tools/networking/dnsmasq { }; dnsmasq = callPackage ../tools/networking/dnsmasq { };