From 59cca52f558d80ff8201a5d526163619a4ac11c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Mar 2025 13:17:42 +0100 Subject: [PATCH] actually hide test-fixture from user if we actually want to avoid the dependency on this facter json, we cannot expose this as a flake input because nix flake archive will have to download this on each deployment step. --- .../flake-module.nix | 7 +++-- flake.lock | 26 ------------------- flake.nix | 4 --- 3 files changed, 5 insertions(+), 32 deletions(-) diff --git a/checks/installation-without-system/flake-module.nix b/checks/installation-without-system/flake-module.nix index 74dd2b86d..fb3ed7970 100644 --- a/checks/installation-without-system/flake-module.nix +++ b/checks/installation-without-system/flake-module.nix @@ -1,7 +1,6 @@ { self, lib, - inputs, ... }: { @@ -19,7 +18,11 @@ imports = [ self.nixosModules.test-install-machine-without-system ]; }; clan.machines.test-install-machine-with-system = { - facter.reportPath = "${inputs.test-fixtures}/nixos-vm-facter-json/facter.json"; + # https://git.clan.lol/clan/test-fixtures + facter.reportPath = builtins.fetchurl { + url = "https://git.clan.lol/clan/test-fixtures/raw/commit/3508b7ed11dad068ffc8c9f0047a5c7d54644e2c/nixos-vm-facter-json/facter.json"; + sha256 = "sha256:16myh0ll2gdwsiwkjw5ba4dl23ppwbsanxx214863j7nvzx42pws"; + }; fileSystems."/".device = lib.mkDefault "/dev/vda"; boot.loader.grub.device = lib.mkDefault "/dev/vda"; diff --git a/flake.lock b/flake.lock index 58636c3b7..150d8d8fb 100644 --- a/flake.lock +++ b/flake.lock @@ -75,7 +75,6 @@ "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", "systems": "systems", - "test-fixtures": "test-fixtures", "treefmt-nix": "treefmt-nix" } }, @@ -115,31 +114,6 @@ "type": "github" } }, - "test-fixtures": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741504481, - "narHash": "sha256-Ndx7LCbLF2sgRvbiefKEe1rgL+cYlBANVRokg27DflI=", - "ref": "main", - "rev": "3508b7ed11dad068ffc8c9f0047a5c7d54644e2c", - "shallow": true, - "type": "git", - "url": "https://git.clan.lol/clan/test-fixtures" - }, - "original": { - "ref": "main", - "shallow": true, - "type": "git", - "url": "https://git.clan.lol/clan/test-fixtures" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 94fda5fdd..6d1f945cb 100644 --- a/flake.nix +++ b/flake.nix @@ -19,10 +19,6 @@ treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; - - test-fixtures.url = "git+https://git.clan.lol/clan/test-fixtures?ref=main&shallow=1"; - test-fixtures.inputs.flake-parts.follows = "flake-parts"; - test-fixtures.inputs.nixpkgs.follows = "nixpkgs"; }; outputs =