Revert "Specify the systems through a flake input."

The flake input does not seem to work well with garnix.

This reverts commit 7db9cbff4e.
This commit is contained in:
r-vdp 2023-05-31 13:37:53 +02:00
parent 7db9cbff4e
commit 425a796daa
No known key found for this signature in database
3 changed files with 33 additions and 29 deletions

40
flake.lock generated
View file

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

View file

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

View file

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