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/opendmarc | |
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/opendmarc')
-rw-r--r-- | flakes/opendmarc/flake.lock | 39 | ||||
-rw-r--r-- | flakes/opendmarc/flake.nix | 10 |
2 files changed, 2 insertions, 47 deletions
diff --git a/flakes/opendmarc/flake.lock b/flakes/opendmarc/flake.lock index 92551af..4503c79 100644 --- a/flakes/opendmarc/flake.lock +++ b/flakes/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", |
@@ -88,7 +50,6 @@ | |||
88 | "root": { | 50 | "root": { |
89 | "inputs": { | 51 | "inputs": { |
90 | "flake-utils": "flake-utils", | 52 | "flake-utils": "flake-utils", |
91 | "libspf2": "libspf2", | ||
92 | "myuids": "myuids", | 53 | "myuids": "myuids", |
93 | "nixpkgs": "nixpkgs" | 54 | "nixpkgs": "nixpkgs" |
94 | } | 55 | } |
diff --git a/flakes/opendmarc/flake.nix b/flakes/opendmarc/flake.nix index 469cf74..f1877b6 100644 --- a/flakes/opendmarc/flake.nix +++ b/flakes/opendmarc/flake.nix | |||
@@ -6,18 +6,12 @@ | |||
6 | type = "git"; | 6 | type = "git"; |
7 | dir = "flakes/myuids"; | 7 | dir = "flakes/myuids"; |
8 | }; | 8 | }; |
9 | inputs.libspf2 = { | ||
10 | url = "https://git.immae.eu/perso/Immae/Config/Nix.git"; | ||
11 | type = "git"; | ||
12 | dir = "flakes/libspf2"; | ||
13 | inputs.nixpkgs.follows = "nixpkgs"; | ||
14 | }; | ||
15 | inputs.flake-utils.url = "github:numtide/flake-utils"; | 9 | inputs.flake-utils.url = "github:numtide/flake-utils"; |
16 | inputs.nixpkgs.url = "github:NixOS/nixpkgs"; | 10 | inputs.nixpkgs.url = "github:NixOS/nixpkgs"; |
17 | 11 | ||
18 | outputs = { self, myuids, libspf2, flake-utils, nixpkgs }: flake-utils.lib.eachSystem ["aarch64-linux" "i686-linux" "x86_64-linux"] (system: | 12 | outputs = { self, myuids, flake-utils, nixpkgs }: flake-utils.lib.eachSystem ["aarch64-linux" "i686-linux" "x86_64-linux"] (system: |
19 | let | 13 | let |
20 | pkgs = import nixpkgs { inherit system; overlays = [ libspf2.overlay ]; }; | 14 | pkgs = import nixpkgs { inherit system; overlays = []; }; |
21 | in rec { | 15 | in rec { |
22 | packages.opendmarc = pkgs.callPackage ./. {}; | 16 | packages.opendmarc = pkgs.callPackage ./. {}; |
23 | defaultPackage = packages.opendmarc; | 17 | defaultPackage = packages.opendmarc; |