December 2024 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-unordered-containers for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-unordered-containers for openSUSE:Factory checked in at 2024-12-29 11:56:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-unordered-containers (Old) and /work/SRC/openSUSE:Factory/.ghc-unordered-containers.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-unordered-containers" Sun Dec 29 11:56:35 2024 rev:34 rq:1233716 version:0.2.20 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-unordered-containers/ghc-unordered-containers.changes 2024-08-16 12:23:55.723727194 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-unordered-containers.new.1881/ghc-unordered-containers.changes 2024-12-29 11:56:50.748686145 +0100 @@ -1,0 +2,6 @@ +Sat Dec 21 13:10:41 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update unordered-containers to version 0.2.20 revision 4. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-unordered-containers.spec ++++++ --- /var/tmp/diff_new_pack.mwpH0r/_old 2024-12-29 11:56:51.904733551 +0100 +++ /var/tmp/diff_new_pack.mwpH0r/_new 2024-12-29 11:56:51.904733551 +0100 @@ -26,7 +26,7 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/4.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof ++++++ unordered-containers.cabal ++++++ --- /var/tmp/diff_new_pack.mwpH0r/_old 2024-12-29 11:56:51.952735520 +0100 +++ /var/tmp/diff_new_pack.mwpH0r/_new 2024-12-29 11:56:51.956735684 +0100 @@ -1,6 +1,6 @@ name: unordered-containers version: 0.2.20 -x-revision: 3 +x-revision: 4 synopsis: Efficient hashing-based container types description: Efficient hashing-based container types. The containers have been @@ -61,7 +61,7 @@ base >= 4.10 && < 5, deepseq >= 1.4.3, hashable >= 1.4 && < 1.6, - template-haskell < 2.23 + template-haskell < 2.24 default-language: Haskell2010

1 0

commit ghc-text-short for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-text-short for openSUSE:Factory checked in at 2024-12-29 11:56:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-text-short (Old) and /work/SRC/openSUSE:Factory/.ghc-text-short.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-text-short" Sun Dec 29 11:56:34 2024 rev:14 rq:1233620 version:0.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-text-short/ghc-text-short.changes 2024-07-22 17:17:51.664936588 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-text-short.new.1881/ghc-text-short.changes 2024-12-29 11:56:49.344628567 +0100 @@ -1,0 +2,6 @@ +Fri Dec 20 18:17:31 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update text-short to version 0.1.6 revision 3. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-text-short.spec ++++++ --- /var/tmp/diff_new_pack.Pwm3a5/_old 2024-12-29 11:56:50.036656946 +0100 +++ /var/tmp/diff_new_pack.Pwm3a5/_new 2024-12-29 11:56:50.036656946 +0100 @@ -26,7 +26,7 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof ++++++ text-short.cabal ++++++ --- /var/tmp/diff_new_pack.Pwm3a5/_old 2024-12-29 11:56:50.076658586 +0100 +++ /var/tmp/diff_new_pack.Pwm3a5/_new 2024-12-29 11:56:50.080658750 +0100 @@ -1,7 +1,7 @@ cabal-version: 1.18 name: text-short version: 0.1.6 -x-revision: 2 +x-revision: 3 synopsis: Memory-efficient representation of Unicode text strings license: BSD3 license-file: LICENSE @@ -22,9 +22,10 @@ || ==9.0.2 || ==9.2.8 || ==9.4.8 - || ==9.6.5 - || ==9.8.2 + || ==9.6.6 + || ==9.8.4 || ==9.10.1 + || ==9.12.1 extra-source-files: ChangeLog.md @@ -45,13 +46,13 @@ other-modules: Data.Text.Short.Internal build-depends: - base >=4.12 && <4.21 + base >=4.12 && <4.22 , binary >=0.8.6.0 && <0.9 , bytestring >=0.10.8.2 && <0.13 , deepseq >=1.4.4.0 && <1.6 - , ghc-prim >=0.5.3 && <0.12 + , ghc-prim >=0.5.3 && <0.14 , hashable >=1.4.4.0 && <1.6 - , template-haskell >=2.14.0.0 && <2.23 + , template-haskell >=2.14.0.0 && <2.24 , text >=1.2.3.1 && <1.3 || >=2.0 && <2.2 other-modules: PrimOps

1 0

commit ghc-integer-logarithms for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-integer-logarithms for openSUSE:Factory checked in at 2024-12-29 11:56:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-integer-logarithms (Old) and /work/SRC/openSUSE:Factory/.ghc-integer-logarithms.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-integer-logarithms" Sun Dec 29 11:56:32 2024 rev:22 rq:1233619 version:1.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-integer-logarithms/ghc-integer-logarithms.changes 2024-04-12 17:40:16.011865616 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-integer-logarithms.new.1881/ghc-integer-logarithms.changes 2024-12-29 11:56:48.060575911 +0100 @@ -1,0 +2,10 @@ +Fri Dec 20 17:13:43 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update integer-logarithms to version 1.0.4. + 1.0.4 + ----- + + - Drop support for GHCs prior 8.6.5 + - GHC-9.12 support + +------------------------------------------------------------------- Old: ---- integer-logarithms-1.0.3.1.tar.gz integer-logarithms.cabal New: ---- integer-logarithms-1.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-integer-logarithms.spec ++++++ --- /var/tmp/diff_new_pack.uhOFKn/_old 2024-12-29 11:56:49.112619053 +0100 +++ /var/tmp/diff_new_pack.uhOFKn/_new 2024-12-29 11:56:49.112619053 +0100 @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.0.3.1 +Version: 1.0.4 Release: 0 Summary: Integer logarithms License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/6.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-array-prof @@ -86,7 +85,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ integer-logarithms-1.0.3.1.tar.gz -> integer-logarithms-1.0.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integer-logarithms-1.0.3.1/changelog.md new/integer-logarithms-1.0.4/changelog.md --- old/integer-logarithms-1.0.3.1/changelog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/integer-logarithms-1.0.4/changelog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,9 @@ +1.0.4 +----- + +- Drop support for GHCs prior 8.6.5 +- GHC-9.12 support + 1.0.3.1 ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integer-logarithms-1.0.3.1/integer-logarithms.cabal new/integer-logarithms-1.0.4/integer-logarithms.cabal --- old/integer-logarithms-1.0.3.1/integer-logarithms.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/integer-logarithms-1.0.4/integer-logarithms.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: integer-logarithms -version: 1.0.3.1 +version: 1.0.4 cabal-version: >=1.10 author: Daniel Fischer copyright: @@ -23,19 +23,16 @@ category: Math, Algorithms, Number Theory tested-with: - GHC ==7.0.4 - || ==7.2.2 - || ==7.4.2 - || ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.4 + GHC ==8.6.5 || ==8.8.4 - || ==8.10.2 - , GHCJS ==8.4 + || ==8.10.4 + || ==9.0.2 + || ==9.2.8 + || ==9.4.8 + || ==9.6.6 + || ==9.8.4 + || ==9.10.1 + || ==9.12.1 extra-source-files: changelog.md @@ -55,9 +52,9 @@ default-language: Haskell2010 hs-source-dirs: src build-depends: - array >=0.3 && <0.6 - , base >=4.3 && <4.16 - , ghc-prim >=0 && <0.8 + array >=0.5.3.0 && <0.6 + , base >=4.12.0.0 && <4.22 + , ghc-prim <0.14 if !impl(ghc >=7.10) build-depends: nats >=1.1.2 && <1.2 @@ -65,7 +62,7 @@ if impl(ghc >=9.0) build-depends: base >=4.15 - , ghc-bignum >=1.0 && <1.1 + , ghc-bignum >=1.0 && <1.4 if !flag(integer-gmp) build-depends: invalid-cabal-flag-settings <0 @@ -116,16 +113,13 @@ build-depends: base , integer-logarithms - , QuickCheck >=2.14.1 && <2.15 + , QuickCheck >=2.14.1 && <2.16 , smallcheck >=1.2 && <1.3 - , tasty >=0.10 && <1.4 - , tasty-hunit >=0.9 && <0.11 - , tasty-quickcheck >=0.8 && <0.11 + , tasty >=1.4 && <1.6 + , tasty-hunit >=0.10 && <0.11 + , tasty-quickcheck >=0.10 && <0.12 , tasty-smallcheck >=0.8 && <0.9 - if !impl(ghc >=7.10) - build-depends: nats ==1.1.* - other-modules: Math.NumberTheory.LogarithmsTests Math.NumberTheory.TestUtils diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integer-logarithms-1.0.3.1/src/Math/NumberTheory/Logarithms.hs new/integer-logarithms-1.0.4/src/Math/NumberTheory/Logarithms.hs --- old/integer-logarithms-1.0.3.1/src/Math/NumberTheory/Logarithms.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/integer-logarithms-1.0.4/src/Math/NumberTheory/Logarithms.hs 2001-09-09 03:46:40.000000000 +0200 @@ -11,9 +11,7 @@ -- {-# LANGUAGE CPP #-} {-# LANGUAGE MagicHash #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -#endif module Math.NumberTheory.Logarithms ( -- * Integer logarithms with input checks integerLogBase @@ -330,9 +328,3 @@ naturalLog2# n = integerLog2# (toInteger n) #endif #endif - -#if __GLASGOW_HASKELL__ < 707 --- The times they are a-changing. The types of primops too :( -isTrue# :: Bool -> Bool -isTrue# = id -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integer-logarithms-1.0.3.1/src/Math/NumberTheory/Powers/Integer.hs new/integer-logarithms-1.0.4/src/Math/NumberTheory/Powers/Integer.hs --- old/integer-logarithms-1.0.3.1/src/Math/NumberTheory/Powers/Integer.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/integer-logarithms-1.0.4/src/Math/NumberTheory/Powers/Integer.hs 2001-09-09 03:46:40.000000000 +0200 @@ -9,24 +9,13 @@ -- Potentially faster power function for 'Integer' base and 'Int' -- or 'Word' exponent. -- -{-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >= 702 -#if __GLASGOW_HASKELL__ >= 704 {-# LANGUAGE Safe #-} -#else -{-# LANGUAGE Trustworthy #-} -#endif -#endif module Math.NumberTheory.Powers.Integer {-# DEPRECATED "It is no faster than (^)" #-} ( integerPower , integerWordPower ) where -#if !MIN_VERSION_base(4,8,0) -import Data.Word -#endif - -- | Power of an 'Integer' by the left-to-right repeated squaring algorithm. -- This needs two multiplications in each step while the right-to-left -- algorithm needs only one multiplication for 0-bits, but here the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integer-logarithms-1.0.3.1/src/Math/NumberTheory/Powers/Natural.hs new/integer-logarithms-1.0.4/src/Math/NumberTheory/Powers/Natural.hs --- old/integer-logarithms-1.0.3.1/src/Math/NumberTheory/Powers/Natural.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/integer-logarithms-1.0.4/src/Math/NumberTheory/Powers/Natural.hs 2001-09-09 03:46:40.000000000 +0200 @@ -9,25 +9,14 @@ -- Potentially faster power function for 'Natural' base and 'Int' -- or 'Word' exponent. -- -{-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >= 702 -#if __GLASGOW_HASKELL__ >= 704 {-# LANGUAGE Safe #-} -#else -{-# LANGUAGE Trustworthy #-} -#endif -#endif module Math.NumberTheory.Powers.Natural {-# DEPRECATED "It is no faster than (^)" #-} ( naturalPower , naturalWordPower ) where -#if !MIN_VERSION_base(4,8,0) -import Data.Word -#endif - -import Numeric.Natural +import Numeric.Natural (Natural) -- | Power of an 'Natural' by the left-to-right repeated squaring algorithm. -- This needs two multiplications in each step while the right-to-left diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/integer-logarithms-1.0.3.1/test-suite/Math/NumberTheory/LogarithmsTests.hs new/integer-logarithms-1.0.4/test-suite/Math/NumberTheory/LogarithmsTests.hs --- old/integer-logarithms-1.0.3.1/test-suite/Math/NumberTheory/LogarithmsTests.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/integer-logarithms-1.0.4/test-suite/Math/NumberTheory/LogarithmsTests.hs 2001-09-09 03:46:40.000000000 +0200 @@ -8,8 +8,6 @@ -- Tests for Math.NumberTheory.Logarithms -- -{-# LANGUAGE CPP #-} - {-# OPTIONS_GHC -fno-warn-type-defaults #-} module Math.NumberTheory.LogarithmsTests @@ -17,11 +15,6 @@ ) where import Test.Tasty - -#if MIN_VERSION_base(4,8,0) -#else -import Data.Word -#endif import Numeric.Natural import Math.NumberTheory.Logarithms

1 0

commit ghc-foldl for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-foldl for openSUSE:Factory checked in at 2024-12-29 11:56:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-foldl (Old) and /work/SRC/openSUSE:Factory/.ghc-foldl.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-foldl" Sun Dec 29 11:56:31 2024 rev:30 rq:1233618 version:1.4.18 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-foldl/ghc-foldl.changes 2024-09-06 17:19:13.537588177 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-foldl.new.1881/ghc-foldl.changes 2024-12-29 11:56:47.064535066 +0100 @@ -1,0 +2,9 @@ +Fri Dec 20 05:14:50 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update foldl to version 1.4.18. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/foldl-1.4.18/src/CHANGELOG.md + +------------------------------------------------------------------- Old: ---- foldl-1.4.17.tar.gz New: ---- foldl-1.4.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-foldl.spec ++++++ --- /var/tmp/diff_new_pack.DQMmDM/_old 2024-12-29 11:56:47.772564100 +0100 +++ /var/tmp/diff_new_pack.DQMmDM/_new 2024-12-29 11:56:47.772564100 +0100 @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.4.17 +Version: 1.4.18 Release: 0 Summary: Composable, streaming, and efficient left folds License: BSD-3-Clause ++++++ foldl-1.4.17.tar.gz -> foldl-1.4.18.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foldl-1.4.17/CHANGELOG.md new/foldl-1.4.18/CHANGELOG.md --- old/foldl-1.4.17/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/foldl-1.4.18/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,7 +1,15 @@ +1.4.18 + +- Add [`lifts`](https://github.com/Gabriella439/foldl/pull/214) +- Add [`nest`](https://github.com/Gabriella439/foldl/pull/215) for `Fold1` +- Add [`Choice`, `Closed`, `Cosieve`, `Extend`, `Semigroupoid`, `Category`, `Strong`, `Arrow` and `ArrowChoice`](https://github.com/Gabriella439/foldl/pull/215) instances for `Fold1` +- Add [`Closed`](https://github.com/Gabriella439/foldl/pull/215) instance for `Fold` +- [Define `stimes` from `EndoM`'s Semigroup instance for 0](https://github.com/Gabriella439/foldl/pull/217) + 1.4.17 -- Add [Fold1 utilities](): `purely`, `purely_`, `premap`, `handles`, `foldOver`, `folded1` -- Add pattern synonym `Fold1_` that makes the initial, step and extraction functions explicit. +- Add [Fold1 utilities](https://github.com/Gabriella439/foldl/pull/212): `purely`, `purely_`, `premap`, `handles`, `foldOver`, `folded1` +- Add pattern synonym [`Fold1_`](https://github.com/Gabriella439/foldl/pull/212) that makes the initial, step and extraction functions explicit. 1.4.16 @@ -15,7 +23,7 @@ - Add [`Control.Foldl.NonEmpty.nonEmpty`](https://github.com/Gabriella439/foldl/pull/186) - Add [`Control.Foldl.NonEmpty.toFold`](https://github.com/Gabriella439/foldl/pull/191) - - [Generalize `fold1` to work with `Foldable1`](https://github.com/Gabriella439/foldl/pull/185) +- [Generalize `fold1` to work with `Foldable1`](https://github.com/Gabriella439/foldl/pull/185) 1.4.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foldl-1.4.17/foldl.cabal new/foldl-1.4.18/foldl.cabal --- old/foldl-1.4.17/foldl.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/foldl-1.4.18/foldl.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: foldl -Version: 1.4.17 +Version: 1.4.18 Cabal-Version: >=1.10 Build-Type: Simple License: BSD3 @@ -60,7 +60,7 @@ HS-Source-Dirs: bench Main-Is: Foldl.hs Build-Depends: - base, + base >= 4.11.0.0 && < 5, criterion, foldl, profunctors @@ -72,7 +72,7 @@ HS-Source-Dirs: bench Main-Is: Scanl.hs Build-Depends: - base, + base >= 4.11.0.0 && < 5, criterion, foldl GHC-Options: -O2 -Wall -rtsopts -with-rtsopts=-T @@ -83,7 +83,7 @@ HS-Source-Dirs: test Main-Is: doctest.hs Build-Depends: - base, + base >= 4.11.0.0 && < 5, doctest >= 0.16 GHC-Options: -threaded Default-Language: Haskell2010 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foldl-1.4.17/src/Control/Foldl/NonEmpty.hs new/foldl-1.4.18/src/Control/Foldl/NonEmpty.hs --- old/foldl-1.4.17/src/Control/Foldl/NonEmpty.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/foldl-1.4.18/src/Control/Foldl/NonEmpty.hs 2001-09-09 03:46:40.000000000 +0200 @@ -3,6 +3,7 @@ {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE ViewPatterns #-} {-# LANGUAGE CPP #-} +{-# LANGUAGE MultiParamTypeClasses #-} {-| This module provides a `Fold1` type that is a \"non-empty\" analog of the `Fold` type, meaning that it requires at least one input element in order to @@ -57,16 +58,24 @@ , handles , foldOver , folded1 + , nest ) where import Control.Applicative (liftA2, Const(..)) +import Control.Arrow (Arrow (..), ArrowChoice (..)) +import Control.Category (Category ()) +import qualified Control.Category +import Control.Comonad (Comonad(..)) import Control.Foldl (Fold(..)) import Control.Foldl.Internal (Either'(..)) import Data.List.NonEmpty (NonEmpty(..)) import Data.Monoid (Dual(..)) -import Data.Functor.Apply (Apply) -import Data.Profunctor (Profunctor(..)) +import Data.Functor.Apply (Apply (..)) +import Data.Functor.Extend (Extend (..)) +import Data.Profunctor +import Data.Profunctor.Sieve (Cosieve(..)) import Data.Semigroup.Foldable (Foldable1(..), traverse1_) +import Data.Semigroupoid (Semigroupoid (..)) import Data.Functor.Contravariant (Contravariant(..)) import Prelude hiding (head, last, minimum, maximum) @@ -83,7 +92,7 @@ >>> _2 f (x, y) = fmap (\i -> (x, i)) (f y) ->>> both f (x, y) = (,) <$> f x <.> f y +>>> both1 f (x, y) = (,) <$> f x <.> f y -} @@ -137,6 +146,18 @@ rmap = fmap {-# INLINE rmap #-} +instance Choice Fold1 where + right' = nest + {-# INLINE right' #-} + +instance Closed Fold1 where + closed = nest + {-# INLINE closed #-} + +instance Cosieve Fold1 NonEmpty where + cosieve = Control.Foldl.NonEmpty.fold1 + {-# INLINE cosieve #-} + instance Applicative (Fold1 a) where pure b = Fold1 (pure (pure b)) {-# INLINE pure #-} @@ -144,6 +165,10 @@ Fold1 l <*> Fold1 r = Fold1 (liftA2 (<*>) l r) {-# INLINE (<*>) #-} +instance Extend (Fold1 a) where + duplicated (Fold1 f) = Fold1 $ fmap fromFold . duplicated . f + {-# INLINE duplicated #-} + instance Semigroup b => Semigroup (Fold1 a b) where (<>) = liftA2 (<>) {-# INLINE (<>) #-} @@ -155,6 +180,36 @@ mappend = (<>) {-# INLINE mappend #-} +instance Semigroupoid Fold1 where + o (Fold1 l1) (Fold1 r1) = Fold1 f1 + where + f1 a = let r = r1 a + l = l1 $ extract r + in o l r + {-# INLINE o #-} + +instance Category Fold1 where + (.) = o + {-# INLINE (.) #-} + + id = last + {-# INLINE id #-} + +instance Strong Fold1 where + first' f = (,) <$> lmap fst f <*> lmap snd last + {-# INLINE first' #-} + +instance Arrow Fold1 where + arr f = f <$> last + {-# INLINE arr #-} + + first = first' + {-# INLINE first #-} + +instance ArrowChoice Fold1 where + left = left' + {-# INLINE left #-} + instance Num b => Num (Fold1 a b) where fromInteger = pure . fromInteger {-# INLINE fromInteger #-} @@ -404,7 +459,7 @@ {- | @(foldOver f folder xs)@ folds all values from a Lens, Traversal1 or Fold1 optic with the given folder ->>> foldOver (_2 . both) Foldl1.nonEmpty (1, (2, 3)) +>>> foldOver (_2 . both1) Foldl1.nonEmpty (1, (2, 3)) 2 :| [3] > Foldl1.foldOver f folder xs == Foldl1.fold1 folder (xs ^.. f) @@ -431,3 +486,12 @@ folded1 k ts = contramap (\_ -> ()) (traverse1_ k ts) {-# INLINABLE folded1 #-} +{-| Nest a fold in an Apply. +-} +nest :: Apply f => Fold1 a b -> Fold1 (f a) (f b) +nest (Fold1_ i s e) = + Fold1_ + (fmap i) + (liftF2 s) + (fmap e) +{-# INLINABLE nest #-} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/foldl-1.4.17/src/Control/Foldl.hs new/foldl-1.4.18/src/Control/Foldl.hs --- old/foldl-1.4.17/src/Control/Foldl.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/foldl-1.4.18/src/Control/Foldl.hs 2001-09-09 03:46:40.000000000 +0200 @@ -118,6 +118,7 @@ , impurely_ , generalize , simplify + , lifts , hoists , duplicateM , _Fold1 @@ -162,6 +163,7 @@ import Data.HashMap.Strict (HashMap) import Data.Map.Strict (Map) import Data.Monoid hiding ((<>)) +import Data.Semigroup (Semigroup(stimes), stimesMonoid) import Data.Semigroupoid (Semigroupoid) import Data.Functor.Extend (Extend(..)) import Data.Profunctor @@ -219,7 +221,7 @@ >>> in Control.Foldl.Optics.prism Just maybeEither >>> :} ->>> both f (x, y) = (,) <$> f x <.> f y +>>> both f (x, y) = (,) <$> f x <*> f y -} @@ -245,9 +247,13 @@ rmap = fmap instance Choice Fold where - right' (Fold step begin done) = Fold (liftA2 step) (Right begin) (fmap done) + right' = nest {-# INLINE right' #-} +instance Closed Fold where + closed = nest + {-# INLINE closed #-} + instance Cosieve Fold [] where cosieve = fold {-# INLINE cosieve #-} @@ -1164,6 +1170,14 @@ hoists phi (FoldM step begin done) = FoldM (\a b -> phi (step a b)) (phi begin) (phi . done) {-# INLINABLE hoists #-} +{- | Lift a monadic value to a 'FoldM'; + works like 'Control.Monad.Trans.Class.lift'. + +> lifts . pure = pure +-} +lifts :: Monad m => m b -> FoldM m a b +lifts mb = FoldM (\() _ -> pure ()) (pure ()) (\() -> mb) + {-| Allows to continue feeding a 'FoldM' even after passing it to a function that closes it. @@ -1230,11 +1244,11 @@ {-| @(postmapM f folder)@ returns a new 'FoldM' where f is applied to the final value. -> postmapM return = id +> postmapM pure = id > > postmapM (f >=> g) = postmapM g . postmapM f -> postmapM k (pure r) = k r +> postmapM k (pure r) = lifts (k r) -} postmapM :: Monad m => (a -> m r) -> FoldM m x a -> FoldM m x r postmapM f (FoldM step begin done) = FoldM step begin done' @@ -1404,6 +1418,9 @@ (EndoM f) <> (EndoM g) = EndoM (f <=< g) {-# INLINE (<>) #-} + stimes = stimesMonoid + {-# INLINE stimes #-} + instance Monad m => Monoid (EndoM m a) where mempty = EndoM return {-# INLINE mempty #-}

1 0

commit ghc-data-fix for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-data-fix for openSUSE:Factory checked in at 2024-12-29 11:56:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-data-fix (Old) and /work/SRC/openSUSE:Factory/.ghc-data-fix.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-data-fix" Sun Dec 29 11:56:30 2024 rev:14 rq:1233617 version:0.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-data-fix/ghc-data-fix.changes 2024-07-22 17:17:03.267009555 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-data-fix.new.1881/ghc-data-fix.changes 2024-12-29 11:56:44.888445829 +0100 @@ -1,0 +2,6 @@ +Fri Dec 20 15:43:08 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update data-fix to version 0.3.4 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- New: ---- data-fix.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-data-fix.spec ++++++ --- /var/tmp/diff_new_pack.mp5uF9/_old 2024-12-29 11:56:45.816483886 +0100 +++ /var/tmp/diff_new_pack.mp5uF9/_new 2024-12-29 11:56:45.816483886 +0100 @@ -25,6 +25,7 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof @@ -69,6 +70,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ data-fix.cabal ++++++ cabal-version: 2.2 Name: data-fix Version: 0.3.4 x-revision: 1 License: BSD-3-Clause License-file: LICENSE Author: Anton Kholomiov, Edward Kmett, Oleg Grenrus Maintainer: <anton.kholomiov(a)gmail.com> Category: Data Synopsis: Fixpoint data types Build-Type: Simple Description: Fixpoint types and recursion schemes. If you define your AST as fixpoint type, you get fold and unfold operations for free. . Thanks for contribution to: Matej Kollar, Herbert Valerio Riedel Stability: Experimental Homepage: https://github.com/spell-music/data-fix Bug-Reports: https://github.com/spell-music/data-fix/issues Tested-With: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1 extra-source-files: CHANGELOG.md Source-repository head Type: git Location: https://github.com/spell-music/data-fix library hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall exposed-modules: Data.Fix ghc-options: -Wno-trustworthy-safe ghc-options: -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints -Widentities -Wmissing-export-lists build-depends: , base >=4.12.0.0 && <4.22 , deepseq >=1.4.4.0 && <1.6 , hashable >=1.4.4.0 && <1.6

1 0

commit ghc-assoc for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-assoc for openSUSE:Factory checked in at 2024-12-29 11:56:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-assoc (Old) and /work/SRC/openSUSE:Factory/.ghc-assoc.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-assoc" Sun Dec 29 11:56:29 2024 rev:12 rq:1233616 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-assoc/ghc-assoc.changes 2024-05-20 18:17:06.738314382 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-assoc.new.1881/ghc-assoc.changes 2024-12-29 11:56:42.620352819 +0100 @@ -1,0 +2,6 @@ +Fri Dec 20 15:43:36 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update assoc to version 1.1.1 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- New: ---- assoc.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-assoc.spec ++++++ --- /var/tmp/diff_new_pack.n7ZJrX/_old 2024-12-29 11:56:44.032410725 +0100 +++ /var/tmp/diff_new_pack.n7ZJrX/_new 2024-12-29 11:56:44.052411545 +0100 @@ -25,6 +25,7 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof @@ -64,6 +65,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ assoc.cabal ++++++ cabal-version: 3.0 name: assoc version: 1.1.1 x-revision: 1 license: BSD-3-Clause license-file: LICENSE synopsis: swap and assoc: Symmetric and Semigroupy Bifunctors category: Data description: Provides generalisations of @swap :: (a,b) -> (b,a)@ and @assoc :: ((a,b),c) -> (a,(b,c))@ to @Bifunctor@s supporting similar operations (e.g. @Either@, @These@). author: Oleg Grenrus <oleg.grenrus(a)iki.fi> maintainer: Oleg Grenrus <oleg.grenrus(a)iki.fi> build-type: Simple extra-source-files: CHANGELOG.md tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1 source-repository head type: git location: https://github.com/phadej/assoc.git flag tagged default: False manual: True description: You can disable the use of the `tagged` package using `-f-tagged`. . Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. library default-language: Haskell2010 hs-source-dirs: src build-depends: base >=4.12 && <4.22 if flag(tagged) build-depends: tagged >=0.8.8 && <0.9 exposed-modules: Data.Bifunctor.Assoc Data.Bifunctor.Swap other-extensions: TypeFamilies

1 0

commit ghc-OneTuple for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-OneTuple for openSUSE:Factory checked in at 2024-12-29 11:56:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-OneTuple (Old) and /work/SRC/openSUSE:Factory/.ghc-OneTuple.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-OneTuple" Sun Dec 29 11:56:28 2024 rev:9 rq:1233615 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-OneTuple/ghc-OneTuple.changes 2024-05-20 18:17:06.142292682 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-OneTuple.new.1881/ghc-OneTuple.changes 2024-12-29 11:56:40.404261942 +0100 @@ -1,0 +2,6 @@ +Fri Dec 20 18:16:59 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update OneTuple to version 0.4.2 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- New: ---- OneTuple.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-OneTuple.spec ++++++ --- /var/tmp/diff_new_pack.NZAlnW/_old 2024-12-29 11:56:41.744316895 +0100 +++ /var/tmp/diff_new_pack.NZAlnW/_new 2024-12-29 11:56:41.756317387 +0100 @@ -26,6 +26,7 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof @@ -75,6 +76,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ OneTuple.cabal ++++++ cabal-version: 1.12 name: OneTuple version: 0.4.2 x-revision: 1 synopsis: Singleton Tuple category: Data description: This package is a compatibility package for a singleton data type . > data Solo a = MkSolo a . Note: it's not a @newtype@ . @Solo@ is available in @base-4.16@ (GHC-9.2). copyright: (c) John Dorsey 2008 license: BSD3 license-file: LICENSE author: John Dorsey <haskell(a)colquitt.org> maintainer: Oleg Grenrus <oleg.grenrus(a)iki.fi>, John Dorsey <haskell(a)colquitt.org> stability: experimental build-type: Simple tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.6 || ==9.10.1 || ==9.12.1 extra-source-files: Changelog.md source-repository head type: git location: https://github.com/phadej/OneTuple.git library default-language: Haskell98 exposed-modules: Data.Tuple.OneTuple Data.Tuple.Solo Data.Tuple.Solo.TH hs-source-dirs: src build-depends: base >=4.12 && <4.22 , template-haskell if impl(ghc >=9.0) build-depends: ghc-prim else build-depends: hashable >=1.3.5.0 && <1.6 if !impl(ghc >=9.0) build-depends: foldable1-classes-compat >=0.1 && <0.2 if !impl(ghc >=9.2) build-depends: base-orphans >=0.8.6 test-suite instances type: exitcode-stdio-1.0 default-language: Haskell98 hs-source-dirs: test main-is: instances.hs build-depends: base , hashable , OneTuple if !impl(ghc >=8.0) build-depends: semigroups , transformers , transformers-compat if !impl(ghc >=9.6) build-depends: foldable1-classes-compat >=0.1 && <0.2 test-suite th type: exitcode-stdio-1.0 default-language: Haskell98 hs-source-dirs: test main-is: th.hs build-depends: base , OneTuple , template-haskell

1 0

