Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9633a2c899 |
2 changed files with 37 additions and 6 deletions
28
cabal-install-3.2-update-hackage-repo-keys.patch
Normal file
28
cabal-install-3.2-update-hackage-repo-keys.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
--- cabal-install-3.2.0.0/Distribution/Client/Config.hs~ 2001-09-09 09:46:40.000000000 +0800
|
||||
+++ cabal-install-3.2.0.0/Distribution/Client/Config.hs 2025-07-29 14:08:06.225646657 +0800
|
||||
@@ -694,12 +694,19 @@
|
||||
--
|
||||
defaultHackageRemoteRepoKeys :: [String]
|
||||
defaultHackageRemoteRepoKeys =
|
||||
- [ "fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0",
|
||||
- "1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42",
|
||||
- "2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3",
|
||||
- "0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d",
|
||||
- "51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921"
|
||||
- ]
|
||||
+ [ -- Adam Gundry (uRPdSiL3/MNsk50z6NB55ABo0OrrNDXigtCul4vtzmw=)
|
||||
+ "fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0"
|
||||
+ , -- Gershom Bazerman (bYoUXXQ9TtX10UriaMiQtTccuXPGnmldP68djzZ7cLo=)
|
||||
+ "1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42"
|
||||
+ , -- John Wiegley (zazm5w480r+zPO6Z0+8fjGuxZtb9pAuoVmQ+VkuCvgU=)
|
||||
+ "0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d"
|
||||
+ , -- Norman Ramsey (ZI8di3a9Un0s2RBrt5GwVRvfOXVuywADfXGPZfkiDb0=)
|
||||
+ "51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921"
|
||||
+ , -- Mathieu Boespflug (ydN1nGGQ79K1Q0nN+ul+Ln8MxikTB95w0YdGd3v3kmg=)
|
||||
+ "be75553f3c7ba1dbe298da81f1d1b05c9d39dd8ed2616c9bddf1525ca8c03e48"
|
||||
+ , -- Joachim Breitner (5iUgwqZCWrCJktqMx0bBMIuoIyT4A1RYGozzchRN9rA=)
|
||||
+ "d26e46f3b631aae1433b89379a6c68bd417eb5d1c408f0643dcc07757fece522"
|
||||
+ ]
|
||||
|
||||
-- | The required threshold of root key signatures for hackage.haskell.org
|
||||
--
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
Name: cabal-install
|
||||
Version: 3.2.0.0
|
||||
Release: 9%{?dist}
|
||||
Release: 10%{?dist}
|
||||
Summary: The command-line interface for Cabal and Hackage
|
||||
|
||||
License: BSD
|
||||
|
|
@ -17,6 +17,7 @@ Patch0: https://github.com/haskell/cabal/commit/442869918260a7bb3f0cb069
|
|||
# https://build.opensuse.org/package/view_file/openSUSE:Factory/cabal-install/ghc-8.10-support-for-3.2.patch
|
||||
Patch1: cabal-3.2-ghc-8.10-opensuse.patch
|
||||
Patch2: https://github.com/haskell/cabal/commit/83983fcc4ba16d7969ba36f4174daf27de00a38e.patch
|
||||
Patch3: cabal-install-3.2-update-hackage-repo-keys.patch
|
||||
|
||||
# Begin cabal-rpm deps:
|
||||
BuildRequires: ghc-rpm-macros
|
||||
|
|
@ -77,11 +78,10 @@ installation of Haskell libraries and programs.
|
|||
# Begin cabal-rpm setup:
|
||||
%setup -q
|
||||
# End cabal-rpm setup
|
||||
%patch0 -p2 -b .sdist
|
||||
%patch1 -p2 -b .ghc8.10
|
||||
#cabal-tweak-dep-ver base '< 4.14' '< 4.15'
|
||||
%patch2 -p2 -b .base16
|
||||
#cabal-tweak-dep-ver base16-bytestring '< 0.2' '< 2'
|
||||
%patch -P0 -p2 -b .sdist
|
||||
%patch -P1 -p2 -b .ghc8.10
|
||||
%patch -P2 -p2 -b .base16
|
||||
%patch -P3 -p1 -b .keys
|
||||
cabal-tweak-dep-ver random '< 1.2' '< 1.3'
|
||||
|
||||
|
||||
|
|
@ -113,6 +113,9 @@ install -pm 644 -D -t %{buildroot}%{_sysconfdir}/profile.d/ %{SOURCE10}
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 29 2025 Jens Petersen <petersen@redhat.com> - 3.2.0.0-10
|
||||
- update list of Hackage repo root keys to versions from 3.10.3
|
||||
|
||||
* Fri Sep 16 2022 Jens Petersen <petersen@redhat.com> - 3.2.0.0-9
|
||||
- revert recommending ghcX.Y
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue