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

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

[Jens Petersen]

A new commit has been pushed.

Repo   : rpms/ghc9.6
Branch : rawhide
Commit : 1b0594209d1f65ed35d712742c14df8157ddfb87
Author : Jens Petersen <petersen@redhat.com>
Date   : 2026-08-09T14:52:36+08:00
Stats  : +10/-18 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ghc9.6/c/1b0594209d1f65ed35d712742c14df8157ddfb87?branch=rawhide

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

---
diff --git a/ghc9.6.spec b/ghc9.6.spec
index dc36cb5..4e845b2 100644
--- a/ghc9.6.spec
+++ b/ghc9.6.spec
@@ -45,7 +45,7 @@
 # rhel9 binutils too old for llvm13:
 # https://bugzilla.redhat.com/show_bug.cgi?id=2141054
 # https://gitlab.haskell.org/ghc/ghc/-/issues/22427
-%if 0%{?rhel} == 9
+%if %{defined el9}
 %global llvm_major 12
 %else
 %global llvm_major 14
@@ -59,7 +59,7 @@ Version: 9.6.7
 # - 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: 27%{?dist}
+Release: 28%{?dist}
 Summary: Glasgow Haskell Compiler
 
 License: BSD-3-Clause AND HaskellReport
@@ -71,8 +71,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.6.7/hadrian-bootstrap-sources/hadrian-bootstrap-sources-9.4.3.tar.gz
 
 # absolute haddock path (was for html/libraries -> libraries)
 Patch1: ghc-gen_contents_index-haddock-path.patch
@@ -163,10 +161,14 @@ BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-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
@@ -386,23 +388,11 @@ Installing this package causes %{name}-*-prof packages corresponding to
 
 %prep
 %setup -q -n ghc-%{version} %{?with_testsuite:-b1}
-
-%global hadrian_deps clock-0.8.4 extra-1.8 filepattern-0.1.3 hashable-1.4.7.0 heaps-0.4.1 js-dgtable-0.5.2 js-flot-0.8.3 js-jquery-3.3.1 os-string-2.0.7 primitive-0.9.0.0 splitmix-0.1.1 random-1.2.1.3 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 bytestring '< 0.12' '< 0.13'
   cabal-tweak-dep-ver containers '< 0.7' '< 0.8'
   cabal-tweak-dep-ver directory '>= 1.3.9.0' '>= 1.3.6'
-  mkdir deps
-  (cd deps
-  tar xf %SOURCE10
-  for i in %hadrian_deps; do
-      tar xf $i.tar.gz
-      mv -f $(echo $i | sed 's/\(.*\)-.*/\1.cabal/') $i
-      mv $i ..
-  done
-  )
   ln -sf ../libraries/Cabal/Cabal-syntax Cabal-syntax-%{Cabal_ver}
   ln -sf ../libraries/Cabal/Cabal Cabal-%{Cabal_ver}
 )
@@ -492,7 +482,7 @@ export LANG=C.utf8
 %global ghc_debuginfo 1
 (
 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
@@ -847,6 +837,9 @@ make test
 
 
 %changelog
+* Sun Aug 09 2026 Jens Petersen <petersen@redhat.com> - 9.6.7-28
+- revert use of hadrian-bootstrap-sources (Cabal is enough)
+
 * Fri Aug 07 2026 Jens Petersen <petersen@redhat.com> - 9.6.7-27
 - use hadrian-bootstrap-sources and bundled Cabal to build hadrian (#2503916)
 - patch for sphinx9

diff --git a/sources b/sources
index fde0cc6..b1e714d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 SHA512 (ghc-9.6.7-src.tar.lz) = 38d4b8fad3d298b6ac38e462478f9fad55d9d729441094aa60d7c75df06f0ca8d916ee253576e8e91d005d516d0b6e72a15503de6d04c780961a94dfc5e7f986
-SHA512 (hadrian-bootstrap-sources-9.4.3.tar.gz) = 8bbe0725298ddd0e917a276dfe7f34a0f6f8bddda8e3e9351ac522f978cd46cd5da0f86daa2fb82ffc63765dafb3b444a7fef420395bec244545e8411f7ca832