Merge pull request 'devFlake: switch back to main' (#4691) from update-nixpkgs-2 into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4691

checks/flash/flake-module.nix

@@ -62,6 +62,10 @@
           nodes.target = {
             virtualisation.emptyDiskImages = [ 4096 ];
             virtualisation.memorySize = 4096;
+
+            virtualisation.useNixStoreImage = true;
+            virtualisation.writableStore = true;
+
             environment.systemPackages = [ self.packages.${pkgs.system}.clan-cli ];
             environment.etc."install-closure".source = "${closureInfo}/store-paths";
 
@@ -80,8 +84,8 @@
             start_all()
 
             # Some distros like to automount disks with spaces
-            machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdb && mount /dev/vdb "/mnt/with spaces"')
-            machine.succeed("clan flash write --debug --flake ${privateInputs.clan-core-for-checks} --yes --disk main /dev/vdb test-flash-machine-${pkgs.hostPlatform.system}")
+            machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdc && mount /dev/vdc "/mnt/with spaces"')
+            machine.succeed("clan flash write --debug --flake ${privateInputs.clan-core-for-checks} --yes --disk main /dev/vdc test-flash-machine-${pkgs.hostPlatform.system}")
           '';
         } { inherit pkgs self; };
       };

devFlake/flake.lock

@@ -3,16 +3,16 @@
     "clan-core-for-checks": {
       "flake": false,
       "locked": {
-        "lastModified": 1754923254,
-        "narHash": "sha256-x5dWBbu+2Hw96Eh2uy8A+2Ol9xxzRyewMkAkizwpEjw=",
-        "ref": "update-nixpkgs-2",
-        "rev": "82c9a6d5ce427d2e3683b2b3ec0ddf338f1730d2",
+        "lastModified": 1754926555,
+        "narHash": "sha256-21UwgSn3e4dtg+drHTf4pNj0JyITFIv6ra/hBUBOwQE=",
+        "ref": "main",
+        "rev": "4f191f3ebee226bb3ebfdf60e970b81b541fa58c",
         "shallow": true,
         "type": "git",
         "url": "https://git.clan.lol/clan/clan-core"
       },
       "original": {
-        "ref": "update-nixpkgs-2",
+        "ref": "main",
         "shallow": true,
         "type": "git",
         "url": "https://git.clan.lol/clan/clan-core"

devFlake/flake.nix

@@ -15,7 +15,7 @@
 
   inputs.systems.url = "github:nix-systems/default";
 
-  inputs.clan-core-for-checks.url = "git+https://git.clan.lol/clan/clan-core?ref=update-nixpkgs-2&shallow=1";
+  inputs.clan-core-for-checks.url = "git+https://git.clan.lol/clan/clan-core?ref=main&shallow=1";
   inputs.clan-core-for-checks.flake = false;
 
   outputs = inputs: inputs;