diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch index 41ad0ceb346..275444e828b 100644 --- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch +++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch @@ -128,15 +128,6 @@ index d360cfe..ab7ede7 100644 STG_UNUSED #endif ) -@@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for - } - } - --#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) -+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)) - - #define OP_LO(op,lo) ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF)) - #define OP_HI(op,hi) ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16)) @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr) return; } diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch deleted file mode 100644 index 5a09de43bc0..00000000000 --- a/srcpkgs/ghc/patches/sphinx-unicode.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py ---- ghc-8.8.4-orig/docs/users_guide/conf.py 2020-07-08 16:43:03.000000000 +0000 -+++ ghc-8.8.4/docs/users_guide/conf.py 2021-07-10 20:25:33.536928487 +0000 -@@ -101,5 +101,5 @@ latex_elements = { - 'inputenc': '', - 'utf8extra': '', -- 'preamble': ''' -+ 'preamble': r''' - \usepackage{fontspec} - \usepackage{makeidx} -@@ -107,5 +107,5 @@ latex_elements = { - \setromanfont{DejaVu Serif} - \setmonofont{DejaVu Sans Mono} --\setlength{\\tymin}{45pt} -+\setlength{\tymin}{45pt} - ''', - } diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template index 3bb7aa59f70..b8b16f67b43 100644 --- a/srcpkgs/ghc/template +++ b/srcpkgs/ghc/template @@ -1,7 +1,7 @@ # Template file for 'ghc' pkgname=ghc # Keep this synchronized with http://www.stackage.org/lts -version=8.10.4 +version=8.10.7 revision=1 wrksrc="ghc-${version%[!0-9]}" build_style=gnu-configure @@ -14,7 +14,7 @@ maintainer="slotThe " license="BSD-3-Clause" homepage="http://www.haskell.org/ghc/" distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz" -checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e +checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d nocross=yes # this is conditionally unset for cross bindist nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections" _bindir="/usr/lib/${pkgname}-${version}/bin"