aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2021-08-24 00:29:34 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2021-08-24 01:10:29 +0200
commitf4721555d1f15c180504b1363b422f37f2d5b3f0 (patch)
tree2656cefcf618c5c47768a775b44155ec71af5cfc
parent5e2ec9fb8628136e7f9f618c68c0e42ab086b80e (diff)
downloadNix-f4721555d1f15c180504b1363b422f37f2d5b3f0.tar.gz
Nix-f4721555d1f15c180504b1363b422f37f2d5b3f0.tar.zst
Nix-f4721555d1f15c180504b1363b422f37f2d5b3f0.zip
Refactor flakes
Second iteration
Diffstat
-rw-r--r--flakes/openarc/flake.nix3
-rw-r--r--flakes/opendmarc/flake.lock32
-rw-r--r--flakes/opendmarc/flake.nix3
-rw-r--r--flakes/peertube/flake.nix3
-rw-r--r--flakes/private/openarc/flake.lock16
-rw-r--r--flakes/private/opendmarc/flake.lock18
-rw-r--r--flakes/private/peertube/flake.lock20
7 files changed, 55 insertions, 40 deletions
diff --git a/flakes/openarc/flake.nix b/flakes/openarc/flake.nix
index f47afcf..f4ce653 100644
--- a/flakes/openarc/flake.nix
+++ b/flakes/openarc/flake.nix
@@ -102,6 +102,7 @@
102 }; 102 };
103 103
104 config = lib.mkIf cfg.enable { 104 config = lib.mkIf cfg.enable {
105 nixpkgs.overlays = [ self.overlay ];
105 users.users = lib.optionalAttrs (cfg.user == "openarc") { 106 users.users = lib.optionalAttrs (cfg.user == "openarc") {
106 openarc = { 107 openarc = {
107 group = cfg.group; 108 group = cfg.group;
@@ -113,7 +114,7 @@
113 openarc.gid = myuids.lib.gids.openarc; 114 openarc.gid = myuids.lib.gids.openarc;
114 }; 115 };
115 116
116 environment.systemPackages = [ self.defaultPackage."${pkgs.system}" ]; 117 environment.systemPackages = [ pkgs.openarc ];
117 118
118 systemd.services.openarc = { 119 systemd.services.openarc = {
119 description = "OpenARC daemon"; 120 description = "OpenARC daemon";
diff --git a/flakes/opendmarc/flake.lock b/flakes/opendmarc/flake.lock
index 0bd645c..92551af 100644
--- a/flakes/opendmarc/flake.lock
+++ b/flakes/opendmarc/flake.lock
@@ -38,24 +38,36 @@
38 ] 38 ]
39 }, 39 },
40 "locked": { 40 "locked": {
41 "narHash": "sha256-q6JJxHV1hyMQlqsqFFTFeUyiH6HsVZJ3GYxXODybPfM=", 41 "dir": "flakes/libspf2",
42 "path": "../libspf2", 42 "lastModified": 1629758991,
43 "type": "path" 43 "narHash": "sha256-J0mMj/lPMR+QaqvAzUpOUWELYoyKCpI20T4YZHerAEs=",
44 "ref": "master",
45 "rev": "5e2ec9fb8628136e7f9f618c68c0e42ab086b80e",
46 "revCount": 866,
47 "type": "git",
48 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
44 }, 49 },
45 "original": { 50 "original": {
46 "path": "../libspf2", 51 "dir": "flakes/libspf2",
47 "type": "path" 52 "type": "git",
53 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
48 } 54 }
49 }, 55 },
50 "myuids": { 56 "myuids": {
51 "locked": { 57 "locked": {
52 "narHash": "sha256-GUYJUFgSpffirdUSwZ1r/NyAQkBkVxgH6fEaOvtyGiI=", 58 "dir": "flakes/myuids",
53 "path": "../myuids", 59 "lastModified": 1628207001,
54 "type": "path" 60 "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=",
61 "ref": "master",
62 "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3",
63 "revCount": 865,
64 "type": "git",
65 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
55 }, 66 },
56 "original": { 67 "original": {
57 "path": "../myuids", 68 "dir": "flakes/myuids",
58 "type": "path" 69 "type": "git",
70 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
59 } 71 }
60 }, 72 },
61 "nixpkgs": { 73 "nixpkgs": {
diff --git a/flakes/opendmarc/flake.nix b/flakes/opendmarc/flake.nix
index bf7bd5b..469cf74 100644
--- a/flakes/opendmarc/flake.nix
+++ b/flakes/opendmarc/flake.nix
@@ -93,6 +93,7 @@
93 }; 93 };
94 94
95 config = lib.mkIf cfg.enable { 95 config = lib.mkIf cfg.enable {
96 nixpkgs.overlays = [ self.overlay ];
96 users.users = lib.optionalAttrs (cfg.user == "opendmarc") { 97 users.users = lib.optionalAttrs (cfg.user == "opendmarc") {
97 opendmarc = { 98 opendmarc = {
98 group = cfg.group; 99 group = cfg.group;
@@ -104,7 +105,7 @@
104 opendmarc.gid = myuids.lib.gids.opendmarc; 105 opendmarc.gid = myuids.lib.gids.opendmarc;
105 }; 106 };
106 107
107 environment.systemPackages = [ self.defaultPackage."${pkgs.system}" ]; 108 environment.systemPackages = [ pkgs.opendmarc ];
108 109
109 systemd.services.opendmarc = { 110 systemd.services.opendmarc = {
110 description = "OpenDMARC daemon"; 111 description = "OpenDMARC daemon";
diff --git a/flakes/peertube/flake.nix b/flakes/peertube/flake.nix
index 9a5c557..2f9c8c1 100644
--- a/flakes/peertube/flake.nix
+++ b/flakes/peertube/flake.nix
@@ -196,7 +196,7 @@
196 }; 196 };
197 package = lib.mkOption { 197 package = lib.mkOption {
198 type = lib.types.package; 198 type = lib.types.package;
199 default = self.defaultPackage."${pkgs.system}"; 199 default = pkgs.peertube;
200 description = '' 200 description = ''
201 Peertube package to use. 201 Peertube package to use.
202 ''; 202 '';
@@ -215,6 +215,7 @@
215 }; 215 };
216 216
217 config = lib.mkIf cfg.enable { 217 config = lib.mkIf cfg.enable {
218 nixpkgs.overlays = [ self.overlay ];
218 users.users = lib.optionalAttrs (cfg.user == name) { 219 users.users = lib.optionalAttrs (cfg.user == name) {
219 "${name}" = { 220 "${name}" = {
220 uid = myuids.lib.uids.peertube; 221 uid = myuids.lib.uids.peertube;
diff --git a/flakes/private/openarc/flake.lock b/flakes/private/openarc/flake.lock
index 854f73f..f15e441 100644
--- a/flakes/private/openarc/flake.lock
+++ b/flakes/private/openarc/flake.lock
@@ -18,11 +18,11 @@
18 "myuids": { 18 "myuids": {
19 "locked": { 19 "locked": {
20 "dir": "flakes/myuids", 20 "dir": "flakes/myuids",
21 "lastModified": 1609281959, 21 "lastModified": 1628207001,
22 "narHash": "sha256-SYNlHeobQAzTzK0pM5AqMn7M2WbTuzBeoD+Q3Mu+sho=", 22 "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=",
23 "ref": "master", 23 "ref": "master",
24 "rev": "1be9e64bb4556676f65e6e5044e04426848849c0", 24 "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3",
25 "revCount": 791, 25 "revCount": 865,
26 "type": "git", 26 "type": "git",
27 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" 27 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
28 }, 28 },
@@ -34,11 +34,11 @@
34 }, 34 },
35 "nix-lib": { 35 "nix-lib": {
36 "locked": { 36 "locked": {
37 "lastModified": 1629671097, 37 "lastModified": 1629758329,
38 "narHash": "sha256-OKwGVcFaW0M4Su5NlwmUjubbsRCwbmPP1rNPtHd82As=", 38 "narHash": "sha256-Qdno5vgP0pnc+nEB5DjYGseW+4MuXiJMfc6cHwalCXY=",
39 "owner": "NixOS", 39 "owner": "NixOS",
40 "repo": "nixpkgs", 40 "repo": "nixpkgs",
41 "rev": "82d05e980543e1703cbfd3b5ccd1fdcd4b0f1f00", 41 "rev": "99967a54d893b9742b38809ccfe3172b6918bdef",
42 "type": "github" 42 "type": "github"
43 }, 43 },
44 "original": { 44 "original": {
@@ -70,7 +70,7 @@
70 "openarc": "openarc_2" 70 "openarc": "openarc_2"
71 }, 71 },
72 "locked": { 72 "locked": {
73 "narHash": "sha256-cTe5ak0julFu18fRiXVWZ469km8dPVTRidjl21W+SWc=", 73 "narHash": "sha256-w+MiC+2IBNsXJT9Ln5TBfipv0eCqZOdyY/BYGFVu+nk=",
74 "path": "../../openarc", 74 "path": "../../openarc",
75 "type": "path" 75 "type": "path"
76 }, 76 },
diff --git a/flakes/private/opendmarc/flake.lock b/flakes/private/opendmarc/flake.lock
index cdb3833..24df937 100644
--- a/flakes/private/opendmarc/flake.lock
+++ b/flakes/private/opendmarc/flake.lock
@@ -39,11 +39,11 @@
39 }, 39 },
40 "locked": { 40 "locked": {
41 "dir": "flakes/libspf2", 41 "dir": "flakes/libspf2",
42 "lastModified": 1609548509, 42 "lastModified": 1629758991,
43 "narHash": "sha256-d9gssVdKV0EaeDU/L5QgQpQwFuxWMbwNQ71i7z4LdDs=", 43 "narHash": "sha256-J0mMj/lPMR+QaqvAzUpOUWELYoyKCpI20T4YZHerAEs=",
44 "ref": "master", 44 "ref": "master",
45 "rev": "749623765bef80615fc21e73aff89521d262e277", 45 "rev": "5e2ec9fb8628136e7f9f618c68c0e42ab086b80e",
46 "revCount": 796, 46 "revCount": 866,
47 "type": "git", 47 "type": "git",
48 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" 48 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
49 }, 49 },
@@ -56,11 +56,11 @@
56 "myuids": { 56 "myuids": {
57 "locked": { 57 "locked": {
58 "dir": "flakes/myuids", 58 "dir": "flakes/myuids",
59 "lastModified": 1609548509, 59 "lastModified": 1628207001,
60 "narHash": "sha256-d9gssVdKV0EaeDU/L5QgQpQwFuxWMbwNQ71i7z4LdDs=", 60 "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=",
61 "ref": "master", 61 "ref": "master",
62 "rev": "749623765bef80615fc21e73aff89521d262e277", 62 "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3",
63 "revCount": 796, 63 "revCount": 865,
64 "type": "git", 64 "type": "git",
65 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" 65 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
66 }, 66 },
@@ -108,7 +108,7 @@
108 "nixpkgs": "nixpkgs" 108 "nixpkgs": "nixpkgs"
109 }, 109 },
110 "locked": { 110 "locked": {
111 "narHash": "sha256-Fw06I3FREReXjXFSs8TuTVQv2kncP3toGdJE1KeHJO8=", 111 "narHash": "sha256-co+AfUh+3SMGGFTQy5u8470UHXbLiPeAlDWRCdoNdFc=",
112 "path": "../../opendmarc", 112 "path": "../../opendmarc",
113 "type": "path" 113 "type": "path"
114 }, 114 },
diff --git a/flakes/private/peertube/flake.lock b/flakes/private/peertube/flake.lock
index 97c5c63..4944da7 100644
--- a/flakes/private/peertube/flake.lock
+++ b/flakes/private/peertube/flake.lock
@@ -33,11 +33,11 @@
33 "myuids": { 33 "myuids": {
34 "locked": { 34 "locked": {
35 "dir": "flakes/myuids", 35 "dir": "flakes/myuids",
36 "lastModified": 1611091761, 36 "lastModified": 1628207001,
37 "narHash": "sha256-fE3FBeUxVaMezKjEpepdQW9apOza+0AfBALFhaaD0VA=", 37 "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=",
38 "ref": "master", 38 "ref": "master",
39 "rev": "23f9fdf03a6673dbe334ae33be4f498cc4753191", 39 "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3",
40 "revCount": 802, 40 "revCount": 865,
41 "type": "git", 41 "type": "git",
42 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" 42 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
43 }, 43 },
@@ -50,11 +50,11 @@
50 "myuids_2": { 50 "myuids_2": {
51 "locked": { 51 "locked": {
52 "dir": "flakes/myuids", 52 "dir": "flakes/myuids",
53 "lastModified": 1611091761, 53 "lastModified": 1628207001,
54 "narHash": "sha256-fE3FBeUxVaMezKjEpepdQW9apOza+0AfBALFhaaD0VA=", 54 "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=",
55 "ref": "master", 55 "ref": "master",
56 "rev": "23f9fdf03a6673dbe334ae33be4f498cc4753191", 56 "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3",
57 "revCount": 802, 57 "revCount": 865,
58 "type": "git", 58 "type": "git",
59 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" 59 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
60 }, 60 },
@@ -136,7 +136,7 @@
136 "peertube": "peertube" 136 "peertube": "peertube"
137 }, 137 },
138 "locked": { 138 "locked": {
139 "narHash": "sha256-YvUqraTpt/I4jw0mSrJgptLymZwlBvhwSK9VLUKD/cc=", 139 "narHash": "sha256-ESrcCrx7QmNk8MHgws9KrPEZqIxKNQ6bcshbUPj9u88=",
140 "path": "../../peertube", 140 "path": "../../peertube",
141 "type": "path" 141 "type": "path"
142 }, 142 },
@@ -153,7 +153,7 @@
153 "peertube": "peertube_2" 153 "peertube": "peertube_2"
154 }, 154 },
155 "locked": { 155 "locked": {
156 "narHash": "sha256-YvUqraTpt/I4jw0mSrJgptLymZwlBvhwSK9VLUKD/cc=", 156 "narHash": "sha256-ESrcCrx7QmNk8MHgws9KrPEZqIxKNQ6bcshbUPj9u88=",
157 "path": "../../peertube", 157 "path": "../../peertube",
158 "type": "path" 158 "type": "path"
159 }, 159 },
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 19:38:24 +0000