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

refactor: namespace builders

Browse source
This commit is contained in:
Jake Hamilton 2025-09-14 09:27:13 -07:00
parent f4f1f0aea7
commit 6854e9ccac
Signed by: jakehamilton
GPG key ID: 9762169A1B35EA68
80 changed files with 191 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tidepool/default.nix
View file

@ -50,5 +50,5 @@ let
in
new [
./src/packages
./src/builders/basic.nix
./src/builders/foundation/basic.nix
]

4
tidepool/src/builders/default.nix
View file

@ -4,13 +4,13 @@ let
in
{
includes = [
./passthrough.nix
./foundation
];
options = {
builders = lib.options.create {
description = "A set of builders that can be used to build packages.";
type = lib.types.attrs.of lib.types.builder;
type = lib.types.attrs.of (lib.types.attrs.of lib.types.builder);
default.value = { };
};
};

12
tidepool/src/builders/basic.nix → tidepool/src/builders/foundation/basic.nix
View file

@ -8,7 +8,7 @@ let
pretty = lib.generators.pretty { };
in
{
config.builders.basic = {
config.builders.foundation.basic = {
build =
package:
let
@ -52,7 +52,13 @@ in
sorted = lib.dag.sort.topological phases;
script = lib.strings.concatMapSep "\n" (entry: entry.value) sorted.result;
script = lib.strings.concatMapSep "\n"
(entry: ''
# Phase: ${entry.name}
# ====================================================
${entry.value}
'')
sorted.result;
executable =
if system == "i686-linux" then
@ -74,6 +80,8 @@ in
inherit (package) name;
inherit script system;
outputs = builtins.attrNames (lib.packages.getOutputs package);
passAsFile = [ "script" ];
SHELL = executable;

9
tidepool/src/builders/foundation/default.nix Normal file
View file

@ -0,0 +1,9 @@
{
includes = [
# We explicitly don't include `basic` here to let users create package sets which do not
# include anything from `packages.foundation`.
# ./basic.nix
./passthrough.nix
];
}

2
tidepool/src/builders/passthrough.nix → tidepool/src/builders/foundation/passthrough.nix
View file

@ -6,7 +6,7 @@ let
inherit (config.internal.packages) foundation;
in
{
config.builders.passthrough =
config.builders.foundation.passthrough =
{ config }:
{
options = {

10
tidepool/src/lib/packages.nix
View file

@ -209,6 +209,16 @@ in
in
builtins.head sorted;
getOutputs = alias:
let
package = lib.packages.resolve alias;
outputs = if builtins.isList package.outputs then
lib.attrs.generate package.outputs (output: package.package.${output})
else
package.outputs;
in
outputs;
resolve =
alias:
if alias ? versions then

87
tidepool/src/lib/types.nix
View file

@ -796,76 +796,6 @@ in
type = lib.types.builder;
};
# builder = lib.options.create {
# description = "The builder for the package.";
# type =
# let
# initial = lib.types.withCheck lib.types.raw (
# value:
# let
# builder = global.config.builders.${value.name} or null;
# in
# if builder == null then
# builtins.throw "Builder `${
# lib.options.getIdentifier [
# "builders"
# value.name
# ]
# }` for `${
# lib.options.getIdentifier [
# "packages"
# config.namespace
# config.id
# "versions"
# config.version
# ]
# }` is used but not defined."
# else
# value ? name && value ? build
# );
#
# transform =
# value:
# if value ? settings.__type__ then
# value
# // {
# settings = { };
# }
# else
# value;
#
# final = lib.types.withCheck lib.types.raw (
# value:
# let
# builder = global.config.builders.${value.name} or null;
# results = lib.attrs.mapToList (
# name: option:
# if option.type.check value.settings.${name} then
# true
# else
# builtins.throw "The option `${
# lib.options.getIdentifier [
# "packages"
# config.namespace
# config.id
# "versions"
# config.version
# "builder"
# "settings"
# name
# ]
# }` is not of type ${option.type.description}."
# ) builder.settings;
# checked = builtins.foldl' (acc: result: builtins.seq result acc) true results;
# in
# if value ? settings.__type__ then false else checked
# );
#
# coerced = lib.types.coerce initial transform final;
# in
# coerced;
# };
src = lib.options.create {
description = "The source for the package.";
type =
@ -881,6 +811,23 @@ in
default.value = null;
};
outputs = lib.options.create {
description = "The outputs for the package.";
type = let
initial = lib.types.attrs.of lib.types.derivation;
transform = builtins.attrNames;
final = lib.types.list.of lib.types.string;
in
lib.types.coerce initial transform final;
default.value = [ "out" ];
apply = outputs:
lib.attrs.generate
outputs
(output: config.package.${output});
};
env = lib.options.create {
description = "The environment for the package.";
type = lib.types.attrs.of lib.types.string;

61
tidepool/src/packages/core/README.md Normal file
View file

@ -0,0 +1,61 @@
# Core Packages
The goal of Core packages is to build commonly required software in addition to a Nix
implementation (Lix).
## Lix
In order to build Lix, we first need to package its dependencies:
- `aws-sdk-cpp`
- `boehmgc`
- `boehmgc-nix`
- `boost`
- `brotli`
- `build-release-notes`
- `busybox-sandbox-shell`
- `bzip2`
- `capnproto`
- `cmake`
- `curl`
- `doxygen`
- `editline`
- `editline-lix`
- `git`
- `gtest`
- `gcc`
- `glibc`
- `binutils`
- `python` (with `python-frontmatter`, `pycapnp`)
- `jq`
- `libarchive`
- `libcpuid`
- `libseccomp`
- `libsystemtap`
- `lowdown`
- `lowdown-unsandboxed`
- `lsof`
- `mdbook`
- `mdbook-linkcheck`
- `mercurial`
- `meson`
- `ncurses`
- `ninja`
- `nlohmann_json`
- `openssl`
- `passt-lix`
- `pegtl`
- `pkg-config`
- `python3`
- `rapidcheck`
- `removeReferencesTo`
- `rustc`
- `rustPlatform`
- `sqlite`
- `systemtap-lix`
- `toml11`
- `toml11-lix`
- `util-linuxMinimal`
- `utillinuxMinimal`
- `xz`
- `yq`

5
tidepool/src/packages/core/default.nix Normal file
View file

@ -0,0 +1,5 @@
{
includes = [
./lix
];
}

3
tidepool/src/packages/core/lix/default.nix Normal file
View file

@ -0,0 +1,3 @@
{
config.packages.lix.lix = { };
}

1
tidepool/src/packages/default.nix
View file

@ -5,6 +5,7 @@ in
{
includes = [
./aux
./core
./foundation
];

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

@ -34,7 +34,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -39,7 +39,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/bash/bash-${version}.tar.gz";

2
tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-binutils;
};

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

@ -35,7 +35,7 @@ in
}
];
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -78,7 +78,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/binutils/binutils-${version}.tar.xz";

2
tidepool/src/packages/foundation/bison/versions/3.8.2-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage1-bison;
};

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

@ -31,7 +31,7 @@ in
target = "x86_64-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -31,7 +31,7 @@ in
target = "x86_64-linux";
};
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/bison/bison-${version}.tar.xz";

6
tidepool/src/packages/foundation/busybox/versions/1.36.1-bootstrap.nix
View file

@ -1,8 +1,8 @@
{ config, global }:
let
inherit (global) lib packages builders;
inherit (global.internal.packages) foundation;
inherit (global) lib packages builders. foundation.
inherit ( global. internal. packages) foundation;
in
{
config = {
@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-busybox;
};

2
tidepool/src/packages/foundation/bzip2/versions/1.0.8-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-bzip2;
};

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

@ -33,7 +33,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -43,7 +43,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz";

2
tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-coreutils;
};

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

@ -33,7 +33,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -50,7 +50,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/coreutils/coreutils-${version}.tar.gz";

2
tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-diffutils;
};

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

@ -33,7 +33,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -38,7 +38,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/diffutils/diffutils-${version}.tar.xz";

2
tidepool/src/packages/foundation/findutils/versions/4.9.0-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-findutils;
};

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

