From 993952ce1f7a8feee1c5f295bb5328c38d43e0ee Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Jul 20 2020 02:10:54 +0000 Subject: update to stack-2.3.1 --- diff --git a/.gitignore b/.gitignore index a9e1f90..ef06cbe 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,11 @@ haskell-platform-2010.2.0.0.tar.gz /rio-orphans-0.1.1.0.tar.gz /stack-2.1.3.1.tar.gz /th-utilities-0.2.3.1.tar.gz +/casa-client-0.0.1.tar.gz +/casa-types-0.0.1.tar.gz +/hpack-0.34.2.tar.gz +/http-download-0.2.0.0.tar.gz +/pantry-0.4.0.1.tar.gz +/retry-0.8.1.2.tar.gz +/stack-2.3.1.tar.gz +/th-utilities-0.2.4.0.tar.gz diff --git a/haskell-platform.spec b/haskell-platform.spec index 5753ffd..5665b56 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,30 +1,31 @@ -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.6 --subpackage +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ -%global stack_ver 2.1.3.1 +%global stack_ver 2.3.1 %global stack stack-%{stack_ver} %global filelock filelock-0.1.1.4 %global hifileparser hi-file-parser-0.1.0.0 -%global hpack hpack-0.31.2 -%global httpdownload http-download-0.1.0.1 +%global hpack hpack-0.34.2 +%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 openbrowser open-browser-0.2.1.0 -%global pantry pantry-0.1.1.2 +%global pantry pantry-0.4.0.1 %global projecttemplate project-template-0.2.0.1 %global regexapplicativetext regex-applicative-text-0.1.0.1 -%global retry retry-0.8.1.0 - +%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.3.1 - -%global subpkgs %{filelock} %{hifileparser} %{inferlicense} %{hpack} %{retry} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{thutilities} %{rioorphans} %{pantry} %{projecttemplate} %{regexapplicativetext} %{stack} +%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} Name: haskell-platform -Version: 2020.1 -Release: 2%{?dist} +Version: 2020.2 +Release: 3%{?dist} Summary: Standard Haskell distribution License: BSD @@ -44,11 +45,13 @@ 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 -Source20: https://hackage.haskell.org/package/%{inferlicense}/%{inferlicense}.tar.gz -Source21: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz -Source22: https://hackage.haskell.org/package/%{thutilities}/%{thutilities}.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 # End cabal-rpm sources -Patch0: stack-2.1-relax_version_warnings.patch +#Patch0: stack-2.1-relax_version_warnings.patch BuildRequires: ghc BuildRequires: alex @@ -69,6 +72,8 @@ BuildRequires: ghc-attoparsec-prof 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-conduit-prof BuildRequires: ghc-conduit-extra-prof @@ -118,8 +123,6 @@ BuildRequires: ghc-primitive-prof BuildRequires: ghc-process-prof #BuildRequires: ghc-project-template-prof #BuildRequires: ghc-regex-applicative-text-prof -BuildRequires: ghc-resource-pool-prof -BuildRequires: ghc-resourcet-prof #BuildRequires: ghc-retry-prof BuildRequires: ghc-rio-prof BuildRequires: ghc-rio-prettyprint-prof @@ -130,7 +133,6 @@ BuildRequires: ghc-streaming-commons-prof BuildRequires: ghc-tar-prof BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-temporary-prof -BuildRequires: ghc-terminal-size-prof BuildRequires: ghc-text-prof BuildRequires: ghc-text-metrics-prof BuildRequires: ghc-th-reify-many-prof @@ -152,7 +154,6 @@ 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 @@ -163,22 +164,32 @@ BuildRequires: ghc-th-lift-prof # for missing dep 'neat-interpolation': BuildRequires: ghc-megaparsec-prof # for missing dep 'pantry': -BuildRequires: ghc-base-orphans-prof -BuildRequires: ghc-contravariant-prof BuildRequires: ghc-digest-prof -BuildRequires: ghc-network-prof -#BuildRequires: ghc-rio-orphans-prof -BuildRequires: ghc-safe-prof -BuildRequires: ghc-syb-prof +BuildRequires: ghc-resourcet-prof BuildRequires: ghc-tar-conduit-prof -BuildRequires: ghc-th-lift-prof -BuildRequires: ghc-th-lift-instances-prof -BuildRequires: ghc-th-orphans-prof -#BuildRequires: ghc-th-utilities-prof +# for missing dep 'project-template': +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 +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 +BuildRequires: ghc-th-lift-prof +BuildRequires: ghc-unliftio-core-prof +# for missing dep 'casa-types': +BuildRequires: ghc-base16-bytestring-prof +BuildRequires: ghc-path-pieces-prof # End cabal-rpm deps # pull in all of ghc for least surprise @@ -193,7 +204,7 @@ Requires: stack Obsoletes: ghc-haskell-platform-devel < %{version}-%{release} %description -Haskell Platform is a set stable and well used Haskell tools. +Haskell Platform is a set of stable and well used Haskell tools. It provides a good starting environment for Haskell development. @@ -226,6 +237,8 @@ Stack is a cross-platform program for developing Haskell projects. %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} %endif @@ -234,12 +247,12 @@ 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 -a20 -a21 -a22 +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 # End cabal-rpm setup -%patch0 -b .orig +#%%patch0 -b .orig ( cd %{regexapplicativetext} -cabal-tweak-dep-ver base '<4.10' '<4.13' +cabal-tweak-dep-ver base '<4.10' '<4.14' ) @@ -277,6 +290,9 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog +* Thu Jun 25 2020 Jens Petersen - 2020.2-3 +- update stack to 2.3.1 + * Sat May 2 2020 Jens Petersen - generate bash completions diff --git a/sources b/sources index 6569774..24dd4f5 100644 --- a/sources +++ b/sources @@ -1,16 +1,18 @@ +SHA512 (casa-client-0.0.1.tar.gz) = 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa +SHA512 (casa-types-0.0.1.tar.gz) = 6296898e8ffdd20ad7dc5aa52a99078fa71bb2384a8631761255e19b7b670a1d349715241be8cb2ee84fd52ee7ac70b4458adab3a86ebe63b9c976f7bac44f98 SHA512 (filelock-0.1.1.4.tar.gz) = ff1d87f6c8bb7dc63b63b7d85dfc007285a74fa47b4bcbaa8783a05482a0a8964ab631fdda5bb177eeed1a89f9687eb19014bc7ef20e99f1daf227e1061152ed SHA512 (hi-file-parser-0.1.0.0.tar.gz) = e101c99486839d8c28a3a1fa7fddb0cc8287298f587affaf90cccfa517adaf84b570af8d28faae16201271e0d27059fdbac5740f429e9f4f341f760d5d9d0b5f -SHA512 (hpack-0.31.2.tar.gz) = 8476463d34a4f110362e09e2b64fa091776c8742b217be26de8cddd932ae850eb63d2ba241021e4f2a1528a10b5852bba7bccdb8b7248e6ced534d45a6c39542 -SHA512 (http-download-0.1.0.1.tar.gz) = 4c1e6398e2cb819c6a03d44a104c93dc11f8a467f66e0edd55f6c0e60a3756ef3ae5bb436f6b0bd6f882160e31c520d646bacb089ed009c4dfbb586e977c47b8 +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 SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1 -SHA512 (pantry-0.1.1.2.tar.gz) = 71aee04c7d44b6e43c76baa7d69a62c3f34c148ef9bf51f6cd4beaac141204bfb93fe05f5efbec5297780076e69da603f9f00fbbcf5cd70affeda2f68fc6492e +SHA512 (pantry-0.4.0.1.tar.gz) = 0fbed425e3079bf1a06805efff092345c5f09bca430d2167d132cba4cd4a4c66567ce1aba921a9ac01d0db368f255395b2ad38d8b16ea5d81e263b100ad5a51d SHA512 (project-template-0.2.0.1.tar.gz) = bc5824086ba8dfaff4ff64c5115d37ea5e496d7692f1120b11c2a878e522119d362c7d119ccf7b9cc064c58f9ce6382b5e24a69cdac5ac5d683c4d616e2c66ea SHA512 (regex-applicative-text-0.1.0.1.tar.gz) = 8ee1d581498e047a7b759476ce98c43c19656b767790b0f12b8485bc212a71c7115cee5c3e5089392995bc71851025093c406bce9d8ac3c5962675ae06fa4339 -SHA512 (retry-0.8.1.0.tar.gz) = 1350df8a3ac342522a86d5e607dcdaff29278e8979c32796c776a746b3e1b040c8c20d2034981b108ea163d6201343c92c3ae5a902c18019e139d183c538929e +SHA512 (retry-0.8.1.2.tar.gz) = 42856d43035e7c3a8128768c1a12fb1fbbd33ebc12fba152f5559e117a6339ea35a75e06243c320623e42a70916ad9f5a141988c42df4e44acb084210e2488e7 SHA512 (rio-orphans-0.1.1.0.tar.gz) = 2e415ebcc7341cf1c913de54de3218ac487e310c9556d1e1bdb349f4e7b9d041ea729c21e2bfdbcded9a214c84f483e32839a4fec87b2af9b986db5aaa18b42a -SHA512 (stack-2.1.3.1.tar.gz) = 73edf9368e9fcb2149eb7ecd850edbc3cd88769b0578a1c660bb5b990f3a20a38a8bfa6aa26f88f03f4d0be93dac7e56875e153cd9044fff715f6221df76a4ab -SHA512 (th-utilities-0.2.3.1.tar.gz) = e281fbb5c93d5ecbafb397a68be4d47b601f4e83185798e0f37db3aa490f8bb97fb37f4c36b0f18a6f4b691e4b34873639e1970c9088040baa9ff64317b70eef +SHA512 (stack-2.3.1.tar.gz) = b5bab09697d2be10445500911ff0b038adc0e9e27baa2b015de9dd3c7d18dbac8d813c20451ac660c43d3ed2c2f587b4dfffd759653ce9c23b159a936e345aa5 +SHA512 (th-utilities-0.2.4.0.tar.gz) = 9dfd8996811f0918ef103ddba7408ef36dd91978fad12e523ca89957e79f6799479adb01422251023ad224c9386309d22169a0105eadeccff609a08c5bfbce13