diff --git a/.gitignore b/.gitignore index 6b8a867..8f001e9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,13 @@ /project-template-0.2.1.0.tar.gz /rio-orphans-0.1.2.0.tar.gz /static-bytes-0.1.0.tar.gz +/stack-3.1.1.tar.gz +/hi-file-parser-0.1.7.0.tar.gz +/hpack-0.37.0.tar.gz +/open-browser-0.2.1.1.tar.gz +/pantry-0.10.0.tar.gz +/stack-3.7.1.tar.gz +/mustache-2.4.3.1.tar.gz +/pantry-0.10.1.tar.gz +/static-bytes-0.1.1.tar.gz +/open-browser-0.3.0.1.tar.gz diff --git a/sources b/sources index e0cf060..bb7cb53 100644 --- a/sources +++ b/sources @@ -1,18 +1,18 @@ -SHA512 (stack-2.15.7.tar.gz) = 0a0e2fca52b17e3fbc5091da9fc7dd639a50c37519ae8ea27954536381d63bda4e1f20ca047e061dc898cac35a0551c996ced6f8d87184fe8e5be03e03d3cb82 +SHA512 (stack-3.7.1.tar.gz) = 351f8bb9cc20507889b92c328cfe916625935bd4e33d33bf5e11428a3fa8cc7db17cf47152231870547c9fa876661f2dac8cb826a7623fd5d8fd6c93c3e97f81 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 (hi-file-parser-0.1.7.0.tar.gz) = 5f97d8eaa14c23e400ae293f76817630170c8a49eb3eaee255685104f41d82bafb2620fe7e6637674461cde06df620426beb22d6ce53885fa6e7a4d013fdc97d +SHA512 (hpack-0.37.0.tar.gz) = 66796da16c406a3d3eea1d7a918966bdfb27dcd64820b4a4bc50c0ca86affc8e22251da1bea80c7f9906dc9d7a1e99e895423e3c6be17e44c560a88575532f89 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 (mustache-2.4.3.1.tar.gz) = 57aec94227992565d37bd3c0a2fe1e9cab50d79958a2b803de9d7bd847d77be3cc58bf48920b72da64821cdd929fdc574bc7d40b0144cdd873163f67af41dd74 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 (open-browser-0.3.0.1.tar.gz) = ab2ebd77cfdc2457b1bb32d87b3b8428489419af292ef3609d05d2c8c43d18297fde1e0e844baf01d72393c49c0de256f805001b18fc8ed026e28e9adeeee98c +SHA512 (pantry-0.10.1.tar.gz) = 6dc1b2608c4470e43e1c02ea17039b3dfe3b545c1eb85a6c4e8c941093655ab9742065a9df5709749cb86f2d9172612f006b7f4d6bf91dce19b7a60189399add 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 +SHA512 (static-bytes-0.1.1.tar.gz) = 5994a9a345592d16f04812bfeb77512b8e0769b1601d4fc2b035a4dab6f040eb513dd0e8ab88e2cfc77c47f0a461b7e399a281362f32fd0e713cbe2aff323bf3 diff --git a/stack-disabled-global-warnings.patch b/stack-disabled-global-warnings.patch index fd4525d..f33700c 100644 --- a/stack-disabled-global-warnings.patch +++ b/stack-disabled-global-warnings.patch @@ -1,10 +1,10 @@ -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 +diff -up stack-3.7.1/src/Stack/Config.hs~ stack-3.7.1/src/Stack/Config.hs +--- stack-3.7.1/src/Stack/Config.hs~ 2025-06-15 22:57:29.000000000 +0800 ++++ stack-3.7.1/src/Stack/Config.hs 2025-07-22 14:28:58.453909444 +0800 +@@ -472,9 +472,9 @@ configFromConfigMonoid fromFirst Constants.hackageBaseUrl configMonoid.hackageBaseUrl hideSourcePaths = fromFirstTrue configMonoid.hideSourcePaths - recommendUpgrade = fromFirstTrue configMonoid.recommendUpgrade + recommendStackUpgrade = fromFirstTrue configMonoid.recommendStackUpgrade - notifyIfNixOnPath = fromFirstTrue configMonoid.notifyIfNixOnPath - notifyIfGhcUntested = fromFirstTrue configMonoid.notifyIfGhcUntested - notifyIfCabalUntested = fromFirstTrue configMonoid.notifyIfCabalUntested @@ -12,30 +12,30 @@ diff -up stack-2.15.7/src/Stack/Config.hs~ stack-2.15.7/src/Stack/Config.hs + 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 + notifyIfNoRunTests = fromFirstTrue configMonoid.notifyIfNoRunTests + notifyIfNoRunBenchmarks = +diff -up stack-3.7.1/src/Stack/Types/ConfigMonoid.hs~ stack-3.7.1/src/Stack/Types/ConfigMonoid.hs +--- stack-3.7.1/src/Stack/Types/ConfigMonoid.hs~ 2025-06-15 22:57:29.000000000 +0800 ++++ stack-3.7.1/src/Stack/Types/ConfigMonoid.hs 2025-07-22 14:30:23.654826664 +0800 +@@ -187,11 +187,11 @@ data ConfigMonoid = ConfigMonoid + -- ^ See 'Stack.Types.Config.hideSourcePaths' + , recommendStackUpgrade :: !FirstTrue + -- ^ See 'Stack.Types.Config.recommendStackUpgrade' +- , notifyIfNixOnPath :: !FirstTrue ++ , notifyIfNixOnPath :: !FirstFalse + -- ^ See 'Stack.Types.Config.notifyIfNixOnPath' +- , notifyIfGhcUntested :: !FirstTrue ++ , notifyIfGhcUntested :: !FirstFalse + -- ^ See 'Stack.Types.Config.notifyIfGhcUntested' +- , notifyIfCabalUntested :: !FirstTrue ++ , notifyIfCabalUntested :: !FirstFalse + -- ^ See 'Stack.Types.Config.notifyIfCabalUntested' + , notifyIfArchUnknown :: !FirstTrue + -- ^ See 'Stack.Types.Config.notifyIfArchUnknown' +@@ -344,11 +344,11 @@ parseConfigMonoidObject rootDir obj = do hideSourcePaths <- FirstTrue <$> obj ..:? configMonoidHideSourcePathsName - recommendUpgrade <- FirstTrue <$> obj ..:? configMonoidRecommendUpgradeName + recommendStackUpgrade <- + FirstTrue <$> obj ..:? configMonoidRecommendStackUpgradeName - notifyIfNixOnPath <- FirstTrue <$> obj ..:? configMonoidNotifyIfNixOnPathName + notifyIfNixOnPath <- FirstFalse <$> obj ..:? configMonoidNotifyIfNixOnPathName notifyIfGhcUntested <- @@ -46,4 +46,4 @@ diff -up stack-2.15.7/src/Stack/Types/ConfigMonoid.hs~ stack-2.15.7/src/Stack/Ty + FirstFalse <$> obj ..:? configMonoidNotifyIfCabalUntestedName notifyIfArchUnknown <- FirstTrue <$> obj ..:? configMonoidNotifyIfArchUnknownName - casaOpts <- jsonSubWarnings (obj ..:? configMonoidCasaOptsName ..!= mempty) + notifyIfNoRunTests <- diff --git a/stack.spec b/stack.spec index 610e786..652f753 100644 --- a/stack.spec +++ b/stack.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.2.2 --subpackage +# generated by cabal-rpm-2.3.1 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name stack @@ -11,30 +11,31 @@ %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 hifileparser hi-file-parser-0.1.7.0 +%global hpack hpack-0.37.0 %global httpdownload http-download-0.2.1.0 %global mintty mintty-0.1.4 -%global mustache mustache-2.4.2 +%global mustache mustache-2.4.3.1 %global neatinterpolation neat-interpolation-0.5.1.4 -%global openbrowser open-browser-0.2.1.0 -%global pantry pantry-0.9.3.2 +%global openbrowser open-browser-0.3.0.1 +%global pantry pantry-0.10.1 %global projecttemplate project-template-0.2.1.0 %global rioorphans rio-orphans-0.1.2.0 -%global staticbytes static-bytes-0.1.0 +%global staticbytes static-bytes-0.1.1 %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 +# crypton-conduit requires crypton-combinators +%bcond tests 0 Name: %{pkg_name} -Version: 2.15.7 +Version: 3.7.1 # can only be reset when all subpkgs bumped -Release: 35%{?dist} +Release: 39%{?dist} Summary: Haskell stable package build tool License: BSD-3-Clause -Url: https://haskellstack.org +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 @@ -91,6 +92,7 @@ BuildRequires: ghc-fsnotify-devel BuildRequires: ghc-generic-deriving-devel BuildRequires: ghc-ghc-boot-devel BuildRequires: ghc-githash-devel +BuildRequires: ghc-hashable-devel #BuildRequires: ghc-hi-file-parser-devel #BuildRequires: ghc-hpack-devel BuildRequires: ghc-hpc-devel @@ -159,6 +161,7 @@ BuildRequires: ghc-fsnotify-prof BuildRequires: ghc-generic-deriving-prof BuildRequires: ghc-ghc-boot-prof BuildRequires: ghc-githash-prof +BuildRequires: ghc-hashable-prof #BuildRequires: ghc-hi-file-parser-prof #BuildRequires: ghc-hpack-prof BuildRequires: ghc-hpc-prof @@ -200,6 +203,12 @@ 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 @@ -216,11 +225,9 @@ 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': @@ -271,7 +278,6 @@ BuildRequires: ghc-megaparsec-prof 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 @@ -282,8 +288,6 @@ BuildRequires: ghc-zip-archive-devel 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 @@ -398,6 +402,10 @@ This package provides the Haskell %{name} profiling library. %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 +( cd %{pantry} + cabal-tweak-drop-dep persistent-template +) +cabal-tweak-dep-ver unix-compat '>=0.7.4' '>=0.7.3' %build @@ -420,8 +428,6 @@ mkdir -p %{buildroot}%{_mandir}/man1/ help2man --no-info %{buildroot}%{_bindir}/%{name} > %{buildroot}%{_mandir}/man1/%{name}.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 @@ -468,6 +474,19 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Mon Aug 11 2025 Jens Petersen - 3.7.1-39 +- Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 3.7.1-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jul 22 2025 Jens Petersen - 3.7.1-37 +- https://hackage.haskell.org/package/stack-3.7.1/changelog +- pantry-0.10.1, open-browser-0.3.0.1, mustache-2.4.3.1, static-bytes-0.1.1 + +* Tue Mar 25 2025 Jens Petersen - 3.1.1-36 +- https://hackage.haskell.org/package/stack-3.1.1/changelog + * Sun Jan 19 2025 Fedora Release Engineering - 2.15.7-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild