From e6cf6db2c11ab2fa3a11bf3d1e5fb42ef201d5d6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Apr 09 2020 03:39:32 +0000 Subject: add stack-2.1.3.1 and subpackage missing deps (#1816920) --- diff --git a/.gitignore b/.gitignore index e3c9059..a9e1f90 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,19 @@ haskell-platform-2010.2.0.0.tar.gz /haskell-platform-7.10.3.tar.gz /haskell-platform-8.0.2.tar.gz /haskell-platform-8.2.2.tar.gz +/filelock-0.1.1.4.tar.gz +/hi-file-parser-0.1.0.0.tar.gz +/hpack-0.31.2.tar.gz +/http-download-0.1.0.1.tar.gz +/infer-license-0.2.0.tar.gz +/mintty-0.1.2.tar.gz +/mustache-2.3.1.tar.gz +/neat-interpolation-0.3.2.6.tar.gz +/open-browser-0.2.1.0.tar.gz +/pantry-0.1.1.2.tar.gz +/project-template-0.2.0.1.tar.gz +/regex-applicative-text-0.1.0.1.tar.gz +/retry-0.8.1.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 diff --git a/haskell-platform.spec b/haskell-platform.spec index 2d7bcb5..942ed05 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -1,20 +1,185 @@ # https://fedoraproject.org/wiki/Packaging:Haskell +%global stack_ver 2.1.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 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 projecttemplate project-template-0.2.0.1 +%global regexapplicativetext regex-applicative-text-0.1.0.1 +%global retry retry-0.8.1.0 + +%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} + Name: haskell-platform -Version: 2019.1 -Release: 4%{?dist} +Version: 2020.1 +Release: 1%{?dist} Summary: Standard Haskell distribution License: BSD URL: http://www.haskell.org/platform/ +# 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/%{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 +# End cabal-rpm sources -BuildArch: noarch BuildRequires: ghc BuildRequires: alex BuildRequires: cabal-install BuildRequires: happy BuildRequires: hscolour +# for stack: +# Begin cabal-rpm deps: +BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-Cabal-prof +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-annotated-wl-pprint-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-colour-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-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-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 +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-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 +#BuildRequires: ghc-pantry-prof +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-pretty-prof +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 +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-terminal-size-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 +# for missing dep 'hi-file-parser': +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 +BuildRequires: ghc-either-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-scientific-prof +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-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 'regex-applicative-text': +BuildRequires: ghc-regex-applicative-prof +# for missing dep 'retry': +BuildRequires: ghc-random-prof +# End cabal-rpm deps + # pull in all of ghc for least surprise # even though strictly libHSghc is not formally part of HP Requires: ghc @@ -22,8 +187,7 @@ Requires: alex Requires: cabal-install Requires: happy Requires: hscolour -# F17: -Obsoletes: ghc-haskell-platform < %{version}-%{release} +Requires: stack # F26: Obsoletes: ghc-haskell-platform-devel < %{version}-%{release} @@ -31,19 +195,84 @@ Obsoletes: ghc-haskell-platform-devel < %{version}-%{release} Haskell Platform is a set 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 +License: BSD +Url: http://haskellstack.org + +%description -n stack +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 MIT %{hpack} +%ghc_lib_subpackage -l BSD %{httpdownload} +%ghc_lib_subpackage -l BSD %{mintty} +%ghc_lib_subpackage -l BSD %{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 %{regexapplicativetext} +%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 %{stack} +%endif + +%global version %{main_version} + + %prep -%{nil} +# Begin cabal-rpm setup: +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a20 -a21 -a22 +# End cabal-rpm setup +( +cd %{regexapplicativetext} +cabal-tweak-dep-ver base '<4.10' '<4.13' +) + %build -%{nil} +# Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} +# End cabal-rpm build + %install -%{nil} +# Begin cabal-rpm install +%ghc_libs_install %{subpkgs} +%ghc_fix_rpath %{pkgver} +# 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 + %files +%files -n stack +# Begin cabal-rpm files: +%license %{stack}/LICENSE +%doc %{stack}/CONTRIBUTING.md %{stack}/ChangeLog.md %{stack}/README.md +%{_bindir}/stack +# End cabal-rpm files + + %changelog +* Wed Apr 8 2020 Jens Petersen - 2020.1-1 +- subpackage stack package tool + * Wed Jan 29 2020 Fedora Release Engineering - 2019.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index e69de29..6569774 100644 --- a/sources +++ b/sources @@ -0,0 +1,16 @@ +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 (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 (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 (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