auxolotl/labs
26
12
Fork 16
Code Issues 6 Pull requests 9 Projects Releases Packages Wiki Activity Actions

refactor: eval performant target (#40)

Browse source 
Using `.extend` function causes nix to not cache the evaluation of a package (`a.extend {} != a.extend {}` ). In effect this meant that every time we used
```
	          gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
            settings.target = config.platform.host;
          };
          binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
            settings.target = config.platform.host;
          };
```
we were performing full re-evaluations of binutils and gcc. To make this worse, since binutils and gcc depend on other binutils and gcc (sometimes with this `.extend`), the amount of evaluations would start to blow up.
Before this patch evaluating `packages.foundation.gcc.latest.packages.x86_64-linux.x86_64-linux.package` would evaluate `binutils` stage1 139 times, after this patch (and before target patch) it's 4.

Reviewed-on: #40
Co-authored-by: Victor Fuentes <vlinkz@snowflakeos.org>
Co-committed-by: Victor Fuentes <vlinkz@snowflakeos.org>
This commit is contained in:
Victor Fuentes 2025-10-15 03:23:25 +00:00 • committed by vlinkz
parent 76cd63f5fe
commit e2f6de0b11
25 changed files with 86 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix
View file

@ -78,12 +78,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix
View file

@ -36,6 +36,14 @@ in
default.value = false;
};
};
target = lib.options.create {
type = lib.types.raw;
default.value = lib.attrs.generate lib.systems.doubles.all (
target:
(config.extend { settings.target = target; })
.packages.${config.platform.build}.${config.platform.host}
);
};
};
config = {

16
tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix
View file

@ -62,6 +62,14 @@ in
default.value = false;
};
};
target = lib.options.create {
type = lib.types.raw;
default.value = lib.attrs.generate lib.systems.doubles.all (
target:
(config.extend { settings.target = target; })
.packages.${config.platform.build}.${config.platform.host}
);
};
};
config = {
@ -129,12 +137,8 @@ in
}
)
// (lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
});
};

8
tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix
View file

@ -77,12 +77,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix
View file

@ -68,12 +68,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix
View file

@ -84,12 +84,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix
View file

@ -79,12 +79,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix
View file

@ -79,12 +79,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix
View file

@ -79,12 +79,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/gcc/versions/13.2.0-passthrough.nix
View file

@ -33,6 +33,14 @@ in
default.value = config.platform.host;
description = "Target of the compiler";
};
target = lib.options.create {
type = lib.types.raw;
default.value = lib.attrs.generate lib.systems.doubles.all (
target:
(config.extend { settings.target = target; })
.packages.${config.platform.build}.${config.platform.host}
);
};
};
config = {

13
tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix
View file

@ -79,6 +79,14 @@ in
default.value = "x86_64-linux";
description = "Target of the compiler";
};
target = lib.options.create {
type = lib.types.raw;
default.value = lib.attrs.generate lib.systems.doubles.all (
target:
(config.extend { settings.target = target; })
.packages.${config.platform.build}.${config.platform.host}
);
};
};
config = {
@ -168,9 +176,8 @@ in
}
)
// {
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.settings.target;
};
binutils-cross =
packages.foundation.binutils.versions."2.41-stage1".target.${config.settings.target};
};
};

13
tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
View file

@ -82,6 +82,14 @@ in
default.value = "x86_64-linux";
description = "Target of the compiler";
};
target = lib.options.create {
type = lib.types.raw;
default.value = lib.attrs.generate lib.systems.doubles.all (
target:
(config.extend { settings.target = target; })
.packages.${config.platform.build}.${config.platform.host}
);
};
};
config = {
@ -171,9 +179,8 @@ in
}
)
// {
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.settings.target;
};
binutils-cross =
packages.foundation.binutils.versions."2.41-stage1".target.${config.settings.target};
};
host = {

8
tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
View file

@ -163,12 +163,8 @@ in
}
)
// {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
host = {

8
tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix
View file

@ -99,12 +99,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage1".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage1".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
host = {
linux-headers = packages.foundation.linux-headers.versions."6.5.6-stage1";

8
tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix
View file

@ -79,12 +79,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix
View file

@ -79,12 +79,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix
View file

@ -85,12 +85,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix
View file

@ -79,12 +79,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix
View file

@ -79,12 +79,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix
View file

@ -79,12 +79,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix
View file

@ -79,12 +79,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc-cross = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils-cross = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/musl/versions/1.2.4-stage1.nix
View file

@ -67,12 +67,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
# target = lib.attrs.when (config.platform.host != config.platform.target) {
# gcc = packages.foundation.gcc.versions."13.2.0-stage2";

8
tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix
View file

@ -81,12 +81,8 @@ in
)
// lib.attrs.when (config.platform.build != config.platform.host) {
python = packages.foundation.python.versions."3.12.0-stage1";
gcc = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
host = {

8
tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix
View file

@ -75,12 +75,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};

8
tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix
View file

@ -68,12 +68,8 @@ in
}
)
// lib.attrs.when (config.platform.build != config.platform.host) {
gcc = packages.foundation.gcc.versions."13.2.0-stage2".extend {
settings.target = config.platform.host;
};
binutils = packages.foundation.binutils.versions."2.41-stage1".extend {
settings.target = config.platform.host;
};
gcc = packages.foundation.gcc.versions."13.2.0-stage2".target.${config.platform.host};
binutils = packages.foundation.binutils.versions."2.41-stage1".target.${config.platform.host};
};
};