format

flake.lock

@@ -335,56 +335,17 @@
         "type": "github"
       }
     },
-    "naersk_2": {
-      "inputs": {
-        "nixpkgs": [
-          "skyflake",
-          "nix-cache-cut",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1671096816,
-        "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "naersk_3": {
-      "inputs": {
-        "nixpkgs": [
-          "ticker",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1659610603,
-        "narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "c6a45e4277fa58abd524681466d3450f896dc094",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "c6a45e4277fa58abd524681466d3450f896dc094",
-        "type": "github"
-      }
-    },
     "nix-cache-cut": {
       "inputs": {
-        "naersk": "naersk_2",
+        "naersk": [
-        "nixpkgs": "nixpkgs",
+          "naersk"
-        "utils": "utils"
+        ],
+        "nixpkgs": [
+          "nixos"
+        ],
+        "utils": [
+          "flake-utils"
+        ]
       },
       "locked": {
         "lastModified": 1677107143,
@@ -416,6 +377,22 @@
         "type": "github"
       }
     },
+    "nixos-23-05": {
+      "locked": {
+        "lastModified": 1684796928,
+        "narHash": "sha256-GxF+TX2UsuiIj0rdLkovBBWnMdAccWmw/T9p6S00etU=",
+        "owner": "SuperSandro2000",
+        "repo": "nixpkgs",
+        "rev": "7582acc515fa86fb0c5797970ea987f3872a8ad6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SuperSandro2000",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1684169666,
@@ -451,22 +428,6 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1676790509,
-        "narHash": "sha256-W9uWAWokgS8US8rJf79qBLS2M+ZgIscfoz+KsNE7VGQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a1291d0d020a200c7ce3c48e96090bfa4890a475",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "oparl-scraper": {
       "flake": false,
       "locked": {
@@ -537,7 +498,9 @@
         "heliwatch": "heliwatch",
         "microvm": "microvm",
         "naersk": "naersk",
+        "nix-cache-cut": "nix-cache-cut",
         "nixos": "nixos",
+        "nixos-23-05": "nixos-23-05",
         "nixos-hardware": "nixos-hardware",
         "nixos-modules": "nixos-modules",
         "oparl-scraper": "oparl-scraper",
@@ -634,7 +597,9 @@
         "microvm": [
           "microvm"
         ],
-        "nix-cache-cut": "nix-cache-cut",
+        "nix-cache-cut": [
+          "nix-cache-cut"
+        ],
         "nixpkgs": [
           "nixos"
         ]
@@ -742,7 +707,9 @@
         "fenix": [
           "fenix"
         ],
-        "naersk": "naersk_3",
+        "naersk": [
+          "naersk"
+        ],
         "nixpkgs": [
           "nixos"
         ],
@@ -806,21 +773,6 @@
         "url": "https://gitea.c3d2.de/astro/tracer"
       }
     },
-    "utils": {
-      "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "yammat": {
       "inputs": {
         "nixpkgs": [

flake.nix

@@ -9,10 +9,8 @@
   inputs = {
     # use sandro's fork full with cherry-picked fixes
     nixos.url = "github:SuperSandro2000/nixpkgs/nixos-22.11";
-    # nixos-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon";
+    nixos-23-05.url = "github:SuperSandro2000/nixpkgs/nixos-23.05";
     nixos-hardware.url = "github:nixos/nixos-hardware";
-    # nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    # nixos-unstable-simd.url = "github:SuperSandro2000/nixpkgs/nixos-unstable-simd";
 
     affection-src = {
       url = "git+https://gitea.nek0.eu/nek0/affection";
@@ -112,6 +110,14 @@
         nixpkgs.follows = "nixos";
       };
     };
+    nix-cache-cut = {
+      url = "github:astro/nix-cache-cut";
+      inputs = {
+        naersk.follows = "naersk";
+        nixpkgs.follows = "nixos";
+        utils.follows = "flake-utils";
+      };
+    };
     nixos-modules = {
       url = "github:SuperSandro2000/nixos-modules";
       inputs.nixpkgs-lib.follows = "nixos";
@@ -146,6 +152,7 @@
       inputs = {
         microvm.follows = "microvm";
         nixpkgs.follows = "nixos";
+        nix-cache-cut.follows = "nix-cache-cut";
       };
     };
     sshlogd = {
@@ -174,8 +181,7 @@
       url = "git+https://gitea.c3d2.de/astro/ticker.git";
       inputs = {
         fenix.follows = "fenix";
-        # causes build failure
+        naersk.follows = "naersk";
-        # naersk.follows = "naersk";
         nixpkgs.follows = "nixos";
         utils.follows = "flake-utils";
       };
@@ -207,7 +213,7 @@
     };
   };
 
-  outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, disko, fenix, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
+  outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, disko, fenix, heliwatch, microvm, naersk, nixos, nixos-23-05, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
     let
       inherit (nixos) lib;
 
@@ -225,11 +231,12 @@
 
       # Our custom NixOS builder
       nixosSystem' =
-        { modules
+        { nixos ? inputs.nixos
+        , modules
         , system ? "x86_64-linux"
       }@args:
 
-      { inherit args; } // lib.nixosSystem {
+      { inherit args; } // nixos.lib.nixosSystem {
         inherit system;
 
         modules = [
@@ -825,19 +832,19 @@
           in
           lib.mapAttrs getBuildEntryPoint self.nixosConfigurations
           # NOTE: left here to have the code as reference if we need something like in the future, eg. on a stable update
-          # // lib.mapAttrs' (hostname: nixosSystem: lib.nameValuePair
+          // lib.mapAttrs' (hostname: nixosSystem: let
-          #   # job display name
+            hostname' = hostname + "-23-05";
-          #   (hostname + "-nox")
+          in lib.nameValuePair
-          #   (getBuildEntryPoint null (nixosSystem' (nixosSystem.args // (with nixosSystem.args; {
+            hostname' # job display name
-          #     modules = modules ++ [
+            (getBuildEntryPoint hostname' (nixosSystem' (nixosSystem.args // (with nixosSystem.args; {
-          #       {
+              modules = modules ++ [
-          #         # simd.enable = lib.mkForce true;
+              #   {
-          #         environment.noXlibs = true;
+              #     simd.enable = lib.mkForce true;
-          #       }
+              #   }
-          #     ];
+              ];
-          #     # nixpkgs = nixos-unstable-simd;
+              nixos = nixos-23-05;
-          #   }))))
+            }))))
-          # ) self.nixosConfigurations
+          ) self.nixosConfigurations
           // nixos.lib.filterAttrs (name: attr:
             (builtins.match ".+-tftproot" name != null && lib.isDerivation attr)
           ) self.packages.aarch64-linux