flake: add flake-utils import and use eachDefaultSystem (#3704)

This commit is contained in:
6543 2024-05-13 21:57:36 +02:00 committed by GitHub
parent a700b5855e
commit 83eba294c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 28 deletions

View file

@ -13,8 +13,9 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "flake-utils", "owner": "numtide",
"type": "indirect" "repo": "flake-utils",
"type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
@ -36,8 +37,7 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"systems": "systems_2"
} }
}, },
"systems": { "systems": {
@ -54,21 +54,6 @@
"repo": "default", "repo": "default",
"type": "github" "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"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -1,16 +1,13 @@
{ {
# Override nixpkgs to use the latest set of node packages # Override nixpkgs to use the latest set of node packages
inputs.nixpkgs.url = "github:NixOS/nixpkgs/master"; inputs = {
inputs.systems.url = "github:nix-systems/default"; nixpkgs.url = "github:NixOS/nixpkgs/master";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = outputs =
{ { nixpkgs, flake-utils, ... }:
self, flake-utils.lib.eachDefaultSystem (
nixpkgs,
flake-utils,
systems,
}:
flake-utils.lib.eachSystem (import systems) (
system: system:
let let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };