From b16f0190e0e33c41a7c0dd761bc416242048c6a8 Mon Sep 17 00:00:00 2001 From: June Date: Sat, 27 Dec 2025 23:21:35 +0100 Subject: [PATCH] disable nixos-generators input as its broken a. makes infra-rebuild fail --- flake.lock | 65 ++++++------------------------------------------------ flake.nix | 60 ++++++++++++++++++++++++------------------------- 2 files changed, 37 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 3d624db..76a3fc3 100644 --- a/flake.lock +++ b/flake.lock @@ -17,52 +17,18 @@ "url": "https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys" } }, - "nixlib": { - "locked": { - "lastModified": 1736643958, - "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1736657626, - "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", - "owner": "NixOS", + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -83,27 +49,10 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "authorizedKeysRepo": "authorizedKeysRepo", - "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index 3901c78..be9e8fb 100644 --- a/flake.nix +++ b/flake.nix @@ -8,12 +8,12 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - # Add nixos-generators as an input. - # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake - nixos-generators = { - url = "github:nix-community/nixos-generators"; - #inputs.nixpkgs.follows = "nixpkgs"; - }; + # # Add nixos-generators as an input. + # # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake + # nixos-generators = { + # url = "github:nix-community/nixos-generators"; + # #inputs.nixpkgs.follows = "nixpkgs"; + # }; # Add sops-nix as an input for secret management. # See here: https://github.com/Mic92/sops-nix?tab=readme-ov-file#flakes-current-recommendation @@ -28,7 +28,7 @@ }; }; - outputs = { self, nixpkgs, nixos-generators, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }: + outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }: let specialArgs = { inherit authorizedKeysRepo; @@ -233,30 +233,30 @@ }; }; - packages.x86_64-linux = { - proxmox-nixos-template = nixos-generators.nixosGenerate { - inherit specialArgs; - system = "x86_64-linux"; - modules = [ - ./config/nixos-generators/proxmox.nix - self.nixosModules.common - self.nixosModules.proxmox-vm - ]; - format = "proxmox"; - }; + # packages.x86_64-linux = { + # proxmox-nixos-template = nixos-generators.nixosGenerate { + # inherit specialArgs; + # system = "x86_64-linux"; + # modules = [ + # ./config/nixos-generators/proxmox.nix + # self.nixosModules.common + # self.nixosModules.proxmox-vm + # ]; + # format = "proxmox"; + # }; - proxmox-chaosknoten-nixos-template = nixos-generators.nixosGenerate { - inherit specialArgs; - system = "x86_64-linux"; - modules = [ - ./config/nixos-generators/proxmox-chaosknoten.nix - ./config/proxmox-chaosknoten-additional-initial-config.nix - self.nixosModules.common - self.nixosModules.proxmox-vm - ]; - format = "proxmox"; - }; - }; + # proxmox-chaosknoten-nixos-template = nixos-generators.nixosGenerate { + # inherit specialArgs; + # system = "x86_64-linux"; + # modules = [ + # ./config/nixos-generators/proxmox-chaosknoten.nix + # ./config/proxmox-chaosknoten-additional-initial-config.nix + # self.nixosModules.common + # self.nixosModules.proxmox-vm + # ]; + # format = "proxmox"; + # }; + # }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;