From ed7b484260ab1e853e7b70093a37386179fc2095 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Tue, 30 Dec 2025 00:28:00 -0600
Subject: [PATCH] tracking upstream changes

---
 hosts/pi-server/upgrade-diff.nix |  2 +-
 hosts/server/upgrade-diff.nix    |  2 +-
 nixos-anywhere/configuration.nix |  2 +-
 nixos-anywhere/flake.nix         | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hosts/pi-server/upgrade-diff.nix b/hosts/pi-server/upgrade-diff.nix
index 1903966..a74504e 100644
--- a/hosts/pi-server/upgrade-diff.nix
+++ b/hosts/pi-server/upgrade-diff.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  system.activationScripts.diff = {
+  stdenv.hostPlatform.system.activationScripts.diff = {
     supportsDryActivation = true;
     text = ''
       ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
diff --git a/hosts/server/upgrade-diff.nix b/hosts/server/upgrade-diff.nix
index 1903966..a74504e 100644
--- a/hosts/server/upgrade-diff.nix
+++ b/hosts/server/upgrade-diff.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  system.activationScripts.diff = {
+  stdenv.hostPlatform.system.activationScripts.diff = {
     supportsDryActivation = true;
     text = ''
       ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
diff --git a/nixos-anywhere/configuration.nix b/nixos-anywhere/configuration.nix
index 8115b33..b7d87bc 100644
--- a/nixos-anywhere/configuration.nix
+++ b/nixos-anywhere/configuration.nix
@@ -61,5 +61,5 @@
     ]
     ++ (args.extraPublicKeys or []); # this is used for unit-testing this module and can be removed if not needed
 
-  system.stateVersion = "25.11";
+  stdenv.hostPlatform.system.stateVersion = "25.11";
 }
diff --git a/nixos-anywhere/flake.nix b/nixos-anywhere/flake.nix
index 2d524a9..7090932 100644
--- a/nixos-anywhere/flake.nix
+++ b/nixos-anywhere/flake.nix
@@ -13,7 +13,7 @@
     }:
     {
       nixosConfigurations.hetzner-cloud = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+        stdenv.hostPlatform.system = "x86_64-linux";
         modules = [
           disko.nixosModules.disko
           ./configuration.nix
@@ -21,7 +21,7 @@
       };
       # tested with 2GB/2CPU droplet, 1GB droplets do not have enough RAM for kexec
       nixosConfigurations.digitalocean = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+        stdenv.hostPlatform.system = "x86_64-linux";
         modules = [
           ./digitalocean.nix
           disko.nixosModules.disko
@@ -30,7 +30,7 @@
         ];
       };
       nixosConfigurations.hetzner-cloud-aarch64 = nixpkgs.lib.nixosSystem {
-        system = "aarch64-linux";
+        stdenv.hostPlatform.system = "aarch64-linux";
         modules = [
           disko.nixosModules.disko
           ./configuration.nix
@@ -40,7 +40,7 @@
       # Use this for all other targets
       # nixos-anywhere --flake .#generic --generate-hardware-config nixos-generate-config ./hardware-configuration.nix <hostname>
       nixosConfigurations.generic = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+        stdenv.hostPlatform.system = "x86_64-linux";
         modules = [
           disko.nixosModules.disko
           ./configuration.nix
@@ -51,7 +51,7 @@
       # Slightly experimental: Like generic, but with nixos-facter (https://github.com/numtide/nixos-facter)
       # nixos-anywhere --flake .#generic-nixos-facter --generate-hardware-config nixos-facter facter.json <hostname>
       nixosConfigurations.generic-nixos-facter = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+        stdenv.hostPlatform.system = "x86_64-linux";
         modules = [
           disko.nixosModules.disko
           ./configuration.nix