diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-08-30 23:14:00 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-09-30 00:42:52 +0200 |
| commit | 1009efb436c36100bfcc5ad9597b106198fb6764 (patch) | |
| tree | 316ec37ac861aa125845479091f85011210840f6 /flakes/private | |
| parent | 56cfbfb0d8534122d1eaf45ef945d8010f831133 (diff) | |
| download | Nix-1009efb436c36100bfcc5ad9597b106198fb6764.tar.gz Nix-1009efb436c36100bfcc5ad9597b106198fb6764.tar.zst Nix-1009efb436c36100bfcc5ad9597b106198fb6764.zip | |
Remove libspf2 flake for stock one
Diffstat (limited to 'flakes/private')
| -rw-r--r-- | flakes/private/opendmarc/flake.lock | 51 | ||||
| -rw-r--r-- | flakes/private/opendmarc/flake.nix | 5 |
2 files changed, 5 insertions, 51 deletions
diff --git a/flakes/private/opendmarc/flake.lock b/flakes/private/opendmarc/flake.lock index 24df937..33e00a4 100644 --- a/flakes/private/opendmarc/flake.lock +++ b/flakes/private/opendmarc/flake.lock | |||
| @@ -15,44 +15,6 @@ | |||
| 15 | "type": "github" | 15 | "type": "github" |
| 16 | } | 16 | } |
| 17 | }, | 17 | }, |
| 18 | "flake-utils_2": { | ||
| 19 | "locked": { | ||
| 20 | "lastModified": 1609246779, | ||
| 21 | "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", | ||
| 22 | "owner": "numtide", | ||
| 23 | "repo": "flake-utils", | ||
| 24 | "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", | ||
| 25 | "type": "github" | ||
| 26 | }, | ||
| 27 | "original": { | ||
| 28 | "owner": "numtide", | ||
| 29 | "repo": "flake-utils", | ||
| 30 | "type": "github" | ||
| 31 | } | ||
| 32 | }, | ||
| 33 | "libspf2": { | ||
| 34 | "inputs": { | ||
| 35 | "flake-utils": "flake-utils_2", | ||
| 36 | "nixpkgs": [ | ||
| 37 | "nixpkgs" | ||
| 38 | ] | ||
| 39 | }, | ||
| 40 | "locked": { | ||
| 41 | "dir": "flakes/libspf2", | ||
| 42 | "lastModified": 1629758991, | ||
| 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" | ||
| 49 | }, | ||
| 50 | "original": { | ||
| 51 | "dir": "flakes/libspf2", | ||
| 52 | "type": "git", | ||
| 53 | "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" | ||
| 54 | } | ||
| 55 | }, | ||
| 56 | "myuids": { | 18 | "myuids": { |
| 57 | "locked": { | 19 | "locked": { |
| 58 | "dir": "flakes/myuids", | 20 | "dir": "flakes/myuids", |
| @@ -72,11 +34,11 @@ | |||
| 72 | }, | 34 | }, |
| 73 | "nix-lib": { | 35 | "nix-lib": { |
| 74 | "locked": { | 36 | "locked": { |
| 75 | "lastModified": 1629674054, | 37 | "lastModified": 1630358951, |
| 76 | "narHash": "sha256-Vl4SmTN1Cwz9T8Te85Bkq11e9VPl4JRNO+Rzmxxop+c=", | 38 | "narHash": "sha256-y6jh6YDWX6fX88tS9bSFOVSnckCL4qgt7UqUJhLPSx8=", |
| 77 | "owner": "NixOS", | 39 | "owner": "NixOS", |
| 78 | "repo": "nixpkgs", | 40 | "repo": "nixpkgs", |
| 79 | "rev": "f118101266328f38241e266d30316cd3c50e43da", | 41 | "rev": "2d786792ca69c98a8655858464e53698ad7311e2", |
| 80 | "type": "github" | 42 | "type": "github" |
| 81 | }, | 43 | }, |
| 82 | "original": { | 44 | "original": { |
| @@ -103,12 +65,11 @@ | |||
| 103 | "opendmarc": { | 65 | "opendmarc": { |
| 104 | "inputs": { | 66 | "inputs": { |
| 105 | "flake-utils": "flake-utils", | 67 | "flake-utils": "flake-utils", |
| 106 | "libspf2": "libspf2", | ||
| 107 | "myuids": "myuids", | 68 | "myuids": "myuids", |
| 108 | "nixpkgs": "nixpkgs" | 69 | "nixpkgs": "nixpkgs" |
| 109 | }, | 70 | }, |
| 110 | "locked": { | 71 | "locked": { |
| 111 | "narHash": "sha256-co+AfUh+3SMGGFTQy5u8470UHXbLiPeAlDWRCdoNdFc=", | 72 | "narHash": "sha256-eIe5hzNsp1zz5m4ZMzORwdHuLkhEsKkS7WMpPOJE4ok=", |
| 112 | "path": "../../opendmarc", | 73 | "path": "../../opendmarc", |
| 113 | "type": "path" | 74 | "type": "path" |
| 114 | }, | 75 | }, |
| @@ -120,10 +81,6 @@ | |||
| 120 | "root": { | 81 | "root": { |
| 121 | "inputs": { | 82 | "inputs": { |
| 122 | "nix-lib": "nix-lib", | 83 | "nix-lib": "nix-lib", |
| 123 | "nixpkgs": [ | ||
| 124 | "opendmarc", | ||
| 125 | "nixpkgs" | ||
| 126 | ], | ||
| 127 | "opendmarc": "opendmarc" | 84 | "opendmarc": "opendmarc" |
| 128 | } | 85 | } |
| 129 | } | 86 | } |
diff --git a/flakes/private/opendmarc/flake.nix b/flakes/private/opendmarc/flake.nix index 3d500a2..ae96c30 100644 --- a/flakes/private/opendmarc/flake.nix +++ b/flakes/private/opendmarc/flake.nix | |||
| @@ -5,11 +5,8 @@ | |||
| 5 | }; | 5 | }; |
| 6 | inputs.nix-lib.url = "github:NixOS/nixpkgs"; | 6 | inputs.nix-lib.url = "github:NixOS/nixpkgs"; |
| 7 | 7 | ||
| 8 | # Necessary for dependencies | ||
| 9 | inputs.nixpkgs.follows = "opendmarc/nixpkgs"; | ||
| 10 | |||
| 11 | description = "Private configuration for opendmarc"; | 8 | description = "Private configuration for opendmarc"; |
| 12 | outputs = { self, nix-lib, opendmarc, nixpkgs }: | 9 | outputs = { self, nix-lib, opendmarc }: |
| 13 | let | 10 | let |
| 14 | cfg = name': { config, lib, pkgs, name, ... }: lib.mkIf (name == name') { | 11 | cfg = name': { config, lib, pkgs, name, ... }: lib.mkIf (name == name') { |
| 15 | users.users."${config.services.opendmarc.user}".extraGroups = [ "keys" ]; | 12 | users.users."${config.services.opendmarc.user}".extraGroups = [ "keys" ]; |