commit ghc-toml-parser for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-toml-parser for openSUSE:Factory checked in at 2024-12-29 11:56:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-toml-parser (Old) and /work/SRC/openSUSE:Factory/.ghc-toml-parser.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-toml-parser" Sun Dec 29 11:56:27 2024 rev:10 rq:1233471 version:2.0.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-toml-parser/ghc-toml-parser.changes 2024-06-11 18:28:48.155794125 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-toml-parser.new.1881/ghc-toml-parser.changes 2024-12-29 11:56:37.788154662 +0100 @@ -1,0 +2,6 @@ +Thu Dec 19 00:34:19 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update toml-parser to version 2.0.1.0 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- New: ---- toml-parser.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-toml-parser.spec ++++++ --- /var/tmp/diff_new_pack.rxVaKd/_old 2024-12-29 11:56:39.344218472 +0100 +++ /var/tmp/diff_new_pack.rxVaKd/_new 2024-12-29 11:56:39.352218800 +0100 @@ -26,6 +26,7 @@ License: ISC URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: alex BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel @@ -84,6 +85,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ toml-parser.cabal ++++++ cabal-version: 3.0 name: toml-parser version: 2.0.1.0 x-revision: 1 synopsis: TOML 1.0.0 parser description: TOML parser using generated lexers and parsers with careful attention to the TOML 1.0.0 semantics for defining tables. license: ISC license-file: LICENSE author: Eric Mertens maintainer: emertens(a)gmail.com copyright: 2023 Eric Mertens category: Text build-type: Simple tested-with: GHC == {8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.5, 9.8.2, 9.10.1} extra-doc-files: ChangeLog.md README.md source-repository head type: git location: https://github.com/glguy/toml-parser tag: main common extensions default-language: Haskell2010 default-extensions: BlockArguments DeriveDataTypeable DeriveGeneric DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving ImportQualifiedPost LambdaCase ScopedTypeVariables TypeOperators TypeSynonymInstances ViewPatterns library import: extensions hs-source-dirs: src default-language: Haskell2010 exposed-modules: Toml Toml.Pretty Toml.Schema Toml.Schema.FromValue Toml.Schema.Generic Toml.Schema.Generic.FromValue Toml.Schema.Generic.ToValue Toml.Schema.Matcher Toml.Schema.ParseTable Toml.Schema.ToValue Toml.Semantics Toml.Semantics.Ordered Toml.Semantics.Types Toml.Syntax Toml.Syntax.Lexer Toml.Syntax.Parser Toml.Syntax.Position Toml.Syntax.Token Toml.Syntax.Types other-modules: Toml.Syntax.LexerUtils Toml.Syntax.ParserUtils build-depends: array ^>= 0.5, base ^>= {4.14, 4.15, 4.16, 4.17, 4.18, 4.19, 4.20, 4.21}, containers ^>= {0.5, 0.6, 0.7}, prettyprinter ^>= 1.7, text >= 0.2 && < 3, time ^>= {1.9, 1.10, 1.11, 1.12, 1.14}, transformers ^>= {0.5, 0.6}, build-tool-depends: alex:alex >= 3.2, happy:happy >= 1.19, if impl(ghc >= 9.8) ghc-options: -Wno-x-partial test-suite unittests import: extensions type: exitcode-stdio-1.0 hs-source-dirs: test main-is: Main.hs default-extensions: QuasiQuotes build-tool-depends: hspec-discover:hspec-discover ^>= {2.10, 2.11} build-depends: base, containers, hspec ^>= {2.10, 2.11}, template-haskell ^>= {2.16, 2.17, 2.18, 2.19, 2.20, 2.21, 2.22, 2.23}, text, time, toml-parser, other-modules: DecodeSpec DerivingViaSpec FromValueSpec HieDemoSpec LexerSpec PrettySpec QuoteStr TomlSpec ToValueSpec test-suite readme import: extensions type: exitcode-stdio-1.0 main-is: README.lhs ghc-options: -pgmL markdown-unlit -optL "haskell toml" default-extensions: QuasiQuotes DerivingVia other-modules: QuoteStr hs-source-dirs: . test build-depends: base, toml-parser, hspec ^>= {2.10, 2.11}, template-haskell ^>= {2.16, 2.17, 2.18, 2.19, 2.20, 2.21, 2.22, 2.23}, text, build-tool-depends: markdown-unlit:markdown-unlit ^>= {0.5.1, 0.6.0}, executable toml-benchmarker buildable: False main-is: benchmarker.hs default-language: Haskell2010 build-depends: base, toml-parser, time, text hs-source-dirs: benchmarker

1 0

