wiro.world
yep, more dotfiles
fix(apps): simplify isos creation to fix ci
+5
-13
+3
-11
apps/default.nix
+3
-11
apps/default.nix
···
1
-
{ forAllPkgs }:
1
+
{ pkgs-per-system }:
2
2
3
3
{ lib
4
4
, ...
···
6
6
7
7
let
8
8
apps = {
9
-
# app = exec
9
+
flash-installer-iso-x86_64-linux = import ./flash-installer.nix pkgs-per-system.x86_64-linux pkgs;
10
10
};
11
-
12
-
# Installer ISOs do need to consider target architecture
13
-
# We matrix over all systems to make `flash-installer-iso-${targetSystem}`
14
-
flash-installer-iso-matrix = lib.mapAttrs'
15
-
(name: value: { name = "flash-installer-iso-${name}"; inherit value; })
16
-
(forAllPkgs (targetPkg: (import ./flash-installer.nix targetPkg) pkgs));
17
-
18
-
all-apps = apps // flash-installer-iso-matrix;
19
11
in
20
12
21
-
lib.mapAttrs (_: program: { type = "app"; inherit program; }) all-apps
13
+
lib.mapAttrs (_: program: { type = "app"; inherit program; }) apps
+1
-1
apps/flash-installer.nix
+1
-1
apps/flash-installer.nix
···
10
10
let
11
11
inherit (self.outputs) flake-lib;
12
12
13
-
iso = flake-lib.createSystem targetSystemPkgs [ ../nixos/profiles/installer.nix ];
13
+
iso = flake-lib.nixos.createSystem targetSystemPkgs [ ../nixos/profiles/installer.nix ];
14
14
# Build installer ISO
15
15
isoPath = "${iso.config.system.build.isoImage}/iso/${iso.config.isoImage.isoName}";
16
16
+1
-1
flake.nix
+1
-1
flake.nix
···
67
67
lib = forAllPkgs (import ./lib);
68
68
templates = import ./templates;
69
69
70
-
apps = forAllPkgs (import ./apps { inherit forAllPkgs; });
70
+
apps = forAllPkgs (import ./apps { pkgs-per-system = pkgs; });
71
71
devShells = forAllPkgs (import ./shells.nix);
72
72
overlays = import ./overlays (nixpkgs // { inherit self; });
73
73
packages = forAllPkgs (import ./pkgs);