removed some package overrides

digitallyinduced · Mar 19, 2024 · cf84d70 · cf84d70
1 parent 3b440c4
commit cf84d70
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 175 deletions.
diff --git a/NixSupport/haskell-packages/clientsession.nix b/NixSupport/haskell-packages/clientsession.nix
diff --git a/NixSupport/haskell-packages/haskell-to-elm.nix b/NixSupport/haskell-packages/haskell-to-elm.nix
diff --git a/NixSupport/haskell-packages/minio-hs.nix b/NixSupport/haskell-packages/minio-hs.nix
diff --git a/NixSupport/haskell-packages/smtp-mail.nix b/NixSupport/haskell-packages/smtp-mail.nix
diff --git a/NixSupport/haskell-packages/typerep-map.nix b/NixSupport/haskell-packages/typerep-map.nix
diff --git a/NixSupport/haskell-packages/websockets.nix b/NixSupport/haskell-packages/websockets.nix
diff --git a/NixSupport/mkGhcCompiler.nix b/NixSupport/mkGhcCompiler.nix
@@ -58,6 +58,27 @@ in ghcCompiler.override {
     (self: super: { ormolu_0_7_4_0 = if pkgs.system == "aarch64-darwin" then pkgs.haskell.lib.overrideCabal super.ormolu_0_7_4_0 (_: { enableSeparateBinOutput = false; }) else super.ormolu_0_7_4_0; })
     (self: super: { ghc-syntax-highlighter = super.ghc-syntax-highlighter_0_0_11_0; })
     (self: super: { retrie = super.retrie.override { ghc-exactprint = self.ghc-exactprint_1_8_0_0; }; })
+
+    (self: super: { websockets = super.websockets_0_13_0_0; })
+    (self: super: {
+      minio-hs = (pkgs.haskell.lib.overrideCabal super.minio-hs (_: {
+        patches = [
+          (pkgs.fetchpatch {
+            name = "use-crypoton-connection.patch";
+            url = "https://github.com/minio/minio-hs/commit/786cf1881f0b62b7539e63547e76afc3c1ade36a.patch";
+            sha256 = "sha256-zw0/jhKzShpqV1sUyxWTl73sQOzm6kA/yQOZ9n0L1Ag";
+          }) ];
+        })).override { connection = super.crypton-connection; };
+
+
+      smtp-mail = (pkgs.haskell.lib.overrideCabal super.smtp-mail (_: {
+        patches = [
+          (pkgs.fetchpatch {
+            url = "https://github.com/jhickner/smtp-mail/commit/4c724c80814ab1da7c37256a6c10e04c88b9af95.patch";
+            sha256 = "sha256-rCyY4rB/wLspeAbLw1jji5BykYFLnmTjLiUyNkiEXmw";
+          }) ];
+        })).override { connection = super.crypton-connection; };
+    })
 
     # (self: super: { fourmolu_0_15_0_0 = super.fourmolu_0_15_0_0.override { hlint = self.ghc-exactprint_1_8_0_0; }; })
   ];