From 0a2fefd141aa6d2701ac7840630480e10ba269b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 31 Oct 2025 18:49:02 +0100 Subject: [PATCH] treewide: replace pkgs.hostPlatform with pkgs.stdenv.hostPlatform nixpkgs now throws an error for this, the other variant in stdenv also exists in the previous release --- checks/flash/flake-module.nix | 70 +++++++++++++------------- checks/installation/flake-module.nix | 10 ++-- checks/llm/default.nix | 4 +- checks/systemd-abstraction/default.nix | 2 +- checks/update/flake-module.nix | 18 +++---- nixosModules/flake-module.nix | 2 +- nixosModules/installer/zfs-latest.nix | 2 +- 7 files changed, 55 insertions(+), 53 deletions(-) diff --git a/checks/flash/flake-module.nix b/checks/flash/flake-module.nix index 0d1e1a5fc..13f00583a 100644 --- a/checks/flash/flake-module.nix +++ b/checks/flash/flake-module.nix @@ -58,51 +58,53 @@ pkgs.buildPackages.xorg.lndir pkgs.glibcLocales pkgs.kbd.out - self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".pkgs.perlPackages.ConfigIniFiles - self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".pkgs.perlPackages.FileSlurp + self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".pkgs.perlPackages.ConfigIniFiles + self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".pkgs.perlPackages.FileSlurp pkgs.bubblewrap - self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.toplevel - self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript - self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript.drvPath + self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.toplevel + self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.diskoScript + self.nixosConfigurations."test-flash-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.diskoScript.drvPath ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs); closureInfo = pkgs.closureInfo { rootPaths = dependencies; }; in { # Skip flash test on aarch64-linux for now as it's too slow - checks = lib.optionalAttrs (pkgs.stdenv.isLinux && pkgs.hostPlatform.system != "aarch64-linux") { - nixos-test-flash = self.clanLib.test.baseTest { - name = "flash"; - nodes.target = { - virtualisation.emptyDiskImages = [ 4096 ]; - virtualisation.memorySize = 4096; + checks = + lib.optionalAttrs (pkgs.stdenv.isLinux && pkgs.stdenv.hostPlatform.system != "aarch64-linux") + { + nixos-test-flash = self.clanLib.test.baseTest { + name = "flash"; + nodes.target = { + virtualisation.emptyDiskImages = [ 4096 ]; + virtualisation.memorySize = 4096; - virtualisation.useNixStoreImage = true; - virtualisation.writableStore = true; + virtualisation.useNixStoreImage = true; + virtualisation.writableStore = true; - environment.systemPackages = [ self.packages.${pkgs.system}.clan-cli ]; - environment.etc."install-closure".source = "${closureInfo}/store-paths"; + environment.systemPackages = [ self.packages.${pkgs.system}.clan-cli ]; + environment.etc."install-closure".source = "${closureInfo}/store-paths"; - nix.settings = { - substituters = lib.mkForce [ ]; - hashed-mirrors = null; - connect-timeout = lib.mkForce 3; - flake-registry = ""; - experimental-features = [ - "nix-command" - "flakes" - ]; - }; + nix.settings = { + substituters = lib.mkForce [ ]; + hashed-mirrors = null; + connect-timeout = lib.mkForce 3; + flake-registry = ""; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + }; + testScript = '' + start_all() + machine.succeed("echo 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIRWUusawhlIorx7VFeQJHmMkhl9X3QpnvOdhnV/bQNG root@target' > ./test_id_ed25519.pub") + # Some distros like to automount disks with spaces + machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdc && mount /dev/vdc "/mnt/with spaces"') + machine.succeed("clan flash write --ssh-pubkey ./test_id_ed25519.pub --keymap de --language de_DE.UTF-8 --debug --flake ${self.checks.x86_64-linux.clan-core-for-checks} --yes --disk main /dev/vdc test-flash-machine-${pkgs.stdenv.hostPlatform.system}") + ''; + } { inherit pkgs self; }; }; - testScript = '' - start_all() - machine.succeed("echo 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIRWUusawhlIorx7VFeQJHmMkhl9X3QpnvOdhnV/bQNG root@target' > ./test_id_ed25519.pub") - # Some distros like to automount disks with spaces - machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdc && mount /dev/vdc "/mnt/with spaces"') - machine.succeed("clan flash write --ssh-pubkey ./test_id_ed25519.pub --keymap de --language de_DE.UTF-8 --debug --flake ${self.checks.x86_64-linux.clan-core-for-checks} --yes --disk main /dev/vdc test-flash-machine-${pkgs.hostPlatform.system}") - ''; - } { inherit pkgs self; }; - }; }; } diff --git a/checks/installation/flake-module.nix b/checks/installation/flake-module.nix index dc7bcfa6b..298324849 100644 --- a/checks/installation/flake-module.nix +++ b/checks/installation/flake-module.nix @@ -160,9 +160,9 @@ closureInfo = pkgs.closureInfo { rootPaths = [ privateInputs.clan-core-for-checks - self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.toplevel - self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.initialRamdisk - self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript + self.nixosConfigurations."test-install-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.toplevel + self.nixosConfigurations."test-install-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.initialRamdisk + self.nixosConfigurations."test-install-machine-${pkgs.stdenv.hostPlatform.system}".config.system.build.diskoScript pkgs.stdenv.drvPath pkgs.bash.drvPath pkgs.buildPackages.xorg.lndir @@ -215,7 +215,7 @@ # Prepare test flake and Nix store flake_dir = prepare_test_flake( temp_dir, - "${self.checks.${pkgs.hostPlatform.system}.clan-core-for-checks}", + "${self.checks.${pkgs.stdenv.hostPlatform.system}.clan-core-for-checks}", "${closureInfo}" ) @@ -296,7 +296,7 @@ # Prepare test flake and Nix store flake_dir = prepare_test_flake( temp_dir, - "${self.checks.${pkgs.hostPlatform.system}.clan-core-for-checks}", + "${self.checks.${pkgs.stdenv.hostPlatform.system}.clan-core-for-checks}", "${closureInfo}" ) diff --git a/checks/llm/default.nix b/checks/llm/default.nix index 0c0e143fc..89e72b7ca 100644 --- a/checks/llm/default.nix +++ b/checks/llm/default.nix @@ -2,7 +2,7 @@ let - cli = self.packages.${pkgs.hostPlatform.system}.clan-cli-full; + cli = self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli-full; ollama-model = pkgs.callPackage ./qwen3-4b-instruct.nix { }; in @@ -53,7 +53,7 @@ in pytest pytest-xdist (cli.pythonRuntime.pkgs.toPythonModule cli) - self.legacyPackages.${pkgs.hostPlatform.system}.nixosTestLib + self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nixosTestLib ] )) ]; diff --git a/checks/systemd-abstraction/default.nix b/checks/systemd-abstraction/default.nix index 4150690ad..de80b08ac 100644 --- a/checks/systemd-abstraction/default.nix +++ b/checks/systemd-abstraction/default.nix @@ -2,7 +2,7 @@ let - cli = self.packages.${pkgs.hostPlatform.system}.clan-cli-full; + cli = self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli-full; in { name = "systemd-abstraction"; diff --git a/checks/update/flake-module.nix b/checks/update/flake-module.nix index ddeef5c71..0957cc76d 100644 --- a/checks/update/flake-module.nix +++ b/checks/update/flake-module.nix @@ -115,9 +115,9 @@ let closureInfo = pkgs.closureInfo { rootPaths = [ - self.packages.${pkgs.hostPlatform.system}.clan-cli - self.checks.${pkgs.hostPlatform.system}.clan-core-for-checks - self.clanInternals.machines.${pkgs.hostPlatform.system}.test-update-machine.config.system.build.toplevel + self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli + self.checks.${pkgs.stdenv.hostPlatform.system}.clan-core-for-checks + self.clanInternals.machines.${pkgs.stdenv.hostPlatform.system}.test-update-machine.config.system.build.toplevel pkgs.stdenv.drvPath pkgs.bash.drvPath pkgs.buildPackages.xorg.lndir @@ -132,7 +132,7 @@ imports = [ self.nixosModules.test-update-machine ]; }; extraPythonPackages = _p: [ - self.legacyPackages.${pkgs.hostPlatform.system}.nixosTestLib + self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nixosTestLib ]; testScript = '' @@ -154,7 +154,7 @@ # Prepare test flake and Nix store flake_dir = prepare_test_flake( temp_dir, - "${self.checks.${pkgs.hostPlatform.system}.clan-core-for-checks}", + "${self.checks.${pkgs.stdenv.hostPlatform.system}.clan-core-for-checks}", "${closureInfo}" ) (flake_dir / ".clan-flake").write_text("") # Ensure .clan-flake exists @@ -226,7 +226,7 @@ "--to", "ssh://root@192.168.1.1", "--no-check-sigs", - f"${self.packages.${pkgs.hostPlatform.system}.clan-cli}", + f"${self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli}", "--extra-experimental-features", "nix-command flakes", ], check=True, @@ -242,7 +242,7 @@ "-o", "UserKnownHostsFile=/dev/null", "-o", "StrictHostKeyChecking=no", f"root@192.168.1.1", - "${self.packages.${pkgs.hostPlatform.system}.clan-cli}/bin/clan", + "${self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli}/bin/clan", "machines", "update", "--debug", @@ -270,7 +270,7 @@ # Run clan update command subprocess.run([ - "${self.packages.${pkgs.hostPlatform.system}.clan-cli-full}/bin/clan", + "${self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli-full}/bin/clan", "machines", "update", "--debug", @@ -297,7 +297,7 @@ # Run clan update command with --build-host subprocess.run([ - "${self.packages.${pkgs.hostPlatform.system}.clan-cli-full}/bin/clan", + "${self.packages.${pkgs.stdenv.hostPlatform.system}.clan-cli-full}/bin/clan", "machines", "update", "--debug", diff --git a/nixosModules/flake-module.nix b/nixosModules/flake-module.nix index 3d82fec62..ffda62e1f 100644 --- a/nixosModules/flake-module.nix +++ b/nixosModules/flake-module.nix @@ -18,7 +18,7 @@ let inputs.data-mesher.nixosModules.data-mesher ]; config = { - clan.core.clanPkgs = lib.mkDefault self.packages.${pkgs.hostPlatform.system}; + clan.core.clanPkgs = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system}; }; }; in diff --git a/nixosModules/installer/zfs-latest.nix b/nixosModules/installer/zfs-latest.nix index 77f060d9a..c31fe9ad2 100644 --- a/nixosModules/installer/zfs-latest.nix +++ b/nixosModules/installer/zfs-latest.nix @@ -30,5 +30,5 @@ let in { # Note this might jump back and worth as kernel get added or removed. - boot.kernelPackages = lib.mkIf (lib.meta.availableOn pkgs.hostPlatform pkgs.zfs) latestKernelPackage; + boot.kernelPackages = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.zfs) latestKernelPackage; }