update to 0.1.30 (fails with ghc-9.6)

haskell/ghcup-hs#1129

ghcup.spec

@@ -1,4 +1,4 @@
-# generated by cabal-rpm-2.2.1 --standalone
+# generated by cabal-rpm-2.2.2 --standalone
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global ghc_without_dynamic 1
@@ -13,19 +13,22 @@
 %global pkgver %{pkg_name}-%{version}
 
 Name:           %{pkg_name}
-Version:        0.1.22.0
+Version:        0.1.30.0
 Release:        1%{?dist}
 Summary:        Ghc toolchain installer
 
 License:        LGPL-3.0-only
-Url:            https://hackage.haskell.org/package/%{name}
+Url:            https://hackage.haskell.org/package/ghcup
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-Cabal-devel
+%if %{defined fedora}
+BuildRequires:  ghc-Cabal-syntax-devel
+%endif
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-aeson-pretty-devel
 BuildRequires:  ghc-async-devel
@@ -37,10 +40,9 @@ BuildRequires:  ghc-brick-devel
 %endif
 BuildRequires:  ghc-bytestring-devel
 #BuildRequires:  ghc-bz2-devel
-#BuildRequires:  ghc-cabal-install-parsers-devel
-#BuildRequires:  ghc-cabal-plan-devel
 BuildRequires:  ghc-case-insensitive-devel
 #BuildRequires:  ghc-casing-devel
+BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-cryptohash-sha256-devel
 BuildRequires:  ghc-deepseq-devel
@@ -60,6 +62,7 @@ BuildRequires:  ghc-mtl-devel
 #BuildRequires:  ghc-optics-devel
 BuildRequires:  ghc-optparse-applicative-devel
 #BuildRequires:  ghc-os-release-devel
+BuildRequires:  ghc-parsec-devel
 BuildRequires:  ghc-pretty-devel
 BuildRequires:  ghc-pretty-terminal-devel
 BuildRequires:  ghc-process-devel
@@ -73,7 +76,6 @@ BuildRequires:  ghc-safe-devel
 BuildRequires:  ghc-safe-exceptions-devel
 %endif
 BuildRequires:  ghc-split-devel
-#BuildRequires:  ghc-streamly-devel
 #BuildRequires:  ghc-strict-base-devel
 BuildRequires:  ghc-tagsoup-devel
 BuildRequires:  ghc-template-haskell-devel
@@ -96,61 +98,29 @@ BuildRequires:  ghc-vector-devel
 BuildRequires:  ghc-vty-devel
 BuildRequires:  ghc-word8-devel
 %endif
-#BuildRequires:  ghc-yaml-streamly-devel
+#BuildRequires:  ghc-yaml-devel
 BuildRequires:  ghc-zlib-devel
 BuildRequires:  help2man
-BuildRequires:  cabal-install > 1.18
-# for missing dep 'atomic-primops':
-BuildRequires:  ghc-primitive-devel
-# for missing dep 'binary-instances':
-%if %{defined fedora}
-BuildRequires:  ghc-binary-orphans-devel
-%endif
-BuildRequires:  ghc-hashable-devel
-BuildRequires:  ghc-primitive-devel
-BuildRequires:  ghc-scientific-devel
-BuildRequires:  ghc-tagged-devel
-BuildRequires:  ghc-time-compat-devel
-%if %{defined fedora}
-BuildRequires:  ghc-vector-binary-instances-devel
-%endif
-# for missing dep 'cabal-install-parsers':
-%if 0%{?fedora} >= 39
-BuildRequires:  ghc-Cabal-syntax-devel
-%endif
-BuildRequires:  ghc-lukko-devel
-BuildRequires:  ghc-network-uri-devel
-BuildRequires:  ghc-parsec-devel
-BuildRequires:  ghc-tar-devel
-# for missing dep 'cabal-plan':
-BuildRequires:  ghc-ansi-terminal-devel
-BuildRequires:  ghc-base-compat-devel
-BuildRequires:  ghc-parsec-devel
-%if %{defined fedora}
-BuildRequires:  ghc-semialign-devel
-BuildRequires:  ghc-singleton-bool-devel
-%endif
-BuildRequires:  ghc-these-devel
+BuildRequires:  cabal-install
 # for missing dep 'chs-deps':
 BuildRequires:  ghc-array-devel
 # for missing dep 'file-uri':
 BuildRequires:  ghc-attoparsec-devel
 # for missing dep 'libarchive':
 BuildRequires:  ghc-dlist-devel
 BuildRequires:  ghc-unix-compat-devel
