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.
This commit is contained in:
Jörg Thalheim
2025-03-11 13:17:42 +01:00
committed by clan-bot
parent a14fe1aef8
commit 9ac8a45f1d
3 changed files with 5 additions and 32 deletions

View File

@@ -1,7 +1,6 @@
{ {
self, self,
lib, lib,
inputs,
... ...
}: }:
{ {
@@ -19,7 +18,11 @@
imports = [ self.nixosModules.test-install-machine-without-system ]; imports = [ self.nixosModules.test-install-machine-without-system ];
}; };
clan.machines.test-install-machine-with-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"; fileSystems."/".device = lib.mkDefault "/dev/vda";
boot.loader.grub.device = lib.mkDefault "/dev/vda"; boot.loader.grub.device = lib.mkDefault "/dev/vda";

26
flake.lock generated
View File

@@ -75,7 +75,6 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems", "systems": "systems",
"test-fixtures": "test-fixtures",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }
}, },
@@ -115,31 +114,6 @@
"type": "github" "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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View File

@@ -19,10 +19,6 @@
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; 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 = outputs =