From f4721555d1f15c180504b1363b422f37f2d5b3f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Tue, 24 Aug 2021 00:29:34 +0200 Subject: [PATCH] Refactor flakes Second iteration --- flakes/openarc/flake.nix | 3 ++- flakes/opendmarc/flake.lock | 32 ++++++++++++++++++++--------- flakes/opendmarc/flake.nix | 3 ++- flakes/peertube/flake.nix | 3 ++- flakes/private/openarc/flake.lock | 16 +++++++-------- flakes/private/opendmarc/flake.lock | 18 ++++++++-------- flakes/private/peertube/flake.lock | 20 +++++++++--------- 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 @@ }; config = lib.mkIf cfg.enable { + nixpkgs.overlays = [ self.overlay ]; users.users = lib.optionalAttrs (cfg.user == "openarc") { openarc = { group = cfg.group; @@ -113,7 +114,7 @@ openarc.gid = myuids.lib.gids.openarc; }; - environment.systemPackages = [ self.defaultPackage."${pkgs.system}" ]; + environment.systemPackages = [ pkgs.openarc ]; systemd.services.openarc = { 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 @@ ] }, "locked": { - "narHash": "sha256-q6JJxHV1hyMQlqsqFFTFeUyiH6HsVZJ3GYxXODybPfM=", - "path": "../libspf2", - "type": "path" + "dir": "flakes/libspf2", + "lastModified": 1629758991, + "narHash": "sha256-J0mMj/lPMR+QaqvAzUpOUWELYoyKCpI20T4YZHerAEs=", + "ref": "master", + "rev": "5e2ec9fb8628136e7f9f618c68c0e42ab086b80e", + "revCount": 866, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" }, "original": { - "path": "../libspf2", - "type": "path" + "dir": "flakes/libspf2", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" } }, "myuids": { "locked": { - "narHash": "sha256-GUYJUFgSpffirdUSwZ1r/NyAQkBkVxgH6fEaOvtyGiI=", - "path": "../myuids", - "type": "path" + "dir": "flakes/myuids", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", + "ref": "master", + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" }, "original": { - "path": "../myuids", - "type": "path" + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" } }, "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 @@ }; config = lib.mkIf cfg.enable { + nixpkgs.overlays = [ self.overlay ]; users.users = lib.optionalAttrs (cfg.user == "opendmarc") { opendmarc = { group = cfg.group; @@ -104,7 +105,7 @@ opendmarc.gid = myuids.lib.gids.opendmarc; }; - environment.systemPackages = [ self.defaultPackage."${pkgs.system}" ]; + environment.systemPackages = [ pkgs.opendmarc ]; systemd.services.opendmarc = { 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 @@ }; package = lib.mkOption { type = lib.types.package; - default = self.defaultPackage."${pkgs.system}"; + default = pkgs.peertube; description = '' Peertube package to use. ''; @@ -215,6 +215,7 @@ }; config = lib.mkIf cfg.enable { + nixpkgs.overlays = [ self.overlay ]; users.users = lib.optionalAttrs (cfg.user == name) { "${name}" = { 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 @@ "myuids": { "locked": { "dir": "flakes/myuids", - "lastModified": 1609281959, - "narHash": "sha256-SYNlHeobQAzTzK0pM5AqMn7M2WbTuzBeoD+Q3Mu+sho=", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", "ref": "master", - "rev": "1be9e64bb4556676f65e6e5044e04426848849c0", - "revCount": 791, + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, "type": "git", "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" }, @@ -34,11 +34,11 @@ }, "nix-lib": { "locked": { - "lastModified": 1629671097, - "narHash": "sha256-OKwGVcFaW0M4Su5NlwmUjubbsRCwbmPP1rNPtHd82As=", + "lastModified": 1629758329, + "narHash": "sha256-Qdno5vgP0pnc+nEB5DjYGseW+4MuXiJMfc6cHwalCXY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82d05e980543e1703cbfd3b5ccd1fdcd4b0f1f00", + "rev": "99967a54d893b9742b38809ccfe3172b6918bdef", "type": "github" }, "original": { @@ -70,7 +70,7 @@ "openarc": "openarc_2" }, "locked": { - "narHash": "sha256-cTe5ak0julFu18fRiXVWZ469km8dPVTRidjl21W+SWc=", + "narHash": "sha256-w+MiC+2IBNsXJT9Ln5TBfipv0eCqZOdyY/BYGFVu+nk=", "path": "../../openarc", "type": "path" }, 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 @@ }, "locked": { "dir": "flakes/libspf2", - "lastModified": 1609548509, - "narHash": "sha256-d9gssVdKV0EaeDU/L5QgQpQwFuxWMbwNQ71i7z4LdDs=", + "lastModified": 1629758991, + "narHash": "sha256-J0mMj/lPMR+QaqvAzUpOUWELYoyKCpI20T4YZHerAEs=", "ref": "master", - "rev": "749623765bef80615fc21e73aff89521d262e277", - "revCount": 796, + "rev": "5e2ec9fb8628136e7f9f618c68c0e42ab086b80e", + "revCount": 866, "type": "git", "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" }, @@ -56,11 +56,11 @@ "myuids": { "locked": { "dir": "flakes/myuids", - "lastModified": 1609548509, - "narHash": "sha256-d9gssVdKV0EaeDU/L5QgQpQwFuxWMbwNQ71i7z4LdDs=", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", "ref": "master", - "rev": "749623765bef80615fc21e73aff89521d262e277", - "revCount": 796, + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, "type": "git", "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" }, @@ -108,7 +108,7 @@ "nixpkgs": "nixpkgs" }, "locked": { - "narHash": "sha256-Fw06I3FREReXjXFSs8TuTVQv2kncP3toGdJE1KeHJO8=", + "narHash": "sha256-co+AfUh+3SMGGFTQy5u8470UHXbLiPeAlDWRCdoNdFc=", "path": "../../opendmarc", "type": "path" }, 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 @@ "myuids": { "locked": { "dir": "flakes/myuids", - "lastModified": 1611091761, - "narHash": "sha256-fE3FBeUxVaMezKjEpepdQW9apOza+0AfBALFhaaD0VA=", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", "ref": "master", - "rev": "23f9fdf03a6673dbe334ae33be4f498cc4753191", - "revCount": 802, + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, "type": "git", "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" }, @@ -50,11 +50,11 @@ "myuids_2": { "locked": { "dir": "flakes/myuids", - "lastModified": 1611091761, - "narHash": "sha256-fE3FBeUxVaMezKjEpepdQW9apOza+0AfBALFhaaD0VA=", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", "ref": "master", - "rev": "23f9fdf03a6673dbe334ae33be4f498cc4753191", - "revCount": 802, + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, "type": "git", "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" }, @@ -136,7 +136,7 @@ "peertube": "peertube" }, "locked": { - "narHash": "sha256-YvUqraTpt/I4jw0mSrJgptLymZwlBvhwSK9VLUKD/cc=", + "narHash": "sha256-ESrcCrx7QmNk8MHgws9KrPEZqIxKNQ6bcshbUPj9u88=", "path": "../../peertube", "type": "path" }, @@ -153,7 +153,7 @@ "peertube": "peertube_2" }, "locked": { - "narHash": "sha256-YvUqraTpt/I4jw0mSrJgptLymZwlBvhwSK9VLUKD/cc=", + "narHash": "sha256-ESrcCrx7QmNk8MHgws9KrPEZqIxKNQ6bcshbUPj9u88=", "path": "../../peertube", "type": "path" }, -- 2.41.0