commit ghc-splitmix for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-splitmix for openSUSE:Factory checked in at 2024-12-29 11:56:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-splitmix (Old) and /work/SRC/openSUSE:Factory/.ghc-splitmix.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-splitmix" Sun Dec 29 11:56:26 2024 rev:18 rq:1233470 version:0.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-splitmix/ghc-splitmix.changes 2024-04-12 17:40:17.319913790 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-splitmix.new.1881/ghc-splitmix.changes 2024-12-29 11:56:36.552103974 +0100 @@ -1,0 +2,9 @@ +Thu Dec 19 14:34:52 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update splitmix to version 0.1.1. + # 0.1.1 + + - Drop support for GHCs prior 8.6.5 + - Support GHC-9.12 + +------------------------------------------------------------------- Old: ---- splitmix-0.1.0.5.tar.gz splitmix.cabal New: ---- splitmix-0.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-splitmix.spec ++++++ --- /var/tmp/diff_new_pack.X4Rmcw/_old 2024-12-29 11:56:37.408139078 +0100 +++ /var/tmp/diff_new_pack.X4Rmcw/_new 2024-12-29 11:56:37.412139242 +0100 @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.0.5 +Version: 0.1.1 Release: 0 Summary: Fast Splittable PRNG License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof @@ -41,8 +40,6 @@ BuildRequires: ghc-async-prof BuildRequires: ghc-base-compat-batteries-devel BuildRequires: ghc-base-compat-batteries-prof -BuildRequires: ghc-base-compat-devel -BuildRequires: ghc-base-compat-prof BuildRequires: ghc-bytestring-devel BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-devel @@ -114,7 +111,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ splitmix-0.1.0.5.tar.gz -> splitmix-0.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/splitmix-0.1.0.5/Changelog.md new/splitmix-0.1.1/Changelog.md --- old/splitmix-0.1.0.5/Changelog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/splitmix-0.1.1/Changelog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,8 @@ +# 0.1.1 + +- Drop support for GHCs prior 8.6.5 +- Support GHC-9.12 + # 0.1.0.4 - Add TestU01 test-suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/splitmix-0.1.0.5/splitmix.cabal new/splitmix-0.1.1/splitmix.cabal --- old/splitmix-0.1.0.5/splitmix.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/splitmix-0.1.1/splitmix.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: splitmix -version: 0.1.0.5 +version: 0.1.1 synopsis: Fast Splittable PRNG description: Pure Haskell implementation of SplitMix described in @@ -33,24 +33,16 @@ category: System, Random build-type: Simple tested-with: - GHC ==7.0.4 - || ==7.2.2 - || ==7.4.2 - || ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 + GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.2 || ==9.2.8 - || ==9.4.7 - || ==9.6.3 - || ==9.8.1 - , GHCJS ==8.4 + || ==9.4.8 + || ==9.6.6 + || ==9.8.4 + || ==9.10.1 + || ==9.11.1 extra-source-files: Changelog.md @@ -80,8 +72,8 @@ -- ghc-options: -fplugin=DumpCore -fplugin-opt DumpCore:core-html build-depends: - base >=4.3 && <4.20 - , deepseq >=1.3.0.0 && <1.6 + base >=4.12.0.0 && <4.22 + , deepseq >=1.4.4.0 && <1.6 if flag(optimised-mixer) cpp-options: -DOPTIMISED_MIX32=1 @@ -105,7 +97,7 @@ else cpp-options: -DSPLITMIX_INIT_COMPAT=1 - build-depends: time >=1.2.0.3 && <1.13 + build-depends: time >=1.2.0.3 && <1.15 source-repository head type: git @@ -119,8 +111,8 @@ main-is: Bench.hs build-depends: base - , containers >=0.4.2.1 && <0.7 - , criterion >=1.1.0.0 && <1.7 + , containers >=0.6.0.1 && <0.8 + , criterion >=1.6.0.0 && <1.7 , random , splitmix , tf-random >=0.5 && <0.6 @@ -148,9 +140,6 @@ , random , splitmix - if !impl(ghcjs) - build-depends: clock >=0.8 && <0.9 - test-suite examples type: exitcode-stdio-1.0 default-language: Haskell2010 @@ -159,7 +148,7 @@ main-is: Examples.hs build-depends: base - , HUnit ==1.3.1.2 || >=1.6.0.0 && <1.7 + , HUnit >=1.6.0.0 && <1.7 , splitmix test-suite splitmix-tests @@ -174,10 +163,9 @@ build-depends: base - , base-compat >=0.11.1 && <0.14 - , containers >=0.4.0.0 && <0.7 - , HUnit ==1.3.1.2 || >=1.6.0.0 && <1.7 - , math-functions ==0.1.7.0 || >=0.3.3.0 && <0.4 + , containers >=0.4.0.0 && <0.8 + , HUnit >=1.6.0.0 && <1.7 + , math-functions >=0.3.3.0 && <0.4 , splitmix , test-framework >=0.8.2.0 && <0.9 , test-framework-hunit >=0.3.0.2 && <0.4 @@ -211,14 +199,13 @@ build-depends: async >=2.2.1 && <2.3 , base - , base-compat-batteries >=0.10.5 && <0.14 - , bytestring >=0.9.1.8 && <0.13 + , bytestring >=0.10.8.2 && <0.13 , deepseq - , process >=1.0.1.5 && <1.7 + , process >=1.6.0.0 && <1.7 , random , splitmix , tf-random >=0.5 && <0.6 - , vector >=0.11.0.0 && <0.14 + , vector >=0.13.0.0 && <0.14 test-suite splitmix-testu01 if !os(linux) @@ -233,7 +220,7 @@ extra-libraries: testu01 build-depends: base - , base-compat-batteries >=0.10.5 && <0.14 + , base-compat-batteries >=0.10.5 && <0.15 , splitmix test-suite initialization @@ -244,5 +231,5 @@ main-is: Initialization.hs build-depends: base - , HUnit ==1.3.1.2 || >=1.6.0.0 && <1.7 + , HUnit >=1.6.0.0 && <1.7 , splitmix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/splitmix-0.1.0.5/src/System/Random/SplitMix.hs new/splitmix-0.1.1/src/System/Random/SplitMix.hs --- old/splitmix-0.1.0.5/src/System/Random/SplitMix.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/splitmix-0.1.1/src/System/Random/SplitMix.hs 2001-09-09 03:46:40.000000000 +0200 @@ -22,14 +22,8 @@ -- (the mixing functions are easily inverted, and two successive outputs -- suffice to reconstruct the internal state). -- --- Note: This module supports all GHCs since GHC-7.0.4, --- but GHC-7.0 and GHC-7.2 have slow implementation, as there --- are no native 'popCount'. --- {-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -#endif module System.Random.SplitMix ( SMGen, nextWord64, @@ -62,7 +56,7 @@ import System.Random.SplitMix.Init -#if defined(__HUGS__) || !MIN_VERSION_base(4,8,0) +#if defined(__HUGS__) import Data.Word (Word) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/splitmix-0.1.0.5/src/System/Random/SplitMix32.hs new/splitmix-0.1.1/src/System/Random/SplitMix32.hs --- old/splitmix-0.1.0.5/src/System/Random/SplitMix32.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/splitmix-0.1.1/src/System/Random/SplitMix32.hs 2001-09-09 03:46:40.000000000 +0200 @@ -5,14 +5,8 @@ -- -- You __really don't want to use this one__. -- --- Note: This module supports all GHCs since GHC-7.0.4, --- but GHC-7.0 and GHC-7.2 have slow implementation, as there --- are no native 'popCount'. --- {-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -#endif module System.Random.SplitMix32 ( SMGen, nextWord32, @@ -46,7 +40,7 @@ import System.Random.SplitMix.Init -#if defined(__HUGS__) || !MIN_VERSION_base(4,8,0) +#if defined(__HUGS__) import Data.Word (Word) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/splitmix-0.1.0.5/src-compat/Data/Bits/Compat.hs new/splitmix-0.1.1/src-compat/Data/Bits/Compat.hs --- old/splitmix-0.1.0.5/src-compat/Data/Bits/Compat.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/splitmix-0.1.1/src-compat/Data/Bits/Compat.hs 2001-09-09 03:46:40.000000000 +0200 @@ -6,39 +6,4 @@ countLeadingZeros, ) where -import Data.Bits - -#if !MIN_VERSION_base(4,7,0) -#define FiniteBits Bits -#endif - -#if !MIN_VERSION_base(4,5,0) -popCount :: Bits a => a -> Int -popCount = go 0 - where - go c 0 = c `seq` c - go c w = go (c+1) (w .&. (w - 1)) -- clear the least significant -{-# INLINE popCount #-} -#endif - -#if !MIN_VERSION_base(4,7,0) -zeroBits :: Bits a => a -zeroBits = clearBit (bit 0) 0 -{-# INLINE zeroBits #-} - -finiteBitSize :: Bits a => a -> Int -finiteBitSize = bitSize -{-# INLINE finiteBitSize #-} -#endif - -#if !MIN_VERSION_base(4,8,0) -countLeadingZeros :: FiniteBits b => b -> Int -countLeadingZeros x = (w-1) - go (w-1) - where - go i | i < 0 = i -- no bit set - | testBit x i = i - | otherwise = go (i-1) - - w = finiteBitSize x -{-# INLINE countLeadingZeros #-} -#endif +import Data.Bits (popCount, zeroBits, finiteBitSize, countLeadingZeros) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/splitmix-0.1.0.5/tests/Dieharder.hs new/splitmix-0.1.1/tests/Dieharder.hs --- old/splitmix-0.1.0.5/tests/Dieharder.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/splitmix-0.1.1/tests/Dieharder.hs 2001-09-09 03:46:40.000000000 +0200 @@ -3,9 +3,6 @@ {-# LANGUAGE ScopedTypeVariables #-} module Main (main) where -import Prelude () -import Prelude.Compat - import Control.Concurrent.QSem import Control.DeepSeq (force) import Control.Monad (when) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/splitmix-0.1.0.5/tests/MiniQC.hs new/splitmix-0.1.1/tests/MiniQC.hs --- old/splitmix-0.1.0.5/tests/MiniQC.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/splitmix-0.1.1/tests/MiniQC.hs 2001-09-09 03:46:40.000000000 +0200 @@ -5,8 +5,6 @@ import Control.Monad (ap) import Data.Int (Int32, Int64) import Data.Word (Word32, Word64) -import Prelude () -import Prelude.Compat import Test.Framework.Providers.API (Test, TestName) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit (assertFailure)

1 0

commit ghc-http-client for openSUSE:Factory
by Source-Sync 29 Dec '24

