s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Specify the systems through a flake input.

Browse source
This commit is contained in:
r-vdp 2023-05-31 10:22:20 +02:00
parent 9f51341822
commit 7db9cbff4e
No known key found for this signature in database
3 changed files with 29 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

40
flake.lock generated
View file

@ -35,7 +35,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems" "systems": [
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1683635384, "lastModified": 1683635384,
@ -69,7 +71,9 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": [
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -172,6 +176,7 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"systems": "systems",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }
}, },
@ -199,33 +204,16 @@
} }
}, },
"systems": { "systems": {
"flake": false,
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-8wkkYGr1dPSnX9oVMX8D6dTOROXKOYpBTKfriA0sEBI=",
"owner": "nix-systems", "path": "./systems.nix",
"repo": "default", "type": "path"
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "path": "./systems.nix",
"repo": "default", "type": "path"
"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"
} }
}, },
"treefmt-nix": { "treefmt-nix": {

18
flake.nix
View file

@ -1,11 +1,19 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; systems = {
url = "path:./systems.nix";
flake = false;
};
flake-utils = {
url = "github:numtide/flake-utils";
inputs.systems.follows = "systems";
};
devshell = { devshell = {
url = "github:numtide/devshell"; url = "github:numtide/devshell";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
systems.follows = "systems";
}; };
}; };
pre-commit-hooks = { pre-commit-hooks = {
@ -46,7 +54,7 @@
, devshell , devshell
, treefmt-nix , treefmt-nix
, pre-commit-hooks , pre-commit-hooks
, , ...
}: }:
{ {
lib = import ./nix/lib.nix { lib = import ./nix/lib.nix {
@ -60,11 +68,7 @@
}; };
} }
// //
(flake-utils.lib.eachSystem (flake-utils.lib.eachDefaultSystem
[
flake-utils.lib.system.x86_64-linux
flake-utils.lib.system.aarch64-linux
]
(system: (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {

4
systems.nix Normal file
View file

@ -0,0 +1,4 @@
[
"x86_64-linux"
"aarch64-linux"
]