From 742d75c5bcd587ba0ac2a4c01e16b0872b743b89 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sat, 23 Oct 2021 13:42:26 -0700 Subject: [PATCH] ghcjs: remove duplicate vector patch Allows vector to be built with ghcjs --- .../ghcjs/patches/vector-ghcjs-storable-set.patch | 14 -------------- .../haskell-modules/configuration-ghcjs.nix | 3 --- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch diff --git a/pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch b/pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch deleted file mode 100644 index 20e19d8bf863..000000000000 --- a/pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Data/Vector/Storable/Mutable.hs b/Data/Vector/Storable/Mutable.hs -index 8b538bc..2b74fce 100644 ---- a/Data/Vector/Storable/Mutable.hs -+++ b/Data/Vector/Storable/Mutable.hs -@@ -197,7 +197,9 @@ storableSet (MVector n fp) x - 1 -> storableSetAsPrim n fp x (undefined :: Word8) - 2 -> storableSetAsPrim n fp x (undefined :: Word16) - 4 -> storableSetAsPrim n fp x (undefined :: Word32) -+#if !defined(ghcjs_HOST_OS) - 8 -> storableSetAsPrim n fp x (undefined :: Word64) -+#endif - _ -> unsafeWithForeignPtr fp $ \p -> do - poke p x - diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index d4e443d6beaf..953695e7b6cc 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -101,9 +101,6 @@ self: super: # still present here https://github.com/glguy/th-abstraction/issues/53 th-abstraction = dontCheck super.th-abstraction; - # https://github.com/haskell/vector/issues/410 - vector = appendPatch super.vector (../compilers/ghcjs/patches/vector-ghcjs-storable-set.patch) ; - # Need hedgehog for tests, which fails to compile due to dep on concurrent-output zenc = dontCheck super.zenc; }