auxolotl/labs
22
8
Fork 4
Code Issues 1 Pull requests 3 Actions Packages Projects Releases Wiki Activity

feat: inital support for x86_64-linux

Browse source
This commit is contained in:
isabel roses 2024-06-13 13:00:59 +01:00
parent 9c29945531
commit e0eeb90446
Signed by: isabelroses
GPG key ID: 08A97B9A107A1798
5 changed files with 71 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
foundation/flake.lock
View file

@ -3,10 +3,10 @@
"lib": { "lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"dirtyRev": "f24f0876a9103c7adb8120ce9709fb90c73f2a7c-dirty", "dirtyRev": "9c29945531c58ad81f05cd1f4958c8894a733216-dirty",
"dirtyShortRev": "f24f087-dirty", "dirtyShortRev": "9c29945-dirty",
"lastModified": 1718105966, "lastModified": 1718255029,
"narHash": "sha256-L68G29+bPmwZSERg3VYXdfont/w+mssmWnrs6tyBijk=", "narHash": "sha256-DtCLqQJ1Aa3WTrZcfZyVEa5uGZeYh+7YuqT44K166Cg=",
"type": "git", "type": "git",
"url": "file:../?dir=lib" "url": "file:../?dir=lib"
}, },

49
foundation/flake.nix
View file

@ -7,34 +7,33 @@
}; };
}; };
outputs = inputs: let outputs =
inherit (inputs.lib) lib; inputs:
let
inherit (inputs.lib) lib;
modules = import ./src; modules = import ./src;
forEachSystem = lib.attrs.generate [ forEachSystem = lib.attrs.generate [
"i686-linux" "i686-linux"
]; "x86_64-linux"
in { ];
extras = let
result = lib.modules.run {
modules =
builtins.attrValues modules;
};
in in
result.config.exports.resolved.extras; {
extras =
let
result = lib.modules.run { modules = builtins.attrValues modules; };
in
result.config.exports.resolved.extras;
packages = forEachSystem ( packages = forEachSystem (
system: let system:
result = lib.modules.run { let
modules = result = lib.modules.run {
(builtins.attrValues modules) modules = (builtins.attrValues modules) ++ [ { config.aux.system = system; } ];
++ [ };
{config.aux.system = system;} in
];
};
in
result.config.exports.resolved.packages result.config.exports.resolved.packages
); );
}; };
} }

40
potluck/default.nix
View file

@ -1,30 +1,30 @@
{ {
lib ? import ./../lib, lib ? import ./../lib,
foundation ? import ./../foundation {system = "i686-linux";}, system ? builtins.currentSystem,
}: let foundation ? import ./../foundation { inherit system; },
}:
let
modules = import ./src/modules.nix; modules = import ./src/modules.nix;
result = lib.modules.run { result = lib.modules.run {
modules = modules = (builtins.attrValues modules) ++ [
(builtins.attrValues modules) ./src/export.nix
++ [ {
./src/export.nix __file__ = ./default.nix;
{
__file__ = ./default.nix;
options.packages.aux = { options.packages.aux = {
foundation = lib.options.create { foundation = lib.options.create {
type = lib.types.attrs.of lib.types.package; type = lib.types.attrs.of lib.types.package;
internal = true; internal = true;
description = "The foundational packages used to construct the larger package set."; description = "The foundational packages used to construct the larger package set.";
};
}; };
};
config.packages.aux = { config.packages.aux = {
foundation = foundation; inherit foundation;
}; };
} }
]; ];
}; };
in in
result.config.exported result.config.exported

16
potluck/flake.lock
View file

@ -8,10 +8,10 @@
}, },
"locked": { "locked": {
"dir": "foundation", "dir": "foundation",
"dirtyRev": "cd12786be17a611976b44fbba3e245eca512535f-dirty", "dirtyRev": "9c29945531c58ad81f05cd1f4958c8894a733216-dirty",
"dirtyShortRev": "cd12786-dirty", "dirtyShortRev": "9c29945-dirty",
"lastModified": 1718199069, "lastModified": 1718255029,
"narHash": "sha256-H2Mkyp9BPDPte+E++uIG2N/vGtcS3H9Q7tM3fOOEXT0=", "narHash": "sha256-O+UzIjpab9YUwFACx+pi7tqO4HEtjr70ySGKKteURVw=",
"type": "git", "type": "git",
"url": "file:../?dir=foundation" "url": "file:../?dir=foundation"
}, },
@ -24,10 +24,10 @@
"lib": { "lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"dirtyRev": "cd12786be17a611976b44fbba3e245eca512535f-dirty", "dirtyRev": "9c29945531c58ad81f05cd1f4958c8894a733216-dirty",
"dirtyShortRev": "cd12786-dirty", "dirtyShortRev": "9c29945-dirty",
"lastModified": 1718199069, "lastModified": 1718255029,
"narHash": "sha256-H2Mkyp9BPDPte+E++uIG2N/vGtcS3H9Q7tM3fOOEXT0=", "narHash": "sha256-O+UzIjpab9YUwFACx+pi7tqO4HEtjr70ySGKKteURVw=",
"type": "git", "type": "git",
"url": "file:../?dir=lib" "url": "file:../?dir=lib"
}, },

21
potluck/flake.nix
View file

@ -9,11 +9,20 @@
}; };
}; };
outputs = inputs: let outputs =
exports = import ./default.nix { inputs:
lib = inputs.lib.lib; let
foundation = inputs.foundation.packages.i686-linux; inherit (inputs.lib) lib;
};
in forEachSystem = lib.attrs.generate [
"i686-linux"
"x86_64-linux"
];
exports = import ./default.nix {
inherit lib;
foundation = forEachSystem (system: inputs.foundation.packages.${system});
};
in
exports; exports;
} }