diff --git a/.gitignore b/.gitignore index 11798ae..6b8a867 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,18 @@ /stack-2.15.7.tar.gz +/aeson-warning-parser-0.1.1.tar.gz +/casa-client-0.0.2.tar.gz +/casa-types-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 +/mintty-0.1.4.tar.gz +/mustache-2.4.2.tar.gz +/neat-interpolation-0.5.1.4.tar.gz +/open-browser-0.2.1.0.tar.gz +/pantry-0.9.3.2.tar.gz +/project-template-0.2.1.0.tar.gz +/rio-orphans-0.1.2.0.tar.gz +/static-bytes-0.1.0.tar.gz diff --git a/sources b/sources index 8851b21..e0cf060 100644 --- a/sources +++ b/sources @@ -1 +1,18 @@ 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 diff --git a/stack.spec b/stack.spec index e518f72..07201e5 100644 --- a/stack.spec +++ b/stack.spec @@ -1,33 +1,72 @@ -# generated by cabal-rpm-2.2.2 +# generated by cabal-rpm-2.2.2 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name stack %global pkgver %{pkg_name}-%{version} %{?haskell_setup} -%bcond tests 0 +%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: %{pkg_name} Version: 2.15.7 -Release: 2%{?dist} +# can only be reset when all subpkgs bumped +Release: 34%{?dist} Summary: Haskell stable package build tool License: BSD-3-Clause Url: https://haskellstack.org # 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 -Source1: stack-symlink-distro-ghc +Source20: stack-symlink-distro-ghc +# disable warning about ghc/Cabal version and nix in path Patch0: stack-disabled-global-warnings.patch # https://github.com/commercialhaskell/stack/issues/6379 Patch1: stack-Setup-Platforms.patch # Begin cabal-rpm deps: -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel -BuildRequires: ghc-aeson-warning-parser-devel +#BuildRequires: ghc-aeson-warning-parser-devel BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-async-devel @@ -35,8 +74,8 @@ 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-casa-client-devel +#BuildRequires: ghc-companion-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-conduit-extra-devel BuildRequires: ghc-containers-devel @@ -46,36 +85,36 @@ BuildRequires: ghc-echo-devel BuildRequires: ghc-exceptions-devel BuildRequires: ghc-extra-devel BuildRequires: ghc-file-embed-devel -BuildRequires: ghc-filelock-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-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-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-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-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-project-template-devel BuildRequires: ghc-random-devel BuildRequires: ghc-rio-devel BuildRequires: ghc-rio-prettyprint-devel @@ -95,7 +134,7 @@ BuildRequires: ghc-zlib-devel %if %{with ghc_prof} BuildRequires: ghc-Cabal-prof BuildRequires: ghc-aeson-prof -BuildRequires: ghc-aeson-warning-parser-prof +#BuildRequires: ghc-aeson-warning-parser-prof BuildRequires: ghc-ansi-terminal-prof BuildRequires: ghc-array-prof BuildRequires: ghc-async-prof @@ -103,8 +142,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-companion-prof +#BuildRequires: ghc-casa-client-prof +#BuildRequires: ghc-companion-prof BuildRequires: ghc-conduit-prof BuildRequires: ghc-conduit-extra-prof BuildRequires: ghc-containers-prof @@ -114,36 +153,36 @@ BuildRequires: ghc-echo-prof BuildRequires: ghc-exceptions-prof BuildRequires: ghc-extra-prof BuildRequires: ghc-file-embed-prof -BuildRequires: ghc-filelock-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-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-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-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-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-project-template-prof BuildRequires: ghc-random-prof BuildRequires: ghc-rio-prof BuildRequires: ghc-rio-prettyprint-prof @@ -161,13 +200,122 @@ BuildRequires: ghc-vector-prof BuildRequires: ghc-yaml-prof BuildRequires: ghc-zlib-prof %endif -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-hspec-devel -BuildRequires: ghc-hspec-discover-devel -BuildRequires: ghc-raw-strings-qq-devel -%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 Requires: gcc Requires: gmp-devel @@ -220,21 +368,48 @@ This package provides the Haskell %{name} 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 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 %autopatch -p1 # End cabal-rpm setup %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 @@ -245,7 +420,12 @@ mkdir -p %{buildroot}%{_mandir}/man1/ help2man --no-info %{buildroot}%{_bindir}/%{name} > %{buildroot}%{_mandir}/man1/%{name}.1 # End cabal-rpm install -install -p %{SOURCE1} %{buildroot}%{_bindir}/stack-symlink-distro-ghc +# 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 %check @@ -288,6 +468,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Fri Dec 6 2024 Jens Petersen - 2.15.7-34 +- split out with deps from haskell-platform + * Tue Nov 26 2024 Jens Petersen - 2.15.7-2 - disable tests since needs network access (#2271914)