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

WIP: basic capabilities #56

Draft
vlinkz wants to merge 3 commits from vlinkz/labs:capabilitiespoc into main
pull from: vlinkz/labs:capabilitiespoc
merge into: auxolotl:main
Conversation 5 Commits 3 Files changed 6 +124 -42
5 changed files with 124 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f1b82410df - Show all commits

53
tidepool/src/capabilities/configure.nix Normal file
View file

@ -0,0 +1,53 @@
{
config.capabilities.configure =
{ config, global, ... }:
let
inherit (global)
lib
;
platform = {
build = lib.systems.withBuildInfo config.platform.build;
host = lib.systems.withBuildInfo config.platform.host;
};
in
{
options.configure = {
flags = lib.options.create {
description = "List of flags to pass to configure.";
type = lib.types.list.of lib.types.string;
default.value = [ ];
};
prefix = lib.options.create {
description = "Include prefix configure flag.";
type = lib.types.bool;
default.value = true;
};
platforms = lib.options.create {
description = "Include platform configure flags.";
type = lib.types.bool;
default.value = true;
};
};
config = {
phases =
let
configureFlags = builtins.concatStringsSep " " (
lib.lists.when config.configure.prefix [ "--prefix=$out" ]
++ lib.lists.when config.configure.platforms [
"--build=${platform.build.triple}"
"--host=${platform.host.triple}"
]
++ config.configure.flags
);
in
{
configureConfigure = lib.dag.entry.between [ "unpack" ] [ "configure" ] ''
RossSmyth commented 2025-12-03 19:38:58 +00:00
Copy link

It is a bit unfortunate that they cannot directly set the configure phase

It is a bit unfortunate that they cannot directly set the `configure` phase
bash ./configure \
RossSmyth commented 2025-12-03 19:34:37 +00:00
Copy link

We shouldn't call bash ./configure directly because there is more software than you may realize that use Python, Perl, Scheme, or something else for their configure scripts. I would prefer to just use the shebangs, but Aux does not have a way to patch shebangs (yet), so I would instead just put a TODO.

We shouldn't call `bash ./configure` directly because there is more software than you may realize that use Python, Perl, Scheme, or something else for their configure scripts. I would prefer to just use the shebangs, but Aux does not have a way to patch shebangs (yet), so I would instead just put a TODO.
${configureFlags}
RossSmyth commented 2025-12-03 19:36:10 +00:00
Copy link

One thing I'd like to devise is a way to pass arguments down the to derivation call so that we can use structuredAttrs for configure flags and such, as they means Aux doesn't need to worry about escaping and spaces, as it will Just Work since Nix does the proper escaping for us.

If you don't want to, can just put a TODO there.

One thing I'd like to devise is a way to pass arguments down the to derivation call so that we can use `structuredAttrs` for configure flags and such, as they means Aux doesn't need to worry about escaping and spaces, as it will Just Work since Nix does the proper escaping for us. If you don't want to, can just put a TODO there.
'';
};
};
};
}

2
tidepool/src/capabilities/default.nix
View file