@ -35,7 +35,7 @@ in
}
];
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -38,7 +38,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/findutils/findutils-${version}.tar.xz";

2
tidepool/src/packages/foundation/gawk/versions/5.2.2-bootstrap.nix
View file

@ -20,7 +20,7 @@ in
}
];
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-gawk;
};

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

@ -35,7 +35,7 @@ in
}
];
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -38,7 +38,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/gawk/gawk-${version}.tar.gz";

2
tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
View file

@ -23,7 +23,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-gcc;
};

2
tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix
View file

@ -78,7 +78,7 @@ in
target = "i686-linux";
};
builder = builders.basic;
builder = builders.foundation.basic;
gmp.version = "6.3.0";
mpfr.version = "4.2.1";

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

@ -98,7 +98,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
gmp.version = "6.3.0";
mpfr.version = "4.2.1";

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

@ -93,7 +93,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
gmp.version = "6.3.0";
mpfr.version = "4.2.1";

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

@ -34,7 +34,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -94,7 +94,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
gmp.version = "6.3.0";
mpfr.version = "4.2.1";

2
tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
View file

@ -81,7 +81,7 @@ in
target = "@build";
};
builder = builders.basic;
builder = builders.foundation.basic;
gmp.version = "6.3.0";
mpfr.version = "4.2.1";

