[rpms/ghc9.8] rawhide: revert use of hadrian-bootstrap-sources (Cabal is enough)

[rpms/ghc9.8] rawhide: revert use of hadrian-bootstrap-sources (Cabal is enough)

[Jens Petersen]

A new commit has been pushed.

Repo   : rpms/ghc9.8
Branch : rawhide
Commit : 38fcf02f9d24a9764d04e4b5887de8b6d6b771d2
Author : Jens Petersen <petersen@redhat.com>
Date   : 2026-08-09T15:26:44+08:00
Stats  : +11/-140 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/ghc9.8/c/38fcf02f9d24a9764d04e4b5887de8b6d6b771d2?branch=rawhide

Log:
revert use of hadrian-bootstrap-sources (Cabal is enough)

---
diff --git a/bafe87d871399b58ce4a50592b980c990a3eac39.patch b/bafe87d871399b58ce4a50592b980c990a3eac39.patch
deleted file mode 100644
index d90f3ef..0000000
--- a/bafe87d871399b58ce4a50592b980c990a3eac39.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bafe87d871399b58ce4a50592b980c990a3eac39 Mon Sep 17 00:00:00 2001
-From: Bodigrim <andrew.lelechenko@gmail.com>
-Date: Thu, 9 May 2024 01:02:44 +0100
-Subject: [PATCH] Fix compilation on big-endian arches
-
----
- System/OsString/Data/ByteString/Short/Internal.hs | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/System/OsString/Data/ByteString/Short/Internal.hs b/System/OsString/Data/ByteString/Short/Internal.hs
-index fedc199..f7ddcd8 100644
---- a/System/OsString/Data/ByteString/Short/Internal.hs
-+++ b/System/OsString/Data/ByteString/Short/Internal.hs
-@@ -311,7 +311,11 @@ word16ToLE#, word16FromLE# :: Word16# -> Word16#
- word16ToLE#, word16FromLE# :: Word# -> Word#
- #endif
- #ifdef WORDS_BIGENDIAN
-+#if MIN_VERSION_base(4,16,0)
-+word16ToLE# w = wordToWord16# (byteSwap16# (word16ToWord# w))
-+#else
- word16ToLE# = byteSwap16#
-+#endif
- #else
- word16ToLE# w# = w#
- #endif

diff --git a/extra.cabal b/extra.cabal
deleted file mode 100644
index 05a13a7..0000000
--- a/extra.cabal
+++ /dev/null
@@ -1,87 +0,0 @@
-cabal-version:      1.18
-build-type:         Simple
-name:               extra
-version:            1.7.16
-x-revision: 1
-license:            BSD3
-license-file:       LICENSE
-category:           Development
-author:             Neil Mitchell <ndmitchell@gmail.com>
-maintainer:         Neil Mitchell <ndmitchell@gmail.com>
-copyright:          Neil Mitchell 2014-2024
-synopsis:           Extra functions I use.
-description:
-    A library of extra functions for the standard Haskell libraries. Most functions are simple additions, filling out missing functionality. A few functions are available in later versions of GHC, but this package makes them available back to GHC 7.2.
-    .
-    The module "Extra" documents all functions provided by this library. Modules such as "Data.List.Extra" provide extra functions over "Data.List" and also reexport "Data.List". Users are recommended to replace "Data.List" imports with "Data.List.Extra" if they need the extra functionality.
-homepage:           https://github.com/ndmitchell/extra#readme
-bug-reports:        https://github.com/ndmitchell/extra/issues
-tested-with:        GHC==9.8, GHC==9.6, GHC==9.4, GHC==9.2, GHC==9.0, GHC==8.10, GHC==8.8
-
-extra-doc-files:
-    CHANGES.txt
-    README.md
-extra-source-files:
-    Generate.hs
-
-source-repository head
-    type:     git
-    location: https://github.com/ndmitchell/extra.git
-
-library
-    default-language: Haskell2010
-    hs-source-dirs: src
-    build-depends:
-        base >= 4.9 && < 4.21,
-        directory,
-        filepath,
-        process,
-        clock >= 0.7,
-        time
-    if !os(windows)
-        build-depends: unix
-
-    other-modules:
-        Partial
-    exposed-modules:
-        Extra
-        Control.Concurrent.Extra
-        Control.Exception.Extra
-        Control.Monad.Extra
-        Data.Foldable.Extra
-        Data.Either.Extra
-        Data.IORef.Extra
-        Data.List.Extra
-        Data.List.NonEmpty.Extra
-        Data.Monoid.Extra
-        Data.Tuple.Extra
-        Data.Typeable.Extra
-        Data.Version.Extra
-        Numeric.Extra
-        System.Directory.Extra
-        System.Environment.Extra
-        System.Info.Extra
-        System.IO.Extra
-        System.Process.Extra
-        System.Time.Extra
-        Text.Read.Extra
-
-test-suite extra-test
-    type:            exitcode-stdio-1.0
-    default-language: Haskell2010
-    build-depends:
-        base == 4.*,
-        directory,
-        filepath,
-        extra,
-        QuickCheck >= 2.10,
-        quickcheck-instances >= 0.3.17
-    if !os(windows)
-        build-depends: unix
-    hs-source-dirs: test
-    ghc-options: -main-is Test -threaded "-with-rtsopts=-N4 -K1K"
-    main-is:        Test.hs
-    other-modules:
-        TestCustom
-        TestGen
-        TestUtil

diff --git a/ghc9.8.spec b/ghc9.8.spec
index 96ce603..6c58024 100644
--- a/ghc9.8.spec
+++ b/ghc9.8.spec
@@ -66,7 +66,7 @@ Version: 9.8.4
 # - release can only be reset if *all* library versions get bumped simultaneously
 #   (sometimes after a major release)
 # - minor release numbers for a branch should be incremented monotonically
