move image building into default.nix

Author: Lillecarl

.github/workflows/ci.yaml

@@ -33,18 +33,18 @@ jobs:
 
       - name: Build and push environments
         run: |
-          nix build --file default.nix push --out-link nix-envs
+          nix build --file . push --out-link nix-envs
           ./nix-envs/bin/push
 
       # Build and push all components sequentially to reuse Nix store
       - name: Build and push Lix image
         run: |
-          nix build --file liximage.nix push --out-link nix-images
+          nix build --file . lixImage.push --out-link nix-images
           ./nix-images/bin/push
 
       - name: Build and push scratch image
         run: |
-          nix build --file scratchimage.nix push --out-link nix-scratches
+          nix build --file . scratchImage.push --out-link nix-scratches
           ./nix-scratches/bin/push
 
   test-kind-cache:

default.nix

@@ -188,4 +188,6 @@ rec {
         cp --no-preserve=mode ${optionsDocs.optionsCommonMark} $GIT_ROOT/doc/options.md
       '';
 
+  lixImage = pkgs.callPackage ./liximage.nix { };
+  scratchImage = pkgs.callPackage ./scratchimage.nix { };
 }

liximage.nix

@@ -1,30 +1,12 @@
-let
-  inputs =
-    (
-      let
-        lockFile = builtins.readFile ./flake.lock;
-        lockAttrs = builtins.fromJSON lockFile;
-        fcLockInfo = lockAttrs.nodes.flake-compatish.locked;
-        fcSrc = builtins.fetchTree fcLockInfo;
-        flake-compatish = import fcSrc;
-      in
-      flake-compatish ./.
-    ).inputs;
-  pkgs = import inputs.nixpkgs {
-    overlays = [
-      (import ./pkgs)
-    ];
-  };
-  inherit (pkgs) lib;
-  server = "ghcr.io";
-  repo = "${server}/lillecarl/nix-csi";
-in
-rec {
-  inherit inputs pkgs;
+{
+  pkgs,
+  lib,
+}:
+{
   images = lib.genAttrs [ "aarch64-linux" "x86_64-linux" ] (
     system:
     let
-      sysPkgs = import inputs.nixpkgs { inherit system; };
+      sysPkgs = import pkgs.path { inherit system; };
       inherit (sysPkgs) lib;
 
       fakeNss = sysPkgs.dockerTools.fakeNss.override {

scratchimage.nix

@@ -1,22 +1,5 @@
+{ pkgs }:
 let
-  inputs =
-    (
-      let
-        lockFile = builtins.readFile ./flake.lock;
-        lockAttrs = builtins.fromJSON lockFile;
-        fcLockInfo = lockAttrs.nodes.flake-compatish.locked;
-        fcSrc = builtins.fetchTree fcLockInfo;
-        flake-compatish = import fcSrc;
-      in
-      flake-compatish ./.
-    ).inputs;
-
-  pkgs = import inputs.nixpkgs {
-    overlays = [
-      (import ./pkgs)
-    ];
-  };
-
   version = "1.0.1";
 
   mkEmptyImage =