From b29e22972a0afcff9891f4894c405a43b4ddee78 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 18 Sep 2020 20:39:14 +0800 Subject: [PATCH 01/40] stack: use recommends for zlib-devel --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index c589bbf..f7fe634 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -215,7 +215,7 @@ License: BSD Url: http://haskellstack.org Requires: gcc Requires: gmp-devel -Requires: zlib-devel +Recommends: zlib-devel %description -n stack Stack is a cross-platform program for developing Haskell projects. @@ -292,6 +292,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Fri Sep 18 2020 Jens Petersen +- stack: use recommends for zlib-devel + * Wed Sep 16 2020 Jens Petersen - 2020.2-6 - stack requires gmp-devel and gcc https://github.com/commercialhaskell/stack/issues/5388 From 18f27d868e36fd1ceaaa463b824385da2a4a2b4d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Jan 2021 12:31:17 +0800 Subject: [PATCH 02/40] th-utilities is not longer needed --- haskell-platform.spec | 19 ++++++++----------- sources | 1 - 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index f7fe634..daef955 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -18,14 +18,13 @@ %global retry retry-0.8.1.2 %global inferlicense infer-license-0.2.0 %global rioorphans rio-orphans-0.1.1.0 -%global thutilities th-utilities-0.2.4.0 %global casaclient casa-client-0.0.1 %global casatypes casa-types-0.0.1 -%global subpkgs %{filelock} %{hifileparser} %{inferlicense} %{hpack} %{retry} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{thutilities} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} +%global subpkgs %{filelock} %{hifileparser} %{inferlicense} %{hpack} %{retry} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} Name: haskell-platform Version: 2020.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Standard Haskell distribution License: BSD @@ -47,9 +46,8 @@ Source11: https://hackage.haskell.org/package/%{regexapplicativetext}/%{re Source12: https://hackage.haskell.org/package/%{retry}/%{retry}.tar.gz Source13: https://hackage.haskell.org/package/%{inferlicense}/%{inferlicense}.tar.gz Source14: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source15: https://hackage.haskell.org/package/%{thutilities}/%{thutilities}.tar.gz -Source16: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz -Source17: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source15: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz +Source16: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz # End cabal-rpm sources #Patch0: stack-2.1-relax_version_warnings.patch @@ -179,9 +177,6 @@ BuildRequires: ghc-monad-control-prof BuildRequires: ghc-monad-logger-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-transformers-base-prof -# for missing dep 'th-utilities': -BuildRequires: ghc-syb-prof -BuildRequires: ghc-th-orphans-prof # for missing dep 'casa-client': BuildRequires: ghc-base16-bytestring-prof BuildRequires: ghc-resourcet-prof @@ -238,7 +233,6 @@ Stack is a cross-platform program for developing Haskell projects. %ghc_lib_subpackage -l BSD %{retry} %ghc_lib_subpackage -l MIT %{inferlicense} %ghc_lib_subpackage -l MIT %{rioorphans} -%ghc_lib_subpackage -l MIT %{thutilities} %ghc_lib_subpackage -l BSD %{casaclient} %ghc_lib_subpackage -l BSD %{casatypes} %ghc_lib_subpackage -l BSD %{stack} @@ -249,7 +243,7 @@ Stack is a cross-platform program for developing Haskell projects. %prep # Begin cabal-rpm setup: -%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 # End cabal-rpm setup #%%patch0 -b .orig ( @@ -292,6 +286,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Sun Jan 17 2021 Jens Petersen - 2020.2-7 +- th-utilities is not longer needed for pantry/store + * Fri Sep 18 2020 Jens Petersen - stack: use recommends for zlib-devel diff --git a/sources b/sources index 3f7bff2..88b2bbf 100644 --- a/sources +++ b/sources @@ -15,4 +15,3 @@ SHA512 (regex-applicative-text-0.1.0.1.tar.gz) = 8ee1d581498e047a7b759476ce98c43 SHA512 (retry-0.8.1.2.tar.gz) = 42856d43035e7c3a8128768c1a12fb1fbbd33ebc12fba152f5559e117a6339ea35a75e06243c320623e42a70916ad9f5a141988c42df4e44acb084210e2488e7 SHA512 (rio-orphans-0.1.1.0.tar.gz) = 2e415ebcc7341cf1c913de54de3218ac487e310c9556d1e1bdb349f4e7b9d041ea729c21e2bfdbcded9a214c84f483e32839a4fec87b2af9b986db5aaa18b42a SHA512 (stack-2.3.3.tar.gz) = cb93e3bcb8f92e01f374806f07f366ca318d66e3b7bd3cfa3fe3b72dce954d2bb371f51e3f79fca8aec19d1d3adef370bb09237bf29340a1bc851a9a103d77a3 -SHA512 (th-utilities-0.2.4.0.tar.gz) = 9dfd8996811f0918ef103ddba7408ef36dd91978fad12e523ca89957e79f6799479adb01422251023ad224c9386309d22169a0105eadeccff609a08c5bfbce13 From 77fe45dffb581d72f9a597e58decf7b0883d3373 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 24 Jan 2021 16:16:14 +0800 Subject: [PATCH 03/40] infer-license was packaged --- haskell-platform.spec | 18 +++++++++--------- sources | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index daef955..bd2df2a 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -16,15 +16,14 @@ %global projecttemplate project-template-0.2.1.0 %global regexapplicativetext regex-applicative-text-0.1.0.1 %global retry retry-0.8.1.2 -%global inferlicense infer-license-0.2.0 %global rioorphans rio-orphans-0.1.1.0 %global casaclient casa-client-0.0.1 %global casatypes casa-types-0.0.1 -%global subpkgs %{filelock} %{hifileparser} %{inferlicense} %{hpack} %{retry} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} +%global subpkgs %{filelock} %{hifileparser} %{hpack} %{retry} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} Name: haskell-platform Version: 2020.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Standard Haskell distribution License: BSD @@ -44,10 +43,9 @@ Source9: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz Source10: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz Source11: https://hackage.haskell.org/package/%{regexapplicativetext}/%{regexapplicativetext}.tar.gz Source12: https://hackage.haskell.org/package/%{retry}/%{retry}.tar.gz -Source13: https://hackage.haskell.org/package/%{inferlicense}/%{inferlicense}.tar.gz -Source14: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source15: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz -Source16: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source13: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz +Source14: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz +Source15: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz # End cabal-rpm sources #Patch0: stack-2.1-relax_version_warnings.patch @@ -231,7 +229,6 @@ Stack is a cross-platform program for developing Haskell projects. %ghc_lib_subpackage -l BSD %{projecttemplate} %ghc_lib_subpackage -l BSD %{regexapplicativetext} %ghc_lib_subpackage -l BSD %{retry} -%ghc_lib_subpackage -l MIT %{inferlicense} %ghc_lib_subpackage -l MIT %{rioorphans} %ghc_lib_subpackage -l BSD %{casaclient} %ghc_lib_subpackage -l BSD %{casatypes} @@ -243,7 +240,7 @@ Stack is a cross-platform program for developing Haskell projects. %prep # Begin cabal-rpm setup: -%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 # End cabal-rpm setup #%%patch0 -b .orig ( @@ -286,6 +283,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Sun Jan 24 2021 Jens Petersen - 2020.2-8 +- infer-license was packaged + * Sun Jan 17 2021 Jens Petersen - 2020.2-7 - th-utilities is not longer needed for pantry/store diff --git a/sources b/sources index 88b2bbf..27040f7 100644 --- a/sources +++ b/sources @@ -4,7 +4,6 @@ SHA512 (filelock-0.1.1.5.tar.gz) = 6ccd0b671cec8d1c2daa3115a5b2d8cd10a31db0a1dc1 SHA512 (hi-file-parser-0.1.0.0.tar.gz) = e101c99486839d8c28a3a1fa7fddb0cc8287298f587affaf90cccfa517adaf84b570af8d28faae16201271e0d27059fdbac5740f429e9f4f341f760d5d9d0b5f SHA512 (hpack-0.34.2.tar.gz) = d05f07237d369d66649ebf0a807275f4c82632fdc9713e3682098d59aba56e5212b83a6509ffd1a5ae535078fee837f624672c00f1be602338d06564a3be0d39 SHA512 (http-download-0.2.0.0.tar.gz) = b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae -SHA512 (infer-license-0.2.0.tar.gz) = 266651d9890ccbd9281ef3f9cd16df10f9c6fa8449990b63e956bd13559b1ef773c9dee92ad80de5b9d03599ac6a09766a1f4f3425884007982ab14d01697d45 SHA512 (mintty-0.1.2.tar.gz) = 6737851b82bec6977114baa572bdd012ff933a9d1c401857b97183fe341f605cc85618f2d0ac4afe2046cd90ec011d595bb82dea775f65b7e1d73dcf41777667 SHA512 (mustache-2.3.1.tar.gz) = 162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3 SHA512 (neat-interpolation-0.3.2.6.tar.gz) = 0b3725258cebdf6144a9442b3dfb5e46a1d36525fdfec7f1797546416ef7788c7ad679d33105d541ae37b208c170d695757355291ef0d05297d8e35ea4116546 From 8183d50d633458a97afa2f66bcef9fafdf66385d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 26 Jan 2021 02:24:59 +0800 Subject: [PATCH 04/40] BR infer-license --- haskell-platform.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/haskell-platform.spec b/haskell-platform.spec index bd2df2a..71271fa 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -150,6 +150,7 @@ BuildRequires: ghc-binary-prof # for missing dep 'hpack': BuildRequires: ghc-Glob-prof BuildRequires: ghc-bifunctors-prof +BuildRequires: ghc-infer-license-prof BuildRequires: ghc-scientific-prof # for missing dep 'mustache': BuildRequires: ghc-cmdargs-prof From 70af6eb742f96575a6f2c6ba8646ee138c0a8bfe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 13:22:32 +0000 Subject: [PATCH 05/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 71271fa..8ade6c0 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -23,7 +23,7 @@ Name: haskell-platform Version: 2020.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Standard Haskell distribution License: BSD @@ -284,6 +284,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2020.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 24 2021 Jens Petersen - 2020.2-8 - infer-license was packaged From 7dea3a5231ab2d95da1ee29ea6351fe07f953b24 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 18 Mar 2021 17:58:36 +0800 Subject: [PATCH 06/40] retry was packaged in Fedora --- haskell-platform.spec | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 8ade6c0..e700639 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -15,15 +15,14 @@ %global pantry pantry-0.4.0.2 %global projecttemplate project-template-0.2.1.0 %global regexapplicativetext regex-applicative-text-0.1.0.1 -%global retry retry-0.8.1.2 %global rioorphans rio-orphans-0.1.1.0 %global casaclient casa-client-0.0.1 %global casatypes casa-types-0.0.1 -%global subpkgs %{filelock} %{hifileparser} %{hpack} %{retry} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} +%global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} Name: haskell-platform Version: 2020.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Standard Haskell distribution License: BSD @@ -42,10 +41,9 @@ Source8: https://hackage.haskell.org/package/%{openbrowser}/%{openbrowser Source9: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz Source10: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz Source11: https://hackage.haskell.org/package/%{regexapplicativetext}/%{regexapplicativetext}.tar.gz -Source12: https://hackage.haskell.org/package/%{retry}/%{retry}.tar.gz -Source13: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source14: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz -Source15: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source12: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz +Source13: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz +Source14: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz # End cabal-rpm sources #Patch0: stack-2.1-relax_version_warnings.patch @@ -119,7 +117,7 @@ BuildRequires: ghc-primitive-prof BuildRequires: ghc-process-prof #BuildRequires: ghc-project-template-prof #BuildRequires: ghc-regex-applicative-text-prof -#BuildRequires: ghc-retry-prof +BuildRequires: ghc-retry-prof BuildRequires: ghc-rio-prof BuildRequires: ghc-rio-prettyprint-prof BuildRequires: ghc-semigroups-prof @@ -168,8 +166,6 @@ BuildRequires: ghc-tar-conduit-prof BuildRequires: ghc-resourcet-prof # for missing dep 'regex-applicative-text': BuildRequires: ghc-regex-applicative-prof -# for missing dep 'retry': -BuildRequires: ghc-random-prof # for missing dep 'rio-orphans': BuildRequires: ghc-fast-logger-prof BuildRequires: ghc-monad-control-prof @@ -229,7 +225,6 @@ Stack is a cross-platform program for developing Haskell projects. %ghc_lib_subpackage -l BSD %{pantry} %ghc_lib_subpackage -l BSD %{projecttemplate} %ghc_lib_subpackage -l BSD %{regexapplicativetext} -%ghc_lib_subpackage -l BSD %{retry} %ghc_lib_subpackage -l MIT %{rioorphans} %ghc_lib_subpackage -l BSD %{casaclient} %ghc_lib_subpackage -l BSD %{casatypes} @@ -241,7 +236,7 @@ Stack is a cross-platform program for developing Haskell projects. %prep # Begin cabal-rpm setup: -%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 # End cabal-rpm setup #%%patch0 -b .orig ( @@ -284,6 +279,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Thu Mar 18 2021 Jens Petersen - 2020.2-10 +- retry was packaged in Fedora + * Tue Jan 26 2021 Fedora Release Engineering - 2020.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6e83a29ba26c68484e9d1e3a2dca9698a482a96b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 8 Jun 2021 20:26:24 +0800 Subject: [PATCH 07/40] rebuild --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index e700639..26948d0 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -22,7 +22,7 @@ Name: haskell-platform Version: 2020.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Standard Haskell distribution License: BSD @@ -279,6 +279,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Tue Jun 8 2021 Jens Petersen - 2020.2-11 +- rebuild + * Thu Mar 18 2021 Jens Petersen - 2020.2-10 - retry was packaged in Fedora From c255f7c9e71bc61a5f7c61ca8bf002e5a3fa6768 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 8 Jun 2021 21:24:44 +0800 Subject: [PATCH 08/40] use %ghc_delete_rpaths from ghc-rpm-macros-2.2.1 --- haskell-platform.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 26948d0..3ab18c4 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -254,7 +254,7 @@ cabal-tweak-dep-ver base '<4.10' '<4.14' %install # Begin cabal-rpm install %ghc_libs_install %{subpkgs} -%ghc_fix_rpath %{pkgver} +%ghc_delete_rpaths # End cabal-rpm install # open-browser @@ -280,7 +280,7 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog * Tue Jun 8 2021 Jens Petersen - 2020.2-11 -- rebuild +- use ghc_delete_rpaths * Thu Mar 18 2021 Jens Petersen - 2020.2-10 - retry was packaged in Fedora From 2b969880447f2ce76446d7a063d56c0b628bb6ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 07:30:47 +0000 Subject: [PATCH 09/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 3ab18c4..34278b4 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -22,7 +22,7 @@ Name: haskell-platform Version: 2020.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Standard Haskell distribution License: BSD @@ -279,6 +279,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2020.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jun 8 2021 Jens Petersen - 2020.2-11 - use ghc_delete_rpaths From 9852ccbfd50db4cfc2bd423c437197dff2342225 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 10 Aug 2021 03:11:05 +0800 Subject: [PATCH 10/40] stack-2.7.3 --- .gitignore | 7 +++++++ haskell-platform.spec | 36 +++++++++++++++++++++--------------- sources | 17 ++++++++--------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index ff99a08..26a06d0 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,10 @@ haskell-platform-2010.2.0.0.tar.gz /project-template-0.2.1.0.tar.gz /pantry-0.4.0.2.tar.gz /stack-2.3.3.tar.gz +/stack-2.7.3.tar.gz +/hi-file-parser-0.1.2.0.tar.gz +/hpack-0.34.4.tar.gz +/neat-interpolation-0.5.1.2.tar.gz +/pantry-0.5.2.3.tar.gz +/rio-orphans-0.1.2.0.tar.gz +/casa-types-0.0.2.tar.gz diff --git a/haskell-platform.spec b/haskell-platform.spec index 34278b4..ae6f925 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,28 +1,31 @@ -# generated by cabal-rpm-2.0.6 --subpackage +# generated by cabal-rpm-2.0.10 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ -%global stack_ver 2.3.3 +%global stack_ver 2.7.3 %global stack stack-%{stack_ver} %global filelock filelock-0.1.1.5 -%global hifileparser hi-file-parser-0.1.0.0 -%global hpack hpack-0.34.2 +%global hifileparser hi-file-parser-0.1.2.0 +%global hpack hpack-0.34.4 %global httpdownload http-download-0.2.0.0 %global mintty mintty-0.1.2 %global mustache mustache-2.3.1 -%global neatinterpolation neat-interpolation-0.3.2.6 +%global neatinterpolation neat-interpolation-0.5.1.2 %global openbrowser open-browser-0.2.1.0 -%global pantry pantry-0.4.0.2 +%global pantry pantry-0.5.2.3 %global projecttemplate project-template-0.2.1.0 %global regexapplicativetext regex-applicative-text-0.1.0.1 -%global rioorphans rio-orphans-0.1.1.0 +%global rioorphans rio-orphans-0.1.2.0 %global casaclient casa-client-0.0.1 -%global casatypes casa-types-0.0.1 +%global casatypes casa-types-0.0.2 + %global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} +# testsuite missing deps: casa-client casa-types filelock hi-file-parser hpack http-download mintty mustache neat-interpolation open-browser pantry project-template raw-strings-qq regex-applicative-text + Name: haskell-platform -Version: 2020.2 -Release: 12%{?dist} +Version: 2021.1 +Release: 13%{?dist} Summary: Standard Haskell distribution License: BSD @@ -45,7 +48,6 @@ Source12: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}. Source13: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz Source14: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz # End cabal-rpm sources -#Patch0: stack-2.1-relax_version_warnings.patch BuildRequires: ghc BuildRequires: alex @@ -111,7 +113,7 @@ BuildRequires: ghc-path-prof BuildRequires: ghc-path-io-prof BuildRequires: ghc-persistent-prof BuildRequires: ghc-persistent-sqlite-prof -BuildRequires: ghc-persistent-template-prof +BuildRequires: ghc-persistent-template-devel BuildRequires: ghc-pretty-prof BuildRequires: ghc-primitive-prof BuildRequires: ghc-process-prof @@ -172,6 +174,7 @@ BuildRequires: ghc-monad-control-prof BuildRequires: ghc-monad-logger-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-transformers-base-prof +BuildRequires: ghc-unliftio-core-prof # for missing dep 'casa-client': BuildRequires: ghc-base16-bytestring-prof BuildRequires: ghc-resourcet-prof @@ -238,10 +241,9 @@ Stack is a cross-platform program for developing Haskell projects. # Begin cabal-rpm setup: %setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 # End cabal-rpm setup -#%%patch0 -b .orig ( cd %{regexapplicativetext} -cabal-tweak-dep-ver base '<4.10' '<4.14' +cabal-tweak-dep-ver base '<4.10' '<4.15' ) @@ -263,7 +265,7 @@ echo %{_bindir}/hpack >> %{hpack}/ghc-hpack.files echo %{_bindir}/haskell-mustache >> %{mustache}/ghc-mustache.files mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ -%{buildroot}%{_bindir}/stack --bash-completion-script stack > %{buildroot}%{_datadir}/bash-completion/completions/stack +%{buildroot}%{_bindir}/stack --bash-completion-script stack | sed s/filenames/default/ > %{buildroot}%{_datadir}/bash-completion/completions/stack %files @@ -279,6 +281,10 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Tue Aug 10 2021 Jens Petersen - 2021.1-13 +- stack-2.7.3 +- https://github.com/commercialhaskell/stack/releases/tag/v2.7.3 + * Thu Jul 22 2021 Fedora Release Engineering - 2020.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 27040f7..ba4bea6 100644 --- a/sources +++ b/sources @@ -1,16 +1,15 @@ -SHA512 (casa-client-0.0.1.tar.gz) = 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa -SHA512 (casa-types-0.0.1.tar.gz) = 6296898e8ffdd20ad7dc5aa52a99078fa71bb2384a8631761255e19b7b670a1d349715241be8cb2ee84fd52ee7ac70b4458adab3a86ebe63b9c976f7bac44f98 +SHA512 (stack-2.7.3.tar.gz) = d74846615cfdd316d34357b033c0940052808b9be88756c256a9a40d4a69709ecce0d413d78809cc3a7f65f712921897f77b5367cd65727da1f3e47ad7a9590f SHA512 (filelock-0.1.1.5.tar.gz) = 6ccd0b671cec8d1c2daa3115a5b2d8cd10a31db0a1dc1c15e6cb80d679bd2e09208be8bebc0f4bb64d7cdd0fad2e7e170e8283b6be61edd5017b788f94a41048 -SHA512 (hi-file-parser-0.1.0.0.tar.gz) = e101c99486839d8c28a3a1fa7fddb0cc8287298f587affaf90cccfa517adaf84b570af8d28faae16201271e0d27059fdbac5740f429e9f4f341f760d5d9d0b5f -SHA512 (hpack-0.34.2.tar.gz) = d05f07237d369d66649ebf0a807275f4c82632fdc9713e3682098d59aba56e5212b83a6509ffd1a5ae535078fee837f624672c00f1be602338d06564a3be0d39 +SHA512 (hi-file-parser-0.1.2.0.tar.gz) = a0e04ec071083c23e850264d9beb5d0346f3c2ed8ae99c86d1d4f0980cc5fe431ff8101beb94b03bf3bae6b5d6595070edd692596869252852ee2a45180fdb6a +SHA512 (hpack-0.34.4.tar.gz) = 90dee8766955e44fd760ac9bead2f68de23763f56778dd7691d30a71cb37e5834093f3c9b382ffaa677bbbef0a3c0c9f7abeeb34343906e6d6b692481eacd7c9 SHA512 (http-download-0.2.0.0.tar.gz) = b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae SHA512 (mintty-0.1.2.tar.gz) = 6737851b82bec6977114baa572bdd012ff933a9d1c401857b97183fe341f605cc85618f2d0ac4afe2046cd90ec011d595bb82dea775f65b7e1d73dcf41777667 SHA512 (mustache-2.3.1.tar.gz) = 162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3 -SHA512 (neat-interpolation-0.3.2.6.tar.gz) = 0b3725258cebdf6144a9442b3dfb5e46a1d36525fdfec7f1797546416ef7788c7ad679d33105d541ae37b208c170d695757355291ef0d05297d8e35ea4116546 +SHA512 (neat-interpolation-0.5.1.2.tar.gz) = 147bfca831dccc4646cce7c91635d3885049c67c93c3da83a774eaf1c7f485fba14e695efa173fd3a125380c13d70fe3ca017c2179e161d8e53d60278bb0b7a8 SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1 -SHA512 (pantry-0.4.0.2.tar.gz) = 17e564825b9b7fa3bf2b091d0d0ba261c5ba17105ae34193b1aeb45db823877240d8d138f9bfb9699e87c946a5c87ce83ba12144aae73919d94c7cf3e7df1d7c +SHA512 (pantry-0.5.2.3.tar.gz) = ecb1a1fb1116f97b8078028752b285557823ee9d870d9a5fb7620ebbbe1b41b870211755c1f39a9188885226c73ca07ba3b86a08a1b52644c2cfadd0dd3e5c8a SHA512 (project-template-0.2.1.0.tar.gz) = ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c SHA512 (regex-applicative-text-0.1.0.1.tar.gz) = 8ee1d581498e047a7b759476ce98c43c19656b767790b0f12b8485bc212a71c7115cee5c3e5089392995bc71851025093c406bce9d8ac3c5962675ae06fa4339 -SHA512 (retry-0.8.1.2.tar.gz) = 42856d43035e7c3a8128768c1a12fb1fbbd33ebc12fba152f5559e117a6339ea35a75e06243c320623e42a70916ad9f5a141988c42df4e44acb084210e2488e7 -SHA512 (rio-orphans-0.1.1.0.tar.gz) = 2e415ebcc7341cf1c913de54de3218ac487e310c9556d1e1bdb349f4e7b9d041ea729c21e2bfdbcded9a214c84f483e32839a4fec87b2af9b986db5aaa18b42a -SHA512 (stack-2.3.3.tar.gz) = cb93e3bcb8f92e01f374806f07f366ca318d66e3b7bd3cfa3fe3b72dce954d2bb371f51e3f79fca8aec19d1d3adef370bb09237bf29340a1bc851a9a103d77a3 +SHA512 (rio-orphans-0.1.2.0.tar.gz) = 85e883977e161161e5ba8f4fa6d13026d71f7367bac262307f9a8cfdc0316b71a490fcb6c15737919a6b4e73b3355b413161e09f5167c95b1f0c5a22c045f7ac +SHA512 (casa-client-0.0.1.tar.gz) = 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa +SHA512 (casa-types-0.0.2.tar.gz) = a54bb7f15310878e0a4c0524749ba8c8de8537a60892d278941cacefb80ad9d31e9ba16dd236c196b6639758f281f9ae66911d04c39b0ec6e2b75db5127ad5bf From e60e00e4d133f3485cd646776a9ff9ff51fead69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 8 Jan 2022 11:11:58 +0100 Subject: [PATCH 11/40] Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index ae6f925..88879bb 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -25,7 +25,7 @@ Name: haskell-platform Version: 2021.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Standard Haskell distribution License: BSD @@ -281,6 +281,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Sat Jan 08 2022 Miro Hrončok - 2021.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + * Tue Aug 10 2021 Jens Petersen - 2021.1-13 - stack-2.7.3 - https://github.com/commercialhaskell/stack/releases/tag/v2.7.3 From ab1e938d2bd00d9b5e45ba5be4aec820da6e2eec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 12:13:32 +0000 Subject: [PATCH 12/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 88879bb..745957e 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -25,7 +25,7 @@ Name: haskell-platform Version: 2021.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Standard Haskell distribution License: BSD @@ -281,6 +281,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2021.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 08 2022 Miro Hrončok - 2021.1-14 - Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 From 0f4f83125fcc4ff70a3e1368fdaa87f4f9eb21d1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 21 Mar 2022 00:24:13 +0800 Subject: [PATCH 13/40] stack-2.7.5 --- .gitignore | 6 ++++++ haskell-platform.spec | 40 +++++++++++++++++----------------------- sources | 13 ++++++------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 26a06d0..ab01acc 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,9 @@ haskell-platform-2010.2.0.0.tar.gz /pantry-0.5.2.3.tar.gz /rio-orphans-0.1.2.0.tar.gz /casa-types-0.0.2.tar.gz +/stack-2.7.5.tar.gz +/hpack-0.34.6.tar.gz +/mintty-0.1.3.tar.gz +/mustache-2.3.2.tar.gz +/neat-interpolation-0.5.1.3.tar.gz +/pantry-0.5.3.tar.gz diff --git a/haskell-platform.spec b/haskell-platform.spec index 745957e..14574da 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,31 +1,31 @@ # generated by cabal-rpm-2.0.10 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ -%global stack_ver 2.7.3 +%global stack_ver 2.7.5 %global stack stack-%{stack_ver} %global filelock filelock-0.1.1.5 %global hifileparser hi-file-parser-0.1.2.0 -%global hpack hpack-0.34.4 +%global hpack hpack-0.34.6 %global httpdownload http-download-0.2.0.0 -%global mintty mintty-0.1.2 -%global mustache mustache-2.3.1 -%global neatinterpolation neat-interpolation-0.5.1.2 +%global mintty mintty-0.1.3 +%global mustache mustache-2.3.2 +%global neatinterpolation neat-interpolation-0.5.1.3 %global openbrowser open-browser-0.2.1.0 -%global pantry pantry-0.5.2.3 +%global pantry pantry-0.5.3 %global projecttemplate project-template-0.2.1.0 %global regexapplicativetext regex-applicative-text-0.1.0.1 %global rioorphans rio-orphans-0.1.2.0 %global casaclient casa-client-0.0.1 %global casatypes casa-types-0.0.2 -%global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} +%global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{stack} # testsuite missing deps: casa-client casa-types filelock hi-file-parser hpack http-download mintty mustache neat-interpolation open-browser pantry project-template raw-strings-qq regex-applicative-text Name: haskell-platform -Version: 2021.1 -Release: 15%{?dist} +Version: 2022.1 +Release: 16%{?dist} Summary: Standard Haskell distribution License: BSD @@ -43,10 +43,9 @@ Source7: https://hackage.haskell.org/package/%{neatinterpolation}/%{neati Source8: https://hackage.haskell.org/package/%{openbrowser}/%{openbrowser}.tar.gz Source9: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz Source10: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz -Source11: https://hackage.haskell.org/package/%{regexapplicativetext}/%{regexapplicativetext}.tar.gz -Source12: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source13: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz -Source14: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source11: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz +Source12: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz +Source13: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz # End cabal-rpm sources BuildRequires: ghc @@ -118,7 +117,6 @@ BuildRequires: ghc-pretty-prof BuildRequires: ghc-primitive-prof BuildRequires: ghc-process-prof #BuildRequires: ghc-project-template-prof -#BuildRequires: ghc-regex-applicative-text-prof BuildRequires: ghc-retry-prof BuildRequires: ghc-rio-prof BuildRequires: ghc-rio-prettyprint-prof @@ -166,8 +164,6 @@ BuildRequires: ghc-resourcet-prof BuildRequires: ghc-tar-conduit-prof # for missing dep 'project-template': BuildRequires: ghc-resourcet-prof -# for missing dep 'regex-applicative-text': -BuildRequires: ghc-regex-applicative-prof # for missing dep 'rio-orphans': BuildRequires: ghc-fast-logger-prof BuildRequires: ghc-monad-control-prof @@ -193,8 +189,6 @@ Requires: cabal-install Requires: happy Requires: hscolour Requires: stack -# F26: -Obsoletes: ghc-haskell-platform-devel < %{version}-%{release} %description Haskell Platform is a set of stable and well used Haskell tools. @@ -239,12 +233,8 @@ Stack is a cross-platform program for developing Haskell projects. %prep # Begin cabal-rpm setup: -%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 # End cabal-rpm setup -( -cd %{regexapplicativetext} -cabal-tweak-dep-ver base '<4.10' '<4.15' -) %build @@ -281,6 +271,10 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Mon Mar 21 2022 Jens Petersen - 2022.1-16 +- https://hackage.haskell.org/package/stack-2.7.5/changelog +- drop regex-applicative-text library + * Thu Jan 20 2022 Fedora Release Engineering - 2021.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index ba4bea6..db15891 100644 --- a/sources +++ b/sources @@ -1,15 +1,14 @@ -SHA512 (stack-2.7.3.tar.gz) = d74846615cfdd316d34357b033c0940052808b9be88756c256a9a40d4a69709ecce0d413d78809cc3a7f65f712921897f77b5367cd65727da1f3e47ad7a9590f +SHA512 (stack-2.7.5.tar.gz) = fd51f990d3ccec6103c8699a8e39c970a0233a1185587a519eda659d2b45bc4496c4f261f6897c06781d0f76d2b1d526d5acdfb502fe1494f8cf048c78ba1a8d SHA512 (filelock-0.1.1.5.tar.gz) = 6ccd0b671cec8d1c2daa3115a5b2d8cd10a31db0a1dc1c15e6cb80d679bd2e09208be8bebc0f4bb64d7cdd0fad2e7e170e8283b6be61edd5017b788f94a41048 SHA512 (hi-file-parser-0.1.2.0.tar.gz) = a0e04ec071083c23e850264d9beb5d0346f3c2ed8ae99c86d1d4f0980cc5fe431ff8101beb94b03bf3bae6b5d6595070edd692596869252852ee2a45180fdb6a -SHA512 (hpack-0.34.4.tar.gz) = 90dee8766955e44fd760ac9bead2f68de23763f56778dd7691d30a71cb37e5834093f3c9b382ffaa677bbbef0a3c0c9f7abeeb34343906e6d6b692481eacd7c9 +SHA512 (hpack-0.34.6.tar.gz) = a7fb819b06ccb8019b7a6fb26526190d8856c113cdee12e6db58372cbc9c57a3584202bb44d23a3f12076f784d27f5ca1c401ec68fd0ae11ab5caa52a472c43e SHA512 (http-download-0.2.0.0.tar.gz) = b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae -SHA512 (mintty-0.1.2.tar.gz) = 6737851b82bec6977114baa572bdd012ff933a9d1c401857b97183fe341f605cc85618f2d0ac4afe2046cd90ec011d595bb82dea775f65b7e1d73dcf41777667 -SHA512 (mustache-2.3.1.tar.gz) = 162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3 -SHA512 (neat-interpolation-0.5.1.2.tar.gz) = 147bfca831dccc4646cce7c91635d3885049c67c93c3da83a774eaf1c7f485fba14e695efa173fd3a125380c13d70fe3ca017c2179e161d8e53d60278bb0b7a8 +SHA512 (mintty-0.1.3.tar.gz) = a445b37c4c02eb901b390f2a17eef713f7e45a3a195be7c5921b72f43e73e89faebce42b4d2d54ae8861d1edee5ae9bc8acfca54d66fd06ba7447862068deb73 +SHA512 (mustache-2.3.2.tar.gz) = 763ab60bfd99c08b21b291af6b4da17c9265c09659c1c1d14c0b5d5871583f28db5eca4385b66107ed7d9d9c547429a0bbc88048f28d1f6ee80c988cf63fff98 +SHA512 (neat-interpolation-0.5.1.3.tar.gz) = d777ac442d0b32348470b64458a88c76836e84b9fe15f46c6ec05f8a84ebe4a5b79827b85ff9a0e2138bb8db10fc4493c2793e13091ee5f5decf5e28110d86ba SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1 -SHA512 (pantry-0.5.2.3.tar.gz) = ecb1a1fb1116f97b8078028752b285557823ee9d870d9a5fb7620ebbbe1b41b870211755c1f39a9188885226c73ca07ba3b86a08a1b52644c2cfadd0dd3e5c8a +SHA512 (pantry-0.5.3.tar.gz) = 6147bc446400f84ab3ab41eb3ab572192cb8bfe91750a0f1217fe994b663bfc98cb95c789965ee8315515df79fbe7fca46eca14dad466ef9e11671f6999b3bf7 SHA512 (project-template-0.2.1.0.tar.gz) = ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c -SHA512 (regex-applicative-text-0.1.0.1.tar.gz) = 8ee1d581498e047a7b759476ce98c43c19656b767790b0f12b8485bc212a71c7115cee5c3e5089392995bc71851025093c406bce9d8ac3c5962675ae06fa4339 SHA512 (rio-orphans-0.1.2.0.tar.gz) = 85e883977e161161e5ba8f4fa6d13026d71f7367bac262307f9a8cfdc0316b71a490fcb6c15737919a6b4e73b3355b413161e09f5167c95b1f0c5a22c045f7ac SHA512 (casa-client-0.0.1.tar.gz) = 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa SHA512 (casa-types-0.0.2.tar.gz) = a54bb7f15310878e0a4c0524749ba8c8de8537a60892d278941cacefb80ad9d31e9ba16dd236c196b6639758f281f9ae66911d04c39b0ec6e2b75db5127ad5bf From 63eda324ae3f43603ddb4632e3011c8958b800b8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 21 Mar 2022 01:31:01 +0800 Subject: [PATCH 14/40] fully remove %regexapplicativetext --- haskell-platform.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 14574da..470d46a 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -14,14 +14,13 @@ %global openbrowser open-browser-0.2.1.0 %global pantry pantry-0.5.3 %global projecttemplate project-template-0.2.1.0 -%global regexapplicativetext regex-applicative-text-0.1.0.1 %global rioorphans rio-orphans-0.1.2.0 %global casaclient casa-client-0.0.1 %global casatypes casa-types-0.0.2 %global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{stack} -# testsuite missing deps: casa-client casa-types filelock hi-file-parser hpack http-download mintty mustache neat-interpolation open-browser pantry project-template raw-strings-qq regex-applicative-text +# testsuite missing deps: casa-client casa-types filelock hi-file-parser hpack http-download mintty mustache neat-interpolation open-browser pantry project-template raw-strings-qq Name: haskell-platform Version: 2022.1 @@ -221,7 +220,6 @@ Stack is a cross-platform program for developing Haskell projects. %ghc_lib_subpackage -l BSD %{openbrowser} %ghc_lib_subpackage -l BSD %{pantry} %ghc_lib_subpackage -l BSD %{projecttemplate} -%ghc_lib_subpackage -l BSD %{regexapplicativetext} %ghc_lib_subpackage -l MIT %{rioorphans} %ghc_lib_subpackage -l BSD %{casaclient} %ghc_lib_subpackage -l BSD %{casatypes} From cfd162657580c053e6eaa79e0d8756c9d90079f5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 21 Mar 2022 17:37:47 +0800 Subject: [PATCH 15/40] silence the warnings about ghc-9.2 and Cabal-3.6 --- haskell-platform.spec | 9 +++++++-- stack-2.7.5-ghc-Cabal-version-warnings.patch | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 stack-2.7.5-ghc-Cabal-version-warnings.patch diff --git a/haskell-platform.spec b/haskell-platform.spec index 470d46a..73c51f8 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2022.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Standard Haskell distribution License: BSD @@ -46,6 +46,7 @@ Source11: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}. Source12: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz Source13: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz # End cabal-rpm sources +Patch0: stack-2.7.5-ghc-Cabal-version-warnings.patch BuildRequires: ghc BuildRequires: alex @@ -233,6 +234,7 @@ Stack is a cross-platform program for developing Haskell projects. # Begin cabal-rpm setup: %setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 # End cabal-rpm setup +%patch0 -p0 -b .orig %build @@ -269,7 +271,10 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog -* Mon Mar 21 2022 Jens Petersen - 2022.1-16 +* Mon Mar 21 2022 Jens Petersen - 2022.1-17 +- silence the warnings about ghc-9.2 and Cabal-3.6 + +* Sun Mar 20 2022 Jens Petersen - 2022.1-16 - https://hackage.haskell.org/package/stack-2.7.5/changelog - drop regex-applicative-text library diff --git a/stack-2.7.5-ghc-Cabal-version-warnings.patch b/stack-2.7.5-ghc-Cabal-version-warnings.patch new file mode 100644 index 0000000..08925f9 --- /dev/null +++ b/stack-2.7.5-ghc-Cabal-version-warnings.patch @@ -0,0 +1,20 @@ +--- stack-2.7.5/src/Stack/Setup.hs~ 2022-03-05 08:13:02.000000000 +0800 ++++ stack-2.7.5/src/Stack/Setup.hs 2022-03-21 17:34:33.423272288 +0800 +@@ -468,7 +468,7 @@ + logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648" + logWarn "" + pure True +- | ghcVersion >= mkVersion [9, 1] -> do ++ | ghcVersion >= mkVersion [9, 3] -> do + logWarn $ + "Stack has not been tested with GHC versions above 9.0, and using " <> + fromString (versionString ghcVersion) <> +@@ -495,7 +495,7 @@ + logWarn "This invocation will most likely fail." + logWarn "To fix this, either use an older version of Stack or a newer resolver" + logWarn "Acceptable resolvers: lts-3.0/nightly-2015-05-05 or later" +- | cabalVersion >= mkVersion [3, 5] -> ++ | cabalVersion >= mkVersion [3, 7] -> + logWarn $ + "Stack has not been tested with Cabal versions above 3.4, but version " <> + fromString (versionString cabalVersion) <> From 9f94d354e107b5f68560e7c3788568c72fcd172c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 30 Apr 2022 23:16:10 +0800 Subject: [PATCH 16/40] stack-symlink-distro-ghc script for setting up stack to use ghcX.Y --- haskell-platform.spec | 9 ++++++++- stack-symlink-distro-ghc | 41 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100755 stack-symlink-distro-ghc diff --git a/haskell-platform.spec b/haskell-platform.spec index 73c51f8..50181c4 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2022.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Standard Haskell distribution License: BSD @@ -45,6 +45,7 @@ Source10: https://hackage.haskell.org/package/%{projecttemplate}/%{project Source11: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz Source12: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz Source13: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source20: stack-symlink-distro-ghc # End cabal-rpm sources Patch0: stack-2.7.5-ghc-Cabal-version-warnings.patch @@ -257,6 +258,8 @@ echo %{_bindir}/haskell-mustache >> %{mustache}/ghc-mustache.files mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %{buildroot}%{_bindir}/stack --bash-completion-script stack | sed s/filenames/default/ > %{buildroot}%{_datadir}/bash-completion/completions/stack +install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc + %files @@ -266,11 +269,15 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %license %{stack}/LICENSE %doc %{stack}/CONTRIBUTING.md %{stack}/ChangeLog.md %{stack}/README.md %{_bindir}/stack +%{_bindir}/stack-symlink-distro-ghc # End cabal-rpm files %{_datadir}/bash-completion/completions/stack %changelog +* Sat Apr 30 2022 Jens Petersen - 2022.1-18 +- stack-symlink-distro-ghc script for setting up stack to use ghcX.Y + * Mon Mar 21 2022 Jens Petersen - 2022.1-17 - silence the warnings about ghc-9.2 and Cabal-3.6 diff --git a/stack-symlink-distro-ghc b/stack-symlink-distro-ghc new file mode 100755 index 0000000..b5a39ce --- /dev/null +++ b/stack-symlink-distro-ghc @@ -0,0 +1,41 @@ +#!/bin/sh + +VERSION=$1 + +if [ -z "$VERSION" ]; then + echo "Usage: $0 X.Y.Z" + exit 1 +fi + +#FIXME lib +LIBDIR=/usr/lib64/ghc-$VERSION +if [ ! -d "$LIBDIR" ]; then + echo "$LIBDIR does not exist: please install ghcX.Y first" + exit 1 +fi + +# FIXME arch +STACK_PROGRAMS=$HOME/.stack/programs/$(arch)-linux + +STACK_GHCDIR=${STACK_PROGRAMS}/ghc-tinfo6-$VERSION + +if [ -e "$STACK_GHCDIR" ]; then + echo "$STACK_GHCDIR exists: please remove first" + exit 1 +fi + +mkdir -p $STACK_GHCDIR/bin + +for i in ghc ghc-pkg ghci hp2ps hpc hsc2hs runghc runhaskell; do + if [ -x /usr/bin/$i-$VERSION ]; then + ln -s /usr/bin/$i-$VERSION $STACK_GHCDIR/bin/$i + else + ln -s /usr/bin/$i $STACK_GHCDIR/bin/$i + fi +done + +ln -s /usr/bin/haddock-ghc-$VERSION $STACK_GHCDIR/bin/haddock + +if [ ! -f "${STACK_GHCDIR}.installed" ]; then + echo "installed" > $STACK_GHCDIR.installed +fi From 234447b44d978d16fdf22ee86202ecbe96524a5f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Jun 2022 13:51:35 +0800 Subject: [PATCH 17/40] bump release --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 50181c4..1a7f208 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2022.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Standard Haskell distribution License: BSD @@ -275,6 +275,9 @@ install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc %changelog +* Mon Jun 20 2022 Jens Petersen - 2022.1-19 +- rebuild + * Sat Apr 30 2022 Jens Petersen - 2022.1-18 - stack-symlink-distro-ghc script for setting up stack to use ghcX.Y From d78b70b6ba04e16535c4936b3ed9de89d7a7801d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 13:30:34 +0000 Subject: [PATCH 18/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 1a7f208..de59325 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2022.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Standard Haskell distribution License: BSD @@ -275,6 +275,9 @@ install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2022.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 20 2022 Jens Petersen - 2022.1-19 - rebuild From ff636396f1bb7d8345c0725f8faec2c1b1944d7d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 18 Dec 2022 12:26:30 +0800 Subject: [PATCH 19/40] stack-symlink-distro-ghc: also symlink bin/*-ghc-version --- stack-symlink-distro-ghc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack-symlink-distro-ghc b/stack-symlink-distro-ghc index b5a39ce..d3c7b39 100755 --- a/stack-symlink-distro-ghc +++ b/stack-symlink-distro-ghc @@ -29,6 +29,8 @@ mkdir -p $STACK_GHCDIR/bin for i in ghc ghc-pkg ghci hp2ps hpc hsc2hs runghc runhaskell; do if [ -x /usr/bin/$i-$VERSION ]; then ln -s /usr/bin/$i-$VERSION $STACK_GHCDIR/bin/$i + elif [ -x /usr/bin/$i-ghc-$VERSION ]; then + ln -s /usr/bin/$i-ghc-$VERSION $STACK_GHCDIR/bin/$i else ln -s /usr/bin/$i $STACK_GHCDIR/bin/$i fi From 784412798a76afb3ae6652e62e3c2968c8c239ae Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Feb 2023 00:20:35 +0800 Subject: [PATCH 20/40] update to stack-2.9.1 --- .gitignore | 6 + 6028.patch | 192 +++++++++++++++++++ haskell-platform.spec | 191 +++++++++++++++--- sources | 12 +- stack-2.7.5-ghc-Cabal-version-warnings.patch | 20 -- 5 files changed, 368 insertions(+), 53 deletions(-) create mode 100644 6028.patch delete mode 100644 stack-2.7.5-ghc-Cabal-version-warnings.patch diff --git a/.gitignore b/.gitignore index ab01acc..bdb17be 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,9 @@ haskell-platform-2010.2.0.0.tar.gz /mustache-2.3.2.tar.gz /neat-interpolation-0.5.1.3.tar.gz /pantry-0.5.3.tar.gz +/stack-2.9.1.tar.gz +/hi-file-parser-0.1.3.0.tar.gz +/hpack-0.35.2.tar.gz +/mintty-0.1.4.tar.gz +/mustache-2.4.1.tar.gz +/pantry-0.5.7.tar.gz diff --git a/6028.patch b/6028.patch new file mode 100644 index 0000000..c324518 --- /dev/null +++ b/6028.patch @@ -0,0 +1,192 @@ +From f58b89550cba1f086287edec25f56b0f4adfa99b Mon Sep 17 00:00:00 2001 +From: Mike Pilgrem +Date: Tue, 17 Jan 2023 00:20:42 +0000 +Subject: [PATCH] Fix #5866 Replace duff `forgivingAbsence $ resolveFile ...` + +--- + src/Path/Extra.hs | 39 +++++++++++++++++++++++++++++++++++--- + src/Stack/Build/Execute.hs | 13 ++++++++----- + src/Stack/ComponentFile.hs | 7 ++++--- + src/Stack/Ghci.hs | 4 ++-- + src/Stack/PackageFile.hs | 5 ++--- + 5 files changed, 52 insertions(+), 16 deletions(-) + +diff --git a/src/Path/Extra.hs b/src/Path/Extra.hs +index 5f1069087..d6d15b937 100644 +--- a/src/Path/Extra.hs ++++ b/src/Path/Extra.hs +@@ -14,21 +14,27 @@ module Path.Extra + , pathToLazyByteString + , pathToText + , tryGetModificationTime ++ , forgivingResolveFile ++ , forgivingResolveFile' + ) where + + import Data.Time ( UTCTime ) + import Path +- ( Abs, Dir, File, Rel, parseAbsDir, parseAbsFile +- , toFilePath ++ ( Abs, Dir, File, PathException (..), Rel, parseAbsDir ++ , parseAbsFile, toFilePath + ) + import Path.Internal ( Path (Path) ) +-import Path.IO ( doesDirExist, doesFileExist, getModificationTime ) ++import Path.IO ++ ( doesDirExist, doesFileExist, getCurrentDir ++ , getModificationTime ++ ) + import RIO + import System.IO.Error ( isDoesNotExistError ) + import qualified Data.ByteString.Char8 as BS + import qualified Data.ByteString.Lazy.Char8 as BSL + import qualified Data.Text as T + import qualified Data.Text.Encoding as T ++import qualified System.Directory as D + import qualified System.FilePath as FP + + -- | Convert to FilePath but don't add a trailing slash. +@@ -123,3 +129,30 @@ pathToText = T.pack . toFilePath + + tryGetModificationTime :: MonadIO m => Path Abs File -> m (Either () UTCTime) + tryGetModificationTime = liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime ++ ++-- | 'Path.IO.resolveFile' (@path-io@ package) throws 'InvalidAbsFile' (@path@ ++-- package) if the file does not exist; this function yields 'Nothing'. ++forgivingResolveFile :: ++ MonadIO m ++ => Path Abs Dir ++ -- ^ Base directory ++ -> FilePath ++ -- ^ Path to resolve ++ -> m (Maybe (Path Abs File)) ++forgivingResolveFile b p = liftIO $ ++ D.canonicalizePath (toFilePath b FP. p) >>= \cp -> ++ catch ++ (Just <$> parseAbsFile cp) ++ ( \e -> case e of ++ InvalidAbsFile _ -> pure Nothing ++ _ -> throwIO e ++ ) ++ ++-- | 'Path.IO.resolveFile'' (@path-io@ package) throws 'InvalidAbsFile' (@path@ ++-- package) if the file does not exist; this function yields 'Nothing'. ++forgivingResolveFile' :: ++ MonadIO m ++ => FilePath ++ -- ^ Path to resolve ++ -> m (Maybe (Path Abs File)) ++forgivingResolveFile' p = getCurrentDir >>= flip forgivingResolveFile p +diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs +index a57550b29..c500f3d28 100644 +--- a/src/Stack/Build/Execute.hs ++++ b/src/Stack/Build/Execute.hs +@@ -76,11 +76,14 @@ import Path + , stripProperPrefix + ) + import Path.CheckInstall ( warnInstallSearchPathIssues ) +-import Path.Extra ( toFilePathNoTrailingSep, rejectMissingFile ) ++import Path.Extra ++ ( forgivingResolveFile, rejectMissingFile ++ , toFilePathNoTrailingSep ++ ) + import Path.IO + ( copyFile, doesDirExist, doesFileExist, ensureDir +- , forgivingAbsence, ignoringAbsence, removeDirRecur +- , removeFile, renameDir, renameFile, resolveFile ++ , ignoringAbsence, removeDirRecur, removeFile, renameDir ++ , renameFile + ) + import RIO.Process + ( HasProcessContext, byteStringInput, doesExecutableExist +@@ -660,7 +663,7 @@ copyExecutables exes = do + case loc of + Snap -> snapBin + Local -> localBin +- mfp <- liftIO $ forgivingAbsence (resolveFile bindir $ T.unpack name ++ ext) ++ mfp <- liftIO $ forgivingResolveFile bindir (T.unpack name ++ ext) + >>= rejectMissingFile + case mfp of + Nothing -> do +@@ -2541,7 +2544,7 @@ mungeBuildOutput excludeTHLoading makeAbsolute pkgDir compilerVer = void $ + if isValidSuffix y + then liftIO $ + fmap (fmap ((T.takeWhile isSpace x <>) . T.pack . toFilePath)) $ +- forgivingAbsence (resolveFile pkgDir (T.unpack $ T.dropWhile isSpace x)) `catch` ++ forgivingResolveFile pkgDir (T.unpack $ T.dropWhile isSpace x) `catch` + \(_ :: PathException) -> pure Nothing + else pure Nothing + case mabs of +diff --git a/src/Stack/ComponentFile.hs b/src/Stack/ComponentFile.hs +index 8b5ad347d..d7dc6b6cf 100644 +--- a/src/Stack/ComponentFile.hs ++++ b/src/Stack/ComponentFile.hs +@@ -43,11 +43,12 @@ import Path + , stripProperPrefix + ) + import Path.Extra +- ( parseCollapsedAbsFile, rejectMissingDir, rejectMissingFile ++ ( forgivingResolveFile, parseCollapsedAbsFile ++ , rejectMissingDir, rejectMissingFile + ) + import Path.IO + ( doesDirExist, doesFileExist, forgivingAbsence +- , getCurrentDir, listDir, resolveDir, resolveFile ++ , getCurrentDir, listDir, resolveDir + ) + import Stack.Constants + ( haskellDefaultPreprocessorExts, haskellFileExts +@@ -294,7 +295,7 @@ parseHI hiPath = do + Iface.unList . Iface.dmods . Iface.deps + resolveFileDependency file = do + resolved <- +- liftIO (forgivingAbsence (resolveFile dir file)) >>= ++ liftIO (forgivingResolveFile dir file) >>= + rejectMissingFile + when (isNothing resolved) $ + prettyWarnL +diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs +index 933c20dde..d0e2a22a3 100644 +--- a/src/Stack/Ghci.hs ++++ b/src/Stack/Ghci.hs +@@ -30,7 +30,7 @@ import qualified Data.Text.Lazy as TL + import qualified Data.Text.Lazy.Encoding as TLE + import qualified Distribution.PackageDescription as C + import Path +-import Path.Extra ( toFilePathNoTrailingSep ) ++import Path.Extra ( forgivingResolveFile', toFilePathNoTrailingSep ) + import Path.IO hiding ( withSystemTempDir ) + import RIO.Process + ( HasProcessContext, exec, proc, readProcess_ +@@ -239,7 +239,7 @@ preprocessTargets buildOptsCLI sma rawTargets = do + then do + fileTargets <- forM fileTargetsRaw $ \fp0 -> do + let fp = T.unpack fp0 +- mpath <- liftIO $ forgivingAbsence (resolveFile' fp) ++ mpath <- liftIO $ forgivingResolveFile' fp + case mpath of + Nothing -> throwM (MissingFileTarget fp) + Just path -> pure path +diff --git a/src/Stack/PackageFile.hs b/src/Stack/PackageFile.hs +index 99cc62d1d..e5d5424c7 100644 +--- a/src/Stack/PackageFile.hs ++++ b/src/Stack/PackageFile.hs +@@ -16,8 +16,7 @@ import Distribution.PackageDescription hiding ( FlagName ) + import Distribution.Simple.Glob ( matchDirFileGlob ) + import qualified Distribution.Types.UnqualComponentName as Cabal + import Path ( parent ) +-import Path.Extra ( rejectMissingFile ) +-import Path.IO ( forgivingAbsence, resolveFile ) ++import Path.Extra ( forgivingResolveFile, rejectMissingFile ) + import Stack.ComponentFile + ( benchmarkFiles, executableFiles, libraryFiles + , resolveOrWarn, testFiles +@@ -37,7 +36,7 @@ resolveFileOrWarn :: FilePath.FilePath + -> RIO GetPackageFileContext (Maybe (Path Abs File)) + resolveFileOrWarn = resolveOrWarn "File" f + where +- f p x = liftIO (forgivingAbsence (resolveFile p x)) >>= rejectMissingFile ++ f p x = liftIO (forgivingResolveFile p x) >>= rejectMissingFile + + -- | Get all files referenced by the package. + packageDescModulesAndFiles :: diff --git a/haskell-platform.spec b/haskell-platform.spec index de59325..6dc2b7e 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,30 +1,29 @@ -# generated by cabal-rpm-2.0.10 --subpackage +# generated by cabal-rpm-2.1.0 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ -%global stack_ver 2.7.5 +%global stack_ver 2.9.1 %global stack stack-%{stack_ver} %global filelock filelock-0.1.1.5 -%global hifileparser hi-file-parser-0.1.2.0 -%global hpack hpack-0.34.6 +%global hifileparser hi-file-parser-0.1.3.0 +%global hpack hpack-0.35.2 %global httpdownload http-download-0.2.0.0 -%global mintty mintty-0.1.3 -%global mustache mustache-2.3.2 +%global mintty mintty-0.1.4 +%global mustache mustache-2.4.1 %global neatinterpolation neat-interpolation-0.5.1.3 %global openbrowser open-browser-0.2.1.0 -%global pantry pantry-0.5.3 +%global pantry pantry-0.5.7 %global projecttemplate project-template-0.2.1.0 %global rioorphans rio-orphans-0.1.2.0 %global casaclient casa-client-0.0.1 %global casatypes casa-types-0.0.2 - %global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{stack} -# testsuite missing deps: casa-client casa-types filelock hi-file-parser hpack http-download mintty mustache neat-interpolation open-browser pantry project-template raw-strings-qq +# testsuite missing deps: raw-strings-qq Name: haskell-platform -Version: 2022.1 -Release: 20%{?dist} +Version: 2022.2 +Release: 21%{?dist} Summary: Standard Haskell distribution License: BSD @@ -47,7 +46,8 @@ Source12: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}. Source13: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz Source20: stack-symlink-distro-ghc # End cabal-rpm sources -Patch0: stack-2.7.5-ghc-Cabal-version-warnings.patch +# https://github.com/commercialhaskell/stack/issues/5866 +Patch1: https://patch-diff.githubusercontent.com/raw/commercialhaskell/stack/pull/6028.patch BuildRequires: ghc BuildRequires: alex @@ -58,6 +58,94 @@ BuildRequires: hscolour # for stack: # Begin cabal-rpm deps: BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-annotated-wl-pprint-devel +BuildRequires: ghc-ansi-terminal-devel +BuildRequires: ghc-array-devel +BuildRequires: ghc-async-devel +BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-base64-bytestring-devel +BuildRequires: ghc-bytestring-devel +#BuildRequires: ghc-casa-client-devel +#BuildRequires: ghc-casa-types-devel +BuildRequires: ghc-colour-devel +BuildRequires: ghc-conduit-devel +BuildRequires: ghc-conduit-extra-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-cryptonite-devel +BuildRequires: ghc-cryptonite-conduit-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-echo-devel +BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-extra-devel +BuildRequires: ghc-file-embed-devel +#BuildRequires: ghc-filelock-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-fsnotify-devel +BuildRequires: ghc-generic-deriving-devel +BuildRequires: ghc-githash-devel +BuildRequires: ghc-hackage-security-devel +BuildRequires: ghc-hashable-devel +#BuildRequires: ghc-hi-file-parser-devel +#BuildRequires: ghc-hpack-devel +BuildRequires: ghc-hpc-devel +BuildRequires: ghc-http-client-devel +BuildRequires: ghc-http-client-tls-devel +BuildRequires: ghc-http-conduit-devel +#BuildRequires: ghc-http-download-devel +BuildRequires: ghc-http-types-devel +BuildRequires: ghc-memory-devel +BuildRequires: ghc-microlens-devel +#BuildRequires: ghc-mintty-devel +BuildRequires: ghc-mono-traversable-devel +BuildRequires: ghc-mtl-devel +#BuildRequires: ghc-mustache-devel +#BuildRequires: ghc-neat-interpolation-devel +BuildRequires: ghc-network-uri-devel +#BuildRequires: ghc-open-browser-devel +BuildRequires: ghc-optparse-applicative-devel +BuildRequires: ghc-optparse-simple-devel +#BuildRequires: ghc-pantry-devel +BuildRequires: ghc-path-devel +BuildRequires: ghc-path-io-devel +BuildRequires: ghc-persistent-devel +BuildRequires: ghc-persistent-sqlite-devel +BuildRequires: ghc-persistent-template-devel +BuildRequires: ghc-pretty-devel +BuildRequires: ghc-primitive-devel +BuildRequires: ghc-process-devel +#BuildRequires: ghc-project-template-devel +BuildRequires: ghc-random-devel +BuildRequires: ghc-retry-devel +BuildRequires: ghc-rio-devel +BuildRequires: ghc-rio-prettyprint-devel +BuildRequires: ghc-semigroups-devel +BuildRequires: ghc-split-devel +BuildRequires: ghc-stm-devel +BuildRequires: ghc-streaming-commons-devel +BuildRequires: ghc-tar-devel +BuildRequires: ghc-template-haskell-devel +BuildRequires: ghc-temporary-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-text-metrics-devel +BuildRequires: ghc-th-reify-many-devel +BuildRequires: ghc-time-devel +BuildRequires: ghc-tls-devel +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-typed-process-devel +BuildRequires: ghc-unicode-transforms-devel +BuildRequires: ghc-unix-devel +BuildRequires: ghc-unix-compat-devel +BuildRequires: ghc-unliftio-devel +BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-vector-devel +BuildRequires: ghc-yaml-devel +BuildRequires: ghc-zip-archive-devel +BuildRequires: ghc-zlib-devel +%if %{with ghc_prof} BuildRequires: ghc-Cabal-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-annotated-wl-pprint-prof @@ -113,11 +201,13 @@ BuildRequires: ghc-path-prof BuildRequires: ghc-path-io-prof BuildRequires: ghc-persistent-prof BuildRequires: ghc-persistent-sqlite-prof -BuildRequires: ghc-persistent-template-devel +# no persistent-template prof: +#BuildRequires: ghc-persistent-template-prof BuildRequires: ghc-pretty-prof BuildRequires: ghc-primitive-prof BuildRequires: ghc-process-prof #BuildRequires: ghc-project-template-prof +BuildRequires: ghc-random-prof BuildRequires: ghc-retry-prof BuildRequires: ghc-rio-prof BuildRequires: ghc-rio-prettyprint-prof @@ -144,42 +234,84 @@ BuildRequires: ghc-vector-prof BuildRequires: ghc-yaml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof +%endif # for missing dep 'hi-file-parser': +BuildRequires: ghc-binary-devel +%if %{with ghc_prof} BuildRequires: ghc-binary-prof +%endif # for missing dep 'hpack': +BuildRequires: ghc-Glob-devel +BuildRequires: ghc-bifunctors-devel +BuildRequires: ghc-scientific-devel +%if %{with ghc_prof} BuildRequires: ghc-Glob-prof BuildRequires: ghc-bifunctors-prof -BuildRequires: ghc-infer-license-prof BuildRequires: ghc-scientific-prof +%endif # for missing dep 'mustache': +BuildRequires: ghc-cmdargs-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-scientific-devel +BuildRequires: ghc-th-lift-devel +%if %{with ghc_prof} BuildRequires: ghc-cmdargs-prof -BuildRequires: ghc-either-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-scientific-prof BuildRequires: ghc-th-lift-prof +%endif # for missing dep 'neat-interpolation': +BuildRequires: ghc-megaparsec-devel +%if %{with ghc_prof} BuildRequires: ghc-megaparsec-prof +%endif # for missing dep 'pantry': +BuildRequires: ghc-digest-devel +BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-tar-conduit-devel +%if %{with ghc_prof} BuildRequires: ghc-digest-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-tar-conduit-prof +%endif # for missing dep 'project-template': +BuildRequires: ghc-resourcet-devel +%if %{with ghc_prof} BuildRequires: ghc-resourcet-prof +%endif # for missing dep 'rio-orphans': +BuildRequires: ghc-fast-logger-devel +BuildRequires: ghc-monad-control-devel +BuildRequires: ghc-monad-logger-devel +BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-transformers-base-devel +BuildRequires: ghc-unliftio-core-devel +%if %{with ghc_prof} BuildRequires: ghc-fast-logger-prof BuildRequires: ghc-monad-control-prof BuildRequires: ghc-monad-logger-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-transformers-base-prof BuildRequires: ghc-unliftio-core-prof +%endif # for missing dep 'casa-client': +BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-th-lift-devel +BuildRequires: ghc-unliftio-core-devel +%if %{with ghc_prof} BuildRequires: ghc-base16-bytestring-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-th-lift-prof BuildRequires: ghc-unliftio-core-prof +%endif # for missing dep 'casa-types': +BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-path-pieces-devel +%if %{with ghc_prof} BuildRequires: ghc-base16-bytestring-prof BuildRequires: ghc-path-pieces-prof +%endif # End cabal-rpm deps # pull in all of ghc for least surprise @@ -212,20 +344,20 @@ Stack is a cross-platform program for developing Haskell projects. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage -l CC0 %{filelock} -%ghc_lib_subpackage -l BSD %{hifileparser} +%ghc_lib_subpackage -l BSD-3-Clause %{casaclient} +%ghc_lib_subpackage -l BSD-3-Clause %{casatypes} +%ghc_lib_subpackage -l CC0-1.0 %{filelock} +%ghc_lib_subpackage -l BSD-3-Clause %{hifileparser} %ghc_lib_subpackage -l MIT %{hpack} -%ghc_lib_subpackage -l BSD %{httpdownload} -%ghc_lib_subpackage -l BSD %{mintty} -%ghc_lib_subpackage -l BSD %{mustache} +%ghc_lib_subpackage -l BSD-3-Clause %{httpdownload} +%ghc_lib_subpackage -l BSD-3-Clause %{mintty} +%ghc_lib_subpackage -l BSD-3-Clause %{mustache} %ghc_lib_subpackage -l MIT %{neatinterpolation} -%ghc_lib_subpackage -l BSD %{openbrowser} -%ghc_lib_subpackage -l BSD %{pantry} -%ghc_lib_subpackage -l BSD %{projecttemplate} +%ghc_lib_subpackage -l BSD-3-Clause %{openbrowser} +%ghc_lib_subpackage -l BSD-3-Clause %{pantry} +%ghc_lib_subpackage -l BSD-3-Clause %{projecttemplate} %ghc_lib_subpackage -l MIT %{rioorphans} -%ghc_lib_subpackage -l BSD %{casaclient} -%ghc_lib_subpackage -l BSD %{casatypes} -%ghc_lib_subpackage -l BSD %{stack} +%ghc_lib_subpackage -l BSD-3-Clause %{stack} %endif %global version %{main_version} @@ -235,7 +367,7 @@ Stack is a cross-platform program for developing Haskell projects. # Begin cabal-rpm setup: %setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 # End cabal-rpm setup -%patch0 -p0 -b .orig +#%%patch1 -p0 -b .orig %build @@ -275,6 +407,11 @@ install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc %changelog +* Tue Feb 21 2023 Jens Petersen - 2022.2-21 +- update to stack 2.9.1 +- https://hackage.haskell.org/package/stack-2.9.1/changelog +- SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 2022.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index db15891..b3003ea 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (stack-2.7.5.tar.gz) = fd51f990d3ccec6103c8699a8e39c970a0233a1185587a519eda659d2b45bc4496c4f261f6897c06781d0f76d2b1d526d5acdfb502fe1494f8cf048c78ba1a8d +SHA512 (stack-2.9.1.tar.gz) = 23446a96b2326fb2dc4a9ba1e52cd09fef92508e8b1c7e50ecf886efc441d6f7dc79318fee9ecde886a2e781fc6766ec4bb702fa4e722daa530ef4bce6d3edd1 SHA512 (filelock-0.1.1.5.tar.gz) = 6ccd0b671cec8d1c2daa3115a5b2d8cd10a31db0a1dc1c15e6cb80d679bd2e09208be8bebc0f4bb64d7cdd0fad2e7e170e8283b6be61edd5017b788f94a41048 -SHA512 (hi-file-parser-0.1.2.0.tar.gz) = a0e04ec071083c23e850264d9beb5d0346f3c2ed8ae99c86d1d4f0980cc5fe431ff8101beb94b03bf3bae6b5d6595070edd692596869252852ee2a45180fdb6a -SHA512 (hpack-0.34.6.tar.gz) = a7fb819b06ccb8019b7a6fb26526190d8856c113cdee12e6db58372cbc9c57a3584202bb44d23a3f12076f784d27f5ca1c401ec68fd0ae11ab5caa52a472c43e +SHA512 (hi-file-parser-0.1.3.0.tar.gz) = 2a2fa5e2e5574abeda360a0c5b5f80e7889ea83955c659460ff2c0c95411fc18652eac79a66e1d445e2d2df8b97bd21d32d1b4280f64785e7c23e51434cceb86 +SHA512 (hpack-0.35.2.tar.gz) = 0b07a509bc429199fefecfc6963aee71987540cdb8901b4d26034db426252d9a42f206607ee162c917343b7146a9cd1eb560703f4bb65594537d3f62255d0ca7 SHA512 (http-download-0.2.0.0.tar.gz) = b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae -SHA512 (mintty-0.1.3.tar.gz) = a445b37c4c02eb901b390f2a17eef713f7e45a3a195be7c5921b72f43e73e89faebce42b4d2d54ae8861d1edee5ae9bc8acfca54d66fd06ba7447862068deb73 -SHA512 (mustache-2.3.2.tar.gz) = 763ab60bfd99c08b21b291af6b4da17c9265c09659c1c1d14c0b5d5871583f28db5eca4385b66107ed7d9d9c547429a0bbc88048f28d1f6ee80c988cf63fff98 +SHA512 (mintty-0.1.4.tar.gz) = f5c3231f342d24d7dc38b0281579aa6f272767451412ea84e1c248f77331d6740186cef0bb4144b7655a80914daa0b1f3573107a76c29c1d2e6a56e793532733 +SHA512 (mustache-2.4.1.tar.gz) = 389a418712fee9ff16c88f45014470e1cdd31f6e9dd2f418853a1a2d174ba7fd11ee05ba20f22b134d34b95377bf55c5add5b52cf423ecb49338bd4ff6534e13 SHA512 (neat-interpolation-0.5.1.3.tar.gz) = d777ac442d0b32348470b64458a88c76836e84b9fe15f46c6ec05f8a84ebe4a5b79827b85ff9a0e2138bb8db10fc4493c2793e13091ee5f5decf5e28110d86ba SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1 -SHA512 (pantry-0.5.3.tar.gz) = 6147bc446400f84ab3ab41eb3ab572192cb8bfe91750a0f1217fe994b663bfc98cb95c789965ee8315515df79fbe7fca46eca14dad466ef9e11671f6999b3bf7 +SHA512 (pantry-0.5.7.tar.gz) = 05814d404f97873939e29f183cd74d2c8e6bf5b3e87a9c665694578faeab641d9b8d3efef0525727a881031a5bf815e39299388ce0207d5ef04c674f172e7618 SHA512 (project-template-0.2.1.0.tar.gz) = ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c SHA512 (rio-orphans-0.1.2.0.tar.gz) = 85e883977e161161e5ba8f4fa6d13026d71f7367bac262307f9a8cfdc0316b71a490fcb6c15737919a6b4e73b3355b413161e09f5167c95b1f0c5a22c045f7ac SHA512 (casa-client-0.0.1.tar.gz) = 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa diff --git a/stack-2.7.5-ghc-Cabal-version-warnings.patch b/stack-2.7.5-ghc-Cabal-version-warnings.patch deleted file mode 100644 index 08925f9..0000000 --- a/stack-2.7.5-ghc-Cabal-version-warnings.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- stack-2.7.5/src/Stack/Setup.hs~ 2022-03-05 08:13:02.000000000 +0800 -+++ stack-2.7.5/src/Stack/Setup.hs 2022-03-21 17:34:33.423272288 +0800 -@@ -468,7 +468,7 @@ - logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648" - logWarn "" - pure True -- | ghcVersion >= mkVersion [9, 1] -> do -+ | ghcVersion >= mkVersion [9, 3] -> do - logWarn $ - "Stack has not been tested with GHC versions above 9.0, and using " <> - fromString (versionString ghcVersion) <> -@@ -495,7 +495,7 @@ - logWarn "This invocation will most likely fail." - logWarn "To fix this, either use an older version of Stack or a newer resolver" - logWarn "Acceptable resolvers: lts-3.0/nightly-2015-05-05 or later" -- | cabalVersion >= mkVersion [3, 5] -> -+ | cabalVersion >= mkVersion [3, 7] -> - logWarn $ - "Stack has not been tested with Cabal versions above 3.4, but version " <> - fromString (versionString cabalVersion) <> From 88ad8b79158b26dfd573139887b65ade1c2a0d37 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Feb 2023 01:05:48 +0800 Subject: [PATCH 21/40] add infer-license BRs --- haskell-platform.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/haskell-platform.spec b/haskell-platform.spec index 6dc2b7e..120f2b6 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -243,10 +243,12 @@ BuildRequires: ghc-binary-prof # for missing dep 'hpack': BuildRequires: ghc-Glob-devel BuildRequires: ghc-bifunctors-devel +BuildRequires: ghc-infer-license-devel BuildRequires: ghc-scientific-devel %if %{with ghc_prof} BuildRequires: ghc-Glob-prof BuildRequires: ghc-bifunctors-prof +BuildRequires: ghc-infer-license-prof BuildRequires: ghc-scientific-prof %endif # for missing dep 'mustache': From 86537fd1d30adec50d3890991f7402d91565a1e5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 11 Apr 2023 13:34:08 +0800 Subject: [PATCH 22/40] backport 6280.patch to 2.9.1 --- 6028-2.9.1.patch | 125 +++++++++++++++++++++++++++ 6028.patch | 192 ------------------------------------------ haskell-platform.spec | 14 ++- 3 files changed, 135 insertions(+), 196 deletions(-) create mode 100644 6028-2.9.1.patch delete mode 100644 6028.patch diff --git a/6028-2.9.1.patch b/6028-2.9.1.patch new file mode 100644 index 0000000..ff6376e --- /dev/null +++ b/6028-2.9.1.patch @@ -0,0 +1,125 @@ +diff -up stack-2.9.1/src/Path/Extra.hs.orig stack-2.9.1/src/Path/Extra.hs +--- stack-2.9.1/src/Path/Extra.hs.orig 2023-04-11 10:23:31.337973989 +0800 ++++ stack-2.9.1/src/Path/Extra.hs 2023-04-11 10:27:20.925638798 +0800 +@@ -15,6 +15,8 @@ module Path.Extra + ,pathToLazyByteString + ,pathToText + ,tryGetModificationTime ++ ,forgivingResolveFile ++ ,forgivingResolveFile' + ) where + + import Data.Time (UTCTime) +@@ -27,6 +29,7 @@ import qualified Data.ByteString.Char8 a + import qualified Data.ByteString.Lazy.Char8 as BSL + import qualified Data.Text as T + import qualified Data.Text.Encoding as T ++import qualified System.Directory as D + import qualified System.FilePath as FP + + -- | Convert to FilePath but don't add a trailing slash. +@@ -121,3 +124,30 @@ pathToText = T.pack . toFilePath + + tryGetModificationTime :: MonadIO m => Path Abs File -> m (Either () UTCTime) + tryGetModificationTime = liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime ++ ++-- | 'Path.IO.resolveFile' (@path-io@ package) throws 'InvalidAbsFile' (@path@ ++-- package) if the file does not exist; this function yields 'Nothing'. ++forgivingResolveFile :: ++ MonadIO m ++ => Path Abs Dir ++ -- ^ Base directory ++ -> FilePath ++ -- ^ Path to resolve ++ -> m (Maybe (Path Abs File)) ++forgivingResolveFile b p = liftIO $ ++ D.canonicalizePath (toFilePath b FP. p) >>= \cp -> ++ catch ++ (Just <$> parseAbsFile cp) ++ ( \e -> case e of ++ InvalidAbsFile _ -> pure Nothing ++ _ -> throwIO e ++ ) ++ ++-- | 'Path.IO.resolveFile'' (@path-io@ package) throws 'InvalidAbsFile' (@path@ ++-- package) if the file does not exist; this function yields 'Nothing'. ++forgivingResolveFile' :: ++ MonadIO m ++ => FilePath ++ -- ^ Path to resolve ++ -> m (Maybe (Path Abs File)) ++forgivingResolveFile' p = getCurrentDir >>= flip forgivingResolveFile p +diff -up stack-2.9.1/src/Stack/Build/Execute.hs.orig stack-2.9.1/src/Stack/Build/Execute.hs +--- stack-2.9.1/src/Stack/Build/Execute.hs.orig 2023-04-11 10:23:31.338973998 +0800 ++++ stack-2.9.1/src/Stack/Build/Execute.hs 2023-04-11 10:31:07.314541963 +0800 +@@ -63,7 +63,10 @@ import Distribution.Verbosity + import Distribution.Version (mkVersion) + import Path + import Path.CheckInstall +-import Path.Extra (toFilePathNoTrailingSep, rejectMissingFile) ++import Path.Extra ++ ( forgivingResolveFile, rejectMissingFile ++ , toFilePathNoTrailingSep ++ ) + import Path.IO hiding (findExecutable, makeAbsolute, withSystemTempDir) + import qualified RIO + import Stack.Build.Cache +@@ -535,7 +538,7 @@ copyExecutables exes = do + case loc of + Snap -> snapBin + Local -> localBin +- mfp <- liftIO $ forgivingAbsence (resolveFile bindir $ T.unpack name ++ ext) ++ mfp <- liftIO $ forgivingResolveFile bindir (T.unpack name ++ ext) + >>= rejectMissingFile + case mfp of + Nothing -> do +@@ -2156,7 +2159,7 @@ + mabs <- + if isValidSuffix y + then liftIO $ liftM (fmap ((T.takeWhile isSpace x <>) . T.pack . toFilePath)) $ +- forgivingAbsence (resolveFile pkgDir (T.unpack $ T.dropWhile isSpace x)) `catch` ++ forgivingResolveFile pkgDir (T.unpack $ T.dropWhile isSpace x) `catch` + \(_ :: PathException) -> return Nothing + else return Nothing + case mabs of +diff -up stack-2.9.1/src/Stack/Ghci.hs.orig stack-2.9.1/src/Stack/Ghci.hs +--- stack-2.9.1/src/Stack/Ghci.hs.orig 2023-04-11 10:23:31.338973998 +0800 ++++ stack-2.9.1/src/Stack/Ghci.hs 2023-04-11 10:35:16.376070265 +0800 +@@ -29,7 +29,7 @@ import qualified Data.Text.Lazy as TL + import qualified Data.Text.Lazy.Encoding as TLE + import qualified Distribution.PackageDescription as C + import Path +-import Path.Extra (toFilePathNoTrailingSep) ++import Path.Extra (forgivingResolveFile', toFilePathNoTrailingSep) + import Path.IO hiding (withSystemTempDir) + import qualified RIO + import RIO.PrettyPrint +@@ -213,7 +213,7 @@ preprocessTargets buildOptsCLI sma rawTa + then do + fileTargets <- forM fileTargetsRaw $ \fp0 -> do + let fp = T.unpack fp0 +- mpath <- liftIO $ forgivingAbsence (resolveFile' fp) ++ mpath <- liftIO $ forgivingResolveFile' fp + case mpath of + Nothing -> throwM (MissingFileTarget fp) + Just path -> return path +--- stack-2.9.1/src/Stack/Package.hs 2022-09-19 18:33:27.000000000 +0800 ++++ stack-2.9.1/src/Stack/Package.hs 2023-04-11 12:03:27.145182761 +0800 +@@ -1120,7 +1120,7 @@ + let moduleNames = fmap (fromString . T.unpack . decodeUtf8Lenient . fst) . + Iface.unList . Iface.dmods . Iface.deps + resolveFileDependency file = do +- resolved <- liftIO (forgivingAbsence (resolveFile dir file)) >>= rejectMissingFile ++ resolved <- liftIO (forgivingResolveFile dir file) >>= rejectMissingFile + when (isNothing resolved) $ + prettyWarnL + [ flow "Dependent file listed in:" +@@ -1326,7 +1326,7 @@ + resolveFileOrWarn :: FilePath.FilePath + -> RIO Ctx (Maybe (Path Abs File)) + resolveFileOrWarn = resolveOrWarn "File" f +- where f p x = liftIO (forgivingAbsence (resolveFile p x)) >>= rejectMissingFile ++ where f p x = liftIO (forgivingResolveFile p x) >>= rejectMissingFile + + -- | Resolve the directory, if it can't be resolved, warn for the user + -- (purely to be helpful). diff --git a/6028.patch b/6028.patch deleted file mode 100644 index c324518..0000000 --- a/6028.patch +++ /dev/null @@ -1,192 +0,0 @@ -From f58b89550cba1f086287edec25f56b0f4adfa99b Mon Sep 17 00:00:00 2001 -From: Mike Pilgrem -Date: Tue, 17 Jan 2023 00:20:42 +0000 -Subject: [PATCH] Fix #5866 Replace duff `forgivingAbsence $ resolveFile ...` - ---- - src/Path/Extra.hs | 39 +++++++++++++++++++++++++++++++++++--- - src/Stack/Build/Execute.hs | 13 ++++++++----- - src/Stack/ComponentFile.hs | 7 ++++--- - src/Stack/Ghci.hs | 4 ++-- - src/Stack/PackageFile.hs | 5 ++--- - 5 files changed, 52 insertions(+), 16 deletions(-) - -diff --git a/src/Path/Extra.hs b/src/Path/Extra.hs -index 5f1069087..d6d15b937 100644 ---- a/src/Path/Extra.hs -+++ b/src/Path/Extra.hs -@@ -14,21 +14,27 @@ module Path.Extra - , pathToLazyByteString - , pathToText - , tryGetModificationTime -+ , forgivingResolveFile -+ , forgivingResolveFile' - ) where - - import Data.Time ( UTCTime ) - import Path -- ( Abs, Dir, File, Rel, parseAbsDir, parseAbsFile -- , toFilePath -+ ( Abs, Dir, File, PathException (..), Rel, parseAbsDir -+ , parseAbsFile, toFilePath - ) - import Path.Internal ( Path (Path) ) --import Path.IO ( doesDirExist, doesFileExist, getModificationTime ) -+import Path.IO -+ ( doesDirExist, doesFileExist, getCurrentDir -+ , getModificationTime -+ ) - import RIO - import System.IO.Error ( isDoesNotExistError ) - import qualified Data.ByteString.Char8 as BS - import qualified Data.ByteString.Lazy.Char8 as BSL - import qualified Data.Text as T - import qualified Data.Text.Encoding as T -+import qualified System.Directory as D - import qualified System.FilePath as FP - - -- | Convert to FilePath but don't add a trailing slash. -@@ -123,3 +129,30 @@ pathToText = T.pack . toFilePath - - tryGetModificationTime :: MonadIO m => Path Abs File -> m (Either () UTCTime) - tryGetModificationTime = liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime -+ -+-- | 'Path.IO.resolveFile' (@path-io@ package) throws 'InvalidAbsFile' (@path@ -+-- package) if the file does not exist; this function yields 'Nothing'. -+forgivingResolveFile :: -+ MonadIO m -+ => Path Abs Dir -+ -- ^ Base directory -+ -> FilePath -+ -- ^ Path to resolve -+ -> m (Maybe (Path Abs File)) -+forgivingResolveFile b p = liftIO $ -+ D.canonicalizePath (toFilePath b FP. p) >>= \cp -> -+ catch -+ (Just <$> parseAbsFile cp) -+ ( \e -> case e of -+ InvalidAbsFile _ -> pure Nothing -+ _ -> throwIO e -+ ) -+ -+-- | 'Path.IO.resolveFile'' (@path-io@ package) throws 'InvalidAbsFile' (@path@ -+-- package) if the file does not exist; this function yields 'Nothing'. -+forgivingResolveFile' :: -+ MonadIO m -+ => FilePath -+ -- ^ Path to resolve -+ -> m (Maybe (Path Abs File)) -+forgivingResolveFile' p = getCurrentDir >>= flip forgivingResolveFile p -diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs -index a57550b29..c500f3d28 100644 ---- a/src/Stack/Build/Execute.hs -+++ b/src/Stack/Build/Execute.hs -@@ -76,11 +76,14 @@ import Path - , stripProperPrefix - ) - import Path.CheckInstall ( warnInstallSearchPathIssues ) --import Path.Extra ( toFilePathNoTrailingSep, rejectMissingFile ) -+import Path.Extra -+ ( forgivingResolveFile, rejectMissingFile -+ , toFilePathNoTrailingSep -+ ) - import Path.IO - ( copyFile, doesDirExist, doesFileExist, ensureDir -- , forgivingAbsence, ignoringAbsence, removeDirRecur -- , removeFile, renameDir, renameFile, resolveFile -+ , ignoringAbsence, removeDirRecur, removeFile, renameDir -+ , renameFile - ) - import RIO.Process - ( HasProcessContext, byteStringInput, doesExecutableExist -@@ -660,7 +663,7 @@ copyExecutables exes = do - case loc of - Snap -> snapBin - Local -> localBin -- mfp <- liftIO $ forgivingAbsence (resolveFile bindir $ T.unpack name ++ ext) -+ mfp <- liftIO $ forgivingResolveFile bindir (T.unpack name ++ ext) - >>= rejectMissingFile - case mfp of - Nothing -> do -@@ -2541,7 +2544,7 @@ mungeBuildOutput excludeTHLoading makeAbsolute pkgDir compilerVer = void $ - if isValidSuffix y - then liftIO $ - fmap (fmap ((T.takeWhile isSpace x <>) . T.pack . toFilePath)) $ -- forgivingAbsence (resolveFile pkgDir (T.unpack $ T.dropWhile isSpace x)) `catch` -+ forgivingResolveFile pkgDir (T.unpack $ T.dropWhile isSpace x) `catch` - \(_ :: PathException) -> pure Nothing - else pure Nothing - case mabs of -diff --git a/src/Stack/ComponentFile.hs b/src/Stack/ComponentFile.hs -index 8b5ad347d..d7dc6b6cf 100644 ---- a/src/Stack/ComponentFile.hs -+++ b/src/Stack/ComponentFile.hs -@@ -43,11 +43,12 @@ import Path - , stripProperPrefix - ) - import Path.Extra -- ( parseCollapsedAbsFile, rejectMissingDir, rejectMissingFile -+ ( forgivingResolveFile, parseCollapsedAbsFile -+ , rejectMissingDir, rejectMissingFile - ) - import Path.IO - ( doesDirExist, doesFileExist, forgivingAbsence -- , getCurrentDir, listDir, resolveDir, resolveFile -+ , getCurrentDir, listDir, resolveDir - ) - import Stack.Constants - ( haskellDefaultPreprocessorExts, haskellFileExts -@@ -294,7 +295,7 @@ parseHI hiPath = do - Iface.unList . Iface.dmods . Iface.deps - resolveFileDependency file = do - resolved <- -- liftIO (forgivingAbsence (resolveFile dir file)) >>= -+ liftIO (forgivingResolveFile dir file) >>= - rejectMissingFile - when (isNothing resolved) $ - prettyWarnL -diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs -index 933c20dde..d0e2a22a3 100644 ---- a/src/Stack/Ghci.hs -+++ b/src/Stack/Ghci.hs -@@ -30,7 +30,7 @@ import qualified Data.Text.Lazy as TL - import qualified Data.Text.Lazy.Encoding as TLE - import qualified Distribution.PackageDescription as C - import Path --import Path.Extra ( toFilePathNoTrailingSep ) -+import Path.Extra ( forgivingResolveFile', toFilePathNoTrailingSep ) - import Path.IO hiding ( withSystemTempDir ) - import RIO.Process - ( HasProcessContext, exec, proc, readProcess_ -@@ -239,7 +239,7 @@ preprocessTargets buildOptsCLI sma rawTargets = do - then do - fileTargets <- forM fileTargetsRaw $ \fp0 -> do - let fp = T.unpack fp0 -- mpath <- liftIO $ forgivingAbsence (resolveFile' fp) -+ mpath <- liftIO $ forgivingResolveFile' fp - case mpath of - Nothing -> throwM (MissingFileTarget fp) - Just path -> pure path -diff --git a/src/Stack/PackageFile.hs b/src/Stack/PackageFile.hs -index 99cc62d1d..e5d5424c7 100644 ---- a/src/Stack/PackageFile.hs -+++ b/src/Stack/PackageFile.hs -@@ -16,8 +16,7 @@ import Distribution.PackageDescription hiding ( FlagName ) - import Distribution.Simple.Glob ( matchDirFileGlob ) - import qualified Distribution.Types.UnqualComponentName as Cabal - import Path ( parent ) --import Path.Extra ( rejectMissingFile ) --import Path.IO ( forgivingAbsence, resolveFile ) -+import Path.Extra ( forgivingResolveFile, rejectMissingFile ) - import Stack.ComponentFile - ( benchmarkFiles, executableFiles, libraryFiles - , resolveOrWarn, testFiles -@@ -37,7 +36,7 @@ resolveFileOrWarn :: FilePath.FilePath - -> RIO GetPackageFileContext (Maybe (Path Abs File)) - resolveFileOrWarn = resolveOrWarn "File" f - where -- f p x = liftIO (forgivingAbsence (resolveFile p x)) >>= rejectMissingFile -+ f p x = liftIO (forgivingResolveFile p x) >>= rejectMissingFile - - -- | Get all files referenced by the package. - packageDescModulesAndFiles :: diff --git a/haskell-platform.spec b/haskell-platform.spec index 120f2b6..c96b408 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -23,7 +23,7 @@ Name: haskell-platform Version: 2022.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Standard Haskell distribution License: BSD @@ -47,7 +47,8 @@ Source13: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.ta Source20: stack-symlink-distro-ghc # End cabal-rpm sources # https://github.com/commercialhaskell/stack/issues/5866 -Patch1: https://patch-diff.githubusercontent.com/raw/commercialhaskell/stack/pull/6028.patch +# https://github.com/commercialhaskell/stack/pull/6028 +Patch1: 6028-2.9.1.patch BuildRequires: ghc BuildRequires: alex @@ -369,8 +370,10 @@ Stack is a cross-platform program for developing Haskell projects. # Begin cabal-rpm setup: %setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 # End cabal-rpm setup -#%%patch1 -p0 -b .orig - +( +cd %{stack} +%patch 1 -p1 -b .orig +) %build # Begin cabal-rpm build: @@ -409,6 +412,9 @@ install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc %changelog +* Tue Apr 11 2023 Jens Petersen - 2022.2-22 +- backport fix for error: InvalidAbsFile "/usr/lib64/ghc-9.2.3/lib/../lib/x86_64-linux-ghc-9.2.3/rts-1.0.2/include/ghcversion.h" (#5866) + * Tue Feb 21 2023 Jens Petersen - 2022.2-21 - update to stack 2.9.1 - https://hackage.haskell.org/package/stack-2.9.1/changelog From a3ba8c2a721b5208db9f289df11c79c665437fff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 06:08:42 +0000 Subject: [PATCH 23/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index c96b408..e9de123 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -23,7 +23,7 @@ Name: haskell-platform Version: 2022.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Standard Haskell distribution License: BSD @@ -412,6 +412,9 @@ install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2022.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 11 2023 Jens Petersen - 2022.2-22 - backport fix for error: InvalidAbsFile "/usr/lib64/ghc-9.2.3/lib/../lib/x86_64-linux-ghc-9.2.3/rts-1.0.2/include/ghcversion.h" (#5866) From fecdd7941bd216ecc88d8aadd6ef3064b679e268 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 16 May 2023 20:36:46 +0800 Subject: [PATCH 24/40] use %patch -P --- haskell-platform.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index e9de123..058649e 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -48,7 +48,7 @@ Source20: stack-symlink-distro-ghc # End cabal-rpm sources # https://github.com/commercialhaskell/stack/issues/5866 # https://github.com/commercialhaskell/stack/pull/6028 -Patch1: 6028-2.9.1.patch +Patch0: 6028-2.9.1.patch BuildRequires: ghc BuildRequires: alex @@ -372,7 +372,7 @@ Stack is a cross-platform program for developing Haskell projects. # End cabal-rpm setup ( cd %{stack} -%patch 1 -p1 -b .orig +%patch -P0 -p1 -b .orig ) %build From b83488d98a41ffa0b885e55002215583b51bc619 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 29 Jul 2023 10:59:09 +0800 Subject: [PATCH 25/40] update to stack-2.9.3.1 rework package along the lines of pandoc-cli --- .gitignore | 5 ++ haskell-platform.spec | 196 ++++++++++++++++++++++++++++-------------- sources | 14 +-- 3 files changed, 143 insertions(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index bdb17be..939929b 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,8 @@ haskell-platform-2010.2.0.0.tar.gz /mintty-0.1.4.tar.gz /mustache-2.4.1.tar.gz /pantry-0.5.7.tar.gz +/stack-2.9.3.1.tar.gz +/filelock-0.1.1.6.tar.gz +/hi-file-parser-0.1.4.0.tar.gz +/mustache-2.4.2.tar.gz +/pantry-0.8.3.tar.gz diff --git a/haskell-platform.spec b/haskell-platform.spec index 058649e..ebe8a42 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,54 +1,52 @@ -# generated by cabal-rpm-2.1.0 --subpackage +# generated by cabal-rpm-2.1.2 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ -%global stack_ver 2.9.1 -%global stack stack-%{stack_ver} +%global pkg_name stack +%global stack_ver 2.9.3.1 +%global pkgver %{pkg_name}-%{stack_ver} -%global filelock filelock-0.1.1.5 -%global hifileparser hi-file-parser-0.1.3.0 +%global casaclient casa-client-0.0.1 +%global casatypes casa-types-0.0.2 +%global filelock filelock-0.1.1.6 +%global hifileparser hi-file-parser-0.1.4.0 %global hpack hpack-0.35.2 %global httpdownload http-download-0.2.0.0 %global mintty mintty-0.1.4 -%global mustache mustache-2.4.1 +%global mustache mustache-2.4.2 %global neatinterpolation neat-interpolation-0.5.1.3 %global openbrowser open-browser-0.2.1.0 -%global pantry pantry-0.5.7 +%global pantry pantry-0.8.3 %global projecttemplate project-template-0.2.1.0 %global rioorphans rio-orphans-0.1.2.0 -%global casaclient casa-client-0.0.1 -%global casatypes casa-types-0.0.2 -%global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{stack} +%global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} # testsuite missing deps: raw-strings-qq Name: haskell-platform -Version: 2022.2 -Release: 23%{?dist} +Version: 2023.1 +Release: 24%{?dist} Summary: Standard Haskell distribution -License: BSD -URL: http://www.haskell.org/platform/ +License: BSD-3-Clause +URL: https://www.haskell.org/ # for stack: # Begin cabal-rpm sources: -Source0: https://hackage.haskell.org/package/%{stack}/%{stack}.tar.gz -Source1: https://hackage.haskell.org/package/%{filelock}/%{filelock}.tar.gz -Source2: https://hackage.haskell.org/package/%{hifileparser}/%{hifileparser}.tar.gz -Source3: https://hackage.haskell.org/package/%{hpack}/%{hpack}.tar.gz -Source4: https://hackage.haskell.org/package/%{httpdownload}/%{httpdownload}.tar.gz -Source5: https://hackage.haskell.org/package/%{mintty}/%{mintty}.tar.gz -Source6: https://hackage.haskell.org/package/%{mustache}/%{mustache}.tar.gz -Source7: https://hackage.haskell.org/package/%{neatinterpolation}/%{neatinterpolation}.tar.gz -Source8: https://hackage.haskell.org/package/%{openbrowser}/%{openbrowser}.tar.gz -Source9: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz -Source10: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz -Source11: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source12: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz -Source13: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz +Source2: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source3: https://hackage.haskell.org/package/%{filelock}/%{filelock}.tar.gz +Source4: https://hackage.haskell.org/package/%{hifileparser}/%{hifileparser}.tar.gz +Source5: https://hackage.haskell.org/package/%{hpack}/%{hpack}.tar.gz +Source6: https://hackage.haskell.org/package/%{httpdownload}/%{httpdownload}.tar.gz +Source7: https://hackage.haskell.org/package/%{mintty}/%{mintty}.tar.gz +Source8: https://hackage.haskell.org/package/%{mustache}/%{mustache}.tar.gz +Source9: https://hackage.haskell.org/package/%{neatinterpolation}/%{neatinterpolation}.tar.gz +Source10: https://hackage.haskell.org/package/%{openbrowser}/%{openbrowser}.tar.gz +Source11: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz +Source12: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz +Source13: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz Source20: stack-symlink-distro-ghc # End cabal-rpm sources -# https://github.com/commercialhaskell/stack/issues/5866 -# https://github.com/commercialhaskell/stack/pull/6028 -Patch0: 6028-2.9.1.patch BuildRequires: ghc BuildRequires: alex @@ -56,7 +54,6 @@ BuildRequires: cabal-install BuildRequires: happy BuildRequires: hscolour -# for stack: # Begin cabal-rpm deps: BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-Cabal-devel @@ -236,6 +233,24 @@ BuildRequires: ghc-yaml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof %endif +# for missing dep 'casa-client': +BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-th-lift-devel +BuildRequires: ghc-unliftio-core-devel +%if %{with ghc_prof} +BuildRequires: ghc-base16-bytestring-prof +BuildRequires: ghc-resourcet-prof +BuildRequires: ghc-th-lift-prof +BuildRequires: ghc-unliftio-core-prof +%endif +# for missing dep 'casa-types': +BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-path-pieces-devel +%if %{with ghc_prof} +BuildRequires: ghc-base16-bytestring-prof +BuildRequires: ghc-path-pieces-prof +%endif # for missing dep 'hi-file-parser': BuildRequires: ghc-binary-devel %if %{with ghc_prof} @@ -297,24 +312,6 @@ BuildRequires: ghc-resourcet-prof BuildRequires: ghc-transformers-base-prof BuildRequires: ghc-unliftio-core-prof %endif -# for missing dep 'casa-client': -BuildRequires: ghc-base16-bytestring-devel -BuildRequires: ghc-resourcet-devel -BuildRequires: ghc-th-lift-devel -BuildRequires: ghc-unliftio-core-devel -%if %{with ghc_prof} -BuildRequires: ghc-base16-bytestring-prof -BuildRequires: ghc-resourcet-prof -BuildRequires: ghc-th-lift-prof -BuildRequires: ghc-unliftio-core-prof -%endif -# for missing dep 'casa-types': -BuildRequires: ghc-base16-bytestring-devel -BuildRequires: ghc-path-pieces-devel -%if %{with ghc_prof} -BuildRequires: ghc-base16-bytestring-prof -BuildRequires: ghc-path-pieces-prof -%endif # End cabal-rpm deps # pull in all of ghc for least surprise @@ -334,8 +331,7 @@ It provides a good starting environment for Haskell development. %package -n stack Version: %{stack_ver} Summary: Haskell package tool -License: BSD -Url: http://haskellstack.org +Url: https://docs.haskellstack.org/en/stable/ Requires: gcc Requires: gmp-devel Recommends: zlib-devel @@ -344,6 +340,52 @@ Recommends: zlib-devel Stack is a cross-platform program for developing Haskell projects. +%package -n ghc-stack +Version: %{stack_ver} +Summary: Haskell stack library + +%description -n ghc-stack +This package provides the Haskell stack shared library. + + +%package -n ghc-stack-devel +Version: %{stack_ver} +Summary: Haskell stack library development files +Provides: ghc-stack-static = %{version}-%{release} +Provides: ghc-stack-static%{?_isa} = %{version}-%{release} +%if %{defined ghc_version} +Requires: ghc-compiler = %{ghc_version} +%endif +Requires: ghc-stack%{?_isa} = %{version}-%{release} + +%description -n ghc-stack-devel +This package provides the Haskell stack library development files. + + +%if %{with haddock} +%package -n ghc-stack-doc +Version: %{stack_ver} +Summary: Haskell stack library documentation +BuildArch: noarch +Requires: ghc-filesystem + +%description -n ghc-stack-doc +This package provides the Haskell stack library documentation. +%endif + + +%if %{with ghc_prof} +%package -n ghc-stack-prof +Version: %{stack_ver} +Summary: Haskell stack profiling library +Requires: ghc-stack-devel%{?_isa} = %{version}-%{release} +Supplements: (ghc-stack-devel and ghc-prof) + +%description -n ghc-stack-prof +This package provides the Haskell stack profiling library. +%endif + + %global main_version %{version} %if %{defined ghclibdir} @@ -360,7 +402,6 @@ Stack is a cross-platform program for developing Haskell projects. %ghc_lib_subpackage -l BSD-3-Clause %{pantry} %ghc_lib_subpackage -l BSD-3-Clause %{projecttemplate} %ghc_lib_subpackage -l MIT %{rioorphans} -%ghc_lib_subpackage -l BSD-3-Clause %{stack} %endif %global version %{main_version} @@ -368,23 +409,23 @@ Stack is a cross-platform program for developing Haskell projects. %prep # Begin cabal-rpm setup: -%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 +%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 # End cabal-rpm setup -( -cd %{stack} -%patch -P0 -p1 -b .orig -) + %build # Begin cabal-rpm build: %ghc_libs_build %{subpkgs} +%ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install %ghc_libs_install %{subpkgs} -%ghc_delete_rpaths +%ghc_lib_install +mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ +%{buildroot}%{_bindir}/stack --bash-completion-script stack | sed s/filenames/default/ > %{buildroot}%{_datadir}/bash-completion/completions/stack # End cabal-rpm install # open-browser @@ -392,26 +433,51 @@ rm %{buildroot}%{_bindir}/example echo %{_bindir}/hpack >> %{hpack}/ghc-hpack.files echo %{_bindir}/haskell-mustache >> %{mustache}/ghc-mustache.files -mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ -%{buildroot}%{_bindir}/stack --bash-completion-script stack | sed s/filenames/default/ > %{buildroot}%{_datadir}/bash-completion/completions/stack - install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc +rm %{buildroot}%{_licensedir}/%{name}/LICENSE + + %files %files -n stack # Begin cabal-rpm files: -%license %{stack}/LICENSE -%doc %{stack}/CONTRIBUTING.md %{stack}/ChangeLog.md %{stack}/README.md +%license LICENSE +%doc CONTRIBUTING.md ChangeLog.md README.md %{_bindir}/stack +%{_datadir}/bash-completion/completions/stack %{_bindir}/stack-symlink-distro-ghc # End cabal-rpm files -%{_datadir}/bash-completion/completions/stack + + +%files -n ghc-stack -f ghc-stack.files +# Begin cabal-rpm files: +%license LICENSE +# End cabal-rpm files + + +%files -n ghc-stack-devel -f ghc-stack-devel.files +%doc CONTRIBUTING.md ChangeLog.md README.md + + +%if %{with haddock} +%files -n ghc-stack-doc -f ghc-stack-doc.files +%license LICENSE +%endif + + +%if %{with ghc_prof} +%files -n ghc-stack-prof -f ghc-stack-prof.files +%endif %changelog +* Sat Jul 29 2023 Jens Petersen - 2023.1-24 +- stack-2.9.3.1 +- https://hackage.haskell.org/package/stack-2.9.3.1/changelog + * Thu Jul 20 2023 Fedora Release Engineering - 2022.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index b3003ea..b7dce7f 100644 --- a/sources +++ b/sources @@ -1,14 +1,14 @@ -SHA512 (stack-2.9.1.tar.gz) = 23446a96b2326fb2dc4a9ba1e52cd09fef92508e8b1c7e50ecf886efc441d6f7dc79318fee9ecde886a2e781fc6766ec4bb702fa4e722daa530ef4bce6d3edd1 -SHA512 (filelock-0.1.1.5.tar.gz) = 6ccd0b671cec8d1c2daa3115a5b2d8cd10a31db0a1dc1c15e6cb80d679bd2e09208be8bebc0f4bb64d7cdd0fad2e7e170e8283b6be61edd5017b788f94a41048 -SHA512 (hi-file-parser-0.1.3.0.tar.gz) = 2a2fa5e2e5574abeda360a0c5b5f80e7889ea83955c659460ff2c0c95411fc18652eac79a66e1d445e2d2df8b97bd21d32d1b4280f64785e7c23e51434cceb86 +SHA512 (stack-2.9.3.1.tar.gz) = d08c95c6104fbe0e79ef4ed7edf29a00caf54acd05eb1cc412a3114b80785995007fd0e8564d4a716dcf4b78ff32eaa32e8b19c3a288a20827ed2794a51f5573 +SHA512 (casa-client-0.0.1.tar.gz) = 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa +SHA512 (casa-types-0.0.2.tar.gz) = a54bb7f15310878e0a4c0524749ba8c8de8537a60892d278941cacefb80ad9d31e9ba16dd236c196b6639758f281f9ae66911d04c39b0ec6e2b75db5127ad5bf +SHA512 (filelock-0.1.1.6.tar.gz) = 859a054d28c6ca915067c36d6764c4c6094aefb359e7082db64a2662f297f5a6c746b911fcdab182691932d58315dccaa5c0f39bb31f95a818c21633b6a88c2c +SHA512 (hi-file-parser-0.1.4.0.tar.gz) = c32adc409a4e7a884e30ed1604927e32bd569174d3bef95b43fa19a0a6f28dbac407cf7f0849ee8e926a5df0b8a5b6d5dbe7c30d1bfc16aee867afaca998a004 SHA512 (hpack-0.35.2.tar.gz) = 0b07a509bc429199fefecfc6963aee71987540cdb8901b4d26034db426252d9a42f206607ee162c917343b7146a9cd1eb560703f4bb65594537d3f62255d0ca7 SHA512 (http-download-0.2.0.0.tar.gz) = b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae SHA512 (mintty-0.1.4.tar.gz) = f5c3231f342d24d7dc38b0281579aa6f272767451412ea84e1c248f77331d6740186cef0bb4144b7655a80914daa0b1f3573107a76c29c1d2e6a56e793532733 -SHA512 (mustache-2.4.1.tar.gz) = 389a418712fee9ff16c88f45014470e1cdd31f6e9dd2f418853a1a2d174ba7fd11ee05ba20f22b134d34b95377bf55c5add5b52cf423ecb49338bd4ff6534e13 +SHA512 (mustache-2.4.2.tar.gz) = 96e10988f8ccf15cd5939e16cd8d5f551853168a3719cd4717b3bb40c3227f540f4d955614e1d38385fb30f9a97351f260f79cfbc872da30eadb73bac1ebc315 SHA512 (neat-interpolation-0.5.1.3.tar.gz) = d777ac442d0b32348470b64458a88c76836e84b9fe15f46c6ec05f8a84ebe4a5b79827b85ff9a0e2138bb8db10fc4493c2793e13091ee5f5decf5e28110d86ba SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1 -SHA512 (pantry-0.5.7.tar.gz) = 05814d404f97873939e29f183cd74d2c8e6bf5b3e87a9c665694578faeab641d9b8d3efef0525727a881031a5bf815e39299388ce0207d5ef04c674f172e7618 +SHA512 (pantry-0.8.3.tar.gz) = d3934bf761f4354f08fdc20cbc320b21c37b83114170ad3a006133122202312f34134ae6d470baef9ea552b2bad2ca2a73af08380ceee108108e395e21728ac5 SHA512 (project-template-0.2.1.0.tar.gz) = ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c SHA512 (rio-orphans-0.1.2.0.tar.gz) = 85e883977e161161e5ba8f4fa6d13026d71f7367bac262307f9a8cfdc0316b71a490fcb6c15737919a6b4e73b3355b413161e09f5167c95b1f0c5a22c045f7ac -SHA512 (casa-client-0.0.1.tar.gz) = 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa -SHA512 (casa-types-0.0.2.tar.gz) = a54bb7f15310878e0a4c0524749ba8c8de8537a60892d278941cacefb80ad9d31e9ba16dd236c196b6639758f281f9ae66911d04c39b0ec6e2b75db5127ad5bf From 36bd7e2ddc8655eb4e90a312c3ccfa2b32154d16 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 8 Aug 2023 14:25:46 +0800 Subject: [PATCH 26/40] bring back the stack InvalidAbsFile patch updated for 2.9.3 --- 6028-2.9.1.patch => 6028-2.9.3.1.patch | 107 +++++++++++++------------ haskell-platform.spec | 10 ++- 2 files changed, 65 insertions(+), 52 deletions(-) rename 6028-2.9.1.patch => 6028-2.9.3.1.patch (53%) diff --git a/6028-2.9.1.patch b/6028-2.9.3.1.patch similarity index 53% rename from 6028-2.9.1.patch rename to 6028-2.9.3.1.patch index ff6376e..59005a8 100644 --- a/6028-2.9.1.patch +++ b/6028-2.9.3.1.patch @@ -1,16 +1,16 @@ -diff -up stack-2.9.1/src/Path/Extra.hs.orig stack-2.9.1/src/Path/Extra.hs ---- stack-2.9.1/src/Path/Extra.hs.orig 2023-04-11 10:23:31.337973989 +0800 -+++ stack-2.9.1/src/Path/Extra.hs 2023-04-11 10:27:20.925638798 +0800 -@@ -15,6 +15,8 @@ module Path.Extra - ,pathToLazyByteString - ,pathToText - ,tryGetModificationTime +diff -ur stack-2.9.3.1/src/Path/Extra.hs stack-2.9.3.1.new/src/Path/Extra.hs +--- stack-2.9.3.1/src/Path/Extra.hs 2023-06-22 18:40:54.000000000 +0800 ++++ stack-2.9.3.1.new/src/Path/Extra.hs 2023-08-08 13:55:22.550467487 +0800 +@@ -15,6 +15,8 @@ + , pathToLazyByteString + , pathToText + , tryGetModificationTime + ,forgivingResolveFile + ,forgivingResolveFile' ) where - import Data.Time (UTCTime) -@@ -27,6 +29,7 @@ import qualified Data.ByteString.Char8 a + import Data.Time ( UTCTime ) +@@ -27,6 +29,7 @@ import qualified Data.ByteString.Lazy.Char8 as BSL import qualified Data.Text as T import qualified Data.Text.Encoding as T @@ -18,7 +18,7 @@ diff -up stack-2.9.1/src/Path/Extra.hs.orig stack-2.9.1/src/Path/Extra.hs import qualified System.FilePath as FP -- | Convert to FilePath but don't add a trailing slash. -@@ -121,3 +124,30 @@ pathToText = T.pack . toFilePath +@@ -121,3 +124,30 @@ tryGetModificationTime :: MonadIO m => Path Abs File -> m (Either () UTCTime) tryGetModificationTime = liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime @@ -49,22 +49,21 @@ diff -up stack-2.9.1/src/Path/Extra.hs.orig stack-2.9.1/src/Path/Extra.hs + -- ^ Path to resolve + -> m (Maybe (Path Abs File)) +forgivingResolveFile' p = getCurrentDir >>= flip forgivingResolveFile p -diff -up stack-2.9.1/src/Stack/Build/Execute.hs.orig stack-2.9.1/src/Stack/Build/Execute.hs ---- stack-2.9.1/src/Stack/Build/Execute.hs.orig 2023-04-11 10:23:31.338973998 +0800 -+++ stack-2.9.1/src/Stack/Build/Execute.hs 2023-04-11 10:31:07.314541963 +0800 -@@ -63,7 +63,10 @@ import Distribution.Verbosity - import Distribution.Version (mkVersion) +diff -ur stack-2.9.3.1/src/Stack/Build/Execute.hs stack-2.9.3.1.new/src/Stack/Build/Execute.hs +--- stack-2.9.3.1/src/Stack/Build/Execute.hs 2023-06-22 18:40:54.000000000 +0800 ++++ stack-2.9.3.1.new/src/Stack/Build/Execute.hs 2023-08-08 13:57:36.831258806 +0800 +@@ -66,6 +66,10 @@ import Path import Path.CheckInstall --import Path.Extra (toFilePathNoTrailingSep, rejectMissingFile) + import Path.Extra ( toFilePathNoTrailingSep, rejectMissingFile ) +import Path.Extra + ( forgivingResolveFile, rejectMissingFile + , toFilePathNoTrailingSep + ) - import Path.IO hiding (findExecutable, makeAbsolute, withSystemTempDir) - import qualified RIO - import Stack.Build.Cache -@@ -535,7 +538,7 @@ copyExecutables exes = do + import Path.IO + hiding ( findExecutable, makeAbsolute, withSystemTempDir ) + import RIO.Process +@@ -548,7 +552,7 @@ case loc of Snap -> snapBin Local -> localBin @@ -73,28 +72,42 @@ diff -up stack-2.9.1/src/Stack/Build/Execute.hs.orig stack-2.9.1/src/Stack/Build >>= rejectMissingFile case mfp of Nothing -> do -@@ -2156,7 +2159,7 @@ +@@ -2195,7 +2199,7 @@ mabs <- if isValidSuffix y then liftIO $ liftM (fmap ((T.takeWhile isSpace x <>) . T.pack . toFilePath)) $ - forgivingAbsence (resolveFile pkgDir (T.unpack $ T.dropWhile isSpace x)) `catch` + forgivingResolveFile pkgDir (T.unpack $ T.dropWhile isSpace x) `catch` - \(_ :: PathException) -> return Nothing - else return Nothing + \(_ :: PathException) -> pure Nothing + else pure Nothing case mabs of -diff -up stack-2.9.1/src/Stack/Ghci.hs.orig stack-2.9.1/src/Stack/Ghci.hs ---- stack-2.9.1/src/Stack/Ghci.hs.orig 2023-04-11 10:23:31.338973998 +0800 -+++ stack-2.9.1/src/Stack/Ghci.hs 2023-04-11 10:35:16.376070265 +0800 -@@ -29,7 +29,7 @@ import qualified Data.Text.Lazy as TL +diff -ur stack-2.9.3.1/src/Stack/ComponentFile.hs stack-2.9.3.1.new/src/Stack/ComponentFile.hs +--- stack-2.9.3.1/src/Stack/ComponentFile.hs 2023-06-22 18:40:54.000000000 +0800 ++++ stack-2.9.3.1.new/src/Stack/ComponentFile.hs 2023-08-08 14:04:52.914859026 +0800 +@@ -283,8 +283,8 @@ + Iface.unList . Iface.dmods . Iface.deps + resolveFileDependency file = do + resolved <- +- liftIO (forgivingAbsence (resolveFile dir file)) >>= +- rejectMissingFile ++ liftIO (forgivingResolveFile dir file) >>= ++ rejectMissingFile + when (isNothing resolved) $ + prettyWarnL + [ flow "Dependent file listed in:" +diff -ur stack-2.9.3.1/src/Stack/Ghci.hs stack-2.9.3.1.new/src/Stack/Ghci.hs +--- stack-2.9.3.1/src/Stack/Ghci.hs 2023-06-22 18:40:54.000000000 +0800 ++++ stack-2.9.3.1.new/src/Stack/Ghci.hs 2023-08-08 13:58:43.393651047 +0800 +@@ -29,7 +29,7 @@ import qualified Data.Text.Lazy.Encoding as TLE import qualified Distribution.PackageDescription as C import Path --import Path.Extra (toFilePathNoTrailingSep) +-import Path.Extra ( toFilePathNoTrailingSep ) +import Path.Extra (forgivingResolveFile', toFilePathNoTrailingSep) - import Path.IO hiding (withSystemTempDir) - import qualified RIO - import RIO.PrettyPrint -@@ -213,7 +213,7 @@ preprocessTargets buildOptsCLI sma rawTa + import Path.IO hiding ( withSystemTempDir ) + import RIO.Process + ( HasProcessContext, exec, proc, readProcess_ +@@ -225,7 +225,7 @@ then do fileTargets <- forM fileTargetsRaw $ \fp0 -> do let fp = T.unpack fp0 @@ -102,24 +115,16 @@ diff -up stack-2.9.1/src/Stack/Ghci.hs.orig stack-2.9.1/src/Stack/Ghci.hs + mpath <- liftIO $ forgivingResolveFile' fp case mpath of Nothing -> throwM (MissingFileTarget fp) - Just path -> return path ---- stack-2.9.1/src/Stack/Package.hs 2022-09-19 18:33:27.000000000 +0800 -+++ stack-2.9.1/src/Stack/Package.hs 2023-04-11 12:03:27.145182761 +0800 -@@ -1120,7 +1120,7 @@ - let moduleNames = fmap (fromString . T.unpack . decodeUtf8Lenient . fst) . - Iface.unList . Iface.dmods . Iface.deps - resolveFileDependency file = do -- resolved <- liftIO (forgivingAbsence (resolveFile dir file)) >>= rejectMissingFile -+ resolved <- liftIO (forgivingResolveFile dir file) >>= rejectMissingFile - when (isNothing resolved) $ - prettyWarnL - [ flow "Dependent file listed in:" -@@ -1326,7 +1326,7 @@ - resolveFileOrWarn :: FilePath.FilePath - -> RIO Ctx (Maybe (Path Abs File)) + Just path -> pure path +diff -ur stack-2.9.3.1/src/Stack/PackageFile.hs stack-2.9.3.1.new/src/Stack/PackageFile.hs +--- stack-2.9.3.1/src/Stack/PackageFile.hs 2023-06-22 18:40:54.000000000 +0800 ++++ stack-2.9.3.1.new/src/Stack/PackageFile.hs 2023-08-08 14:06:21.163396729 +0800 +@@ -34,7 +34,7 @@ + -> RIO GetPackageFileContext (Maybe (Path Abs File)) resolveFileOrWarn = resolveOrWarn "File" f -- where f p x = liftIO (forgivingAbsence (resolveFile p x)) >>= rejectMissingFile -+ where f p x = liftIO (forgivingResolveFile p x) >>= rejectMissingFile + where +- f p x = liftIO (forgivingAbsence (resolveFile p x)) >>= rejectMissingFile ++ f p x = liftIO (forgivingResolveFile p x) >>= rejectMissingFile - -- | Resolve the directory, if it can't be resolved, warn for the user - -- (purely to be helpful). + -- | Get all files referenced by the package. + packageDescModulesAndFiles diff --git a/haskell-platform.spec b/haskell-platform.spec index ebe8a42..9420b41 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2023.1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -47,6 +47,9 @@ Source12: https://hackage.haskell.org/package/%{projecttemplate}/%{project Source13: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz Source20: stack-symlink-distro-ghc # End cabal-rpm sources +# https://github.com/commercialhaskell/stack/issues/5866 +# https://github.com/commercialhaskell/stack/pull/6028 +Patch0: 6028-2.9.3.1.patch BuildRequires: ghc BuildRequires: alex @@ -411,6 +414,7 @@ This package provides the Haskell stack profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 # End cabal-rpm setup +%autopatch -p1 %build @@ -474,6 +478,10 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %changelog +* Tue Aug 8 2023 Jens Petersen - 2023.1-25 +- bring back the stack InvalidAbsFile patch updated for 2.9.3 + https://github.com/commercialhaskell/stack/pull/6028 + * Sat Jul 29 2023 Jens Petersen - 2023.1-24 - stack-2.9.3.1 - https://hackage.haskell.org/package/stack-2.9.3.1/changelog From d3882283afef43d2ed22057cf3605e87d9b66194 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 8 Aug 2023 14:33:10 +0800 Subject: [PATCH 27/40] disable warnings about untested ghc and Cabal versions --- haskell-platform.spec | 2 + ...k-disable-ghc-Cabal-version-warnings.patch | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 stack-disable-ghc-Cabal-version-warnings.patch diff --git a/haskell-platform.spec b/haskell-platform.spec index 9420b41..233c67e 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -50,6 +50,7 @@ Source20: stack-symlink-distro-ghc # https://github.com/commercialhaskell/stack/issues/5866 # https://github.com/commercialhaskell/stack/pull/6028 Patch0: 6028-2.9.3.1.patch +Patch1: stack-disable-ghc-Cabal-version-warnings.patch BuildRequires: ghc BuildRequires: alex @@ -481,6 +482,7 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE * Tue Aug 8 2023 Jens Petersen - 2023.1-25 - bring back the stack InvalidAbsFile patch updated for 2.9.3 https://github.com/commercialhaskell/stack/pull/6028 +- disable warnings about untested ghc and Cabal versions * Sat Jul 29 2023 Jens Petersen - 2023.1-24 - stack-2.9.3.1 diff --git a/stack-disable-ghc-Cabal-version-warnings.patch b/stack-disable-ghc-Cabal-version-warnings.patch new file mode 100644 index 0000000..2bedd29 --- /dev/null +++ b/stack-disable-ghc-Cabal-version-warnings.patch @@ -0,0 +1,38 @@ +--- stack-2.9.3.1/src/Stack/Setup.hs~ 2023-06-22 18:40:54.000000000 +0800 ++++ stack-2.9.3.1/src/Stack/Setup.hs 2023-08-08 14:29:43.486062926 +0800 +@@ -719,12 +719,12 @@ + logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648" + logWarn "" + pure True +- | ghcVersion >= mkVersion [9, 5] -> do +- logWarn $ +- "Stack has not been tested with GHC versions above 9.4, and using " <> +- fromString (versionString ghcVersion) <> +- ", this may fail" +- pure True ++ -- | ghcVersion >= mkVersion [9, 5] -> do ++ -- logWarn $ ++ -- "Stack has not been tested with GHC versions above 9.4, and using " <> ++ -- fromString (versionString ghcVersion) <> ++ -- ", this may fail" ++ -- pure True + | otherwise -> do + logDebug "Asking for a supported GHC version" + pure False +@@ -746,11 +746,11 @@ + logWarn "This invocation will most likely fail." + logWarn "To fix this, either use an older version of Stack or a newer resolver" + logWarn "Acceptable resolvers: lts-3.0/nightly-2015-05-05 or later" +- | cabalVersion >= mkVersion [3, 9] -> +- logWarn $ +- "Stack has not been tested with Cabal versions above 3.8, but version " <> +- fromString (versionString cabalVersion) <> +- " was found, this may fail" ++ -- | cabalVersion >= mkVersion [3, 9] -> ++ -- logWarn $ ++ -- "Stack has not been tested with Cabal versions above 3.8, but version " <> ++ -- fromString (versionString cabalVersion) <> ++ -- " was found, this may fail" + | otherwise -> pure () + + -- | Ensure that the msys toolchain is installed if necessary and From fb1edd4740d9633126d207290f3fef7ef6d5e3ce Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Nov 2023 01:47:38 +0800 Subject: [PATCH 28/40] make stack-symlink-distro-ghc executable --- haskell-platform.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 233c67e..38347b9 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2023.1 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -438,7 +438,7 @@ rm %{buildroot}%{_bindir}/example echo %{_bindir}/hpack >> %{hpack}/ghc-hpack.files echo %{_bindir}/haskell-mustache >> %{mustache}/ghc-mustache.files -install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc +install -p %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc rm %{buildroot}%{_licensedir}/%{name}/LICENSE @@ -452,8 +452,8 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %license LICENSE %doc CONTRIBUTING.md ChangeLog.md README.md %{_bindir}/stack -%{_datadir}/bash-completion/completions/stack %{_bindir}/stack-symlink-distro-ghc +%{_datadir}/bash-completion/completions/stack # End cabal-rpm files @@ -479,6 +479,9 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %changelog +* Tue Nov 7 2023 Jens Petersen - 2023.1-26 +- make stack-symlink-distro-ghc executable + * Tue Aug 8 2023 Jens Petersen - 2023.1-25 - bring back the stack InvalidAbsFile patch updated for 2.9.3 https://github.com/commercialhaskell/stack/pull/6028 From 8a31ee478fe0ed5b3bb74f914cf90f181b7938a8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 15 Dec 2023 23:02:10 +0800 Subject: [PATCH 29/40] patch stack setup for ppc64le and s390x To avoid: Error: [S-1852] I don't know how to install GHC for (Linux,PPC64), please install manually --- haskell-platform.spec | 7 ++++++- stack-Setup-Platforms.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 stack-Setup-Platforms.patch 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 From 073e1bb36a96ca3188f571f60634cce1a3064230 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 21:58:28 +0000 Subject: [PATCH 30/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 9986ea3..51cd273 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2023.1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -481,6 +481,9 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 2023.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Dec 15 2023 Jens Petersen - 2023.1-27 - patch Stack.Setup to accept PPC64 and S390X Linux platforms From 3b2f3dfcce203f06271176f9e9a51006b3a1467a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 21:32:12 +0000 Subject: [PATCH 31/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 51cd273..9002ab3 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2023.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -481,6 +481,9 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2023.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 2023.1-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 70e0f0786cc38a9027844e4470a4b75ac8669170 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 7 Mar 2024 15:53:07 +0800 Subject: [PATCH 32/40] stack-symlink-distro-ghc: print $0 and no longer error for existing dir --- stack-symlink-distro-ghc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stack-symlink-distro-ghc b/stack-symlink-distro-ghc index d3c7b39..04f795b 100755 --- a/stack-symlink-distro-ghc +++ b/stack-symlink-distro-ghc @@ -7,10 +7,12 @@ if [ -z "$VERSION" ]; then exit 1 fi +#set +x + #FIXME lib LIBDIR=/usr/lib64/ghc-$VERSION if [ ! -d "$LIBDIR" ]; then - echo "$LIBDIR does not exist: please install ghcX.Y first" + echo "$0: $LIBDIR does not exist: please install ghcX.Y first" exit 1 fi @@ -20,8 +22,8 @@ STACK_PROGRAMS=$HOME/.stack/programs/$(arch)-linux STACK_GHCDIR=${STACK_PROGRAMS}/ghc-tinfo6-$VERSION if [ -e "$STACK_GHCDIR" ]; then - echo "$STACK_GHCDIR exists: please remove first" - exit 1 + echo "$0: $STACK_GHCDIR exists: to replace, please remove first" + exit 0 fi mkdir -p $STACK_GHCDIR/bin From f54e80c6ab6faf06368a1c4dcf69be044cb59c24 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 7 Mar 2024 15:55:33 +0800 Subject: [PATCH 33/40] stack-symlink-distro-ghc: workaround for ppc64le --- haskell-platform.spec | 6 +++++- stack-symlink-distro-ghc | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 9002ab3..3761cd2 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2023.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -481,6 +481,10 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %changelog +* Thu Mar 7 2024 Jens Petersen - 2023.1-30 +- stack-symlink-distro-ghc: workaround for ppc64le and no longer error + for existing dir + * Wed Jan 24 2024 Fedora Release Engineering - 2023.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/stack-symlink-distro-ghc b/stack-symlink-distro-ghc index 04f795b..894dba8 100755 --- a/stack-symlink-distro-ghc +++ b/stack-symlink-distro-ghc @@ -16,8 +16,14 @@ if [ ! -d "$LIBDIR" ]; then exit 1 fi -# FIXME arch -STACK_PROGRAMS=$HOME/.stack/programs/$(arch)-linux +ARCH=$(arch) + +# stack/Cabal doesn't know ppc64le +if [ "$ARCH" = "ppc64le" ]; then + ARCH=ppc64 +fi + +STACK_PROGRAMS=$HOME/.stack/programs/$ARCH-linux STACK_GHCDIR=${STACK_PROGRAMS}/ghc-tinfo6-$VERSION From 89a5074a4a70f67a1620e25b063ed73a6aff2651 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 8 Jul 2024 14:59:06 +0800 Subject: [PATCH 34/40] update to new stackage snapshots.json url --- haskell-platform.spec | 7 ++++++- stack-snapshots-json.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 stack-snapshots-json.patch diff --git a/haskell-platform.spec b/haskell-platform.spec index 3761cd2..aa7fb01 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2023.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -53,6 +53,8 @@ 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 +# https://discourse.haskell.org/t/ann-stack-2-15-3-and-earliers-default-source-for-list-of-stackage-snapshots-not-up-to-date/9023 +Patch3: stack-snapshots-json.patch BuildRequires: ghc BuildRequires: alex @@ -481,6 +483,9 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %changelog +* Mon Jul 8 2024 Jens Petersen - 2023.1-31 +- update to new stackage snapshots.json url + * Thu Mar 7 2024 Jens Petersen - 2023.1-30 - stack-symlink-distro-ghc: workaround for ppc64le and no longer error for existing dir diff --git a/stack-snapshots-json.patch b/stack-snapshots-json.patch new file mode 100644 index 0000000..7ee4bd6 --- /dev/null +++ b/stack-snapshots-json.patch @@ -0,0 +1,11 @@ +--- stack-2.9.3.1/src/Stack/Config.hs~ 2023-06-23 02:42:33.000000000 +0800 ++++ stack-2.9.3.1/src/Stack/Config.hs 2024-07-08 14:47:57.644375532 +0800 +@@ -214,7 +214,7 @@ + configWorkDir0 <- maybe (pure relDirStackWork) (liftIO . parseRelDir) mstackWorkEnv + let configWorkDir = fromFirst configWorkDir0 configMonoidWorkDir + configLatestSnapshot = fromFirst +- "https://s3.amazonaws.com/haddock.stackage.org/snapshots.json" ++ "https://www.stackage.org/download/snapshots.json" + configMonoidLatestSnapshot + clConnectionCount = fromFirst 8 configMonoidConnectionCount + configHideTHLoading = fromFirstTrue configMonoidHideTHLoading From 6eeff1b1dd71cea7ecb90d4e2eb1ed3b6f3a7015 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 09:06:55 +0000 Subject: [PATCH 35/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index aa7fb01..3d0783d 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2023.1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -483,6 +483,9 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2023.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 8 2024 Jens Petersen - 2023.1-31 - update to new stackage snapshots.json url From 3f3c0e347147c69bba4eadd1ec3b1b2c71495dfe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 2 Aug 2024 01:24:30 +0800 Subject: [PATCH 36/40] update to stack 2.15.7 --- .gitignore | 12 ++ 6028-2.9.3.1.patch | 130 ----------------- haskell-platform.spec | 187 +++++++++++++------------ sources | 20 +-- stack-2.1-relax_version_warnings.patch | 28 ---- stack-Setup-Platforms.patch | 20 +-- stack-disabled-global-warnings.patch | 49 +++++++ stack-snapshots-json.patch | 11 -- 8 files changed, 184 insertions(+), 273 deletions(-) delete mode 100644 6028-2.9.3.1.patch delete mode 100644 stack-2.1-relax_version_warnings.patch create mode 100644 stack-disabled-global-warnings.patch delete mode 100644 stack-snapshots-json.patch diff --git a/.gitignore b/.gitignore index 939929b..35a982e 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,15 @@ haskell-platform-2010.2.0.0.tar.gz /hi-file-parser-0.1.4.0.tar.gz /mustache-2.4.2.tar.gz /pantry-0.8.3.tar.gz +/stack-2.15.7.tar.gz +/aeson-warning-parser-0.1.1.tar.gz +/casa-client-0.0.2.tar.gz +/companion-0.1.0.tar.gz +/crypton-conduit-0.2.3.tar.gz +/filelock-0.1.1.7.tar.gz +/hi-file-parser-0.1.6.0.tar.gz +/hpack-0.36.1.tar.gz +/http-download-0.2.1.0.tar.gz +/neat-interpolation-0.5.1.4.tar.gz +/pantry-0.9.3.2.tar.gz +/static-bytes-0.1.0.tar.gz diff --git a/6028-2.9.3.1.patch b/6028-2.9.3.1.patch deleted file mode 100644 index 59005a8..0000000 --- a/6028-2.9.3.1.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -ur stack-2.9.3.1/src/Path/Extra.hs stack-2.9.3.1.new/src/Path/Extra.hs ---- stack-2.9.3.1/src/Path/Extra.hs 2023-06-22 18:40:54.000000000 +0800 -+++ stack-2.9.3.1.new/src/Path/Extra.hs 2023-08-08 13:55:22.550467487 +0800 -@@ -15,6 +15,8 @@ - , pathToLazyByteString - , pathToText - , tryGetModificationTime -+ ,forgivingResolveFile -+ ,forgivingResolveFile' - ) where - - import Data.Time ( UTCTime ) -@@ -27,6 +29,7 @@ - import qualified Data.ByteString.Lazy.Char8 as BSL - import qualified Data.Text as T - import qualified Data.Text.Encoding as T -+import qualified System.Directory as D - import qualified System.FilePath as FP - - -- | Convert to FilePath but don't add a trailing slash. -@@ -121,3 +124,30 @@ - - tryGetModificationTime :: MonadIO m => Path Abs File -> m (Either () UTCTime) - tryGetModificationTime = liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime -+ -+-- | 'Path.IO.resolveFile' (@path-io@ package) throws 'InvalidAbsFile' (@path@ -+-- package) if the file does not exist; this function yields 'Nothing'. -+forgivingResolveFile :: -+ MonadIO m -+ => Path Abs Dir -+ -- ^ Base directory -+ -> FilePath -+ -- ^ Path to resolve -+ -> m (Maybe (Path Abs File)) -+forgivingResolveFile b p = liftIO $ -+ D.canonicalizePath (toFilePath b FP. p) >>= \cp -> -+ catch -+ (Just <$> parseAbsFile cp) -+ ( \e -> case e of -+ InvalidAbsFile _ -> pure Nothing -+ _ -> throwIO e -+ ) -+ -+-- | 'Path.IO.resolveFile'' (@path-io@ package) throws 'InvalidAbsFile' (@path@ -+-- package) if the file does not exist; this function yields 'Nothing'. -+forgivingResolveFile' :: -+ MonadIO m -+ => FilePath -+ -- ^ Path to resolve -+ -> m (Maybe (Path Abs File)) -+forgivingResolveFile' p = getCurrentDir >>= flip forgivingResolveFile p -diff -ur stack-2.9.3.1/src/Stack/Build/Execute.hs stack-2.9.3.1.new/src/Stack/Build/Execute.hs ---- stack-2.9.3.1/src/Stack/Build/Execute.hs 2023-06-22 18:40:54.000000000 +0800 -+++ stack-2.9.3.1.new/src/Stack/Build/Execute.hs 2023-08-08 13:57:36.831258806 +0800 -@@ -66,6 +66,10 @@ - import Path - import Path.CheckInstall - import Path.Extra ( toFilePathNoTrailingSep, rejectMissingFile ) -+import Path.Extra -+ ( forgivingResolveFile, rejectMissingFile -+ , toFilePathNoTrailingSep -+ ) - import Path.IO - hiding ( findExecutable, makeAbsolute, withSystemTempDir ) - import RIO.Process -@@ -548,7 +552,7 @@ - case loc of - Snap -> snapBin - Local -> localBin -- mfp <- liftIO $ forgivingAbsence (resolveFile bindir $ T.unpack name ++ ext) -+ mfp <- liftIO $ forgivingResolveFile bindir (T.unpack name ++ ext) - >>= rejectMissingFile - case mfp of - Nothing -> do -@@ -2195,7 +2199,7 @@ - mabs <- - if isValidSuffix y - then liftIO $ liftM (fmap ((T.takeWhile isSpace x <>) . T.pack . toFilePath)) $ -- forgivingAbsence (resolveFile pkgDir (T.unpack $ T.dropWhile isSpace x)) `catch` -+ forgivingResolveFile pkgDir (T.unpack $ T.dropWhile isSpace x) `catch` - \(_ :: PathException) -> pure Nothing - else pure Nothing - case mabs of -diff -ur stack-2.9.3.1/src/Stack/ComponentFile.hs stack-2.9.3.1.new/src/Stack/ComponentFile.hs ---- stack-2.9.3.1/src/Stack/ComponentFile.hs 2023-06-22 18:40:54.000000000 +0800 -+++ stack-2.9.3.1.new/src/Stack/ComponentFile.hs 2023-08-08 14:04:52.914859026 +0800 -@@ -283,8 +283,8 @@ - Iface.unList . Iface.dmods . Iface.deps - resolveFileDependency file = do - resolved <- -- liftIO (forgivingAbsence (resolveFile dir file)) >>= -- rejectMissingFile -+ liftIO (forgivingResolveFile dir file) >>= -+ rejectMissingFile - when (isNothing resolved) $ - prettyWarnL - [ flow "Dependent file listed in:" -diff -ur stack-2.9.3.1/src/Stack/Ghci.hs stack-2.9.3.1.new/src/Stack/Ghci.hs ---- stack-2.9.3.1/src/Stack/Ghci.hs 2023-06-22 18:40:54.000000000 +0800 -+++ stack-2.9.3.1.new/src/Stack/Ghci.hs 2023-08-08 13:58:43.393651047 +0800 -@@ -29,7 +29,7 @@ - import qualified Data.Text.Lazy.Encoding as TLE - import qualified Distribution.PackageDescription as C - import Path --import Path.Extra ( toFilePathNoTrailingSep ) -+import Path.Extra (forgivingResolveFile', toFilePathNoTrailingSep) - import Path.IO hiding ( withSystemTempDir ) - import RIO.Process - ( HasProcessContext, exec, proc, readProcess_ -@@ -225,7 +225,7 @@ - then do - fileTargets <- forM fileTargetsRaw $ \fp0 -> do - let fp = T.unpack fp0 -- mpath <- liftIO $ forgivingAbsence (resolveFile' fp) -+ mpath <- liftIO $ forgivingResolveFile' fp - case mpath of - Nothing -> throwM (MissingFileTarget fp) - Just path -> pure path -diff -ur stack-2.9.3.1/src/Stack/PackageFile.hs stack-2.9.3.1.new/src/Stack/PackageFile.hs ---- stack-2.9.3.1/src/Stack/PackageFile.hs 2023-06-22 18:40:54.000000000 +0800 -+++ stack-2.9.3.1.new/src/Stack/PackageFile.hs 2023-08-08 14:06:21.163396729 +0800 -@@ -34,7 +34,7 @@ - -> RIO GetPackageFileContext (Maybe (Path Abs File)) - resolveFileOrWarn = resolveOrWarn "File" f - where -- f p x = liftIO (forgivingAbsence (resolveFile p x)) >>= rejectMissingFile -+ f p x = liftIO (forgivingResolveFile p x) >>= rejectMissingFile - - -- | Get all files referenced by the package. - packageDescModulesAndFiles diff --git a/haskell-platform.spec b/haskell-platform.spec index 3d0783d..921947e 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,30 +1,36 @@ -# generated by cabal-rpm-2.1.2 --subpackage +# generated by cabal-rpm-2.2.1 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name stack -%global stack_ver 2.9.3.1 +%global stack_ver 2.15.7 %global pkgver %{pkg_name}-%{stack_ver} +%{?haskell_setup} -%global casaclient casa-client-0.0.1 +%global aesonwarningparser aeson-warning-parser-0.1.1 +%global casaclient casa-client-0.0.2 %global casatypes casa-types-0.0.2 -%global filelock filelock-0.1.1.6 -%global hifileparser hi-file-parser-0.1.4.0 -%global hpack hpack-0.35.2 -%global httpdownload http-download-0.2.0.0 +%global companion companion-0.1.0 +%global cryptonconduit crypton-conduit-0.2.3 +%global filelock filelock-0.1.1.7 +%global hifileparser hi-file-parser-0.1.6.0 +%global hpack hpack-0.36.1 +%global httpdownload http-download-0.2.1.0 %global mintty mintty-0.1.4 %global mustache mustache-2.4.2 -%global neatinterpolation neat-interpolation-0.5.1.3 +%global neatinterpolation neat-interpolation-0.5.1.4 %global openbrowser open-browser-0.2.1.0 -%global pantry pantry-0.8.3 +%global pantry pantry-0.9.3.2 %global projecttemplate project-template-0.2.1.0 %global rioorphans rio-orphans-0.1.2.0 -%global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} +%global staticbytes static-bytes-0.1.0 + +%global subpkgs %{aesonwarningparser} %{casatypes} %{casaclient} %{companion} %{cryptonconduit} %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{projecttemplate} %{rioorphans} %{staticbytes} %{pantry} # testsuite missing deps: raw-strings-qq Name: haskell-platform -Version: 2023.1 -Release: 32%{?dist} +Version: 2024.1 +Release: 33%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -32,29 +38,30 @@ URL: https://www.haskell.org/ # for stack: # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz -Source2: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz -Source3: https://hackage.haskell.org/package/%{filelock}/%{filelock}.tar.gz -Source4: https://hackage.haskell.org/package/%{hifileparser}/%{hifileparser}.tar.gz -Source5: https://hackage.haskell.org/package/%{hpack}/%{hpack}.tar.gz -Source6: https://hackage.haskell.org/package/%{httpdownload}/%{httpdownload}.tar.gz -Source7: https://hackage.haskell.org/package/%{mintty}/%{mintty}.tar.gz -Source8: https://hackage.haskell.org/package/%{mustache}/%{mustache}.tar.gz -Source9: https://hackage.haskell.org/package/%{neatinterpolation}/%{neatinterpolation}.tar.gz -Source10: https://hackage.haskell.org/package/%{openbrowser}/%{openbrowser}.tar.gz -Source11: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz -Source12: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz -Source13: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source20: stack-symlink-distro-ghc +Source1: https://hackage.haskell.org/package/%{aesonwarningparser}/%{aesonwarningparser}.tar.gz +Source2: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz +Source3: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz +Source4: https://hackage.haskell.org/package/%{companion}/%{companion}.tar.gz +Source5: https://hackage.haskell.org/package/%{cryptonconduit}/%{cryptonconduit}.tar.gz +Source6: https://hackage.haskell.org/package/%{filelock}/%{filelock}.tar.gz +Source7: https://hackage.haskell.org/package/%{hifileparser}/%{hifileparser}.tar.gz +Source8: https://hackage.haskell.org/package/%{hpack}/%{hpack}.tar.gz +Source9: https://hackage.haskell.org/package/%{httpdownload}/%{httpdownload}.tar.gz +Source10: https://hackage.haskell.org/package/%{mintty}/%{mintty}.tar.gz +Source11: https://hackage.haskell.org/package/%{mustache}/%{mustache}.tar.gz +Source12: https://hackage.haskell.org/package/%{neatinterpolation}/%{neatinterpolation}.tar.gz +Source13: https://hackage.haskell.org/package/%{openbrowser}/%{openbrowser}.tar.gz +Source14: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz +Source15: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz +Source16: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz +Source17: https://hackage.haskell.org/package/%{staticbytes}/%{staticbytes}.tar.gz # End cabal-rpm sources -# https://github.com/commercialhaskell/stack/issues/5866 -# https://github.com/commercialhaskell/stack/pull/6028 -Patch0: 6028-2.9.3.1.patch -Patch1: stack-disable-ghc-Cabal-version-warnings.patch +Source20: stack-symlink-distro-ghc + +# disable warning about ghc/Cabal version and nix in path +Patch1: stack-disabled-global-warnings.patch # https://github.com/commercialhaskell/stack/issues/6379 Patch2: stack-Setup-Platforms.patch -# https://discourse.haskell.org/t/ann-stack-2-15-3-and-earliers-default-source-for-list-of-stackage-snapshots-not-up-to-date/9023 -Patch3: stack-snapshots-json.patch BuildRequires: ghc BuildRequires: alex @@ -66,7 +73,7 @@ BuildRequires: hscolour BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel -BuildRequires: ghc-annotated-wl-pprint-devel +#BuildRequires: ghc-aeson-warning-parser-devel BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-async-devel @@ -75,14 +82,11 @@ BuildRequires: ghc-base-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-bytestring-devel #BuildRequires: ghc-casa-client-devel -#BuildRequires: ghc-casa-types-devel -BuildRequires: ghc-colour-devel +#BuildRequires: ghc-companion-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-conduit-extra-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-cryptonite-devel -BuildRequires: ghc-cryptonite-conduit-devel -BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-crypton-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-echo-devel BuildRequires: ghc-exceptions-devel @@ -92,9 +96,8 @@ BuildRequires: ghc-file-embed-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-fsnotify-devel BuildRequires: ghc-generic-deriving-devel +BuildRequires: ghc-ghc-boot-devel BuildRequires: ghc-githash-devel -BuildRequires: ghc-hackage-security-devel -BuildRequires: ghc-hashable-devel #BuildRequires: ghc-hi-file-parser-devel #BuildRequires: ghc-hpack-devel BuildRequires: ghc-hpc-devel @@ -105,12 +108,9 @@ BuildRequires: ghc-http-conduit-devel BuildRequires: ghc-http-types-devel BuildRequires: ghc-memory-devel BuildRequires: ghc-microlens-devel -#BuildRequires: ghc-mintty-devel -BuildRequires: ghc-mono-traversable-devel BuildRequires: ghc-mtl-devel #BuildRequires: ghc-mustache-devel #BuildRequires: ghc-neat-interpolation-devel -BuildRequires: ghc-network-uri-devel #BuildRequires: ghc-open-browser-devel BuildRequires: ghc-optparse-applicative-devel BuildRequires: ghc-optparse-simple-devel @@ -119,42 +119,29 @@ BuildRequires: ghc-path-devel BuildRequires: ghc-path-io-devel BuildRequires: ghc-persistent-devel BuildRequires: ghc-persistent-sqlite-devel -BuildRequires: ghc-persistent-template-devel BuildRequires: ghc-pretty-devel -BuildRequires: ghc-primitive-devel BuildRequires: ghc-process-devel #BuildRequires: ghc-project-template-devel BuildRequires: ghc-random-devel -BuildRequires: ghc-retry-devel BuildRequires: ghc-rio-devel BuildRequires: ghc-rio-prettyprint-devel -BuildRequires: ghc-semigroups-devel BuildRequires: ghc-split-devel BuildRequires: ghc-stm-devel -BuildRequires: ghc-streaming-commons-devel BuildRequires: ghc-tar-devel BuildRequires: ghc-template-haskell-devel -BuildRequires: ghc-temporary-devel BuildRequires: ghc-text-devel -BuildRequires: ghc-text-metrics-devel -BuildRequires: ghc-th-reify-many-devel BuildRequires: ghc-time-devel -BuildRequires: ghc-tls-devel BuildRequires: ghc-transformers-devel -BuildRequires: ghc-typed-process-devel -BuildRequires: ghc-unicode-transforms-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-unix-compat-devel -BuildRequires: ghc-unliftio-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel BuildRequires: ghc-yaml-devel -BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel %if %{with ghc_prof} BuildRequires: ghc-Cabal-prof BuildRequires: ghc-aeson-prof -BuildRequires: ghc-annotated-wl-pprint-prof +#BuildRequires: ghc-aeson-warning-parser-prof BuildRequires: ghc-ansi-terminal-prof BuildRequires: ghc-array-prof BuildRequires: ghc-async-prof @@ -163,14 +150,11 @@ BuildRequires: ghc-base-prof BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-bytestring-prof #BuildRequires: ghc-casa-client-prof -#BuildRequires: ghc-casa-types-prof -BuildRequires: ghc-colour-prof +#BuildRequires: ghc-companion-prof BuildRequires: ghc-conduit-prof BuildRequires: ghc-conduit-extra-prof BuildRequires: ghc-containers-prof -BuildRequires: ghc-cryptonite-prof -BuildRequires: ghc-cryptonite-conduit-prof -BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-crypton-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-echo-prof BuildRequires: ghc-exceptions-prof @@ -180,9 +164,8 @@ BuildRequires: ghc-file-embed-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-fsnotify-prof BuildRequires: ghc-generic-deriving-prof +BuildRequires: ghc-ghc-boot-prof BuildRequires: ghc-githash-prof -BuildRequires: ghc-hackage-security-prof -BuildRequires: ghc-hashable-prof #BuildRequires: ghc-hi-file-parser-prof #BuildRequires: ghc-hpack-prof BuildRequires: ghc-hpc-prof @@ -193,12 +176,9 @@ BuildRequires: ghc-http-conduit-prof BuildRequires: ghc-http-types-prof BuildRequires: ghc-memory-prof BuildRequires: ghc-microlens-prof -#BuildRequires: ghc-mintty-prof -BuildRequires: ghc-mono-traversable-prof BuildRequires: ghc-mtl-prof #BuildRequires: ghc-mustache-prof #BuildRequires: ghc-neat-interpolation-prof -BuildRequires: ghc-network-uri-prof #BuildRequires: ghc-open-browser-prof BuildRequires: ghc-optparse-applicative-prof BuildRequires: ghc-optparse-simple-prof @@ -207,58 +187,54 @@ BuildRequires: ghc-path-prof BuildRequires: ghc-path-io-prof BuildRequires: ghc-persistent-prof BuildRequires: ghc-persistent-sqlite-prof -# no persistent-template prof: -#BuildRequires: ghc-persistent-template-prof BuildRequires: ghc-pretty-prof -BuildRequires: ghc-primitive-prof BuildRequires: ghc-process-prof #BuildRequires: ghc-project-template-prof BuildRequires: ghc-random-prof -BuildRequires: ghc-retry-prof BuildRequires: ghc-rio-prof BuildRequires: ghc-rio-prettyprint-prof -BuildRequires: ghc-semigroups-prof BuildRequires: ghc-split-prof BuildRequires: ghc-stm-prof -BuildRequires: ghc-streaming-commons-prof BuildRequires: ghc-tar-prof BuildRequires: ghc-template-haskell-prof -BuildRequires: ghc-temporary-prof BuildRequires: ghc-text-prof -BuildRequires: ghc-text-metrics-prof -BuildRequires: ghc-th-reify-many-prof BuildRequires: ghc-time-prof -BuildRequires: ghc-tls-prof BuildRequires: ghc-transformers-prof -BuildRequires: ghc-typed-process-prof -BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof BuildRequires: ghc-unix-compat-prof -BuildRequires: ghc-unliftio-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof BuildRequires: ghc-yaml-prof -BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof %endif +BuildRequires: help2man # for missing dep 'casa-client': BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-network-uri-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-th-lift-devel BuildRequires: ghc-unliftio-core-devel %if %{with ghc_prof} BuildRequires: ghc-base16-bytestring-prof +BuildRequires: ghc-network-uri-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-th-lift-prof BuildRequires: ghc-unliftio-core-prof %endif # for missing dep 'casa-types': BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-hashable-devel BuildRequires: ghc-path-pieces-devel %if %{with ghc_prof} BuildRequires: ghc-base16-bytestring-prof +BuildRequires: ghc-hashable-prof BuildRequires: ghc-path-pieces-prof %endif +# for missing dep 'crypton-conduit': +BuildRequires: ghc-resourcet-devel +%if %{with ghc_prof} +BuildRequires: ghc-resourcet-prof +%endif # for missing dep 'hi-file-parser': BuildRequires: ghc-binary-devel %if %{with ghc_prof} @@ -267,14 +243,21 @@ BuildRequires: ghc-binary-prof # for missing dep 'hpack': BuildRequires: ghc-Glob-devel BuildRequires: ghc-bifunctors-devel +BuildRequires: ghc-deepseq-devel BuildRequires: ghc-infer-license-devel BuildRequires: ghc-scientific-devel %if %{with ghc_prof} BuildRequires: ghc-Glob-prof BuildRequires: ghc-bifunctors-prof +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-infer-license-prof BuildRequires: ghc-scientific-prof %endif +# for missing dep 'http-download': +BuildRequires: ghc-retry-devel +%if %{with ghc_prof} +BuildRequires: ghc-retry-prof +%endif # for missing dep 'mustache': BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-parsec-devel @@ -293,12 +276,26 @@ BuildRequires: ghc-megaparsec-prof %endif # for missing dep 'pantry': BuildRequires: ghc-digest-devel +BuildRequires: ghc-hackage-security-devel +BuildRequires: ghc-network-uri-devel +BuildRequires: ghc-persistent-template-devel +BuildRequires: ghc-primitive-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-tar-conduit-devel +BuildRequires: ghc-text-metrics-devel +BuildRequires: ghc-unliftio-devel +BuildRequires: ghc-zip-archive-devel %if %{with ghc_prof} BuildRequires: ghc-digest-prof +BuildRequires: ghc-hackage-security-prof +BuildRequires: ghc-network-uri-prof +BuildRequires: ghc-persistent-template-prof +BuildRequires: ghc-primitive-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-tar-conduit-prof +BuildRequires: ghc-text-metrics-prof +BuildRequires: ghc-unliftio-prof +BuildRequires: ghc-zip-archive-prof %endif # for missing dep 'project-template': BuildRequires: ghc-resourcet-devel @@ -320,6 +317,11 @@ BuildRequires: ghc-resourcet-prof BuildRequires: ghc-transformers-base-prof BuildRequires: ghc-unliftio-core-prof %endif +# for missing dep 'static-bytes': +BuildRequires: ghc-primitive-devel +%if %{with ghc_prof} +BuildRequires: ghc-primitive-prof +%endif # End cabal-rpm deps # pull in all of ghc for least surprise @@ -397,8 +399,11 @@ This package provides the Haskell stack profiling library. %global main_version %{version} %if %{defined ghclibdir} +%ghc_lib_subpackage -l BSD-3-Clause %{aesonwarningparser} %ghc_lib_subpackage -l BSD-3-Clause %{casaclient} %ghc_lib_subpackage -l BSD-3-Clause %{casatypes} +%ghc_lib_subpackage -l BSD-3-Clause %{companion} +%ghc_lib_subpackage -l BSD-3-Clause %{cryptonconduit} %ghc_lib_subpackage -l CC0-1.0 %{filelock} %ghc_lib_subpackage -l BSD-3-Clause %{hifileparser} %ghc_lib_subpackage -l MIT %{hpack} @@ -410,6 +415,7 @@ This package provides the Haskell stack profiling library. %ghc_lib_subpackage -l BSD-3-Clause %{pantry} %ghc_lib_subpackage -l BSD-3-Clause %{projecttemplate} %ghc_lib_subpackage -l MIT %{rioorphans} +%ghc_lib_subpackage -l BSD-3-Clause %{staticbytes} %endif %global version %{main_version} @@ -417,7 +423,7 @@ This package provides the Haskell stack profiling library. %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 +%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 # End cabal-rpm setup %autopatch -p1 @@ -433,8 +439,13 @@ This package provides the Haskell stack profiling library. # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install -mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ -%{buildroot}%{_bindir}/stack --bash-completion-script stack | sed s/filenames/default/ > %{buildroot}%{_datadir}/bash-completion/completions/stack + +set noclobber +mkdir -p %{buildroot}%{bash_completions_dir} +%{buildroot}%{_bindir}/stack --bash-completion-script stack | sed s/filenames/default/ > %{buildroot}%{bash_completions_dir}/stack + +mkdir -p %{buildroot}%{_mandir}/man1/ +help2man --no-info %{buildroot}%{_bindir}/stack > %{buildroot}%{_mandir}/man1/stack.1 # End cabal-rpm install # open-browser @@ -456,9 +467,10 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %license LICENSE %doc CONTRIBUTING.md ChangeLog.md README.md %{_bindir}/stack -%{_bindir}/stack-symlink-distro-ghc -%{_datadir}/bash-completion/completions/stack +%{bash_completions_dir}/stack +%{_mandir}/man1/stack.1* # End cabal-rpm files +%{_bindir}/stack-symlink-distro-ghc %files -n ghc-stack -f ghc-stack.files @@ -483,6 +495,9 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE %changelog +* Thu Aug 1 2024 Jens Petersen - 2024.1-33 +- https://hackage.haskell.org/package/stack-2.15.7/changelog + * Thu Jul 18 2024 Fedora Release Engineering - 2023.1-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index b7dce7f..e0cf060 100644 --- a/sources +++ b/sources @@ -1,14 +1,18 @@ -SHA512 (stack-2.9.3.1.tar.gz) = d08c95c6104fbe0e79ef4ed7edf29a00caf54acd05eb1cc412a3114b80785995007fd0e8564d4a716dcf4b78ff32eaa32e8b19c3a288a20827ed2794a51f5573 -SHA512 (casa-client-0.0.1.tar.gz) = 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa +SHA512 (stack-2.15.7.tar.gz) = 0a0e2fca52b17e3fbc5091da9fc7dd639a50c37519ae8ea27954536381d63bda4e1f20ca047e061dc898cac35a0551c996ced6f8d87184fe8e5be03e03d3cb82 +SHA512 (aeson-warning-parser-0.1.1.tar.gz) = 86c10f3e1681ec8892ba396b9077f72b1975f23373db6f56a038ecc67cb48e8d7ba33c2396031d1b31fc9da3ead2e8c00ce27c2e3a02f8b52f53f5e3ed61610d +SHA512 (casa-client-0.0.2.tar.gz) = 885ede1522142cf7b7c4ad2c49506974b349256e3537a3e6d05c45d1ef64f8144538a7bae90ae97fa3d5af4b2f24c5a1bd52dba847c677a0cec486992e5d654a SHA512 (casa-types-0.0.2.tar.gz) = a54bb7f15310878e0a4c0524749ba8c8de8537a60892d278941cacefb80ad9d31e9ba16dd236c196b6639758f281f9ae66911d04c39b0ec6e2b75db5127ad5bf -SHA512 (filelock-0.1.1.6.tar.gz) = 859a054d28c6ca915067c36d6764c4c6094aefb359e7082db64a2662f297f5a6c746b911fcdab182691932d58315dccaa5c0f39bb31f95a818c21633b6a88c2c -SHA512 (hi-file-parser-0.1.4.0.tar.gz) = c32adc409a4e7a884e30ed1604927e32bd569174d3bef95b43fa19a0a6f28dbac407cf7f0849ee8e926a5df0b8a5b6d5dbe7c30d1bfc16aee867afaca998a004 -SHA512 (hpack-0.35.2.tar.gz) = 0b07a509bc429199fefecfc6963aee71987540cdb8901b4d26034db426252d9a42f206607ee162c917343b7146a9cd1eb560703f4bb65594537d3f62255d0ca7 -SHA512 (http-download-0.2.0.0.tar.gz) = b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae +SHA512 (companion-0.1.0.tar.gz) = 5220f0784d15e8763ac5eca34bf27c7b820a98daa7b14e6abefaf2735d0ba367ac8209b5a27d016ab1ce536973389d28a39fab9987c1827b8e849192b86e1cba +SHA512 (crypton-conduit-0.2.3.tar.gz) = 2776ef49609c11a8379e4b9f7e9dcb40f4ad5c33924de6cfd9c9952106321b8959d2dbe4537905e1d55dfe577593d75d7c1f1ff47d26497dccfbba667fdf2257 +SHA512 (filelock-0.1.1.7.tar.gz) = ca82dc7efde8a36dc4c7df63609159349d145e7de1fed6b9dcdc8c16b64cdddb3d13b838c39f363eb89ee82871cb2904e76cb833c5798319ed514815aac88e98 +SHA512 (hi-file-parser-0.1.6.0.tar.gz) = 49a29ce589440aa0554d8c1b26a2e97c2d55aff5e4a0fc63f102d8be4003572b5716f5819e64ddeb7c523e52d14b594208ca8179a959b5d1fe86435e6f7ca502 +SHA512 (hpack-0.36.1.tar.gz) = ee92ebc0cb6e37d228f4a4ffb2b2c1551fe160b8a5db065e8f61902cfe2f8c79ca8c443048d1ab60fc33c40e74015c14404666bca4e99b3d984d0d46b210c5e5 +SHA512 (http-download-0.2.1.0.tar.gz) = 75a208684bf4f116746a1015870a6bb2afbdd1a4b4c268b88f142b189e0e31c59b8d691606c3eb33be9b1637a0131c4d7cb48091179f22bba8d6d2919ce30e02 SHA512 (mintty-0.1.4.tar.gz) = f5c3231f342d24d7dc38b0281579aa6f272767451412ea84e1c248f77331d6740186cef0bb4144b7655a80914daa0b1f3573107a76c29c1d2e6a56e793532733 SHA512 (mustache-2.4.2.tar.gz) = 96e10988f8ccf15cd5939e16cd8d5f551853168a3719cd4717b3bb40c3227f540f4d955614e1d38385fb30f9a97351f260f79cfbc872da30eadb73bac1ebc315 -SHA512 (neat-interpolation-0.5.1.3.tar.gz) = d777ac442d0b32348470b64458a88c76836e84b9fe15f46c6ec05f8a84ebe4a5b79827b85ff9a0e2138bb8db10fc4493c2793e13091ee5f5decf5e28110d86ba +SHA512 (neat-interpolation-0.5.1.4.tar.gz) = 16f62bee23984fabebd70e70311b24bc2e7835ba90cf84bb7bb6f4d84c097bf817e3f5d653c843117b63ed886b0e16511219a688e17bdcf62c16f659074d690f SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1 -SHA512 (pantry-0.8.3.tar.gz) = d3934bf761f4354f08fdc20cbc320b21c37b83114170ad3a006133122202312f34134ae6d470baef9ea552b2bad2ca2a73af08380ceee108108e395e21728ac5 +SHA512 (pantry-0.9.3.2.tar.gz) = 6c109bc2dd08813103c072f288b5b67d577915a3401057f9c5aaae008306a1484c4ef72c4af818c67a1062793a6ae81bcc24c8d1d6f61d4de78625395bfb7b88 SHA512 (project-template-0.2.1.0.tar.gz) = ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c SHA512 (rio-orphans-0.1.2.0.tar.gz) = 85e883977e161161e5ba8f4fa6d13026d71f7367bac262307f9a8cfdc0316b71a490fcb6c15737919a6b4e73b3355b413161e09f5167c95b1f0c5a22c045f7ac +SHA512 (static-bytes-0.1.0.tar.gz) = 6bccb86796f1afdc28dfa8b1b4c86503fe500dd3088488213fbc68ab2d0e2c358295b56acac024ecf62ed27a33036560716d253deaaaef21983cf1d7352c8deb diff --git a/stack-2.1-relax_version_warnings.patch b/stack-2.1-relax_version_warnings.patch deleted file mode 100644 index 53bd16e..0000000 --- a/stack-2.1-relax_version_warnings.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- stack-2.1.3.1/src/Stack/Setup.hs~ 2019-07-14 12:22:56.000000000 +0800 -+++ stack-2.1.3.1/src/Stack/Setup.hs 2020-04-12 11:56:39.453839733 +0800 -@@ -482,9 +482,9 @@ - logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648" - logWarn "" - pure True -- | ghcVersion >= mkVersion [8, 7] -> do -+ | ghcVersion >= mkVersion [8, 9] -> do - logWarn $ -- "Stack has not been tested with GHC versions above 8.6, and using " <> -+ "Stack has not been tested with GHC versions above 8.8, and using " <> - fromString (versionString ghcVersion) <> - ", this may fail" - pure True -@@ -509,9 +509,9 @@ - logWarn "This invocation will most likely fail." - logWarn "To fix this, either use an older version of Stack or a newer resolver" - logWarn "Acceptable resolvers: lts-3.0/nightly-2015-05-05 or later" -- | cabalVersion >= mkVersion [2, 5] -> -+ | cabalVersion >= mkVersion [3, 1] -> - logWarn $ -- "Stack has not been tested with Cabal versions above 2.4, but version " <> -+ "Stack has not been tested with Cabal versions above 3.0, but version " <> - fromString (versionString cabalVersion) <> - " was found, this may fail" - | otherwise -> pure () - -Diff finished. Sun Apr 12 11:56:54 2020 diff --git a/stack-Setup-Platforms.patch b/stack-Setup-Platforms.patch index 8319819..b557d44 100644 --- a/stack-Setup-Platforms.patch +++ b/stack-Setup-Platforms.patch @@ -1,11 +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 +--- stack-2.15.7/src/Stack/Setup.hs~ 2024-05-12 22:50:14.000000000 +0800 ++++ stack-2.15.7/src/Stack/Setup.hs 2024-08-02 01:11:32.252316054 +0800 +@@ -2138,6 +2138,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 -> + prettyThrowM $ UnsupportedSetupCombo os arch tool toolDir programsDir - downloadOrUseLocal diff --git a/stack-disabled-global-warnings.patch b/stack-disabled-global-warnings.patch new file mode 100644 index 0000000..fd4525d --- /dev/null +++ b/stack-disabled-global-warnings.patch @@ -0,0 +1,49 @@ +diff -up stack-2.15.7/src/Stack/Config.hs~ stack-2.15.7/src/Stack/Config.hs +--- stack-2.15.7/src/Stack/Config.hs~ 2024-05-12 22:50:13.000000000 +0800 ++++ stack-2.15.7/src/Stack/Config.hs 2024-08-02 01:21:01.138918479 +0800 +@@ -435,9 +435,9 @@ configFromConfigMonoid + fromFirst Constants.hackageBaseUrl configMonoid.hackageBaseUrl + hideSourcePaths = fromFirstTrue configMonoid.hideSourcePaths + recommendUpgrade = fromFirstTrue configMonoid.recommendUpgrade +- notifyIfNixOnPath = fromFirstTrue configMonoid.notifyIfNixOnPath +- notifyIfGhcUntested = fromFirstTrue configMonoid.notifyIfGhcUntested +- notifyIfCabalUntested = fromFirstTrue configMonoid.notifyIfCabalUntested ++ notifyIfNixOnPath = fromFirstFalse configMonoid.notifyIfNixOnPath ++ notifyIfGhcUntested = fromFirstFalse configMonoid.notifyIfGhcUntested ++ notifyIfCabalUntested = fromFirstFalse configMonoid.notifyIfCabalUntested + notifyIfArchUnknown = fromFirstTrue configMonoid.notifyIfArchUnknown + noRunCompile = fromFirstFalse configMonoid.noRunCompile + allowDifferentUser <- +diff -up stack-2.15.7/src/Stack/Types/ConfigMonoid.hs~ stack-2.15.7/src/Stack/Types/ConfigMonoid.hs +--- stack-2.15.7/src/Stack/Types/ConfigMonoid.hs~ 2024-05-12 22:50:14.000000000 +0800 ++++ stack-2.15.7/src/Stack/Types/ConfigMonoid.hs 2024-08-02 01:20:22.724711778 +0800 +@@ -170,11 +170,11 @@ data ConfigMonoid = ConfigMonoid + -- ^ See 'configHideSourcePaths' + , recommendUpgrade :: !FirstTrue + -- ^ See 'configRecommendUpgrade' +- , notifyIfNixOnPath :: !FirstTrue ++ , notifyIfNixOnPath :: !FirstFalse + -- ^ See 'configNotifyIfNixOnPath' +- , notifyIfGhcUntested :: !FirstTrue ++ , notifyIfGhcUntested :: !FirstFalse + -- ^ See 'configNotifyIfGhcUntested' +- , notifyIfCabalUntested :: !FirstTrue ++ , notifyIfCabalUntested :: !FirstFalse + -- ^ See 'configNotifyIfCabalUntested' + , notifyIfArchUnknown :: !FirstTrue + -- ^ See 'configNotifyIfArchUnknown' +@@ -317,11 +317,11 @@ parseConfigMonoidObject rootDir obj = do + let styles = fromMaybe mempty $ configMonoidStylesUS <|> configMonoidStylesGB + hideSourcePaths <- FirstTrue <$> obj ..:? configMonoidHideSourcePathsName + recommendUpgrade <- FirstTrue <$> obj ..:? configMonoidRecommendUpgradeName +- notifyIfNixOnPath <- FirstTrue <$> obj ..:? configMonoidNotifyIfNixOnPathName ++ notifyIfNixOnPath <- FirstFalse <$> obj ..:? configMonoidNotifyIfNixOnPathName + notifyIfGhcUntested <- +- FirstTrue <$> obj ..:? configMonoidNotifyIfGhcUntestedName ++ FirstFalse <$> obj ..:? configMonoidNotifyIfGhcUntestedName + notifyIfCabalUntested <- +- FirstTrue <$> obj ..:? configMonoidNotifyIfCabalUntestedName ++ FirstFalse <$> obj ..:? configMonoidNotifyIfCabalUntestedName + notifyIfArchUnknown <- + FirstTrue <$> obj ..:? configMonoidNotifyIfArchUnknownName + casaOpts <- jsonSubWarnings (obj ..:? configMonoidCasaOptsName ..!= mempty) diff --git a/stack-snapshots-json.patch b/stack-snapshots-json.patch deleted file mode 100644 index 7ee4bd6..0000000 --- a/stack-snapshots-json.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- stack-2.9.3.1/src/Stack/Config.hs~ 2023-06-23 02:42:33.000000000 +0800 -+++ stack-2.9.3.1/src/Stack/Config.hs 2024-07-08 14:47:57.644375532 +0800 -@@ -214,7 +214,7 @@ - configWorkDir0 <- maybe (pure relDirStackWork) (liftIO . parseRelDir) mstackWorkEnv - let configWorkDir = fromFirst configWorkDir0 configMonoidWorkDir - configLatestSnapshot = fromFirst -- "https://s3.amazonaws.com/haddock.stackage.org/snapshots.json" -+ "https://www.stackage.org/download/snapshots.json" - configMonoidLatestSnapshot - clConnectionCount = fromFirst 8 configMonoidConnectionCount - configHideTHLoading = fromFirstTrue configMonoidHideTHLoading From b763b8828e729c690c746c1c392edda04d4fa3c3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 7 Aug 2024 18:13:40 +0800 Subject: [PATCH 37/40] persistent-template is a meta-package --- haskell-platform.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 921947e..ec4a98b 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -289,7 +289,8 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-digest-prof BuildRequires: ghc-hackage-security-prof BuildRequires: ghc-network-uri-prof -BuildRequires: ghc-persistent-template-prof +# no persistent-template prof! +#BuildRequires: ghc-persistent-template-prof BuildRequires: ghc-primitive-prof BuildRequires: ghc-resourcet-prof BuildRequires: ghc-tar-conduit-prof From 605a127cb1bb820c331157e82adced56c4902e00 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Dec 2024 18:31:09 +0530 Subject: [PATCH 38/40] stack and deps now in a standalone package --- haskell-platform.spec | 460 +----------------------------------------- sources | 18 -- 2 files changed, 5 insertions(+), 473 deletions(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index ec4a98b..e90f6df 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,329 +1,20 @@ # generated by cabal-rpm-2.2.1 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ -%global pkg_name stack -%global stack_ver 2.15.7 -%global pkgver %{pkg_name}-%{stack_ver} -%{?haskell_setup} - -%global aesonwarningparser aeson-warning-parser-0.1.1 -%global casaclient casa-client-0.0.2 -%global casatypes casa-types-0.0.2 -%global companion companion-0.1.0 -%global cryptonconduit crypton-conduit-0.2.3 -%global filelock filelock-0.1.1.7 -%global hifileparser hi-file-parser-0.1.6.0 -%global hpack hpack-0.36.1 -%global httpdownload http-download-0.2.1.0 -%global mintty mintty-0.1.4 -%global mustache mustache-2.4.2 -%global neatinterpolation neat-interpolation-0.5.1.4 -%global openbrowser open-browser-0.2.1.0 -%global pantry pantry-0.9.3.2 -%global projecttemplate project-template-0.2.1.0 -%global rioorphans rio-orphans-0.1.2.0 -%global staticbytes static-bytes-0.1.0 - -%global subpkgs %{aesonwarningparser} %{casatypes} %{casaclient} %{companion} %{cryptonconduit} %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{projecttemplate} %{rioorphans} %{staticbytes} %{pantry} - -# testsuite missing deps: raw-strings-qq - Name: haskell-platform Version: 2024.1 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause URL: https://www.haskell.org/ -# for stack: -# Begin cabal-rpm sources: -Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{aesonwarningparser}/%{aesonwarningparser}.tar.gz -Source2: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz -Source3: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz -Source4: https://hackage.haskell.org/package/%{companion}/%{companion}.tar.gz -Source5: https://hackage.haskell.org/package/%{cryptonconduit}/%{cryptonconduit}.tar.gz -Source6: https://hackage.haskell.org/package/%{filelock}/%{filelock}.tar.gz -Source7: https://hackage.haskell.org/package/%{hifileparser}/%{hifileparser}.tar.gz -Source8: https://hackage.haskell.org/package/%{hpack}/%{hpack}.tar.gz -Source9: https://hackage.haskell.org/package/%{httpdownload}/%{httpdownload}.tar.gz -Source10: https://hackage.haskell.org/package/%{mintty}/%{mintty}.tar.gz -Source11: https://hackage.haskell.org/package/%{mustache}/%{mustache}.tar.gz -Source12: https://hackage.haskell.org/package/%{neatinterpolation}/%{neatinterpolation}.tar.gz -Source13: https://hackage.haskell.org/package/%{openbrowser}/%{openbrowser}.tar.gz -Source14: https://hackage.haskell.org/package/%{pantry}/%{pantry}.tar.gz -Source15: https://hackage.haskell.org/package/%{projecttemplate}/%{projecttemplate}.tar.gz -Source16: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source17: https://hackage.haskell.org/package/%{staticbytes}/%{staticbytes}.tar.gz -# End cabal-rpm sources -Source20: stack-symlink-distro-ghc - -# disable warning about ghc/Cabal version and nix in path -Patch1: stack-disabled-global-warnings.patch -# https://github.com/commercialhaskell/stack/issues/6379 -Patch2: stack-Setup-Platforms.patch BuildRequires: ghc BuildRequires: alex BuildRequires: cabal-install BuildRequires: happy BuildRequires: hscolour - -# Begin cabal-rpm deps: -BuildRequires: ghc-rpm-macros-extra -BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-aeson-devel -#BuildRequires: ghc-aeson-warning-parser-devel -BuildRequires: ghc-ansi-terminal-devel -BuildRequires: ghc-array-devel -BuildRequires: ghc-async-devel -BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-base-devel -BuildRequires: ghc-base64-bytestring-devel -BuildRequires: ghc-bytestring-devel -#BuildRequires: ghc-casa-client-devel -#BuildRequires: ghc-companion-devel -BuildRequires: ghc-conduit-devel -BuildRequires: ghc-conduit-extra-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-crypton-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-echo-devel -BuildRequires: ghc-exceptions-devel -BuildRequires: ghc-extra-devel -BuildRequires: ghc-file-embed-devel -#BuildRequires: ghc-filelock-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-fsnotify-devel -BuildRequires: ghc-generic-deriving-devel -BuildRequires: ghc-ghc-boot-devel -BuildRequires: ghc-githash-devel -#BuildRequires: ghc-hi-file-parser-devel -#BuildRequires: ghc-hpack-devel -BuildRequires: ghc-hpc-devel -BuildRequires: ghc-http-client-devel -BuildRequires: ghc-http-client-tls-devel -BuildRequires: ghc-http-conduit-devel -#BuildRequires: ghc-http-download-devel -BuildRequires: ghc-http-types-devel -BuildRequires: ghc-memory-devel -BuildRequires: ghc-microlens-devel -BuildRequires: ghc-mtl-devel -#BuildRequires: ghc-mustache-devel -#BuildRequires: ghc-neat-interpolation-devel -#BuildRequires: ghc-open-browser-devel -BuildRequires: ghc-optparse-applicative-devel -BuildRequires: ghc-optparse-simple-devel -#BuildRequires: ghc-pantry-devel -BuildRequires: ghc-path-devel -BuildRequires: ghc-path-io-devel -BuildRequires: ghc-persistent-devel -BuildRequires: ghc-persistent-sqlite-devel -BuildRequires: ghc-pretty-devel -BuildRequires: ghc-process-devel -#BuildRequires: ghc-project-template-devel -BuildRequires: ghc-random-devel -BuildRequires: ghc-rio-devel -BuildRequires: ghc-rio-prettyprint-devel -BuildRequires: ghc-split-devel -BuildRequires: ghc-stm-devel -BuildRequires: ghc-tar-devel -BuildRequires: ghc-template-haskell-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-time-devel -BuildRequires: ghc-transformers-devel -BuildRequires: ghc-unix-devel -BuildRequires: ghc-unix-compat-devel -BuildRequires: ghc-unordered-containers-devel -BuildRequires: ghc-vector-devel -BuildRequires: ghc-yaml-devel -BuildRequires: ghc-zlib-devel -%if %{with ghc_prof} -BuildRequires: ghc-Cabal-prof -BuildRequires: ghc-aeson-prof -#BuildRequires: ghc-aeson-warning-parser-prof -BuildRequires: ghc-ansi-terminal-prof -BuildRequires: ghc-array-prof -BuildRequires: ghc-async-prof -BuildRequires: ghc-attoparsec-prof -BuildRequires: ghc-base-prof -BuildRequires: ghc-base64-bytestring-prof -BuildRequires: ghc-bytestring-prof -#BuildRequires: ghc-casa-client-prof -#BuildRequires: ghc-companion-prof -BuildRequires: ghc-conduit-prof -BuildRequires: ghc-conduit-extra-prof -BuildRequires: ghc-containers-prof -BuildRequires: ghc-crypton-prof -BuildRequires: ghc-directory-prof -BuildRequires: ghc-echo-prof -BuildRequires: ghc-exceptions-prof -BuildRequires: ghc-extra-prof -BuildRequires: ghc-file-embed-prof -#BuildRequires: ghc-filelock-prof -BuildRequires: ghc-filepath-prof -BuildRequires: ghc-fsnotify-prof -BuildRequires: ghc-generic-deriving-prof -BuildRequires: ghc-ghc-boot-prof -BuildRequires: ghc-githash-prof -#BuildRequires: ghc-hi-file-parser-prof -#BuildRequires: ghc-hpack-prof -BuildRequires: ghc-hpc-prof -BuildRequires: ghc-http-client-prof -BuildRequires: ghc-http-client-tls-prof -BuildRequires: ghc-http-conduit-prof -#BuildRequires: ghc-http-download-prof -BuildRequires: ghc-http-types-prof -BuildRequires: ghc-memory-prof -BuildRequires: ghc-microlens-prof -BuildRequires: ghc-mtl-prof -#BuildRequires: ghc-mustache-prof -#BuildRequires: ghc-neat-interpolation-prof -#BuildRequires: ghc-open-browser-prof -BuildRequires: ghc-optparse-applicative-prof -BuildRequires: ghc-optparse-simple-prof -#BuildRequires: ghc-pantry-prof -BuildRequires: ghc-path-prof -BuildRequires: ghc-path-io-prof -BuildRequires: ghc-persistent-prof -BuildRequires: ghc-persistent-sqlite-prof -BuildRequires: ghc-pretty-prof -BuildRequires: ghc-process-prof -#BuildRequires: ghc-project-template-prof -BuildRequires: ghc-random-prof -BuildRequires: ghc-rio-prof -BuildRequires: ghc-rio-prettyprint-prof -BuildRequires: ghc-split-prof -BuildRequires: ghc-stm-prof -BuildRequires: ghc-tar-prof -BuildRequires: ghc-template-haskell-prof -BuildRequires: ghc-text-prof -BuildRequires: ghc-time-prof -BuildRequires: ghc-transformers-prof -BuildRequires: ghc-unix-prof -BuildRequires: ghc-unix-compat-prof -BuildRequires: ghc-unordered-containers-prof -BuildRequires: ghc-vector-prof -BuildRequires: ghc-yaml-prof -BuildRequires: ghc-zlib-prof -%endif -BuildRequires: help2man -# for missing dep 'casa-client': -BuildRequires: ghc-base16-bytestring-devel -BuildRequires: ghc-network-uri-devel -BuildRequires: ghc-resourcet-devel -BuildRequires: ghc-th-lift-devel -BuildRequires: ghc-unliftio-core-devel -%if %{with ghc_prof} -BuildRequires: ghc-base16-bytestring-prof -BuildRequires: ghc-network-uri-prof -BuildRequires: ghc-resourcet-prof -BuildRequires: ghc-th-lift-prof -BuildRequires: ghc-unliftio-core-prof -%endif -# for missing dep 'casa-types': -BuildRequires: ghc-base16-bytestring-devel -BuildRequires: ghc-hashable-devel -BuildRequires: ghc-path-pieces-devel -%if %{with ghc_prof} -BuildRequires: ghc-base16-bytestring-prof -BuildRequires: ghc-hashable-prof -BuildRequires: ghc-path-pieces-prof -%endif -# for missing dep 'crypton-conduit': -BuildRequires: ghc-resourcet-devel -%if %{with ghc_prof} -BuildRequires: ghc-resourcet-prof -%endif -# for missing dep 'hi-file-parser': -BuildRequires: ghc-binary-devel -%if %{with ghc_prof} -BuildRequires: ghc-binary-prof -%endif -# for missing dep 'hpack': -BuildRequires: ghc-Glob-devel -BuildRequires: ghc-bifunctors-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-infer-license-devel -BuildRequires: ghc-scientific-devel -%if %{with ghc_prof} -BuildRequires: ghc-Glob-prof -BuildRequires: ghc-bifunctors-prof -BuildRequires: ghc-deepseq-prof -BuildRequires: ghc-infer-license-prof -BuildRequires: ghc-scientific-prof -%endif -# for missing dep 'http-download': -BuildRequires: ghc-retry-devel -%if %{with ghc_prof} -BuildRequires: ghc-retry-prof -%endif -# for missing dep 'mustache': -BuildRequires: ghc-cmdargs-devel -BuildRequires: ghc-parsec-devel -BuildRequires: ghc-scientific-devel -BuildRequires: ghc-th-lift-devel -%if %{with ghc_prof} -BuildRequires: ghc-cmdargs-prof -BuildRequires: ghc-parsec-prof -BuildRequires: ghc-scientific-prof -BuildRequires: ghc-th-lift-prof -%endif -# for missing dep 'neat-interpolation': -BuildRequires: ghc-megaparsec-devel -%if %{with ghc_prof} -BuildRequires: ghc-megaparsec-prof -%endif -# for missing dep 'pantry': -BuildRequires: ghc-digest-devel -BuildRequires: ghc-hackage-security-devel -BuildRequires: ghc-network-uri-devel -BuildRequires: ghc-persistent-template-devel -BuildRequires: ghc-primitive-devel -BuildRequires: ghc-resourcet-devel -BuildRequires: ghc-tar-conduit-devel -BuildRequires: ghc-text-metrics-devel -BuildRequires: ghc-unliftio-devel -BuildRequires: ghc-zip-archive-devel -%if %{with ghc_prof} -BuildRequires: ghc-digest-prof -BuildRequires: ghc-hackage-security-prof -BuildRequires: ghc-network-uri-prof -# no persistent-template prof! -#BuildRequires: ghc-persistent-template-prof -BuildRequires: ghc-primitive-prof -BuildRequires: ghc-resourcet-prof -BuildRequires: ghc-tar-conduit-prof -BuildRequires: ghc-text-metrics-prof -BuildRequires: ghc-unliftio-prof -BuildRequires: ghc-zip-archive-prof -%endif -# for missing dep 'project-template': -BuildRequires: ghc-resourcet-devel -%if %{with ghc_prof} -BuildRequires: ghc-resourcet-prof -%endif -# for missing dep 'rio-orphans': -BuildRequires: ghc-fast-logger-devel -BuildRequires: ghc-monad-control-devel -BuildRequires: ghc-monad-logger-devel -BuildRequires: ghc-resourcet-devel -BuildRequires: ghc-transformers-base-devel -BuildRequires: ghc-unliftio-core-devel -%if %{with ghc_prof} -BuildRequires: ghc-fast-logger-prof -BuildRequires: ghc-monad-control-prof -BuildRequires: ghc-monad-logger-prof -BuildRequires: ghc-resourcet-prof -BuildRequires: ghc-transformers-base-prof -BuildRequires: ghc-unliftio-core-prof -%endif -# for missing dep 'static-bytes': -BuildRequires: ghc-primitive-devel -%if %{with ghc_prof} -BuildRequires: ghc-primitive-prof -%endif -# End cabal-rpm deps +BuildRequires: stack # pull in all of ghc for least surprise # even though strictly libHSghc is not formally part of HP @@ -339,163 +30,22 @@ Haskell Platform is a set of stable and well used Haskell tools. It provides a good starting environment for Haskell development. -%package -n stack -Version: %{stack_ver} -Summary: Haskell package tool -Url: https://docs.haskellstack.org/en/stable/ -Requires: gcc -Requires: gmp-devel -Recommends: zlib-devel - -%description -n stack -Stack is a cross-platform program for developing Haskell projects. - - -%package -n ghc-stack -Version: %{stack_ver} -Summary: Haskell stack library - -%description -n ghc-stack -This package provides the Haskell stack shared library. - - -%package -n ghc-stack-devel -Version: %{stack_ver} -Summary: Haskell stack library development files -Provides: ghc-stack-static = %{version}-%{release} -Provides: ghc-stack-static%{?_isa} = %{version}-%{release} -%if %{defined ghc_version} -Requires: ghc-compiler = %{ghc_version} -%endif -Requires: ghc-stack%{?_isa} = %{version}-%{release} - -%description -n ghc-stack-devel -This package provides the Haskell stack library development files. - - -%if %{with haddock} -%package -n ghc-stack-doc -Version: %{stack_ver} -Summary: Haskell stack library documentation -BuildArch: noarch -Requires: ghc-filesystem - -%description -n ghc-stack-doc -This package provides the Haskell stack library documentation. -%endif - - -%if %{with ghc_prof} -%package -n ghc-stack-prof -Version: %{stack_ver} -Summary: Haskell stack profiling library -Requires: ghc-stack-devel%{?_isa} = %{version}-%{release} -Supplements: (ghc-stack-devel and ghc-prof) - -%description -n ghc-stack-prof -This package provides the Haskell stack profiling library. -%endif - - -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage -l BSD-3-Clause %{aesonwarningparser} -%ghc_lib_subpackage -l BSD-3-Clause %{casaclient} -%ghc_lib_subpackage -l BSD-3-Clause %{casatypes} -%ghc_lib_subpackage -l BSD-3-Clause %{companion} -%ghc_lib_subpackage -l BSD-3-Clause %{cryptonconduit} -%ghc_lib_subpackage -l CC0-1.0 %{filelock} -%ghc_lib_subpackage -l BSD-3-Clause %{hifileparser} -%ghc_lib_subpackage -l MIT %{hpack} -%ghc_lib_subpackage -l BSD-3-Clause %{httpdownload} -%ghc_lib_subpackage -l BSD-3-Clause %{mintty} -%ghc_lib_subpackage -l BSD-3-Clause %{mustache} -%ghc_lib_subpackage -l MIT %{neatinterpolation} -%ghc_lib_subpackage -l BSD-3-Clause %{openbrowser} -%ghc_lib_subpackage -l BSD-3-Clause %{pantry} -%ghc_lib_subpackage -l BSD-3-Clause %{projecttemplate} -%ghc_lib_subpackage -l MIT %{rioorphans} -%ghc_lib_subpackage -l BSD-3-Clause %{staticbytes} -%endif - -%global version %{main_version} - - %prep -# Begin cabal-rpm setup: -%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -# End cabal-rpm setup -%autopatch -p1 %build -# Begin cabal-rpm build: -%ghc_libs_build %{subpkgs} -%ghc_lib_build -# End cabal-rpm build %install -# Begin cabal-rpm install -%ghc_libs_install %{subpkgs} -%ghc_lib_install - -set noclobber -mkdir -p %{buildroot}%{bash_completions_dir} -%{buildroot}%{_bindir}/stack --bash-completion-script stack | sed s/filenames/default/ > %{buildroot}%{bash_completions_dir}/stack - -mkdir -p %{buildroot}%{_mandir}/man1/ -help2man --no-info %{buildroot}%{_bindir}/stack > %{buildroot}%{_mandir}/man1/stack.1 -# End cabal-rpm install - -# open-browser -rm %{buildroot}%{_bindir}/example -echo %{_bindir}/hpack >> %{hpack}/ghc-hpack.files -echo %{_bindir}/haskell-mustache >> %{mustache}/ghc-mustache.files - -install -p %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc - -rm %{buildroot}%{_licensedir}/%{name}/LICENSE - %files -%files -n stack -# Begin cabal-rpm files: -%license LICENSE -%doc CONTRIBUTING.md ChangeLog.md README.md -%{_bindir}/stack -%{bash_completions_dir}/stack -%{_mandir}/man1/stack.1* -# End cabal-rpm files -%{_bindir}/stack-symlink-distro-ghc - - -%files -n ghc-stack -f ghc-stack.files -# Begin cabal-rpm files: -%license LICENSE -# End cabal-rpm files - - -%files -n ghc-stack-devel -f ghc-stack-devel.files -%doc CONTRIBUTING.md ChangeLog.md README.md - - -%if %{with haddock} -%files -n ghc-stack-doc -f ghc-stack-doc.files -%license LICENSE -%endif - - -%if %{with ghc_prof} -%files -n ghc-stack-prof -f ghc-stack-prof.files -%endif - - %changelog +* Fri Dec 6 2024 Jens Petersen - 2024.1-34 +- stack is now packaged separately + * Thu Aug 1 2024 Jens Petersen - 2024.1-33 - https://hackage.haskell.org/package/stack-2.15.7/changelog diff --git a/sources b/sources index e0cf060..e69de29 100644 --- a/sources +++ b/sources @@ -1,18 +0,0 @@ -SHA512 (stack-2.15.7.tar.gz) = 0a0e2fca52b17e3fbc5091da9fc7dd639a50c37519ae8ea27954536381d63bda4e1f20ca047e061dc898cac35a0551c996ced6f8d87184fe8e5be03e03d3cb82 -SHA512 (aeson-warning-parser-0.1.1.tar.gz) = 86c10f3e1681ec8892ba396b9077f72b1975f23373db6f56a038ecc67cb48e8d7ba33c2396031d1b31fc9da3ead2e8c00ce27c2e3a02f8b52f53f5e3ed61610d -SHA512 (casa-client-0.0.2.tar.gz) = 885ede1522142cf7b7c4ad2c49506974b349256e3537a3e6d05c45d1ef64f8144538a7bae90ae97fa3d5af4b2f24c5a1bd52dba847c677a0cec486992e5d654a -SHA512 (casa-types-0.0.2.tar.gz) = a54bb7f15310878e0a4c0524749ba8c8de8537a60892d278941cacefb80ad9d31e9ba16dd236c196b6639758f281f9ae66911d04c39b0ec6e2b75db5127ad5bf -SHA512 (companion-0.1.0.tar.gz) = 5220f0784d15e8763ac5eca34bf27c7b820a98daa7b14e6abefaf2735d0ba367ac8209b5a27d016ab1ce536973389d28a39fab9987c1827b8e849192b86e1cba -SHA512 (crypton-conduit-0.2.3.tar.gz) = 2776ef49609c11a8379e4b9f7e9dcb40f4ad5c33924de6cfd9c9952106321b8959d2dbe4537905e1d55dfe577593d75d7c1f1ff47d26497dccfbba667fdf2257 -SHA512 (filelock-0.1.1.7.tar.gz) = ca82dc7efde8a36dc4c7df63609159349d145e7de1fed6b9dcdc8c16b64cdddb3d13b838c39f363eb89ee82871cb2904e76cb833c5798319ed514815aac88e98 -SHA512 (hi-file-parser-0.1.6.0.tar.gz) = 49a29ce589440aa0554d8c1b26a2e97c2d55aff5e4a0fc63f102d8be4003572b5716f5819e64ddeb7c523e52d14b594208ca8179a959b5d1fe86435e6f7ca502 -SHA512 (hpack-0.36.1.tar.gz) = ee92ebc0cb6e37d228f4a4ffb2b2c1551fe160b8a5db065e8f61902cfe2f8c79ca8c443048d1ab60fc33c40e74015c14404666bca4e99b3d984d0d46b210c5e5 -SHA512 (http-download-0.2.1.0.tar.gz) = 75a208684bf4f116746a1015870a6bb2afbdd1a4b4c268b88f142b189e0e31c59b8d691606c3eb33be9b1637a0131c4d7cb48091179f22bba8d6d2919ce30e02 -SHA512 (mintty-0.1.4.tar.gz) = f5c3231f342d24d7dc38b0281579aa6f272767451412ea84e1c248f77331d6740186cef0bb4144b7655a80914daa0b1f3573107a76c29c1d2e6a56e793532733 -SHA512 (mustache-2.4.2.tar.gz) = 96e10988f8ccf15cd5939e16cd8d5f551853168a3719cd4717b3bb40c3227f540f4d955614e1d38385fb30f9a97351f260f79cfbc872da30eadb73bac1ebc315 -SHA512 (neat-interpolation-0.5.1.4.tar.gz) = 16f62bee23984fabebd70e70311b24bc2e7835ba90cf84bb7bb6f4d84c097bf817e3f5d653c843117b63ed886b0e16511219a688e17bdcf62c16f659074d690f -SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1 -SHA512 (pantry-0.9.3.2.tar.gz) = 6c109bc2dd08813103c072f288b5b67d577915a3401057f9c5aaae008306a1484c4ef72c4af818c67a1062793a6ae81bcc24c8d1d6f61d4de78625395bfb7b88 -SHA512 (project-template-0.2.1.0.tar.gz) = ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c -SHA512 (rio-orphans-0.1.2.0.tar.gz) = 85e883977e161161e5ba8f4fa6d13026d71f7367bac262307f9a8cfdc0316b71a490fcb6c15737919a6b4e73b3355b413161e09f5167c95b1f0c5a22c045f7ac -SHA512 (static-bytes-0.1.0.tar.gz) = 6bccb86796f1afdc28dfa8b1b4c86503fe500dd3088488213fbc68ab2d0e2c358295b56acac024ecf62ed27a33036560716d253deaaaef21983cf1d7352c8deb From 937baf3e859b9ff5fce4d9be8367b80b7665f784 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 05:47:09 +0000 Subject: [PATCH 39/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index e90f6df..93ec95c 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -3,7 +3,7 @@ Name: haskell-platform Version: 2024.1 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -43,6 +43,9 @@ It provides a good starting environment for Haskell development. %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2024.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Dec 6 2024 Jens Petersen - 2024.1-34 - stack is now packaged separately From 84b6995fd27779423d2e8cfe4d629d1477159a58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:55:06 +0000 Subject: [PATCH 40/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- haskell-platform.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haskell-platform.spec b/haskell-platform.spec index 93ec95c..b4cbdbd 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -3,7 +3,7 @@ Name: haskell-platform Version: 2024.1 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Standard Haskell distribution License: BSD-3-Clause @@ -43,6 +43,9 @@ It provides a good starting environment for Haskell development. %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2024.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 2024.1-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild