splice.nix: start deprecating nativeDrv and crossDrv

Artturin 341e6fd5 70225566

Changed files
+21 -26
doc
lib
pkgs
build-support
kernel
node
build-npm-package
hooks
rust
hooks
development
libraries
stdenv
top-level
+1 -1
doc/stdenv/cross-compilation.chapter.md
···
:::
::: {.note}
-
If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon.
:::
···
:::
::: {.note}
+
If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.__spliced.buildHost` or `.__spliced.hostTarget`.
:::
+1
lib/customisation.nix
···
//
(drv.passthru or {})
//
(lib.optionalAttrs (drv ? crossDrv && drv ? nativeDrv) {
crossDrv = overrideDerivation drv.crossDrv f;
nativeDrv = overrideDerivation drv.nativeDrv f;
···
//
(drv.passthru or {})
//
+
# TODO(@Artturin): remove before release 23.05 and only have __spliced.
(lib.optionalAttrs (drv ? crossDrv && drv ? nativeDrv) {
crossDrv = overrideDerivation drv.crossDrv f;
nativeDrv = overrideDerivation drv.nativeDrv f;
+1 -1
pkgs/build-support/kernel/make-initrd-ng.nix
···
nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;
-
STRIP = if strip then "${(binutils.nativeDrv or binutils).targetPrefix}strip" else null;
}) ''
mkdir ./root
make-initrd-ng "$contentsPath" ./root
···
nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;
+
STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null;
}) ''
mkdir ./root
make-initrd-ng "$contentsPath" ./root
+4 -5
pkgs/build-support/node/build-npm-package/hooks/default.nix
···
-
{ lib, makeSetupHook, nodejs, srcOnly, diffutils, jq, makeWrapper }:
{
npmConfigHook = makeSetupHook
···
# Specify the stdenv's `diff` and `jq` by abspath to ensure that the user's build
# inputs do not cause us to find the wrong binaries.
-
# The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available.
-
diff = "${diffutils.nativeDrv or diffutils}/bin/diff";
-
jq = "${jq.nativeDrv or jq}/bin/jq";
nodeVersion = nodejs.version;
nodeVersionMajor = lib.versions.major nodejs.version;
···
deps = [ makeWrapper ];
substitutions = {
hostNode = "${nodejs}/bin/node";
-
jq = "${jq.nativeDrv or jq}/bin/jq";
};
} ./npm-install-hook.sh;
}
···
+
{ lib, makeSetupHook, nodejs, srcOnly, buildPackages, makeWrapper }:
{
npmConfigHook = makeSetupHook
···
# Specify the stdenv's `diff` and `jq` by abspath to ensure that the user's build
# inputs do not cause us to find the wrong binaries.
+
diff = "${buildPackages.diffutils}/bin/diff";
+
jq = "${buildPackages.jq}/bin/jq";
nodeVersion = nodejs.version;
nodeVersionMajor = lib.versions.major nodejs.version;
···
deps = [ makeWrapper ];
substitutions = {
hostNode = "${nodejs}/bin/node";
+
jq = "${buildPackages.jq}/bin/jq";
};
} ./npm-install-hook.sh;
}
+1 -3
pkgs/build-support/rust/hooks/default.nix
···
, callPackage
, cargo
, clang
-
, diffutils
, lib
, makeSetupHook
, maturin
···
# Specify the stdenv's `diff` by abspath to ensure that the user's build
# inputs do not cause us to find the wrong `diff`.
-
# The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available.
-
diff = "${diffutils.nativeDrv or diffutils}/bin/diff";
# We want to specify the correct crt-static flag for both
# the build and host platforms. This is important when the wanted
···
, callPackage
, cargo
, clang
, lib
, makeSetupHook
, maturin
···
# Specify the stdenv's `diff` by abspath to ensure that the user's build
# inputs do not cause us to find the wrong `diff`.
+
diff = "${lib.getBin buildPackages.diffutils}/bin/diff";
# We want to specify the correct crt-static flag for both
# the build and host platforms. This is important when the wanted
+2
pkgs/development/libraries/qt-6/default.nix
···
} ./hooks/qmake-hook.sh;
};
self = lib.makeScope newScope addPackages;
in
self
···
} ./hooks/qmake-hook.sh;
};
+
# TODO(@Artturin): convert to makeScopeWithSplicing
+
# simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01
self = lib.makeScope newScope addPackages;
in
self
+1 -1
pkgs/development/libraries/qt-6/qtModule.nix
···
if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
# FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs
# I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin
-
${self.qtbase.dev.nativeDrv or self.qtbase.dev}/libexec/syncqt.pl -version "''${version%%-*}"
fi
'';
···
if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
# FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs
# I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin
+
${lib.getDev self.qtbase}/libexec/syncqt.pl -version "''${version%%-*}"
fi
'';
+4 -4
pkgs/stdenv/generic/make-derivation.nix
···
dependencies = map (map lib.chooseDevOutputs) [
[
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild))
-
(map (drv: drv.nativeDrv or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs
++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh
++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh
++ lib.optionals doCheck checkInputs
···
]
[
(map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost))
-
(map (drv: drv.crossDrv or drv) (checkDependencyList "buildInputs" buildInputs))
]
[
(map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget))
···
propagatedDependencies = map (map lib.chooseDevOutputs) [
[
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated))
-
(map (drv: drv.nativeDrv or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs))
(map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated))
]
[
(map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHostPropagated" depsHostHostPropagated))
-
(map (drv: drv.crossDrv or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs))
]
[
(map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated))
···
dependencies = map (map lib.chooseDevOutputs) [
[
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild))
+
(map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs
++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh
++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh
++ lib.optionals doCheck checkInputs
···
]
[
(map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost))
+
(map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "buildInputs" buildInputs))
]
[
(map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget))
···
propagatedDependencies = map (map lib.chooseDevOutputs) [
[
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated))
+
(map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs))
(map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated))
]
[
(map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHostPropagated" depsHostHostPropagated))
+
(map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs))
]
[
(map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated))
+6 -11
pkgs/top-level/splice.nix
···
# The solution is to splice the package sets together as we do below, so every
# `callPackage`d expression in fact gets both versions. Each# derivation (and
# each derivation's outputs) consists of the run-time version, augmented with a
-
# `nativeDrv` field for the build-time version, and `crossDrv` field for the
# run-time version.
-
#
-
# We could have used any names we want for the disambiguated versions, but
-
# `crossDrv` and `nativeDrv` were somewhat similarly used for the old
-
# cross-compiling infrastructure. The names are mostly invisible as
-
# `mkDerivation` knows how to pull out the right ones for `buildDepends` and
-
# friends, but a few packages use them directly, so it seemed efficient (to
-
# @Ericson2314) to reuse those names, at least initially, to minimize breakage.
#
# For performance reasons, rather than uniformally splice in all cases, we only
# do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice`
···
valueHostTarget = pkgsHostTarget.${name} or {};
valueTargetTarget = pkgsTargetTarget.${name} or {};
augmentedValue = defaultValue
-
# TODO(@Ericson2314): Stop using old names after transition period
-
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = valueBuildHost; })
-
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = valueHostTarget; })
// {
__spliced =
(lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
// (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
// (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })
// (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget;
});
};
···
# The solution is to splice the package sets together as we do below, so every
# `callPackage`d expression in fact gets both versions. Each# derivation (and
# each derivation's outputs) consists of the run-time version, augmented with a
+
# `__spliced.buildHost` field for the build-time version, and `__spliced.hostTarget` field for the
# run-time version.
#
# For performance reasons, rather than uniformally splice in all cases, we only
# do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice`
···
valueHostTarget = pkgsHostTarget.${name} or {};
valueTargetTarget = pkgsTargetTarget.${name} or {};
augmentedValue = defaultValue
+
# TODO(@Artturin): remove before release 23.05 and only have __spliced.
+
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = lib.warn "use ${name}.__spliced.buildHost instead of ${name}.nativeDrv" valueBuildHost; })
+
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = lib.warn "use ${name}.__spliced.hostTarget instead of ${name}.crossDrv" valueHostTarget; })
// {
__spliced =
(lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
+
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; })
// (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
// (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })
+
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; })
// (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget;
});
};