diff options
-rw-r--r-- | flakes/private/paste/flake.lock | 40 | ||||
-rw-r--r-- | flakes/private/paste/flake.nix | 9 | ||||
-rw-r--r-- | modules/default.nix | 2 |
3 files changed, 44 insertions, 7 deletions
diff --git a/flakes/private/paste/flake.lock b/flakes/private/paste/flake.lock index 939d589..6ad428c 100644 --- a/flakes/private/paste/flake.lock +++ b/flakes/private/paste/flake.lock | |||
@@ -15,13 +15,27 @@ | |||
15 | "type": "github" | 15 | "type": "github" |
16 | } | 16 | } |
17 | }, | 17 | }, |
18 | "my-lib": { | ||
19 | "inputs": { | ||
20 | "nixpkgs": "nixpkgs" | ||
21 | }, | ||
22 | "locked": { | ||
23 | "narHash": "sha256-HGNP1eH7b42BxViYx/F3ZPO9CM1X+5qfA9JoP2ArN+s=", | ||
24 | "path": "../../lib", | ||
25 | "type": "path" | ||
26 | }, | ||
27 | "original": { | ||
28 | "path": "../../lib", | ||
29 | "type": "path" | ||
30 | } | ||
31 | }, | ||
18 | "nix-lib": { | 32 | "nix-lib": { |
19 | "locked": { | 33 | "locked": { |
20 | "lastModified": 1631655525, | 34 | "lastModified": 1632955135, |
21 | "narHash": "sha256-8U7zAdbjNItXo6eqI/rhtOa3LUPGD6yE9PTZQkrSGHo=", | 35 | "narHash": "sha256-MyOBftnLv5UcPCL4AzvlyNEDwGD2cGGM9HMEOno/MZw=", |
22 | "owner": "NixOS", | 36 | "owner": "NixOS", |
23 | "repo": "nixpkgs", | 37 | "repo": "nixpkgs", |
24 | "rev": "cf0caf529c33c140863ebfa43691f7b69fe2233c", | 38 | "rev": "a4d96cd808f13d924988938ecf9a46b2a2787fa3", |
25 | "type": "github" | 39 | "type": "github" |
26 | }, | 40 | }, |
27 | "original": { | 41 | "original": { |
@@ -45,13 +59,28 @@ | |||
45 | "type": "github" | 59 | "type": "github" |
46 | } | 60 | } |
47 | }, | 61 | }, |
62 | "nixpkgs_2": { | ||
63 | "locked": { | ||
64 | "lastModified": 1631570365, | ||
65 | "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", | ||
66 | "owner": "NixOS", | ||
67 | "repo": "nixpkgs", | ||
68 | "rev": "df7113c0727881519248d4c7d080324e0ee3327b", | ||
69 | "type": "github" | ||
70 | }, | ||
71 | "original": { | ||
72 | "owner": "NixOS", | ||
73 | "repo": "nixpkgs", | ||
74 | "type": "github" | ||
75 | } | ||
76 | }, | ||
48 | "paste": { | 77 | "paste": { |
49 | "inputs": { | 78 | "inputs": { |
50 | "flake-utils": "flake-utils", | 79 | "flake-utils": "flake-utils", |
51 | "nixpkgs": "nixpkgs" | 80 | "nixpkgs": "nixpkgs_2" |
52 | }, | 81 | }, |
53 | "locked": { | 82 | "locked": { |
54 | "narHash": "sha256-oSabBrUGIkY8lKktXlIM4uYSVYI54wKnIjjVZwMOd70=", | 83 | "narHash": "sha256-2ylI42ZHfzW6oCsxfFyHf5zVnDsPMwvJCACtcdErtPg=", |
55 | "path": "../../paste", | 84 | "path": "../../paste", |
56 | "type": "path" | 85 | "type": "path" |
57 | }, | 86 | }, |
@@ -62,6 +91,7 @@ | |||
62 | }, | 91 | }, |
63 | "root": { | 92 | "root": { |
64 | "inputs": { | 93 | "inputs": { |
94 | "my-lib": "my-lib", | ||
65 | "nix-lib": "nix-lib", | 95 | "nix-lib": "nix-lib", |
66 | "paste": "paste" | 96 | "paste": "paste" |
67 | } | 97 | } |
diff --git a/flakes/private/paste/flake.nix b/flakes/private/paste/flake.nix index 71314e8..23f8cd3 100644 --- a/flakes/private/paste/flake.nix +++ b/flakes/private/paste/flake.nix | |||
@@ -3,12 +3,19 @@ | |||
3 | path = "../../paste"; | 3 | path = "../../paste"; |
4 | type = "path"; | 4 | type = "path"; |
5 | }; | 5 | }; |
6 | inputs.my-lib = { | ||
7 | path = "../../lib"; | ||
8 | type = "path"; | ||
9 | }; | ||
6 | inputs.nix-lib.url = "github:NixOS/nixpkgs"; | 10 | inputs.nix-lib.url = "github:NixOS/nixpkgs"; |
7 | 11 | ||
8 | description = "Private configuration for paste"; | 12 | description = "Private configuration for paste"; |
9 | outputs = { self, nix-lib, paste }: | 13 | outputs = { self, my-lib, nix-lib, paste }: |
10 | let | 14 | let |
11 | cfg = name': { config, lib, pkgs, name, ... }: { | 15 | cfg = name': { config, lib, pkgs, name, ... }: { |
16 | imports = [ | ||
17 | (my-lib.lib.withNarKey paste "nixosModule") | ||
18 | ]; | ||
12 | config = lib.mkIf (name == name') { | 19 | config = lib.mkIf (name == name') { |
13 | services.paste = { | 20 | services.paste = { |
14 | enable = true; | 21 | enable = true; |
diff --git a/modules/default.nix b/modules/default.nix index 11b3081..630e8f5 100644 --- a/modules/default.nix +++ b/modules/default.nix | |||
@@ -14,7 +14,7 @@ in | |||
14 | mediagoblin = ./webapps/mediagoblin.nix; | 14 | mediagoblin = ./webapps/mediagoblin.nix; |
15 | peertube = (flakeCompat ../flakes/peertube).nixosModule; | 15 | peertube = (flakeCompat ../flakes/peertube).nixosModule; |
16 | fiche = ./webapps/fiche.nix; | 16 | fiche = ./webapps/fiche.nix; |
17 | paste = (flakeCompat ../flakes/paste).nixosModule; | 17 | paste = flakeLib.withNarKeyCompat flakeCompat ../flakes/paste "nixosModule"; |
18 | 18 | ||
19 | opendmarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/opendmarc "nixosModule"; | 19 | opendmarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/opendmarc "nixosModule"; |
20 | openarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/openarc "nixosModule"; | 20 | openarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/openarc "nixosModule"; |