haskell-cryptol: drop obsolete overrides to fix the build after version update

1 files changed, 5 insertions, 26 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 802532424ea..4aa21ca04d5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -871,38 +871,17 @@ self: super: {
   # https://github.com/takano-akio/filelock/issues/5
   filelock = dontCheck super.filelock;
 
-  # fix GHC 8.6 builds by using irrefutable patterns. jailbreak is also
-  # required due to a constraint failure for base-compat.
-  cryptol = doJailbreak (overrideCabal super.cryptol (drv: {
-
-    # the last patch fixes ghc 8.6 builds; the other two (small) patches fix a
-    # few bugs between them, but are also hard dependencies
-    patches = drv.patches or [] ++ [
-      (pkgs.fetchpatch {
-        url    = https://github.com/GaloisInc/cryptol/commit/634c5a03e757663bf86d1ffad1ce2c6086d4483f.patch;
-        sha256 = "16dvfihsl2c4jnyfndgrjarkm3z5pyn7rzg2svnidx0qipwrxzm7";
-      })
-      (pkgs.fetchpatch {
-        url    = https://github.com/GaloisInc/cryptol/commit/515642328aff6d958ff1b534b9effdd726901b60.patch;
-        sha256 = "1fml71b720igyh8s7mj1z1c2bbv1vk490iy7blvxp625nymzjij6";
-      })
-      (pkgs.fetchpatch {
-        url    = https://github.com/GaloisInc/cryptol/commit/a8eab11b319f6434f9b01b26d419b8305ff30bc2.patch;
-        sha256 = "1bbznp3kbj8l83q979gf4gr2khwbyqi85ykwsf2jnkhzda6pr0n8";
-      })
-    ];
-
+  # Wrap the generated binaries to include their run-time dependencies in
+  # $PATH. Also, cryptol needs a version of sbl that's newer than what we have
+  # in LTS-13.x.
+  cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: {
     buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ];
-
-    # make sure the binaries always start up. previously this was in
-    # all-packages.nix but it's almost certainly better to do it here (e.g. a
-    # haskell deps may use cryptol in the test suite or something, etc)
     postInstall = drv.postInstall or "" + ''
       for b in $out/bin/cryptol $out/bin/cryptol-html; do
         wrapProgram $b --prefix 'PATH' ':' "${pkgs.lib.getBin pkgs.z3}/bin"
       done
     '';
-  }));
+  });
 
   # Tests try to invoke external process and process == 1.4
   grakn = dontCheck (doJailbreak super.grakn);