summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorKerstin Humm <kerstin@erictapen.name>2021-05-24 00:25:55 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-01 12:42:23 +0200
commitb401b432099d174dadd26a4c00f5afb62d7c2e01 (patch)
tree08ccac93cc312afac205a165d64c0345a5a70d26 /pkgs/development/haskell-modules/configuration-common.nix
parentd68632f5fd42a94330b7770899c1a2c70484ef5f (diff)
downloadnixpkgs-b401b432099d174dadd26a4c00f5afb62d7c2e01.tar
nixpkgs-b401b432099d174dadd26a4c00f5afb62d7c2e01.tar.gz
nixpkgs-b401b432099d174dadd26a4c00f5afb62d7c2e01.tar.bz2
nixpkgs-b401b432099d174dadd26a4c00f5afb62d7c2e01.tar.lz
nixpkgs-b401b432099d174dadd26a4c00f5afb62d7c2e01.tar.xz
nixpkgs-b401b432099d174dadd26a4c00f5afb62d7c2e01.tar.zst
nixpkgs-b401b432099d174dadd26a4c00f5afb62d7c2e01.zip
haskellPackages.webify: unbreak, jailbreak, as patches are not upstreamable atm
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix12
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 446e30481d7..5cc0a3e79cd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1212,14 +1212,10 @@ self: super: {
   hasql-notifications = dontCheck super.hasql-notifications;
   hasql-pool = dontCheck super.hasql-pool;
 
-  # This bumps optparse-applicative to <0.16 in the cabal file, as otherwise
-  # the version bounds are not satisfied.  This can be removed if the PR at
-  # https://github.com/ananthakumaran/webify/pull/27 is merged and a new
-  # release of webify is published.
-  webify = appendPatch super.webify (pkgs.fetchpatch {
-    url = "https://github.com/ananthakumaran/webify/pull/27/commits/6d653e7bdc1ffda75ead46851b5db45e87cb2aa0.patch";
-    sha256 = "0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2";
-  });
+  # We jailbreak webify, as optparse-applicative evolved past the version bound
+  # and the corresponding (and outdated) PR was not merged for a year.
+  # https://github.com/ananthakumaran/webify/pull/27
+  webify = doJailbreak super.webify;
 
   # hasn‘t bumped upper bounds
   # upstream: https://github.com/obsidiansystems/which/pull/6