yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove nixos-facter until fixed upstream

Browse Source
This commit is contained in:
Johannes Kirschbauer
2024-08-26 11:27:41 +02:00
parent 10f6292073
commit 8f39db5c54
2 changed files with 22 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

299
flake.lock generated
View File

@@ -3,37 +3,12 @@
"blueprint": {
"inputs": {
"nixpkgs": [
"nixos-facter",
"nixpkgs"
],
"systems": [
"nixos-facter",
"systems"
]
},
"locked": {
"lastModified": 1722503414,
"narHash": "sha256-JFMBd4cERlKd2lH1FuWgiwf2Q9PzPRPsdD4HV8Fs2IQ=",
"owner": "numtide",
"repo": "blueprint",
"rev": "214500b4802d1e0149a51aa19340d6f1aefb33e8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "blueprint",
"type": "github"
}
},
"blueprint_2": {
"inputs": {
"nixpkgs": [
"nixos-facter",
"hwinfo",
"nixpkgs"
],
"systems": "systems"
},
"locked": {
"lastModified": 1724053269,
"narHash": "sha256-DinmPyxmUSLjBUYMe3eK0GKykwe33vWbVTmp7++P4Ng=",
@@ -48,31 +23,6 @@
"type": "github"
}
},
"blueprint_3": {
"inputs": {
"nixpkgs": [
"nixos-facter-modules",
"nixpkgs"
],
"systems": [
"nixos-facter-modules",
"systems"
]
},
"locked": {
"lastModified": 1722503414,
"narHash": "sha256-JFMBd4cERlKd2lH1FuWgiwf2Q9PzPRPsdD4HV8Fs2IQ=",
"owner": "numtide",
"repo": "blueprint",
"rev": "214500b4802d1e0149a51aa19340d6f1aefb33e8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "blueprint",
"type": "github"
}
},
"disko": {
"inputs": {
"nixpkgs": [
@@ -93,24 +43,6 @@
"type": "github"
}
},
"disko_2": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1723996216,
"narHash": "sha256-QNykxbGaHF3ANP369TT+VEBHlHufwY0SQk1SvUz5RcE=",
"owner": "nix-community",
"repo": "disko",
"rev": "fd43891af43916918eabdd498eeb24788d666079",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -131,106 +63,20 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": [
"nixos-facter",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gomod2nix": {
"inputs": {
"flake-utils": [
"nixos-facter",
"flake-utils"
],
"nixpkgs": [
"nixos-facter",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722589758,
"narHash": "sha256-sbbA8b6Q2vB/t/r1znHawoXLysCyD4L/6n6/RykiSnA=",
"owner": "nix-community",
"repo": "gomod2nix",
"rev": "4e08ca09253ef996bd4c03afa383b23e35fe28a1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "gomod2nix",
"type": "github"
}
},
"hwinfo": {
"inputs": {
"blueprint": "blueprint_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1724271981,
"narHash": "sha256-JqGUgN2ronkVrekLJ3t2Oa3Zt/W1JhU5oA/GD5f1nhI=",
"owner": "numtide",
"repo": "hwinfo",
"rev": "db1f44bde5b633cc68a46317773d33a80f7f28e7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "hwinfo",
"type": "github"
}
},
"nixos-facter": {
"inputs": {
"blueprint": "blueprint",
"disko": "disko_2",
"flake-utils": "flake-utils",
"gomod2nix": "gomod2nix",
"hwinfo": "hwinfo",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1724408140,
"narHash": "sha256-NKB/72C5udfGlnoQt1BRNkfZJ0BLd9Fud/2eWnPX5UU=",
"owner": "numtide",
"repo": "nixos-facter",
"rev": "8e7131acedc57af4a17bb51d66596fbb172b71df",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nixos-facter",
"type": "github"
}
},
"nixos-facter-modules": {
"inputs": {
"blueprint": "blueprint_3",
"blueprint": [
"blueprint"
],
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_3",
"treefmt-nix": "treefmt-nix_2"
"systems": [
"systems"
],
"treefmt-nix": [
"treefmt-nix"
]
},
"locked": {
"lastModified": 1724320449,
@@ -268,38 +114,6 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1723603349,
"narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1723991338,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1724607561,
"narHash": "sha256-7I922FoAJO9P2YRJrxQx1ufQom3wvozJNL/Ul6eEKLI=",
@@ -317,15 +131,15 @@
},
"root": {
"inputs": {
"blueprint": "blueprint",
"disko": "disko",
"flake-parts": "flake-parts",
"nixos-facter": "nixos-facter",
"nixos-facter-modules": "nixos-facter-modules",
"nixos-images": "nixos-images",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs",
"sops-nix": "sops-nix",
"systems": "systems_4",
"treefmt-nix": "treefmt-nix_3"
"systems": "systems",
"treefmt-nix": "treefmt-nix"
}
},
"sops-nix": {
@@ -364,94 +178,7 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixos-facter",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723808491,
"narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nixos-facter-modules",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723656612,
"narHash": "sha256-6Sx+/VhRPLR+kRf6rnNUFMQ66DUz1DMYajixYUe+CUU=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "4a6d7dccf80a1aa2d04cfaa88d9e5511542a2486",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"nixpkgs"

27
flake.nix
View File

@@ -17,11 +17,17 @@
systems.url = "github:nix-systems/default";
treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
nixos-facter-modules.inputs.nixpkgs.follows = "nixpkgs";
nixos-facter.url = "github:numtide/nixos-facter";
nixos-facter.inputs.nixpkgs.follows = "nixpkgs";
nixos-facter-modules.inputs.systems.follows = "systems";
nixos-facter-modules.inputs.blueprint.follows = "blueprint";
nixos-facter-modules.inputs.treefmt-nix.follows = "treefmt-nix";
# Pinned input for nixos-facter-modules
# Allows downstream flakes to .follow override the input
blueprint.url = "github:numtide/blueprint";
blueprint.inputs.nixpkgs.follows = "nixpkgs";
blueprint.inputs.systems.follows = "systems";
};
outputs =
@@ -54,21 +60,6 @@
./nixosModules/clanCore/vars/flake-module.nix
./pkgs/flake-module.nix
./templates/flake-module.nix
# Inherit the nixos-facter package so its build is chached in clans binary cache
{
perSystem =
# Facter doesnt have a package for darwin yet.
{
inputs',
system,
lib,
...
}:
lib.optionalAttrs (system == "x86_64-linux") {
packages.nixos-facter = inputs'.nixos-facter.packages.default;
};
}
];
}
);