From a4a73418f0f83cafc737459359bb0f05efd3b905 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 5 Jan 2025 19:33:43 +0100
Subject: [PATCH] haskellPackages.password: drop override

Upstream has addressed the issue we've been trying to work
around (darwin support). The upstream change is different and (iirc)
more correct. We'll have to wait and see if any new issues crop up.
---
 .../haskell-modules/configuration-nix.nix     | 30 -------------------
 .../password-3.0.4.0-scrypt-conditional.patch | 21 -------------
 2 files changed, 51 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index bfb9b187234b..79a16236bfd5 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -113,36 +113,6 @@ self: super: builtins.intersectAttrs super {
     '' + drv.preCheck or "";
   }) super.agda2lagda;
 
-  # - Disable scrypt support since the library used only works on x86 due to SSE2:
-  #   https://github.com/informatikr/scrypt/issues/8
-  # - Use crypton as the encryption backend. That override becomes obsolete with
-  #   3.1.* since cabal2nix picks crypton by default then.
-  password =
-    let
-      scryptSupported = pkgs.stdenv.hostPlatform.isx86;
-    in
-
-      lib.pipe
-        (super.password.override ({
-          cryptonite = self.crypton;
-        } // lib.optionalAttrs (!scryptSupported) {
-          scrypt = null;
-        }))
-        ([
-          (enableCabalFlag "crypton")
-          (disableCabalFlag "cryptonite")
-          # https://github.com/cdepillabout/password/pull/84
-          (appendPatch ./patches/password-3.0.4.0-scrypt-conditional.patch)
-          (overrideCabal (drv: {
-            # patch doesn't apply otherwise because of revisions
-            prePatch = drv.prePatch or "" + ''
-              ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
-            '';
-          }))
-        ] ++ lib.optionals (!scryptSupported) [
-          (disableCabalFlag "scrypt")
-        ]);
-
   audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: {
       executableHaskellDepends = [self.optparse-applicative self.soxlib];
     }) super.audacity);
diff --git a/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch
deleted file mode 100644
index 1e9cc4c65ded..000000000000
--- a/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/password/password.cabal b/password/password.cabal
-index 506457e..8fa978b 100644
---- a/password.cabal
-+++ b/password.cabal
-@@ -186,6 +186,8 @@ test-suite password-tasty
-     other-modules:
-       Scrypt
-       Data.Password.Scrypt
-+    build-depends:
-+      scrypt
-   ghc-options:
-       -threaded -O2 -rtsopts -with-rtsopts=-N
-   build-depends:
-@@ -195,7 +197,6 @@ test-suite password-tasty
-     , bytestring
-     , memory
-     , quickcheck-instances
--    , scrypt
-     , tasty
-     , tasty-hunit
-     , tasty-quickcheck