tracking upstream changes
This commit is contained in:
parent
fa956f5da2
commit
ed7b484260
4 changed files with 8 additions and 8 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
system.activationScripts.diff = {
|
stdenv.hostPlatform.system.activationScripts.diff = {
|
||||||
supportsDryActivation = true;
|
supportsDryActivation = true;
|
||||||
text = ''
|
text = ''
|
||||||
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
|
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
system.activationScripts.diff = {
|
stdenv.hostPlatform.system.activationScripts.diff = {
|
||||||
supportsDryActivation = true;
|
supportsDryActivation = true;
|
||||||
text = ''
|
text = ''
|
||||||
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
|
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
|
||||||
|
|
|
||||||
|
|
@ -61,5 +61,5 @@
|
||||||
]
|
]
|
||||||
++ (args.extraPublicKeys or []); # this is used for unit-testing this module and can be removed if not needed
|
++ (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";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
nixosConfigurations.hetzner-cloud = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.hetzner-cloud = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
stdenv.hostPlatform.system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
};
|
};
|
||||||
# tested with 2GB/2CPU droplet, 1GB droplets do not have enough RAM for kexec
|
# tested with 2GB/2CPU droplet, 1GB droplets do not have enough RAM for kexec
|
||||||
nixosConfigurations.digitalocean = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.digitalocean = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
stdenv.hostPlatform.system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
./digitalocean.nix
|
./digitalocean.nix
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
nixosConfigurations.hetzner-cloud-aarch64 = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.hetzner-cloud-aarch64 = nixpkgs.lib.nixosSystem {
|
||||||
system = "aarch64-linux";
|
stdenv.hostPlatform.system = "aarch64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
# Use this for all other targets
|
# Use this for all other targets
|
||||||
# nixos-anywhere --flake .#generic --generate-hardware-config nixos-generate-config ./hardware-configuration.nix <hostname>
|
# nixos-anywhere --flake .#generic --generate-hardware-config nixos-generate-config ./hardware-configuration.nix <hostname>
|
||||||
nixosConfigurations.generic = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.generic = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
stdenv.hostPlatform.system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
# Slightly experimental: Like generic, but with nixos-facter (https://github.com/numtide/nixos-facter)
|
# 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>
|
# nixos-anywhere --flake .#generic-nixos-facter --generate-hardware-config nixos-facter facter.json <hostname>
|
||||||
nixosConfigurations.generic-nixos-facter = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.generic-nixos-facter = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
stdenv.hostPlatform.system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue