feat(flakes): adopt nix-systems for flake systems

This commit is contained in:
Harsh Shandilya 2023-06-26 00:43:35 +05:30
parent 00cd331a4d
commit d69a1ff10c
No known key found for this signature in database
2 changed files with 29 additions and 37 deletions

21
flake.lock generated
View file

@ -82,7 +82,9 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": [
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1687171271, "lastModified": 1687171271,
@ -121,7 +123,8 @@
"fenix": "fenix", "fenix": "fenix",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"systems": "systems"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -168,16 +171,16 @@
}, },
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1687694171,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-m4E0xN69qKj/oKOj8OtiZcSFpFlO8paI6E3Wo5oXDJc=",
"owner": "nix-systems", "owner": "msfjarvis",
"repo": "default", "repo": "flake-systems",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "7876462a5f60841e8b2712ad20dc18470f448e8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "msfjarvis",
"repo": "default", "repo": "flake-systems",
"type": "github" "type": "github"
} }
} }

View file

@ -1,45 +1,34 @@
{ {
description = "gitice"; description = "gitice";
inputs = { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs = {url = "github:NixOS/nixpkgs/nixpkgs-unstable";};
fenix = { inputs.systems.url = "github:msfjarvis/flake-systems";
url = "github:nix-community/fenix";
inputs = {
nixpkgs.follows = "nixpkgs";
};
};
flake-utils = {url = "github:numtide/flake-utils";}; inputs.advisory-db.url = "github:rustsec/advisory-db";
inputs.advisory-db.flake = false;
flake-compat = { inputs.crane.url = "github:ipetkov/crane";
url = "github:nix-community/flake-compat"; inputs.crane.inputs.flake-compat.follows = "flake-compat";
flake = false; inputs.crane.inputs.flake-utils.follows = "flake-utils";
}; inputs.crane.inputs.nixpkgs.follows = "nixpkgs";
crane = { inputs.fenix.url = "github:nix-community/fenix";
url = "github:ipetkov/crane"; inputs.fenix.inputs.nixpkgs.follows = "nixpkgs";
inputs = {
flake-compat.follows = "flake-compat";
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs";
};
};
advisory-db = { inputs.flake-utils.url = "github:numtide/flake-utils";
url = "github:rustsec/advisory-db"; inputs.flake-utils.inputs.systems.follows = "systems";
flake = false;
}; inputs.flake-compat.url = "github:nix-community/flake-compat";
}; inputs.flake-compat.flake = false;
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
fenix, advisory-db,
crane, crane,
fenix,
flake-utils, flake-utils,
advisory-db,
... ...
}: }:
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (system: let