2
tidepool/src/packages/foundation/gcc/versions/13.2.0-stage5.nix
View file

@ -52,7 +52,7 @@ in
hooks = package.hooks;
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

2
tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix
View file

@ -38,7 +38,7 @@ in
target = "i686-linux";
};
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/libc/glibc-${version}.tar.xz";

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

@ -43,7 +43,7 @@ in
dynamicLinker = package.dynamicLinker;
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -46,7 +46,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/libc/glibc-${version}.tar.xz";

2
tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-gnugrep;
};

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

@ -33,7 +33,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -38,7 +38,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/grep/grep-${version}.tar.xz";

2
tidepool/src/packages/foundation/gnum4/versions/1.4.19-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage1-gnum4;
};

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

@ -31,7 +31,7 @@ in
target = "x86_64-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -31,7 +31,7 @@ in
target = "x86_64-linux";
};
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/m4/m4-${version}.tar.xz";

2
tidepool/src/packages/foundation/gnumake/versions/4.4.1-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-gnumake;
};

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

@ -33,7 +33,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -43,7 +43,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/make/make-${version}.tar.gz";

2
tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-gnupatch;
};

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

@ -33,7 +33,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -38,7 +38,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/patch/patch-${version}.tar.xz";

2
tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-gnused;
};

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

@ -33,7 +33,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -38,7 +38,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/sed/sed-${version}.tar.xz";

2
tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-gnutar;
};

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

@ -33,7 +33,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -38,7 +38,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/tar/tar-${version}.tar.gz";

2
tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-gzip;
};

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

@ -33,7 +33,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -43,7 +43,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "${mirrors.gnu}/gzip/gzip-${version}.tar.xz";

2
tidepool/src/packages/foundation/linux-headers/versions/6.5.6-bootstrap.nix
View file

@ -17,7 +17,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage1-linux-headers;
};

2
tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix
View file

@ -25,7 +25,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

2
tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix
View file

@ -25,7 +25,7 @@ in
target = "@linux";
};
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";

2
tidepool/src/packages/foundation/musl/versions/1.2.4-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage1-musl;
};

2
tidepool/src/packages/foundation/musl/versions/1.2.4.nix
View file

@ -24,7 +24,7 @@ in
target = [ "i686-linux" "x86_64-linux" ];
};
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "https://musl.libc.org/releases/musl-${config.version}.tar.gz";

2
tidepool/src/packages/foundation/patchelf/versions/0.18.0-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage2-patchelf;
};

2
tidepool/src/packages/foundation/python/versions/3.12.0-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage1-python;
};

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

@ -35,7 +35,7 @@ in
target = "@build";
};
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";

2
tidepool/src/packages/foundation/xz/versions/5.4.3-bootstrap.nix
View file

@ -21,7 +21,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage1-xz;
};

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

@ -36,7 +36,7 @@ in
target = "@build";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = package.package;
};

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

@ -41,7 +41,7 @@ in
}
];
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "https://tukaani.org/xz/xz-${version}.tar.gz";

2
tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix
View file

@ -18,7 +18,7 @@ in
target = "i686-linux";
};
builder = builders.passthrough.extend {
builder = builders.foundation.passthrough.extend {
settings = {
derivation = foundation.stage1-zlib;
};

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

@ -31,7 +31,7 @@ in
target = "@build";
};
builder = builders.basic;
builder = builders.foundation.basic;
src = builtins.fetchurl {
url = "https://github.com/madler/zlib/releases/download/v${version}/zlib-${version}.tar.xz";