29 Dec '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-http-client for openSUSE:Factory checked in at 2024-12-29 11:56:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-http-client (Old) and /work/SRC/openSUSE:Factory/.ghc-http-client.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-http-client" Sun Dec 29 11:56:25 2024 rev:55 rq:1233469 version:0.7.18 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-http-client/ghc-http-client.changes 2024-03-28 14:27:36.682778299 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-http-client.new.1881/ghc-http-client.changes 2024-12-29 11:56:34.444017525 +0100 @@ -1,0 +2,8 @@ +Thu Dec 19 07:03:21 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update http-client to version 0.7.18. + ## 0.7.18 + + * Add the `managerSetMaxNumberHeaders` function to the `Client` module to configure `managerMaxNumberHeaders` in `ManagerSettings`. + +------------------------------------------------------------------- Old: ---- http-client-0.7.17.tar.gz New: ---- http-client-0.7.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-http-client.spec ++++++ --- /var/tmp/diff_new_pack.0KaWgM/_old 2024-12-29 11:56:35.092044100 +0100 +++ /var/tmp/diff_new_pack.0KaWgM/_new 2024-12-29 11:56:35.096044264 +0100 @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.7.17 +Version: 0.7.18 Release: 0 Summary: An HTTP client engine License: MIT ++++++ http-client-0.7.17.tar.gz -> http-client-0.7.18.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/ChangeLog.md new/http-client-0.7.18/ChangeLog.md --- old/http-client-0.7.17/ChangeLog.md 2024-03-20 05:42:23.000000000 +0100 +++ new/http-client-0.7.18/ChangeLog.md 2024-12-19 08:02:17.000000000 +0100 @@ -1,5 +1,9 @@ # Changelog for http-client +## 0.7.18 + +* Add the `managerSetMaxNumberHeaders` function to the `Client` module to configure `managerMaxNumberHeaders` in `ManagerSettings`. + ## 0.7.17 * Add `managerSetMaxHeaderLength` to `Client` to change `ManagerSettings` `MaxHeaderLength`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/Network/HTTP/Client/Core.hs new/http-client-0.7.18/Network/HTTP/Client/Core.hs --- old/http-client-0.7.17/Network/HTTP/Client/Core.hs 2023-10-30 09:14:33.000000000 +0100 +++ new/http-client-0.7.18/Network/HTTP/Client/Core.hs 2024-12-19 08:02:17.000000000 +0100 @@ -105,7 +105,7 @@ ex <- try $ do cont <- requestBuilder (dropProxyAuthSecure req) (managedResource mconn) - getResponse (mMaxHeaderLength m) timeout' req mconn cont + getResponse (mMaxHeaderLength m) (mMaxNumberHeaders m) timeout' req mconn cont case ex of -- Connection was reused, and might have been closed. Try again diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/Network/HTTP/Client/Headers.hs new/http-client-0.7.18/Network/HTTP/Client/Headers.hs --- old/http-client-0.7.17/Network/HTTP/Client/Headers.hs 2023-12-31 08:19:15.000000000 +0100 +++ new/http-client-0.7.18/Network/HTTP/Client/Headers.hs 2024-12-19 08:02:17.000000000 +0100 @@ -28,8 +28,8 @@ charPeriod = 46 -parseStatusHeaders :: Maybe MaxHeaderLength -> Connection -> Maybe Int -> ([Header] -> IO ()) -> Maybe (IO ()) -> IO StatusHeaders -parseStatusHeaders mhl conn timeout' onEarlyHintHeaders cont +parseStatusHeaders :: Maybe MaxHeaderLength -> Maybe MaxNumberHeaders -> Connection -> Maybe Int -> ([Header] -> IO ()) -> Maybe (IO ()) -> IO StatusHeaders +parseStatusHeaders mhl mnh conn timeout' onEarlyHintHeaders cont | Just k <- cont = getStatusExpectContinue k | otherwise = getStatus where @@ -91,9 +91,14 @@ Just (i, "") -> Just i _ -> Nothing + guardMaxNumberHeaders :: Int -> IO () + guardMaxNumberHeaders count = case fmap unMaxNumberHeaders mnh of + Nothing -> pure () + Just n -> when (count >= n) $ throwHttp TooManyHeaderFields + parseHeaders :: Int -> ([Header] -> [Header]) -> IO [Header] - parseHeaders 100 _ = throwHttp OverlongHeaders parseHeaders count front = do + guardMaxNumberHeaders count line <- connectionReadLine mhl conn if S.null line then return $ front [] @@ -107,8 +112,8 @@ parseHeaders count front parseEarlyHintHeadersUntilFailure :: Int -> ([Header] -> [Header]) -> IO [Header] - parseEarlyHintHeadersUntilFailure 100 _ = throwHttp OverlongHeaders parseEarlyHintHeadersUntilFailure count front = do + guardMaxNumberHeaders count line <- connectionReadLine mhl conn if S.null line then return $ front [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/Network/HTTP/Client/Manager.hs new/http-client-0.7.18/Network/HTTP/Client/Manager.hs --- old/http-client-0.7.17/Network/HTTP/Client/Manager.hs 2023-12-31 08:19:15.000000000 +0100 +++ new/http-client-0.7.18/Network/HTTP/Client/Manager.hs 2024-12-19 08:02:17.000000000 +0100 @@ -93,6 +93,7 @@ , managerProxyInsecure = defaultProxy , managerProxySecure = defaultProxy , managerMaxHeaderLength = Just $ MaxHeaderLength 4096 + , managerMaxNumberHeaders = Just $ MaxNumberHeaders 100 } -- | Create a 'Manager'. The @Manager@ will be shut down automatically via @@ -133,6 +134,7 @@ then httpsProxy req else httpProxy req , mMaxHeaderLength = managerMaxHeaderLength ms + , mMaxNumberHeaders = managerMaxNumberHeaders ms } return manager @@ -259,7 +261,9 @@ , "\r\n" ] parse conn = do - StatusHeaders status _ _ _ <- parseStatusHeaders (managerMaxHeaderLength ms) conn Nothing (\_ -> return ()) Nothing + let mhl = managerMaxHeaderLength ms + mnh = managerMaxNumberHeaders ms + StatusHeaders status _ _ _ <- parseStatusHeaders mhl mnh conn Nothing (\_ -> return ()) Nothing unless (status == status200) $ throwHttp $ ProxyConnectException ultHost ultPort status in tlsProxyConnection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/Network/HTTP/Client/Response.hs new/http-client-0.7.18/Network/HTTP/Client/Response.hs --- old/http-client-0.7.17/Network/HTTP/Client/Response.hs 2023-12-31 08:19:15.000000000 +0100 +++ new/http-client-0.7.18/Network/HTTP/Client/Response.hs 2024-12-19 08:02:17.000000000 +0100 @@ -81,10 +81,10 @@ mergeHeaders :: W.RequestHeaders -> W.RequestHeaders -> W.RequestHeaders mergeHeaders lhs rhs = nubBy (\(a, _) (a', _) -> a == a') (lhs ++ rhs) - + stripHeaders :: Request -> Request stripHeaders r = do - case (hostDiffer r, shouldStripOnlyIfHostDiffer) of + case (hostDiffer r, shouldStripOnlyIfHostDiffer) of (True, True) -> stripHeaders' r (True, False) -> stripHeaders' r (False, False) -> stripHeaders' r @@ -92,7 +92,7 @@ -- We need to check if we have omitted headers in previous -- request chain. Consider request chain: -- - -- 1. example-1.com + -- 1. example-1.com -- 2. example-2.com (we may have removed some headers here from 1) -- 3. example-1.com (since we are back at same host as 1, we need re-add stripped headers) -- @@ -114,14 +114,15 @@ } getResponse :: Maybe MaxHeaderLength + -> Maybe MaxNumberHeaders -> Maybe Int -> Request -> Managed Connection -> Maybe (IO ()) -- ^ Action to run in case of a '100 Continue'. -> IO (Response BodyReader) -getResponse mhl timeout' req@(Request {..}) mconn cont = do +getResponse mhl mnh timeout' req@(Request {..}) mconn cont = do let conn = managedResource mconn - StatusHeaders s version earlyHs hs <- parseStatusHeaders mhl conn timeout' earlyHintHeadersReceived cont + StatusHeaders s version earlyHs hs <- parseStatusHeaders mhl mnh conn timeout' earlyHintHeadersReceived cont let mcl = lookup "content-length" hs >>= readPositiveInt . S8.unpack isChunked = ("transfer-encoding", CI.mk "chunked") `elem` map (second CI.mk) hs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/Network/HTTP/Client/Types.hs new/http-client-0.7.18/Network/HTTP/Client/Types.hs --- old/http-client-0.7.17/Network/HTTP/Client/Types.hs 2023-12-31 08:19:15.000000000 +0100 +++ new/http-client-0.7.18/Network/HTTP/Client/Types.hs 2024-12-19 08:02:17.000000000 +0100 @@ -1,8 +1,9 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveTraversable #-} -{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE RankNTypes #-} module Network.HTTP.Client.Types ( BodyReader , Connection (..) @@ -39,6 +40,7 @@ , ResponseTimeout (..) , ProxySecureMode (..) , MaxHeaderLength (..) + , MaxNumberHeaders (..) ) where import qualified Data.Typeable as T (Typeable) @@ -147,12 +149,14 @@ -- -- @since 0.5.0 | OverlongHeaders - -- ^ Either too many headers, or too many total bytes in a - -- single header, were returned by the server, and the - -- memory exhaustion protection in this library has kicked - -- in. + -- ^ Too many total bytes in the HTTP header were returned + -- by the server. -- -- @since 0.5.0 + | TooManyHeaderFields + -- ^ Too many HTTP header fields were returned by the server. + -- + -- @since 0.7.18 | ResponseTimeout -- ^ The server took too long to return a response. This can -- be altered via 'responseTimeout' or @@ -821,6 +825,17 @@ -- -- Since 0.4.7 , managerMaxHeaderLength :: Maybe MaxHeaderLength + -- ^ Configure the maximum size, in bytes, of an HTTP header field. + -- + -- Default: 4096 + -- + -- @since 0.7.17 + , managerMaxNumberHeaders :: Maybe MaxNumberHeaders + -- ^ Configure the maximum number of HTTP header fields. + -- + -- Default: 100 + -- + -- @since 0.7.18 } deriving T.Typeable @@ -845,9 +860,10 @@ , mWrapException :: forall a. Request -> IO a -> IO a , mModifyRequest :: Request -> IO Request , mSetProxy :: Request -> Request - , mModifyResponse :: Response BodyReader -> IO (Response BodyReader) + , mModifyResponse :: Response BodyReader -> IO (Response BodyReader) -- ^ See 'managerProxy' , mMaxHeaderLength :: Maybe MaxHeaderLength + , mMaxNumberHeaders :: Maybe MaxNumberHeaders } deriving T.Typeable @@ -906,4 +922,12 @@ newtype MaxHeaderLength = MaxHeaderLength { unMaxHeaderLength :: Int } - deriving (Eq, Show) + deriving (Eq, Show, Ord, Num, Enum, Bounded, T.Typeable) + +-- | The maximum number of header fields. +-- +-- @since 0.7.18 +newtype MaxNumberHeaders = MaxNumberHeaders + { unMaxNumberHeaders :: Int + } + deriving (Eq, Show, Ord, Num, Enum, Bounded, T.Typeable) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/Network/HTTP/Client.hs new/http-client-0.7.18/Network/HTTP/Client.hs --- old/http-client-0.7.17/Network/HTTP/Client.hs 2024-03-20 05:42:23.000000000 +0100 +++ new/http-client-0.7.18/Network/HTTP/Client.hs 2024-12-19 08:02:17.000000000 +0100 @@ -113,6 +113,7 @@ , managerSetInsecureProxy , managerSetSecureProxy , managerSetMaxHeaderLength + , managerSetMaxNumberHeaders , ProxyOverride , proxyFromRequest , noProxy @@ -326,6 +327,11 @@ managerSetMaxHeaderLength l manager = manager { managerMaxHeaderLength = Just $ MaxHeaderLength l } +-- @since 0.7.18 +managerSetMaxNumberHeaders :: Int -> ManagerSettings -> ManagerSettings +managerSetMaxNumberHeaders n manager = manager + { managerMaxNumberHeaders = Just $ MaxNumberHeaders n } + -- $example1 -- = Example Usage -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/http-client.cabal new/http-client-0.7.18/http-client.cabal --- old/http-client-0.7.17/http-client.cabal 2024-03-20 05:42:23.000000000 +0100 +++ new/http-client-0.7.18/http-client.cabal 2024-12-19 08:02:17.000000000 +0100 @@ -1,5 +1,5 @@ name: http-client -version: 0.7.17 +version: 0.7.18 synopsis: An HTTP client engine description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/http-client>. homepage: https://github.com/snoyberg/http-client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/test-nonet/Network/HTTP/Client/HeadersSpec.hs new/http-client-0.7.18/test-nonet/Network/HTTP/Client/HeadersSpec.hs --- old/http-client-0.7.17/test-nonet/Network/HTTP/Client/HeadersSpec.hs 2023-12-31 08:19:15.000000000 +0100 +++ new/http-client-0.7.18/test-nonet/Network/HTTP/Client/HeadersSpec.hs 2024-12-19 08:02:17.000000000 +0100 @@ -23,7 +23,7 @@ , "\nignored" ] (connection, _, _) <- dummyConnection input - statusHeaders <- parseStatusHeaders Nothing connection Nothing (\_ -> return ()) Nothing + statusHeaders <- parseStatusHeaders Nothing Nothing connection Nothing (\_ -> return ()) Nothing statusHeaders `shouldBe` StatusHeaders status200 (HttpVersion 1 1) mempty [ ("foo", "bar") , ("baz", "bin") @@ -37,7 +37,7 @@ ] (conn, out, _) <- dummyConnection input let sendBody = connectionWrite conn "data" - statusHeaders <- parseStatusHeaders Nothing conn Nothing (\_ -> return ()) (Just sendBody) + statusHeaders <- parseStatusHeaders Nothing Nothing conn Nothing (\_ -> return ()) (Just sendBody) statusHeaders `shouldBe` StatusHeaders status200 (HttpVersion 1 1) [] [ ("foo", "bar") ] out >>= (`shouldBe` ["data"]) @@ -47,7 +47,7 @@ ] (conn, out, _) <- dummyConnection input let sendBody = connectionWrite conn "data" - statusHeaders <- parseStatusHeaders Nothing conn Nothing (\_ -> return ()) (Just sendBody) + statusHeaders <- parseStatusHeaders Nothing Nothing conn Nothing (\_ -> return ()) (Just sendBody) statusHeaders `shouldBe` StatusHeaders status417 (HttpVersion 1 1) [] [] out >>= (`shouldBe` []) @@ -59,7 +59,7 @@ , "result" ] (conn, out, inp) <- dummyConnection input - statusHeaders <- parseStatusHeaders Nothing conn Nothing (\_ -> return ()) Nothing + statusHeaders <- parseStatusHeaders Nothing Nothing conn Nothing (\_ -> return ()) Nothing statusHeaders `shouldBe` StatusHeaders status200 (HttpVersion 1 1) [] [ ("foo", "bar") ] out >>= (`shouldBe` []) inp >>= (`shouldBe` ["result"]) @@ -78,7 +78,7 @@ callbackResults :: MVar (Seq.Seq [Header]) <- newMVar mempty let onEarlyHintHeader h = modifyMVar_ callbackResults (return . (Seq.|> h)) - statusHeaders <- parseStatusHeaders Nothing conn Nothing onEarlyHintHeader Nothing + statusHeaders <- parseStatusHeaders Nothing Nothing conn Nothing onEarlyHintHeader Nothing statusHeaders `shouldBe` StatusHeaders status200 (HttpVersion 1 1) [("Link", "</foo.js>") , ("Link", "</bar.js>") @@ -110,7 +110,7 @@ callbackResults :: MVar (Seq.Seq [Header]) <- newMVar mempty let onEarlyHintHeader h = modifyMVar_ callbackResults (return . (Seq.|> h)) - statusHeaders <- parseStatusHeaders Nothing conn Nothing onEarlyHintHeader Nothing + statusHeaders <- parseStatusHeaders Nothing Nothing conn Nothing onEarlyHintHeader Nothing statusHeaders `shouldBe` StatusHeaders status200 (HttpVersion 1 1) [("Link", "</foo.js>") , ("Link", "</bar.js>") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/test-nonet/Network/HTTP/Client/ResponseSpec.hs new/http-client-0.7.18/test-nonet/Network/HTTP/Client/ResponseSpec.hs --- old/http-client-0.7.17/test-nonet/Network/HTTP/Client/ResponseSpec.hs 2023-08-21 16:10:32.000000000 +0200 +++ new/http-client-0.7.18/test-nonet/Network/HTTP/Client/ResponseSpec.hs 2024-12-19 08:02:17.000000000 +0100 @@ -16,7 +16,7 @@ spec :: Spec spec = describe "ResponseSpec" $ do - let getResponse' conn = getResponse Nothing Nothing req (dummyManaged conn) Nothing + let getResponse' conn = getResponse Nothing Nothing Nothing req (dummyManaged conn) Nothing req = parseRequest_ "http://localhost" it "basic" $ do (conn, _, _) <- dummyConnection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.7.17/test-nonet/Network/HTTP/ClientSpec.hs new/http-client-0.7.18/test-nonet/Network/HTTP/ClientSpec.hs --- old/http-client-0.7.17/test-nonet/Network/HTTP/ClientSpec.hs 2023-10-30 09:14:33.000000000 +0100 +++ new/http-client-0.7.18/test-nonet/Network/HTTP/ClientSpec.hs 2024-12-19 08:02:17.000000000 +0100 @@ -31,6 +31,9 @@ notWindows x = x #endif +crlf :: S.ByteString +crlf = "\r\n" + main :: IO () main = hspec spec @@ -323,3 +326,24 @@ case parseRequest "https://o_O:18446744072699450606" of Left _ -> pure () :: IO () Right req -> error $ "Invalid request: " ++ show req + + it "too many header fields" $ do + let message = S.concat $ + ["HTTP/1.1 200 OK", crlf] <> replicate 120 ("foo: bar" <> crlf) <> [crlf, "body"] + + serveWith message $ \port -> do + man <- newManager $ managerSetMaxNumberHeaders 120 defaultManagerSettings + req <- parseUrlThrow $ "http://127.0.0.1:" ++ show port + httpLbs req man `shouldThrow` \e -> case e of + HttpExceptionRequest _ TooManyHeaderFields -> True + _otherwise -> False + + it "not too many header fields" $ do + let message = S.concat $ + ["HTTP/1.1 200 OK", crlf] <> replicate 120 ("foo: bar" <> crlf) <> [crlf, "body"] + + serveWith message $ \port -> do + man <- newManager $ managerSetMaxNumberHeaders 121 defaultManagerSettings + req <- parseUrlThrow $ "http://127.0.0.1:" ++ show port + res <- httpLbs req man + responseBody res `shouldBe` "body"

1 0