From 9caf36f31d920abbd4f1d25a3e9204206cc170352360816281472644bb422e87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Mar 2024 19:00:04 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc revision:18, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=400 --- 9_4_4-bootstrap-sources.tar.gz | 4 +- _constraints | 5 +- cabal-riscv64.patch | 14 ++--- ghc-9.6.4-src.tar.xz | 3 - ghc-9.8.2-src.tar.xz | 3 + ghc-pie.patch | 12 ---- ghc-with-interpreter.patch | 8 +-- ghc.changes | 54 +++-------------- ghc.keyring | 80 ------------------------- ghc.spec | 106 ++++++++++++++++----------------- sphinx7.patch | 26 -------- 11 files changed, 78 insertions(+), 237 deletions(-) delete mode 100644 ghc-9.6.4-src.tar.xz create mode 100644 ghc-9.8.2-src.tar.xz delete mode 100644 ghc-pie.patch delete mode 100644 ghc.keyring delete mode 100644 sphinx7.patch diff --git a/9_4_4-bootstrap-sources.tar.gz b/9_4_4-bootstrap-sources.tar.gz index 15609dd..0b5cf96 100644 --- a/9_4_4-bootstrap-sources.tar.gz +++ b/9_4_4-bootstrap-sources.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ddfa4d0675fce5b19d7f77674f47a2ca557d0edbadd935bf214048b4d031c64 -size 1500603 +oid sha256:3de754bb3e45d4b3980ed238781cfd808f4e7c84ceae73213662f1bf5ea2d8fa +size 1526663 diff --git a/_constraints b/_constraints index 7c5f6ea..f7157cf 100644 --- a/_constraints +++ b/_constraints @@ -23,11 +23,8 @@ riscv64 - - 8 - - 28 + 30 diff --git a/cabal-riscv64.patch b/cabal-riscv64.patch index 448c085..c9278db 100644 --- a/cabal-riscv64.patch +++ b/cabal-riscv64.patch @@ -1,7 +1,7 @@ -Index: ghc-9.6.2/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs +Index: ghc-9.4.5/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs =================================================================== ---- ghc-9.6.2.orig/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs -+++ ghc-9.6.2/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs +--- ghc-9.4.5.orig/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs ++++ ghc-9.4.5/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs @@ -159,7 +159,7 @@ buildOS = classifyOS Permissive System.I -- | These are the known Arches: I386, X86_64, PPC, PPC64, Sparc, @@ -27,11 +27,11 @@ Index: ghc-9.6.2/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs ,JavaScript ,Wasm32] -Index: ghc-9.6.2/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs +Index: ghc-9.4.5/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs =================================================================== ---- ghc-9.6.2.orig/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs -+++ ghc-9.6.2/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs -@@ -731,6 +731,7 @@ platformDefines lbi = +--- ghc-9.4.5.orig/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs ++++ ghc-9.4.5/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs +@@ -729,6 +729,7 @@ platformDefines lbi = Rs6000 -> ["rs6000"] M68k -> ["m68k"] Vax -> ["vax"] diff --git a/ghc-9.6.4-src.tar.xz b/ghc-9.6.4-src.tar.xz deleted file mode 100644 index bed0677..0000000 --- a/ghc-9.6.4-src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10bf25b8b07174fdd9868b5c0c56c17c0ef1edcb6247b4b864be933651bfd4c0 -size 29451856 diff --git a/ghc-9.8.2-src.tar.xz b/ghc-9.8.2-src.tar.xz new file mode 100644 index 0000000..584d1a2 --- /dev/null +++ b/ghc-9.8.2-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2fb7a7dd7461237d22e8365a83edd9e1a77d2e15d045f3945396845a87781c9 +size 32432564 diff --git a/ghc-pie.patch b/ghc-pie.patch deleted file mode 100644 index 355cf51..0000000 --- a/ghc-pie.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: ghc-9.6.1/compiler/GHC/Driver/Session.hs -=================================================================== ---- ghc-9.6.1.orig/compiler/GHC/Driver/Session.hs -+++ ghc-9.6.1/compiler/GHC/Driver/Session.hs -@@ -3861,6 +3861,7 @@ default_PIC platform = - -- This requires PIC on AArch64, and ExternalDynamicRefs on Linux as on top - -- of that. Subsequently we expect all code on aarch64/linux (and macOS) to - -- be built with -fPIC. -+ (OSLinux, ArchX86_64) -> [Opt_PIC] - (OSDarwin, ArchAArch64) -> [Opt_PIC] - (OSLinux, ArchAArch64) -> [Opt_PIC, Opt_ExternalDynamicRefs] - (OSLinux, ArchARM {}) -> [Opt_PIC, Opt_ExternalDynamicRefs] diff --git a/ghc-with-interpreter.patch b/ghc-with-interpreter.patch index 8b4f762..ad2dd2e 100644 --- a/ghc-with-interpreter.patch +++ b/ghc-with-interpreter.patch @@ -1,8 +1,8 @@ -Index: ghc-9.6.2/hadrian/src/Oracles/Setting.hs +Index: ghc-9.4.5/hadrian/src/Oracles/Setting.hs =================================================================== ---- ghc-9.6.2.orig/hadrian/src/Oracles/Setting.hs -+++ ghc-9.6.2/hadrian/src/Oracles/Setting.hs -@@ -295,7 +295,8 @@ ghcWithInterpreter = do +--- ghc-9.4.5.orig/hadrian/src/Oracles/Setting.hs ++++ ghc-9.4.5/hadrian/src/Oracles/Setting.hs +@@ -292,7 +292,8 @@ ghcWithInterpreter = do , "darwin", "kfreebsdgnu" ] goodArch <- anyTargetArch [ "i386", "x86_64", "powerpc" , "arm", "aarch64", "s390x" diff --git a/ghc.changes b/ghc.changes index 5f3e477..2c2c175 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,47 +1,10 @@ ------------------------------------------------------------------- -Tue Feb 27 10:54:02 UTC 2024 - Dominique Leuenberger +Wed Nov 15 19:40:18 UTC 2023 - Andreas Schwab -- Use %patch -P N instead of deprecated %patchN. - -------------------------------------------------------------------- -Sat Feb 24 23:50:25 UTC 2024 - Ondřej Súkup - -- update to 9.6.4 - * Fix a code generator bug on AArch64 platforms resulting in invalid conditional jumps . - * Fix a simplifier bug that may cause segfaults and core lint failures due to incorrect handling of join points . - * Ensure unconstrained instance dictionaries get IPE info . - * Fix a bug where we could silently truncate 64 bit values to 32 bit on 32 bit architectures. - * Fix a GHCi bug where a failure in the :add command would cause the process to exit . - * Fix a bug causing suboptimal error messages for certain invalid cyclic module graphs with hs-boot files . - * Fix a bug causing compiler panics with certain package databases involving unusable units and module reexports - * Fix some memory leaks in GHCi that manifest on reloads - * Fix a bug leading to some template haskell splices failing on being reloaded into GHCi due to not clearing the interactive context properly . - * Fix a type checker crash on certain programs involving implicitly scoped type variables . - * Fix a bug where certain warning flags were not recognised . - * Fix an incorrect assertion in the simplifier . - * Align objects in the data section properly when using the LLVM backend . - * Ensure concurrent thunk update is sound . - * Ensure the listAllBlocks function takes the non-moving heap into account . - * Ensure the non-moving GC is not running when pausing - * Fix some non-moving loops and bugs on Windows and LLP64 platforms - * Fix a bug where certain programs could have incorrect async exception masking . - * Ensure we respect maximum event length and don’t overflow into program memory . - * Ensure we use the right linker flags on AArch64 darwin - * Fix a bug where -DNOSMP wasn’t being passed to the C compiler even if the target doesn’t support SMP . - * Ensure we use the right otool and install_name_tool on Darwin . - * Fix a bug in ghc-bignum where usage of bigNatIsPowerOf2 might result in out of bounds access . - -------------------------------------------------------------------- -Wed Nov 15 15:23:59 UTC 2023 - Ondřej Súkup - -- drop ghc-9.6.3-src.tar.xz.sig - -------------------------------------------------------------------- -Tue Nov 14 10:29:34 UTC 2023 - Andreas Schwab - -- libatomic.patch: Remove unused patch +- libatomic.patch, ghc-8.0.2-Cabal-dynlibdir.patch, 9604.patch, + ghc-pie.patch, sphinx7.patch: Remove unused patches - ghc-with-interpreter.patch: Hadrian: enable GHCi support on riscv64 -- cabal-riscv64.patch: libraries/Cabal: Add support for the 64-bit RISC-V +- cabal-riscv64: libraries/Cabal: Add support for the 64-bit RISC-V architecture - Adjust constraints for riscv64 @@ -102,11 +65,6 @@ Wed May 24 14:10:46 UTC 2023 - Ondřej Súkup - add patch for Sphinx 7 release - sphinx7.patch - cleanup spec -------------------------------------------------------------------- -Wed May 24 14:04:24 UTC 2023 - Ondřej Súkup - -- add sphinx7.patch - ------------------------------------------------------------------- Fri Apr 21 17:57:46 UTC 2023 - Andreas Schwab @@ -134,6 +92,10 @@ Fri Apr 7 13:08:27 UTC 2023 - Ondřej Súkup - add provides hsc2hs into ghc-compiler +------------------------------------------------------------------- +Wed May 24 14:04:24 UTC 2023 - Ondřej Súkup + +- add sphinx7.patch ------------------------------------------------------------------- Fri Mar 17 11:09:29 UTC 2023 - Ondřej Súkup diff --git a/ghc.keyring b/ghc.keyring deleted file mode 100644 index 2cbce8b..0000000 --- a/ghc.keyring +++ /dev/null @@ -1,80 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -hDhK1n518A== -=jcSs ------END PGP PUBLIC KEY BLOCK----- diff --git a/ghc.spec b/ghc.spec index 99bd8e5..61e2be8 100644 --- a/ghc.spec +++ b/ghc.spec @@ -16,8 +16,8 @@ # -%define full_version 9.6.4 -%define short_version 9.6.4 +%define full_version 9.8.2 +%define short_version 9.8.2 %ifnarch s390x %define with_libnuma 1 @@ -73,10 +73,11 @@ %global ghc_llvm_archs s390x riscv64 %global ghc_unregisterized_arches noarch -%global base_ver 4.18.2.0 +%global base_ver 4.19.1.0 %global ghc_compact_ver 0.1.0.0 -%global hpc_ver 0.6.2.0 +%global hpc_ver 0.7.0.0 %global hsc2hs_ver 0.68.8 +%global ghc_bignum_ver 1.3 Name: ghc Version: %{short_version} @@ -90,26 +91,22 @@ Source4: 9_4_4-bootstrap-sources.tar.gz Source5: ghc-pkg.man Source6: haddock.man Source7: runghc.man -Source9: ghc.keyring Patch1: ghc-gen_contents_index-haddock-path.patch # https://ghc.haskell.org/trac/ghc/ticket/15689 Patch2: ghc-Cabal-install-PATH-warning.patch # PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptrommler@icloud.com -- Do not use unboxed arrays on big-endian platforms. See Haskell Trac #15411. Patch3: Disable-unboxed-arrays.patch -# PATCH-FIX-UPSTREAM ghc-pie.patch - set linux as default PIE platform -Patch35: ghc-pie.patch # PATCH-FIX-UPSTREAM Hadrian: enable GHCi support on riscv64 (dd38aca95a) Patch100: ghc-with-interpreter.patch # PATCH-FIX-UPSTREAM libraries/Cabal: Add support for the 64-bit RISC-V architecture (d89526f98) Patch101: cabal-riscv64.patch Patch200: ghc-hadrian-s390x-rts--qg.patch -Patch300: sphinx7.patch BuildRequires: binutils-devel BuildRequires: gcc-PIE BuildRequires: gcc-c++ -BuildRequires: ghc-bootstrap >= 9.2 +BuildRequires: ghc-bootstrap >= 9.4 BuildRequires: ghc-bootstrap-helpers >= 1.3 -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros-extra => 2.6.1 BuildRequires: glibc-devel BuildRequires: gmp-devel BuildRequires: libdw-devel @@ -242,14 +239,15 @@ This package provides the User Guide and Haddock manual. %define libnuma_dep %{nil} %endif #!ForceMultiversion -%ghc_lib_subpackage -d Cabal-3.10.1.0 -%ghc_lib_subpackage -d Cabal-syntax-3.10.1.0 +%ghc_lib_subpackage -d Cabal-3.10.2.0 +%ghc_lib_subpackage -d Cabal-syntax-3.10.2.0 %ghc_lib_subpackage -d array-0.5.6.0 %ghc_lib_subpackage -d -c gmp-devel,libffi-devel,libdw-devel,libelf-devel%{libnuma_dep} base-%{base_ver} %ghc_lib_subpackage -d binary-0.8.9.1 -%ghc_lib_subpackage -d bytestring-0.11.5.3 -%ghc_lib_subpackage -d containers-0.6.7 -%ghc_lib_subpackage -d deepseq-1.4.8.1 +%ghc_lib_subpackage -d -x ghc-bignum-%{ghc_bignum_ver} +%ghc_lib_subpackage -d bytestring-0.12.1.0 +%ghc_lib_subpackage -d containers-0.6.8 +%ghc_lib_subpackage -d deepseq-1.5.0.0 %ghc_lib_subpackage -d directory-1.3.8.1 %ghc_lib_subpackage -d exceptions-0.10.7 %ghc_lib_subpackage -d filepath-1.4.200.1 @@ -261,15 +259,16 @@ This package provides the User Guide and Haddock manual. %ghc_lib_subpackage -d -x ghci-%{ghc_version_override} %ghc_lib_subpackage -d haskeline-0.8.2.1 %ghc_lib_subpackage -d -x hpc-%{hpc_ver} -%ghc_lib_subpackage -d -x libiserv-%{ghc_version_override} +#%%ghc_lib_subpackage -d -x libiserv-%{ghc_version_override} %ghc_lib_subpackage -d mtl-2.3.1 -%ghc_lib_subpackage -d parsec-3.1.16.1 +%ghc_lib_subpackage -d parsec-3.1.17.0 %ghc_lib_subpackage -d pretty-1.1.3.6 -%ghc_lib_subpackage -d process-1.6.17.0 -%ghc_lib_subpackage -d stm-2.5.1.0 -%ghc_lib_subpackage -d template-haskell-2.20.0.0 +%ghc_lib_subpackage -d process-1.6.18.0 +%ghc_lib_subpackage -d semaphore-compat-1.0.0 +%ghc_lib_subpackage -d stm-2.5.2.1 +%ghc_lib_subpackage -d template-haskell-2.21.0.0 %ghc_lib_subpackage -d -c ncurses-devel terminfo-0.4.1.6 -%ghc_lib_subpackage -d text-2.0.2 +%ghc_lib_subpackage -d text-2.1.1 %ghc_lib_subpackage -d time-1.12.2 %ghc_lib_subpackage -d transformers-0.6.1.0 %ghc_lib_subpackage -d unix-2.8.4.0 @@ -278,11 +277,11 @@ This package provides the User Guide and Haddock manual. %global version %{ghc_version_override} %package devel -%{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/%{name}-\1-devel = \2-%{release},/g")} Summary: GHC development libraries meta package Requires: ghc-compiler = %{version}-%{release} Obsoletes: ghc-libraries < %{version}-%{release} Provides: ghc-libraries = %{version}-%{release} +%{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/%{name}-\1-devel = \2-%{release},/g")} %description devel This is a meta-package for all the development library packages in GHC @@ -301,18 +300,16 @@ Installing this package causes %{name}-*-prof packages corresponding to %prep %setup -q -%patch -P 1 -p1 -%patch -P 2 -p1 +%patch1 -p1 +%patch2 -p1 %ifarch s390x -%patch -P 3 -p1 +%patch3 -p1 %endif -%patch -P 35 -p1 -%patch -P 100 -p1 -%patch -P 101 -p1 +%patch100 -p1 +%patch101 -p1 %ifarch ppc64le s390x riscv64 -%patch -P 200 -p1 +%patch200 -p1 %endif -%patch -P 300 -p1 rm libffi-tarballs/libffi-*.tar.gz @@ -352,7 +349,7 @@ python3 boot.source --hadrian %define hadrian_docs %{!?with_haddock:--docs=no-haddocks} %{!?with_manual:--docs=no-sphinx}%{?with_manual:--docs=no-sphinx-pdfs --docs=no-sphinx-man} %if 0%{?suse_version} >= 1500 -%ifarch %{unregisterised_archs} +%ifarch %{unregisterised_archs} riscv64 %if 0%{?qemu_user_space_build} %limit_build -m 15000 %else @@ -361,11 +358,11 @@ python3 boot.source --hadrian %else %limit_build -m 2000 %endif -%{hadrian} %{?_smp_mflags} --flavour=%{?with_quickbuild:quick+no_profiled_libs}%{!?with_quickbuild:perf%{!?with_ghc_prof:+no_profiled_libs}}%{?hadrian_llvm} %{hadrian_docs} binary-dist-dir +%global jobs_nr %{?_smp_mflags} %else -%{hadrian} -j1 --flavour=%{?with_quickbuild:quick+no_profiled_libs}%{!?with_quickbuild:perf%{!?with_ghc_prof:+no_profiled_libs}}%{?hadrian_llvm} %{hadrian_docs} binary-dist-dir +%global jobs_nr -j1 %endif - +%{hadrian} %{jobs_nr} --flavour=%{?with_quickbuild:quick+no_profiled_libs}%{!?with_quickbuild:perf%{!?with_ghc_prof:+no_profiled_libs}}%{?hadrian_llvm} %{hadrian_docs} binary-dist-dir --hash-unit-ids %install @@ -382,14 +379,23 @@ for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q chrpath -d $i done + +%if %{with haddock} +# remove short hashes +for d in %{buildroot}%{ghc_html_libraries_dir}/*/; do +mv $d $(echo $d | sed -e "s/\(.*\)-.*/\\1/") +done +%endif + # containers src moved to a subdir cp -p libraries/containers/containers/LICENSE libraries/containers/LICENSE # hack for Cabal-syntax/LICENSE mkdir -p libraries/Cabal-syntax cp -p libraries/Cabal/Cabal-syntax/LICENSE libraries/Cabal-syntax - + rm -f %{name}-*.files + # FIXME replace with ghc_subpackages_list for i in %{ghc_packages_list}; do name=$(echo $i | sed -e "s/\(.*\)-.*/\1/") @@ -402,18 +408,16 @@ echo "%%dir %{ghclibdir}" >> %{name}-base%{?_ghcdynlibdir:-devel}.files %ghc_gen_filelists ghc %{ghc_version_override} %ghc_gen_filelists ghc-boot %{ghc_version_override} +%ghc_gen_filelists ghc-bignum %{ghc_bignum_ver} %ghc_gen_filelists ghc-compact %{ghc_compact_ver} %ghc_gen_filelists ghc-heap %{ghc_version_override} %ghc_gen_filelists ghci %{ghc_version_override} %ghc_gen_filelists hpc %{hpc_ver} -%ghc_gen_filelists libiserv %{ghc_version_override} -%ghc_gen_filelists ghc-bignum 1.3 -%ghc_gen_filelists ghc-prim 0.10.0 +%ghc_gen_filelists ghc-prim 0.11.0 %ghc_gen_filelists integer-gmp 1.1 %ghc_gen_filelists rts 1.0.2 -%ghc_merge_filelist ghc-bignum base %ghc_merge_filelist ghc-prim base %ghc_merge_filelist integer-gmp base %ghc_merge_filelist rts base @@ -455,12 +459,15 @@ install -p -m 0644 %{SOURCE7} %{buildroot}%{_mandir}/man1/runghc.1 rm %{buildroot}%{ghclibdir}/lib/package.conf.d/.stamp rm %{buildroot}%{ghclibdir}/lib/package.conf.d/*.conf.copy +# https://gitlab.haskell.org/ghc/ghc/-/issues/24121 +rm %{buildroot}%{ghclibdir}/share/doc/%{ghcplatform}/*/LICENSE + ( cd %{buildroot}%{ghclibdir}/lib/bin for i in *; do -if [ -f %{buildroot}%{ghclibdir}/bin/$i ]; then -ln -sf ../../bin/$i -fi + if [ -f %{buildroot}%{ghclibdir}/bin/$i ]; then + ln -sf ../../bin/$i + fi done ) @@ -469,12 +476,8 @@ done # stolen from ghc6/debian/rules: #Do some very simple tests that the compiler actually works export LANG=C.utf8 -%if %{with hadrian} export LD_LIBRARY_PATH=%{buildroot}%{ghclibplatform}: GHC=%{buildroot}%{ghclibdir}/bin/ghc -%else -GHC=inplace/bin/ghc-stage2 -%endif # Do some very simple tests that the compiler actually works rm -rf testghc mkdir testghc @@ -503,9 +506,6 @@ $GHC --info %files %license LICENSE -%dir %{ghcliblib} -%dir %{ghclibdir} -%dir %{ghcliblib}/%{ghcplatform} %files compiler %license LICENSE @@ -527,6 +527,9 @@ $GHC --info %{_bindir}/hsc2hs %{_bindir}/runghc %{_bindir}/runhaskell +%dir %{ghclibdir} +%dir %{ghcliblib} +%dir %{ghcliblib}/%{ghcplatform} %dir %{ghclibdir}/bin %dir %{ghcliblib}/bin %{ghclibdir}/bin/ghc @@ -538,7 +541,6 @@ $GHC --info %{ghclibdir}/bin/runghc %{ghclibdir}/bin/hp2ps %{ghclibdir}/bin/unlit -%if %{with hadrian} %{ghclibdir}/bin/ghc-%{version} %{ghclibdir}/bin/ghc-iserv-ghc-%{version} %{ghclibdir}/bin/ghc-iserv-dyn-ghc-%{version} @@ -555,7 +557,7 @@ $GHC --info %{ghclibdir}/lib/bin/ghc-iserv %{ghclibdir}/lib/bin/ghc-iserv-dyn %{ghclibdir}/lib/bin/unlit -%endif +%{ghcliblib}/ghc-interp.js %{ghcliblib}/ghc-usage.txt %{ghcliblib}/ghci-usage.txt %{ghcliblib}/llvm-passes @@ -605,8 +607,6 @@ $GHC --info %if %{with manual} %files manual -## needs pandoc -#%%{ghc_html_dir}/Cabal %{ghc_html_dir}/users_guide %if %{with hadrian} %{ghc_html_dir}/Haddock diff --git a/sphinx7.patch b/sphinx7.patch deleted file mode 100644 index 73d6c98..0000000 --- a/sphinx7.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 52d701b31dc4427b7e321a04be3f5f13a5fc271e Mon Sep 17 00:00:00 2001 -From: "mimi.vx" -Date: Wed, 24 May 2023 12:42:15 +0000 -Subject: [PATCH] Fix for Sphinx 7 removed style key - -Fixes https://gitlab.haskell.org/ghc/ghc/-/issues/23444 ---- - docs/users_guide/rtd-theme/layout.html | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/users_guide/rtd-theme/layout.html b/docs/users_guide/rtd-theme/layout.html -index 2a61142514a..7ffeff7befc 100644 ---- a/docs/users_guide/rtd-theme/layout.html -+++ b/docs/users_guide/rtd-theme/layout.html -@@ -64,7 +64,7 @@ - {%- endif %} - - {# CSS #} -- -+ - - {%- for css in css_files %} - {%- if css|attr("rel") %} --- -GitLab -