From 410a63cf1baf627a0b99c34a955b3d02efabb48f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 14 Sep 2022 16:06:00 +0200
Subject: ...

---
 overlays/lego.nix                     | 10 ----------
 overlays/postfix-mta-sts-resolver.nix |  2 ++
 overlays/prometheus-node-exporter.nix | 15 ---------------
 overlays/spm/default.nix              |  6 +++---
 4 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 overlays/lego.nix
 delete mode 100644 overlays/prometheus-node-exporter.nix

(limited to 'overlays')

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 @@
-{ prev, ... }: {
-  lego = prev.lego.override {
-    buildGoModule = args: prev.buildGoModule (args // {
-      patches = (args.patches or []) ++ prev.lib.lists.singleton (prev.fetchpatch {
-        url = "https://patch-diff.githubusercontent.com/raw/go-acme/lego/pull/1501.patch";
-        hash = "sha256-hLuWX607T8tcqljpBzEADViZd2FABkCgjNCLXMyWpuA=";
-      });
-    });
-  };
-}
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 @@
         });
       })
     ];
+
+    _.pyparsing.buildInputs.add = with final.python310Packages; [ flit-core ];
   };
 }
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 @@
-{ prev, ... }: {
-  prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs (oldAttrs: {
-    patches = oldAttrs.patches or [] ++ [
-      (prev.runCommand "cpu-unified.diff" {
-        src = prev.fetchurl {
-          url = "https://github.com/pelov/systemd_exporter/commit/2880a8dd1ca4909e51a569093284fad47343016a.diff";
-          hash = "sha256-i6sptiCdXmOqK5kfjLbIupctM34RqDahAE/39+35dRI=";
-        };
-        buildInputs = with prev; [ patchutils ];
-      } ''
-        filterdiff -x '**/CHANGELOG.md' $src > $out
-      '')
-    ];
-  });
-}
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
     # defaultPackages = (import ./stackage.nix {});
     # haskellPackages = defaultPackages // argumentPackages;
     # haskellPackages = argumentPackages;
-    haskellPackages = final.haskell.packages.ghc923.override {
+    haskellPackages = final.haskell.packages.ghc924.override {
       overrides = self: super: {
-         warp-systemd = final.haskell.lib.doJailbreak (super.warp-systemd.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { broken = false; }; })); 
+         warp-systemd = final.haskell.lib.doJailbreak (super.warp-systemd.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { broken = false; }; }));
          servant-server = super.servant-server.overrideAttrs (oldAttrs: {
            patches = [];
          });
@@ -34,7 +34,7 @@ let
       in path: _type: builtins.match "^frontend(/.*)?$" (relPath path) == null;
       src = ./.;
     };
-    
+
     postPatch = ''
       ${oldAttrs.postPatch or ""}
 
-- 
cgit v1.2.3