diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-08-23 01:50:09 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-08-24 00:49:51 +0200 |
commit | 5e2ec9fb8628136e7f9f618c68c0e42ab086b80e (patch) | |
tree | ee56ee4a49b7d48fc91e7baf34ca0158f9c64cff /flakes/private/openarc | |
parent | dfe02d8fd52e33c7d4e1a209cf486696100b88f3 (diff) | |
download | Nix-5e2ec9fb8628136e7f9f618c68c0e42ab086b80e.tar.gz Nix-5e2ec9fb8628136e7f9f618c68c0e42ab086b80e.tar.zst Nix-5e2ec9fb8628136e7f9f618c68c0e42ab086b80e.zip |
Refactor flakes using follows
Diffstat (limited to 'flakes/private/openarc')
-rw-r--r-- | flakes/private/openarc/flake.lock | 14 | ||||
-rw-r--r-- | flakes/private/openarc/flake.nix | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/flakes/private/openarc/flake.lock b/flakes/private/openarc/flake.lock index b1ec2b5..854f73f 100644 --- a/flakes/private/openarc/flake.lock +++ b/flakes/private/openarc/flake.lock | |||
@@ -32,13 +32,13 @@ | |||
32 | "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" | 32 | "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" |
33 | } | 33 | } |
34 | }, | 34 | }, |
35 | "nixpkgs": { | 35 | "nix-lib": { |
36 | "locked": { | 36 | "locked": { |
37 | "lastModified": 1611218116, | 37 | "lastModified": 1629671097, |
38 | "narHash": "sha256-CcyGZ8cLlHgiViWyBjRIjdsdRZxJjP2MgtWeuqSv3CE=", | 38 | "narHash": "sha256-OKwGVcFaW0M4Su5NlwmUjubbsRCwbmPP1rNPtHd82As=", |
39 | "owner": "NixOS", | 39 | "owner": "NixOS", |
40 | "repo": "nixpkgs", | 40 | "repo": "nixpkgs", |
41 | "rev": "30ab92ea31f6b7e9095b1e7e4b56a5000823efdf", | 41 | "rev": "82d05e980543e1703cbfd3b5ccd1fdcd4b0f1f00", |
42 | "type": "github" | 42 | "type": "github" |
43 | }, | 43 | }, |
44 | "original": { | 44 | "original": { |
@@ -47,7 +47,7 @@ | |||
47 | "type": "github" | 47 | "type": "github" |
48 | } | 48 | } |
49 | }, | 49 | }, |
50 | "nixpkgs_2": { | 50 | "nixpkgs": { |
51 | "locked": { | 51 | "locked": { |
52 | "lastModified": 1597943282, | 52 | "lastModified": 1597943282, |
53 | "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", | 53 | "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", |
@@ -66,7 +66,7 @@ | |||
66 | "inputs": { | 66 | "inputs": { |
67 | "flake-utils": "flake-utils", | 67 | "flake-utils": "flake-utils", |
68 | "myuids": "myuids", | 68 | "myuids": "myuids", |
69 | "nixpkgs": "nixpkgs_2", | 69 | "nixpkgs": "nixpkgs", |
70 | "openarc": "openarc_2" | 70 | "openarc": "openarc_2" |
71 | }, | 71 | }, |
72 | "locked": { | 72 | "locked": { |
@@ -97,7 +97,7 @@ | |||
97 | }, | 97 | }, |
98 | "root": { | 98 | "root": { |
99 | "inputs": { | 99 | "inputs": { |
100 | "nixpkgs": "nixpkgs", | 100 | "nix-lib": "nix-lib", |
101 | "openarc": "openarc" | 101 | "openarc": "openarc" |
102 | } | 102 | } |
103 | } | 103 | } |
diff --git a/flakes/private/openarc/flake.nix b/flakes/private/openarc/flake.nix index 65a56ca..fd8ec56 100644 --- a/flakes/private/openarc/flake.nix +++ b/flakes/private/openarc/flake.nix | |||
@@ -3,10 +3,10 @@ | |||
3 | path = "../../openarc"; | 3 | path = "../../openarc"; |
4 | type = "path"; | 4 | type = "path"; |
5 | }; | 5 | }; |
6 | inputs.nixpkgs.url = "github:NixOS/nixpkgs"; | 6 | inputs.nix-lib.url = "github:NixOS/nixpkgs"; |
7 | 7 | ||
8 | description = "Private configuration for openarc"; | 8 | description = "Private configuration for openarc"; |
9 | outputs = { self, nixpkgs, openarc }: | 9 | outputs = { self, nix-lib, openarc }: |
10 | let | 10 | let |
11 | cfg = name': { config, lib, pkgs, name, ... }: lib.mkIf (name == name') { | 11 | cfg = name': { config, lib, pkgs, name, ... }: lib.mkIf (name == name') { |
12 | services.openarc = { | 12 | services.openarc = { |
@@ -41,5 +41,5 @@ | |||
41 | }; | 41 | }; |
42 | in | 42 | in |
43 | openarc.outputs // | 43 | openarc.outputs // |
44 | { nixosModules = openarc.nixosModules or {} // nixpkgs.lib.genAttrs ["eldiron" "backup-2"] cfg; }; | 44 | { nixosModules = openarc.nixosModules or {} // nix-lib.lib.genAttrs ["eldiron" "backup-2"] cfg; }; |
45 | } | 45 | } |