c3d2/nix-config
c3d2
/
nix-config
23
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Only use one flake-utils

This commit is contained in:
Sandro - 2022-08-18 23:59:07 +02:00
parent 476e7f5f47
commit f39817a2fb
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock
View File

@ -146,7 +146,9 @@
}, },
"microvm": { "microvm": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ]
@ -475,6 +477,7 @@
"root": { "root": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"flake-utils": "flake-utils",
"heliwatch": "heliwatch", "heliwatch": "heliwatch",
"hydra": "hydra", "hydra": "hydra",
"hydra-ca": "hydra-ca", "hydra-ca": "hydra-ca",
@ -602,7 +605,9 @@
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
], ],
"utils": "utils_2" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1657495218, "lastModified": 1657495218,
@ -649,21 +654,6 @@
"type": "github" "type": "github"
} }
}, },
"utils_2": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"yammat": { "yammat": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

15
flake.nix
View File

@ -12,6 +12,7 @@
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixos"; inputs.nixpkgs.follows = "nixos";
}; };
flake-utils.url = "github:numtide/flake-utils";
heliwatch = { heliwatch = {
url = "git+https://gitea.c3d2.de/astro/heliwatch.git"; url = "git+https://gitea.c3d2.de/astro/heliwatch.git";
inputs = { inputs = {
@ -24,7 +25,10 @@
hydra-ca.url = "github:mlabs-haskell/hydra/aciceri/ca-derivations"; hydra-ca.url = "github:mlabs-haskell/hydra/aciceri/ca-derivations";
microvm = { microvm = {
url = "github:astro/microvm.nix"; url = "github:astro/microvm.nix";
inputs.nixpkgs.follows = "nixos"; inputs = {
nixpkgs.follows = "nixos";
flake-utils.follows = "flake-utils";
};
}; };
naersk = { naersk = {
url = "github:nix-community/naersk"; url = "github:nix-community/naersk";
@ -45,6 +49,10 @@
openwrt.follows = "openwrt"; openwrt.follows = "openwrt";
}; };
}; };
riscv64 = {
url = "github:zhaofengli/nixos-riscv64";
inputs.nixpkgs.follows = "nixos";
};
scrapers = { scrapers = {
url = "git+https://gitea.c3d2.de/astro/scrapers.git"; url = "git+https://gitea.c3d2.de/astro/scrapers.git";
flake = false; flake = false;
@ -72,6 +80,7 @@
fenix.follows = "fenix"; fenix.follows = "fenix";
naersk.follows = "naersk"; naersk.follows = "naersk";
nixpkgs.follows = "nixos"; nixpkgs.follows = "nixos";
utils.follows = "flake-utils";
}; };
}; };
tigger = { tigger = {
@ -91,10 +100,6 @@
openwrt-imagebuilder.follows = "openwrt-imagebuilder"; openwrt-imagebuilder.follows = "openwrt-imagebuilder";
}; };
}; };
riscv64 = {
url = "github:zhaofengli/nixos-riscv64";
inputs.nixpkgs.follows = "nixos";
};
}; };
outputs = inputs@{ self, nixos-unstable, nixos, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, microvm, riscv64, oparl-scraper, ... }: outputs = inputs@{ self, nixos-unstable, nixos, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, microvm, riscv64, oparl-scraper, ... }: