diff --git a/haskell-platform.spec b/haskell-platform.spec index 38347b9..9986ea3 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2023.1 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -51,6 +51,8 @@ Source20: stack-symlink-distro-ghc # https://github.com/commercialhaskell/stack/pull/6028 Patch0: 6028-2.9.3.1.patch Patch1: stack-disable-ghc-Cabal-version-warnings.patch +# https://github.com/commercialhaskell/stack/issues/6379 +Patch2: stack-Setup-Platforms.patch BuildRequires: ghc BuildRequires: alex @@ -479,6 +481,9 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %changelog +* Fri Dec 15 2023 Jens Petersen - 2023.1-27 +- patch Stack.Setup to accept PPC64 and S390X Linux platforms + * Tue Nov 7 2023 Jens Petersen - 2023.1-26 - make stack-symlink-distro-ghc executable diff --git a/stack-Setup-Platforms.patch b/stack-Setup-Platforms.patch new file mode 100644 index 0000000..8319819 --- /dev/null +++ b/stack-Setup-Platforms.patch @@ -0,0 +1,11 @@ +--- stack-2.9.3.1/src/Stack/Setup.hs~ 2023-12-15 20:23:43.622387891 +0800 ++++ stack-2.9.3.1/src/Stack/Setup.hs 2023-12-15 22:57:36.515310538 +0800 +@@ -1566,6 +1566,8 @@ + Platform Sparc Cabal.Linux -> pure "linux-sparc" + Platform AArch64 Cabal.OSX -> pure "macosx-aarch64" + Platform AArch64 Cabal.FreeBSD -> pure "freebsd-aarch64" ++ Platform PPC64 Cabal.Linux -> pure "linux-ppc64" ++ Platform S390X Cabal.Linux -> pure "linux-s390x" + Platform arch os -> throwM $ UnsupportedSetupCombo os arch + + downloadOrUseLocal