aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2021-08-30 23:14:00 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2021-09-30 00:42:52 +0200
commit1009efb436c36100bfcc5ad9597b106198fb6764 (patch)
tree316ec37ac861aa125845479091f85011210840f6
parent56cfbfb0d8534122d1eaf45ef945d8010f831133 (diff)
downloadNix-1009efb436c36100bfcc5ad9597b106198fb6764.tar.gz
Nix-1009efb436c36100bfcc5ad9597b106198fb6764.tar.zst
Nix-1009efb436c36100bfcc5ad9597b106198fb6764.zip
Remove libspf2 flake for stock one
Diffstat
-rw-r--r--flakes/libspf2/default.nix34
-rw-r--r--flakes/libspf2/flake.lock42
-rw-r--r--flakes/libspf2/flake.nix28
-rw-r--r--flakes/opendmarc/flake.lock39
-rw-r--r--flakes/opendmarc/flake.nix10
-rw-r--r--flakes/private/opendmarc/flake.lock51
-rw-r--r--flakes/private/opendmarc/flake.nix5
-rw-r--r--overlays/default.nix1
8 files changed, 7 insertions, 203 deletions
diff --git a/flakes/libspf2/default.nix b/flakes/libspf2/default.nix
deleted file mode 100644
index d22c738..0000000
--- a/flakes/libspf2/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
1{ fetchpatch, file, fetchurl, libnsl, stdenv, lib }:
2stdenv.mkDerivation rec {
3 pname = "libspf2";
4 version = "1.2.10";
5
6 patches = [
7 (fetchpatch {
8 name = "fix-variadic-macros.patch";
9 url = "https://github.com/shevek/libspf2/commit/5852828582f556e73751076ad092f72acf7fc8b6.patch";
10 sha256 = "00dqpcgjr9jy2qprgqv2qiyvq8y3wlz4yns9xzabf2064jzqh2ic";
11 })
12 ];
13 preConfigure = ''
14 sed -i -e "s@/usr/bin/file@${file}/bin/file@" ./configure
15 '';
16 configureFlags = [
17 "--enable-static"
18 ];
19 postInstall = ''
20 rm $out/bin/*_static
21 '';
22 src = fetchurl {
23 url = "https://www.libspf2.org/spf/${pname}-${version}.tar.gz";
24 sha256 = "1j91p0qiipzf89qxq4m1wqhdf01hpn1h5xj4djbs51z23bl3s7nr";
25 };
26
27 buildInputs = [ libnsl ];
28
29 meta = {
30 description = "Sender Policy Framework record checking library";
31 homepage = "https://www.libspf2.org/";
32 platforms = lib.platforms.linux;
33 };
34}
diff --git a/flakes/libspf2/flake.lock b/flakes/libspf2/flake.lock
deleted file mode 100644
index a278bc0..0000000
--- a/flakes/libspf2/flake.lock
+++ /dev/null
@@ -1,42 +0,0 @@
1{
2 "nodes": {
3 "flake-utils": {
4 "locked": {
5 "lastModified": 1609246779,
6 "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=",
7 "owner": "numtide",
8 "repo": "flake-utils",
9 "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4",
10 "type": "github"
11 },
12 "original": {
13 "owner": "numtide",
14 "repo": "flake-utils",
15 "type": "github"
16 }
17 },
18 "nixpkgs": {
19 "locked": {
20 "lastModified": 1597943282,
21 "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=",
22 "owner": "NixOS",
23 "repo": "nixpkgs",
24 "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38",
25 "type": "github"
26 },
27 "original": {
28 "owner": "NixOS",
29 "repo": "nixpkgs",
30 "type": "github"
31 }
32 },
33 "root": {
34 "inputs": {
35 "flake-utils": "flake-utils",
36 "nixpkgs": "nixpkgs"
37 }
38 }
39 },
40 "root": "root",
41 "version": 7
42}
diff --git a/flakes/libspf2/flake.nix b/flakes/libspf2/flake.nix
deleted file mode 100644
index af1deea..0000000
--- a/flakes/libspf2/flake.nix
+++ /dev/null
@@ -1,28 +0,0 @@
1{
2 description = "Sender Policy Framework record checking library";
3
4 inputs.flake-utils.url = "github:numtide/flake-utils";
5 inputs.nixpkgs.url = "github:NixOS/nixpkgs";
6
7 outputs = { self, flake-utils, nixpkgs }: flake-utils.lib.eachSystem ["aarch64-linux" "i686-linux" "x86_64-linux"] (system:
8 let
9 pkgs = import nixpkgs { inherit system; overlays = []; };
10 libspf2 = pkgs.callPackage ./. {};
11 in rec {
12 packages.libspf2 = libspf2;
13 defaultPackage = libspf2;
14 legacyPackages.libfspf2 = libspf2;
15 apps.libspf2 = flake-utils.lib.mkApp { drv = libspf2; name = "spfquery"; };
16 defaultApp = apps.libspf2;
17 checks.build = libspf2;
18 hydraJobs.build = libspf2;
19 }
20 ) // rec {
21 overlays = {
22 libspf2 = final: prev: {
23 libspf2 = self.defaultPackage."${final.system}";
24 };
25 };
26 overlay = overlays.libspf2;
27 };
28}
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;
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" ];
diff --git a/overlays/default.nix b/overlays/default.nix
index b01dd81..1f1528c 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,7 +2,6 @@ let
2 flakeCompat = import ../lib/flake-compat.nix; 2 flakeCompat = import ../lib/flake-compat.nix;
3 flakes = builtins.foldl' (a: b: a // b) {} (map (n: (flakeCompat n).overlays) [ 3 flakes = builtins.foldl' (a: b: a // b) {} (map (n: (flakeCompat n).overlays) [
4 ../flakes/backports 4 ../flakes/backports
5 ../flakes/libspf2
6 ../flakes/openarc 5 ../flakes/openarc
7 ../flakes/opendmarc 6 ../flakes/opendmarc
8 ../flakes/peertube 7 ../flakes/peertube
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 12:19:10 +0000