summaryrefslogtreecommitdiff
path: root/overlays
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-09-14 16:06:00 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2022-09-14 16:06:00 +0200
commit410a63cf1baf627a0b99c34a955b3d02efabb48f (patch)
tree0b8a0f16f6de3ea7e1495c373b647c3966e3f4fb /overlays
parentb931543508377c0e48a6801e4ea217eb523e2b03 (diff)
downloadnixos-410a63cf1baf627a0b99c34a955b3d02efabb48f.tar
nixos-410a63cf1baf627a0b99c34a955b3d02efabb48f.tar.gz
nixos-410a63cf1baf627a0b99c34a955b3d02efabb48f.tar.bz2
nixos-410a63cf1baf627a0b99c34a955b3d02efabb48f.tar.xz
nixos-410a63cf1baf627a0b99c34a955b3d02efabb48f.zip
...
Diffstat (limited to 'overlays')
-rw-r--r--overlays/lego.nix10
-rw-r--r--overlays/postfix-mta-sts-resolver.nix2
-rw-r--r--overlays/prometheus-node-exporter.nix15
-rw-r--r--overlays/spm/default.nix6
4 files changed, 5 insertions, 28 deletions
diff --git a/overlays/lego.nix b/overlays/lego.nix
deleted file mode 100644
index 363b32da..00000000
--- a/overlays/lego.nix
+++ /dev/null
@@ -1,10 +0,0 @@
1{ prev, ... }: {
2 lego = prev.lego.override {
3 buildGoModule = args: prev.buildGoModule (args // {
4 patches = (args.patches or []) ++ prev.lib.lists.singleton (prev.fetchpatch {
5 url = "https://patch-diff.githubusercontent.com/raw/go-acme/lego/pull/1501.patch";
6 hash = "sha256-hLuWX607T8tcqljpBzEADViZd2FABkCgjNCLXMyWpuA=";
7 });
8 });
9 };
10}
diff --git a/overlays/postfix-mta-sts-resolver.nix b/overlays/postfix-mta-sts-resolver.nix
index 1d8f0188..a06dace5 100644
--- a/overlays/postfix-mta-sts-resolver.nix
+++ b/overlays/postfix-mta-sts-resolver.nix
@@ -22,5 +22,7 @@
22 }); 22 });
23 }) 23 })
24 ]; 24 ];
25
26 _.pyparsing.buildInputs.add = with final.python310Packages; [ flit-core ];
25 }; 27 };
26} 28}
diff --git a/overlays/prometheus-node-exporter.nix b/overlays/prometheus-node-exporter.nix
deleted file mode 100644
index de5b15f2..00000000
--- a/overlays/prometheus-node-exporter.nix
+++ /dev/null
@@ -1,15 +0,0 @@
1{ prev, ... }: {
2 prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs (oldAttrs: {
3 patches = oldAttrs.patches or [] ++ [
4 (prev.runCommand "cpu-unified.diff" {
5 src = prev.fetchurl {
6 url = "https://github.com/pelov/systemd_exporter/commit/2880a8dd1ca4909e51a569093284fad47343016a.diff";
7 hash = "sha256-i6sptiCdXmOqK5kfjLbIupctM34RqDahAE/39+35dRI=";
8 };
9 buildInputs = with prev; [ patchutils ];
10 } ''
11 filterdiff -x '**/CHANGELOG.md' $src > $out
12 '')
13 ];
14 });
15}
diff --git a/overlays/spm/default.nix b/overlays/spm/default.nix
index 5c820d9c..05a8f013 100644
--- a/overlays/spm/default.nix
+++ b/overlays/spm/default.nix
@@ -4,9 +4,9 @@ let
4 # defaultPackages = (import ./stackage.nix {}); 4 # defaultPackages = (import ./stackage.nix {});
5 # haskellPackages = defaultPackages // argumentPackages; 5 # haskellPackages = defaultPackages // argumentPackages;
6 # haskellPackages = argumentPackages; 6 # haskellPackages = argumentPackages;
7 haskellPackages = final.haskell.packages.ghc923.override { 7 haskellPackages = final.haskell.packages.ghc924.override {
8 overrides = self: super: { 8 overrides = self: super: {
9 warp-systemd = final.haskell.lib.doJailbreak (super.warp-systemd.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { broken = false; }; })); 9 warp-systemd = final.haskell.lib.doJailbreak (super.warp-systemd.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { broken = false; }; }));
10 servant-server = super.servant-server.overrideAttrs (oldAttrs: { 10 servant-server = super.servant-server.overrideAttrs (oldAttrs: {
11 patches = []; 11 patches = [];
12 }); 12 });
@@ -34,7 +34,7 @@ let
34 in path: _type: builtins.match "^frontend(/.*)?$" (relPath path) == null; 34 in path: _type: builtins.match "^frontend(/.*)?$" (relPath path) == null;
35 src = ./.; 35 src = ./.;
36 }; 36 };
37 37
38 postPatch = '' 38 postPatch = ''
39 ${oldAttrs.postPatch or ""} 39 ${oldAttrs.postPatch or ""}
40 40