@ -4,7 +4,9 @@ let
in
{
includes = [
./unpack.nix
./make.nix
./configure.nix
];
options = {

13
tidepool/src/capabilities/make.nix
View file

@ -14,12 +14,17 @@
type = lib.types.list.of lib.types.string;
default.value = [ ];
};
bootstrap = lib.options.create {
description = "Whether to use the bootstrap tools for i686-linux builds.";
type = lib.types.bool;
default.value = false;
};
};
config = {
deps.build.build = {
deps.build = {
gnumake =
if (config.platform.build == "i686-linux") then
if (config.make.bootstrap && config.platform.build == "i686-linux") then
packages.foundation.gnumake.versions."4.4.1-bootstrap"
else
packages.foundation.gnumake.versions."4.4.1-stage1-passthrough";
@ -30,10 +35,10 @@
makeFlags = builtins.concatStringsSep " " config.make.flags;
RossSmyth commented 2025-12-03 19:38:03 +00:00
Copy link

Same thing, TODO for structuredAttrs if you want, so we don't need to concat things with spaces naively.

As a minor improvement quoting each argument is probably fine.

Same thing, TODO for `structuredAttrs` if you want, so we don't need to concat things with spaces naively. As a minor improvement quoting each argument is probably fine.
in
{
makeBuild = lib.dag.entry.before [ "build" ] ''
makeBuild = lib.dag.entry.between [ "configure" ] [ "build" ] ''
make -j $NIX_BUILD_CORES ${makeFlags}
'';
makeInstall = lib.dag.entry.before [ "install" ] ''
makeInstall = lib.dag.entry.between [ "build" ] [ "install" ] ''
make -j $NIX_BUILD_CORES install ${makeFlags}
'';
};

46
tidepool/src/capabilities/unpack.nix Normal file
View file

@ -0,0 +1,46 @@
{
config.capabilities.unpack =
{ config, global, ... }:
let
inherit (global)
lib
packages
;
in
{
options.unpack = {
RossSmyth commented 2025-12-03 19:47:08 +00:00
Copy link

Should add an option for the command to run for unpacking, defaulting to tar xfz so that other formats can be unpacked (zip, deb, ...)

Should add an option for the command to run for unpacking, defaulting to `tar xfz` so that other formats can be unpacked (zip, deb, ...)
bootstrap = lib.options.create {
description = "Whether to use the bootstrap tools for i686-linux builds.";
type = lib.types.bool;
default.value = false;
};
};
config = {
deps.build =
if (config.make.bootstrap && config.platform.build == "i686-linux") then
{
bzip2 = packages.foundation.bzip2.versions."1.0.8-bootstrap";
gnutar = packages.foundation.gnutar.versions."1.35-bootstrap";
gzip = packages.foundation.gzip.versions."1.13-bootstrap";
xz = packages.foundation.xz.versions."5.4.3-bootstrap";
}
else
{
bzip2 = packages.foundation.bzip2.versions."1.0.8-stage1-passthrough";
gnutar = packages.foundation.gnutar.versions."1.35-stage1-passthrough";
gzip = packages.foundation.gzip.versions."1.13-stage1-passthrough";
xz = packages.foundation.xz.versions."5.4.3-stage1-passthrough";
};
phases = {
RossSmyth commented 2025-12-03 19:39:38 +00:00
Copy link

Same thing about structuredAttrs here as well.

Same thing about `structuredAttrs` here as well.
unpackUnpack = lib.dag.entry.before [ "unpack" ] ''
before=$(ls -d */ 2>/dev/null | sort)
RossSmyth commented 2025-12-03 19:45:27 +00:00
Copy link

I would recommend using find instead as ls is really only for human output, and ls will often adjust names for better human consumption (if they are not alphanumeric).

Also the glob will fail if there are names with dashes in it, so it should be something like ls -d -- */, or else they will becomes arguments to ls

I would recommend using `find` instead as `ls` is really only for human output, and `ls` will often adjust names for better human consumption (if they are not alphanumeric). Also the glob will fail if there are names with dashes in it, so it should be something like `ls -d -- */`, or else they will becomes arguments to `ls`
tar xzf ${config.src}
after=$(ls -d */ 2>/dev/null | sort)
cd $(comm -13 <(echo "$before") <(echo "$after") | head -1)
'';
};
};
};
}

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

@ -10,15 +10,12 @@ let
;
version = lib.strings.removeSuffix "-stage1" config.version;
platform = {
build = lib.systems.withBuildInfo config.platform.build;
host = lib.systems.withBuildInfo config.platform.host;
};
in
{
includes = [
capabilities.make
includes = with capabilities; [
unpack
make
configure
];
config = {
@ -57,10 +54,8 @@ in
{
gnupatch = packages.foundation.gnupatch.versions."2.7-bootstrap";
gnused = packages.foundation.gnused.versions."4.9-bootstrap";
gnutar = packages.foundation.gnutar.versions."1.35-bootstrap";
gnugrep = packages.foundation.gnugrep.versions."3.11-bootstrap";
gawk = packages.foundation.gawk.versions."5.2.2-bootstrap";
gzip = packages.foundation.gzip.versions."1.13-bootstrap";
diffutils = packages.foundation.diffutils.versions."3.10-bootstrap";
findutils = packages.foundation.findutils.versions."4.9.0-bootstrap";
gcc = packages.foundation.gcc.versions."13.2.0-bootstrap";
@ -70,10 +65,8 @@ in
{
gnupatch = packages.foundation.gnupatch.versions."2.7-stage1-passthrough";
gnused = packages.foundation.gnused.versions."4.9-stage1-passthrough";
gnutar = packages.foundation.gnutar.versions."1.35-stage1-passthrough";
gnugrep = packages.foundation.gnugrep.versions."3.11-stage1-passthrough";
gawk = packages.foundation.gawk.versions."5.2.2-stage1-passthrough";
gzip = packages.foundation.gzip.versions."1.13-stage1-passthrough";
diffutils = packages.foundation.diffutils.versions."3.10-stage1-passthrough";
findutils = packages.foundation.findutils.versions."4.9.0-stage1-passthrough";
gcc = packages.foundation.gcc.versions."13.2.0-stage4";
@ -86,34 +79,17 @@ in
};
};
unpack.bootstrap = true;
RossSmyth commented 2025-12-03 19:47:34 +00:00
Copy link

This looks great!

This looks great!
make.bootstrap = true;
configure.flags = [
"--enable-static-link"
"bash_cv_func_strtoimax=y"
]
++ lib.lists.when (config.platform.host == "i686-linux") [
"--without-bash-malloc"
];
phases = {
unpack = ''
# Unpack
tar xf ${config.src}
cd bash-${version}
'';
configure =
let
flags = builtins.concatStringsSep " " (
[
"--prefix=$out"
"--build=${platform.build.triple}"
"--host=${platform.host.triple}"
"--enable-static-link"
]
++ lib.lists.when (config.platform.host == "i686-linux") [
"--without-bash-malloc"
]
);
in
''
# Configure
bash ./configure \
${flags} \
bash_cv_func_strtoimax=y
'';
install = ''
# Install
rm $out/bin/bashbug