summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-05-31 14:56:27 +0200
committersternenseemann <sternenseemann@systemli.org>2022-05-31 15:01:37 +0200
commited7715885e740c71d21a5e38c31ed6b8fa6190b9 (patch)
treed04e2076f4323dbee8909180096c9792eb0595e6 /pkgs/development/haskell-modules
parent6e267b064bd2437050c9800ddc07465875cd8752 (diff)
downloadnixpkgs-ed7715885e740c71d21a5e38c31ed6b8fa6190b9.tar
nixpkgs-ed7715885e740c71d21a5e38c31ed6b8fa6190b9.tar.gz
nixpkgs-ed7715885e740c71d21a5e38c31ed6b8fa6190b9.tar.bz2
nixpkgs-ed7715885e740c71d21a5e38c31ed6b8fa6190b9.tar.lz
nixpkgs-ed7715885e740c71d21a5e38c31ed6b8fa6190b9.tar.xz
nixpkgs-ed7715885e740c71d21a5e38c31ed6b8fa6190b9.tar.zst
nixpkgs-ed7715885e740c71d21a5e38c31ed6b8fa6190b9.zip
haskellPackages.reflex: drop witherable bounds patch
witherable bounds have been relaxed by upstream via a Hackage revision,
so we no longer need to apply that part of the patch.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix17
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index df2574f0395..30f17594a15 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1685,10 +1685,19 @@ self: super: {
   reflex-dom-pandoc = super.reflex-dom-pandoc.override { clay = dontCheck self.clay_0_13_3; };
 
   # 2022-03-16: Pull request for ghc 9 compat: https://github.com/reflex-frp/reflex/pull/467
-  reflex = appendPatch (fetchpatch {
-    url = "https://github.com/reflex-frp/reflex/compare/823afd9424234cbe0134051f09a6710e54509cec...469b4ab4a755cad76b8d4d6c9ad482d02686b4ae.patch";
-    sha256 = "sha256-EwW7QBXHGlcJkKiLDmsXCZPwQz24+mg2Vuiu0Vb/T6w=";
-  }) (dontCheck super.reflex);
+  reflex = overrideCabal (drv: {
+    patches = drv.patches or [] ++ [
+      (fetchpatch {
+        url = "https://github.com/reflex-frp/reflex/compare/469b4ab4a755cad76b8d4d6c9ad482d02686b4ae.patch";
+        sha256 = "04sxzxpx7xhr6p4n76rg1ci8zjfzs19lr21ziwsfig8zmdg22i7q";
+      })
+    ];
+    doCheck = false;
+    # hackage revision seems to have DOS newlines
+    prePatch = drv.prePatch or "" + ''
+      ${pkgs.buildPackages.dos2unix}/bin/dos2unix reflex.cabal
+    '';
+  }) super.reflex;
 
   # 2020-11-19: jailbreaking because of pretty-simple bound out of date
   # https://github.com/kowainik/stan/issues/408