-# for missing dep 'lockfree-queue':
-%if %{defined fedora}
-BuildRequires:  ghc-abstract-deque-devel
-%endif
 # for missing dep 'optics':
 BuildRequires:  ghc-array-devel
 # for missing dep 'optics-core':
 BuildRequires:  ghc-array-devel
+%if 0%{?fedora} >= 43
+BuildRequires:  ghc-indexed-profunctors-devel
+%endif
 BuildRequires:  ghc-indexed-traversable-devel
 # for missing dep 'optics-extra':
 BuildRequires:  ghc-array-devel
 BuildRequires:  ghc-hashable-devel
-%if 0%{?fedora} >= 38
+%if %{defined fedora}
 BuildRequires:  ghc-indexed-traversable-instances-devel
 %endif
 # for missing dep 'optics-th':
@@ -162,27 +132,6 @@ BuildRequires:  ghc-data-fix-devel
 BuildRequires:  ghc-free-devel
 %endif
 BuildRequires:  ghc-th-abstraction-devel
-# for missing dep 'streamly':
-BuildRequires:  ghc-hashable-devel
-BuildRequires:  ghc-heaps-devel
-BuildRequires:  ghc-monad-control-devel
-BuildRequires:  ghc-network-devel
-BuildRequires:  ghc-transformers-base-devel
-%if 0%{?fedora} > 38
-BuildRequires:  ghc-unicode-data-devel
-%endif
-# for missing dep 'streamly-core':
-BuildRequires:  ghc-heaps-devel
-BuildRequires:  ghc-monad-control-devel
-# for missing dep 'topograph':
-BuildRequires:  ghc-base-compat-devel
-BuildRequires:  ghc-base-orphans-devel
-# for missing dep 'versions':
-BuildRequires:  ghc-hashable-devel
-BuildRequires:  ghc-parser-combinators-devel
-# for missing dep 'yaml-streamly':
-BuildRequires:  ghc-attoparsec-devel
-BuildRequires:  ghc-scientific-devel
 # End cabal-rpm deps
 # for text2
 BuildRequires:  gcc-c++
@@ -201,13 +150,18 @@ experience and exposing an API.
 # Begin cabal-rpm setup:
 %autosetup -p1
 # End cabal-rpm setup
+%if 0%{?fedora} >= 41
+cabal-tweak-dep-ver haskus-utils-variant '^>=3.3' '^>=3.4'
+cabal-tweak-dep-ver mtl '^>=2.2' '>=2.2'
+cabal-tweak-dep-ver transformers '^>=0.5' '>=0.5'
+%endif
 
 
 %build
 # Begin cabal-rpm build:
 %global cabal_install %{_bindir}/cabal
 %cabal_install update
-%if 0%{?rhel} && 0%{?rhel} < 9
+%if %{defined rhel} && 0%{?rhel} < 9
 %cabal_install sandbox init
 %cabal_install install
 %endif
@@ -217,9 +171,14 @@ experience and exposing an API.
 %install
 # Begin cabal-rpm install
 mkdir -p %{buildroot}%{_bindir}
-%if 0%{?fedora} || 0%{?rhel} >= 9
+%if %{defined fedora} || 0%{?rhel} >= 9
 %ghc_set_gcc_flags
-%cabal_install install --install-method=copy --enable-executable-stripping --installdir=%{buildroot}%{_bindir} --constraint="libarchive +system-libarchive" --constraint="streamly +use-unliftio"
+%cabal_install install --install-method=copy --enable-executable-stripping --installdir=%{buildroot}%{_bindir} --constraint="libarchive +system-libarchive" \
+%if 0%{?fedora} < 41
+ --constraint="haskus-utils-data < 1.5"
+%else
+%{nil}
+%endif
 %else
 for i in .cabal-sandbox/bin/*; do
 strip -s -o %{buildroot}%{_bindir}/$(basename $i) $i
@@ -246,6 +205,9 @@ help2man --no-info %{buildroot}%{_bindir}/%{name} > %{buildroot}%{_mandir}/man1/
 
 
 %changelog
+* Wed Sep 18 2024 Jens Petersen <[email protected]> - 0.1.30.0-1
+- https://hackage.haskell.org/package/ghcup-0.1.30.0/changelog
+
 * Mon May 27 2024 Jens Petersen <[email protected]> - 0.1.22.0-1
 - https://hackage.haskell.org/package/ghcup-0.1.22.0/changelog