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