-Release: 19%{?dist}
+Release: 20%{?dist}
 Summary: Glasgow Haskell Compiler
 
 License: BSD-3-Clause AND HaskellReport
@@ -78,10 +78,6 @@ Source1: https://downloads.haskell.org/ghc/%{version}/ghc-%{version}-testsuite.t
 Source5: ghc-pkg.man
 Source6: haddock.man
 Source7: runghc.man
-# hadrian bootstrap libraries
-Source10: https://downloads.haskell.org/ghc/9.8.4/hadrian-bootstrap-sources/hadrian-bootstrap-sources-9.6.2.tar.gz
-Source11: https://hackage.haskell.org/package/extra-1.7.16/extra-1.7.16.tar.gz
-Source12: https://hackage.haskell.org/package/extra-1.7.16/extra.cabal
 
 # absolute haddock path (was for html/libraries -> libraries)
 Patch1: ghc-gen_contents_index-haddock-path.patch
@@ -124,10 +120,6 @@ Patch60: ghc9.8-32bit-unique-word-revert.patch
 # https://github.com/haskell/directory/pull/184 (directory.buildinfo)
 Patch50: https://patch-diff.githubusercontent.com/raw/haskell/directory/pull/184.patch
 
-# os-string (s390x)
-# https://github.com/haskell/os-string/pull/14
-Patch70: https://github.com/haskell/os-string/commit/bafe87d871399b58ce4a50592b980c990a3eac39.patch
-
 # https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
 
 # fedora ghc has been bootstrapped on
@@ -176,13 +168,19 @@ BuildRequires:  autoconf automake
 %if %{with build_hadrian}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-base-devel
+BuildRequires:  ghc-base16-bytestring-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-cryptohash-sha256-devel
 BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-extra-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-parsec-devel
+BuildRequires:  ghc-shake-devel
 BuildRequires:  ghc-stm-devel
 BuildRequires:  ghc-transformers-devel
+BuildRequires:  ghc-unordered-containers-devel
 %else
 BuildRequires:  %{name}-hadrian
 %endif
@@ -401,25 +399,9 @@ Installing this package causes %{name}-*-prof packages corresponding to
 
 %prep
 %setup -q -n ghc-%{version} %{?with_testsuite:-b1}
-
-%global hadrian_deps base16-bytestring-1.0.2.0 clock-0.8.4 cryptohash-sha256-0.11.102.1 extra-1.7.16 filepattern-0.1.3 hashable-1.4.4.0 heaps-0.4 js-dgtable-0.5.2 js-flot-0.8.3 js-jquery-3.3.1 os-string-2.0.2.1 primitive-0.9.0.0 splitmix-0.1.0.5 random-1.2.1.2 unordered-containers-0.2.20 utf8-string-1.0.2 shake-0.19.8
-
 ( cd hadrian
   cabal-tweak-flag selftest False
   cabal-tweak-dep-ver containers '< 0.7' '< 0.8'
-  mkdir deps
-  (cd deps
-  tar xf %SOURCE10
-  cp -p %SOURCE11 %SOURCE12 .
-  for i in %hadrian_deps; do
-      tar xf $i.tar.gz
-      mv -f $(echo $i | sed 's/\(.*\)-.*/\1.cabal/') $i
-      mv $i ..
-  done
-  )
-  (cd os-string-2.0.2.1
-   %patch -P70 -p1 -b .orig
-  )
   ln -sf ../libraries/Cabal/Cabal-syntax Cabal-syntax-%{Cabal_ver}
   ln -sf ../libraries/Cabal/Cabal Cabal-%{Cabal_ver}
 )
@@ -514,7 +496,7 @@ export LANG=C.utf8
 %endif
 (
 cd hadrian
-%ghc_libs_build -H -P -W Cabal-syntax-%{Cabal_ver} Cabal-%{Cabal_ver} %{hadrian_deps}
+%ghc_libs_build -H -P -W Cabal-syntax-%{Cabal_ver} Cabal-%{Cabal_ver}
 %ghc_bin_build -W
 )
 %global hadrian hadrian/dist/build/hadrian/hadrian
@@ -887,6 +869,9 @@ make test
 
 
 %changelog
+* Sun Aug 09 2026 Jens Petersen <petersen@redhat.com> - 9.8.4-20
+- revert use of hadrian-bootstrap-sources (Cabal is enough)
+
 * Sat Aug 08 2026 Jens Petersen <petersen@redhat.com> - 9.8.4-19
 - use hadrian-bootstrap-sources and bundled Cabal to build hadrian (#2503917)
 - disable abicheck since hashes changed this year (#2435219)

diff --git a/sources b/sources
index f8c6290..8a3f1aa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 SHA512 (ghc-9.8.4-src.tar.xz) = f25bd9388cd9c404f33eef09a3c71f83a468ca6cf870bd5938d3f2b16c7b0a6bdc2817b6c188d047f68c0ac39105731b904b34ef267b315abf9572a6488d3b82
-SHA512 (hadrian-bootstrap-sources-9.6.2.tar.gz) = 504ad1c5db5730c7f6c1898b8581c0a0ab2fd5422c24164c8d7eaaeefcbbb50b6740513cf3a4db11b12dd6eb1e906baf3cfb59435063b8b79f1156cb2cc409d8
-SHA512 (extra-1.7.16.tar.gz) = ee10e9105b17a17980c76cf41225ac7a49b85c2a2a6847bb830a9e1ea142ad09a49766ad6aeb3b81b32e639d3093c79836adafd4e88b2db922b4a8d8260d5504