July 2024 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-cryptohash-sha1 for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-cryptohash-sha1 for openSUSE:Factory checked in at 2024-07-22 17:16:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cryptohash-sha1 (Old) and /work/SRC/openSUSE:Factory/.ghc-cryptohash-sha1.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-cryptohash-sha1" Mon Jul 22 17:16:13 2024 rev:12 rq:1188631 version:0.11.101.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cryptohash-sha1/ghc-cryptohash-sha1.changes 2024-04-29 09:09:26.256732882 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-cryptohash-sha1.new.17339/ghc-cryptohash-sha1.changes 2024-07-22 17:16:57.030761632 +0200 @@ -1,0 +2,6 @@ +Wed Jun 26 08:40:21 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update cryptohash-sha1 to version 0.11.101.0 revision 5. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cryptohash-sha1.spec ++++++ --- /var/tmp/diff_new_pack.0Psjwv/_old 2024-07-22 17:16:58.002800275 +0200 +++ /var/tmp/diff_new_pack.0Psjwv/_new 2024-07-22 17:16:58.002800275 +0200 @@ -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/4.cabal… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/5.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof ++++++ cryptohash-sha1.cabal ++++++ --- /var/tmp/diff_new_pack.0Psjwv/_old 2024-07-22 17:16:58.038801706 +0200 +++ /var/tmp/diff_new_pack.0Psjwv/_new 2024-07-22 17:16:58.042801865 +0200 @@ -1,7 +1,7 @@ cabal-version: >=1.10 name: cryptohash-sha1 version: 0.11.101.0 -x-revision: 4 +x-revision: 5 description: A practical incremental and one-pass, pure API to the <https://en.wikipedia.org/wiki/SHA-1 SHA-1 hash algorithm> @@ -29,9 +29,9 @@ build-type: Simple tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 - GHC == 9.6.4 + GHC == 9.6.5 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 @@ -41,7 +41,6 @@ GHC == 8.4.4 GHC == 8.2.2 GHC == 8.0.2 - GHC == 7.10.3 extra-source-files: cbits/sha1.h changelog.md @@ -75,7 +74,7 @@ , base16-bytestring >= 1.0.1.0 && < 1.1 , SHA >= 1.6.4 && < 1.7 , tasty >= 1.4 && < 1.6 - , tasty-quickcheck == 0.10.* + , tasty-quickcheck >= 0.10 && < 1 , tasty-hunit == 0.10.* benchmark bench-sha1

1 0

commit ghc-constraints for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-constraints for openSUSE:Factory checked in at 2024-07-22 17:16:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-constraints (Old) and /work/SRC/openSUSE:Factory/.ghc-constraints.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-constraints" Mon Jul 22 17:16:11 2024 rev:21 rq:1188629 version:0.14.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-constraints/ghc-constraints.changes 2024-05-21 18:36:31.790577598 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-constraints.new.17339/ghc-constraints.changes 2024-07-22 17:16:54.926677983 +0200 @@ -1,0 +2,6 @@ +Fri Jul 5 12:23:40 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update constraints to version 0.14.2 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- New: ---- constraints.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-constraints.spec ++++++ --- /var/tmp/diff_new_pack.MSDvpz/_old 2024-07-22 17:16:55.462699292 +0200 +++ /var/tmp/diff_new_pack.MSDvpz/_new 2024-07-22 17:16:55.466699452 +0200 @@ -26,6 +26,7 @@ License: BSD-2-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 @@ -82,6 +83,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ constraints.cabal ++++++ cabal-version: 2.4 name: constraints category: Constraints version: 0.14.2 x-revision: 1 license: BSD-2-Clause license-file: LICENSE author: Edward A. Kmett maintainer: Edward A. Kmett <ekmett(a)gmail.com> stability: experimental homepage: http://github.com/ekmett/constraints/ bug-reports: http://github.com/ekmett/constraints/issues copyright: Copyright (C) 2011-2021 Edward A. Kmett synopsis: Constraint manipulation description: GHC 7.4 gave us the ability to talk about @ConstraintKinds@. They stopped crashing the compiler in GHC 7.6. . This package provides a vocabulary for working with them. build-type: Simple tested-with: GHC == 9.8.1 GHC == 9.6.3 GHC == 9.4.7 GHC == 9.2.8 GHC == 9.0.2 GHC == 8.10.7 GHC == 8.8.4 GHC == 8.6.5 extra-source-files: README.markdown , CHANGELOG.markdown source-repository head type: git location: https://github.com/ekmett/constraints.git library hs-source-dirs: src default-language: Haskell2010 other-extensions: FunctionalDependencies, ScopedTypeVariables, StandaloneDeriving, FlexibleInstances, FlexibleContexts, ConstraintKinds, KindSignatures, TypeOperators, Rank2Types, GADTs build-depends: , base >= 4.12 && < 5 , binary >= 0.7.1 && < 0.9 , boring >= 0.2 && < 0.3 , deepseq >= 1.3 && < 1.6 , ghc-prim , hashable >= 1.2 && < 1.6 , mtl >= 2.2 && < 2.4 , transformers >= 0.5 && < 0.7 if !impl(ghc >= 9.0) build-depends: integer-gmp exposed-modules: Data.Constraint Data.Constraint.Deferrable Data.Constraint.Forall Data.Constraint.Lifting Data.Constraint.Nat Data.Constraint.Symbol Data.Constraint.Unsafe if impl(ghc >= 9.2) exposed-modules: Data.Constraint.Char ghc-options: -Wall -Wno-star-is-type test-suite spec type: exitcode-stdio-1.0 default-language: Haskell2010 hs-source-dirs: tests main-is: Spec.hs other-modules: GH55Spec GH117Spec ghc-options: -Wall -threaded -rtsopts build-tool-depends: hspec-discover:hspec-discover >= 2 build-depends: , base , constraints , hspec >= 2

1 0

commit ghc-clientsession for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-clientsession for openSUSE:Factory checked in at 2024-07-22 17:16:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-clientsession (Old) and /work/SRC/openSUSE:Factory/.ghc-clientsession.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-clientsession" Mon Jul 22 17:16:11 2024 rev:7 rq:1188628 version:0.9.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-clientsession/ghc-clientsession.changes 2023-07-24 18:26:38.126385911 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-clientsession.new.17339/ghc-clientsession.changes 2024-07-22 17:16:54.106645382 +0200 @@ -1,0 +2,8 @@ +Sun Jul 14 08:07:12 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update clientsession to version 0.9.3.0. + ## 0.9.3.0 + + * Migrate to crypton from cryptonite. + +------------------------------------------------------------------- Old: ---- clientsession-0.9.2.0.tar.gz clientsession.cabal New: ---- clientsession-0.9.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-clientsession.spec ++++++ --- /var/tmp/diff_new_pack.GQibfw/_old 2024-07-22 17:16:54.638666533 +0200 +++ /var/tmp/diff_new_pack.GQibfw/_new 2024-07-22 17:16:54.638666533 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-clientsession # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.9.2.0 +Version: 0.9.3.0 Release: 0 Summary: Securely store session data in a client-side cookie 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/1.cabal… BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel @@ -39,8 +38,8 @@ BuildRequires: ghc-cereal-prof BuildRequires: ghc-crypto-api-devel BuildRequires: ghc-crypto-api-prof -BuildRequires: ghc-cryptonite-devel -BuildRequires: ghc-cryptonite-prof +BuildRequires: ghc-crypton-devel +BuildRequires: ghc-crypton-prof BuildRequires: ghc-directory-devel BuildRequires: ghc-directory-prof BuildRequires: ghc-entropy-devel @@ -98,7 +97,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ clientsession-0.9.2.0.tar.gz -> clientsession-0.9.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clientsession-0.9.2.0/ChangeLog.md new/clientsession-0.9.3.0/ChangeLog.md --- old/clientsession-0.9.2.0/ChangeLog.md 2023-07-18 16:58:27.000000000 +0200 +++ new/clientsession-0.9.3.0/ChangeLog.md 2024-07-14 10:03:15.000000000 +0200 @@ -1,5 +1,9 @@ # ChangeLog for clientsession +## 0.9.3.0 + +* Migrate to crypton from cryptonite. + ## 0.9.2.0 * Migrate crypto-aes and cprng-aes to cryptonite. [#36](https://github.com/yesodweb/clientsession/pull/36) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clientsession-0.9.2.0/clientsession.cabal new/clientsession-0.9.3.0/clientsession.cabal --- old/clientsession-0.9.2.0/clientsession.cabal 2023-07-18 16:59:31.000000000 +0200 +++ new/clientsession-0.9.3.0/clientsession.cabal 2024-07-14 10:03:02.000000000 +0200 @@ -1,5 +1,5 @@ name: clientsession -version: 0.9.2.0 +version: 0.9.3.0 license: MIT license-file: LICENSE author: Michael Snoyman <michael(a)snoyman.com>, Felipe Lessa <felipe.lessa(a)gmail.com> @@ -29,7 +29,9 @@ library default-language: Haskell2010 - build-depends: base >=4 && < 5 + build-depends: base >= 4.8 && < 5 + -- https://github.com/yesodweb/clientsession/commit/1221230770feff60f77ff676d5… + -- Data.Bifunctor entered base in 4.8 , bytestring >= 0.9 , cereal >= 0.3 , directory >= 1 @@ -38,7 +40,7 @@ , skein == 1.0.* , base64-bytestring >= 0.1.1.1 , entropy >= 0.2.1 - , cryptonite >= 0.15 + , crypton >= 1.0 , setenv exposed-modules: Web.ClientSession other-modules: System.LookupEnv @@ -64,4 +66,4 @@ source-repository head type: git - location: git://github.com/yesodweb/clientsession.git + location: https://github.com/yesodweb/clientsession.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clientsession-0.9.2.0/src/Web/ClientSession.hs new/clientsession-0.9.3.0/src/Web/ClientSession.hs --- old/clientsession-0.9.2.0/src/Web/ClientSession.hs 2023-07-18 16:56:02.000000000 +0200 +++ new/clientsession-0.9.3.0/src/Web/ClientSession.hs 2024-07-14 10:02:50.000000000 +0200 @@ -95,11 +95,11 @@ -- from crypto-api import Crypto.Classes (constTimeEq) --- from cryptonite +-- from crypton import qualified Crypto.Cipher.AES as A import Crypto.Cipher.Types(Cipher(..),BlockCipher(..),makeIV) import Crypto.Error (eitherCryptoError) -import "cryptonite" Crypto.Random (ChaChaDRG,drgNew,randomBytesGenerate) +import "crypton" Crypto.Random (ChaChaDRG,drgNew,randomBytesGenerate) -- from skein import Crypto.Skein (skeinMAC', Skein_512_256) @@ -311,7 +311,7 @@ -- Crypto.Modes.getIVIO, since it does not require /dev/urandom -- I/O for every call. --- [now with cryptonite.ChaChaDRG] +-- [now with crypton.ChaChaDRG] -- I haven't run any benchmark; this conversion is a case of “code -- that doesn't crash trumps performance.”

1 0

commit ghc-cairo for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-cairo for openSUSE:Factory checked in at 2024-07-22 17:16:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cairo (Old) and /work/SRC/openSUSE:Factory/.ghc-cairo.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-cairo" Mon Jul 22 17:16:09 2024 rev:6 rq:1188626 version:0.13.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cairo/ghc-cairo.changes 2024-01-29 22:28:17.307862928 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-cairo.new.17339/ghc-cairo.changes 2024-07-22 17:16:45.070286140 +0200 @@ -1,0 +2,6 @@ +Sat Jul 13 13:00:01 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update cairo to version 0.13.11.0. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- cairo-0.13.10.0.tar.gz cairo.cabal New: ---- cairo-0.13.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cairo.spec ++++++ --- /var/tmp/diff_new_pack.bSwieL/_old 2024-07-22 17:16:50.618506711 +0200 +++ /var/tmp/diff_new_pack.bSwieL/_new 2024-07-22 17:16:50.630507188 +0200 @@ -19,13 +19,12 @@ %global pkg_name cairo %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.13.10.0 +Version: 0.13.11.0 Release: 0 Summary: Binding to the Cairo library 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… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-prof BuildRequires: ghc-array-devel @@ -88,7 +87,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ cairo-0.13.10.0.tar.gz -> cairo-0.13.11.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairo-0.13.10.0/Graphics/Rendering/Cairo/Internal/Drawing/Transformations.chs new/cairo-0.13.11.0/Graphics/Rendering/Cairo/Internal/Drawing/Transformations.chs --- old/cairo-0.13.10.0/Graphics/Rendering/Cairo/Internal/Drawing/Transformations.chs 2001-09-09 03:46:40.000000000 +0200 +++ new/cairo-0.13.11.0/Graphics/Rendering/Cairo/Internal/Drawing/Transformations.chs 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ ----------------------------------------------------------------------------- -- | --- Module : Graphics.Rendering.Cairo.Internal.Drawing.Tranformations +-- Module : Graphics.Rendering.Cairo.Internal.Drawing.Transformations -- Copyright : (c) Paolo Martini 2005 -- License : BSD-style (see cairo/COPYRIGHT) -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairo-0.13.10.0/Graphics/Rendering/Cairo.hs new/cairo-0.13.11.0/Graphics/Rendering/Cairo.hs --- old/cairo-0.13.10.0/Graphics/Rendering/Cairo.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/cairo-0.13.11.0/Graphics/Rendering/Cairo.hs 2001-09-09 03:46:40.000000000 +0200 @@ -488,7 +488,7 @@ setSourceRGB :: Double -- ^ red component of colour -> Double -- ^ green component of colour - -> Double -- ^ blue compoment of colour + -> Double -- ^ blue component of colour -> Render () setSourceRGB = liftRender3 Internal.setSourceRGB @@ -568,7 +568,7 @@ -- | Sets the dash pattern to be used by 'stroke'. A dash pattern is specified -- by dashes, a list of positive values. Each value provides the user-space --- length of altenate "on" and "off" portions of the stroke. The offset +-- length of alternate "on" and "off" portions of the stroke. The offset -- specifies an offset into the pattern at which the stroke begins. -- -- If @dashes@ is @[]@ then dashing is disabled. @@ -1232,7 +1232,7 @@ withRadialPattern :: Double -- ^ @cx0@ - x coordinate for the center of the start circle -> Double -- ^ @cy0@ - y coordinate for the center of the start circle - -> Double -- ^ @radius0@ - radius of the start cirle + -> Double -- ^ @radius0@ - radius of the start circle -> Double -- ^ @cx1@ - x coordinate for the center of the end circle -> Double -- ^ @cy1@ - y coordinate for the center of the end circle -> Double -- ^ @radius1@ - radius of the end circle @@ -1531,7 +1531,7 @@ -> m (Status, Int) meshPatternGetPatchCount p = liftIO$ Internal.meshPatternGetPatchCount p --- | Gets path defining a spedified patch from a mesh pattern. +-- | Gets path defining a specified patch from a mesh pattern. -- -- qv <https://www.cairographics.org/manual/cairo-cairo-pattern-t.html#cairo-mesh-…> meshPatternGetPath :: @@ -1812,7 +1812,7 @@ fontOptionsSetAntialias :: MonadIO m => FontOptions -> Antialias -> m () fontOptionsSetAntialias a b = liftIO $ Internal.fontOptionsSetAntialias a b --- | Gets the antialising mode for the font options object. +-- | Gets the antialiasing mode for the font options object. -- fontOptionsGetAntialias :: MonadIO m => FontOptions -> m Antialias fontOptionsGetAntialias a = liftIO $ Internal.fontOptionsGetAntialias a @@ -1880,7 +1880,7 @@ -- | Like 'withSimilarSurface' but creates a Surface that is managed by the --- Haskell memory manager rather than only being temporaily allocated. This +-- Haskell memory manager rather than only being temporarily allocated. This -- is more flexible and allows you to create surfaces that persist, which -- can be very useful, for example to cache static elements in an animation. -- @@ -1904,7 +1904,7 @@ -- surface (like a combination of 'withTargetSurface' and 'withSimilarSurface'). -- -- This is useful for drawing to a temporary surface and then compositing it --- into the main suface. For example, the following code draws to a temporary +-- into the main surface. For example, the following code draws to a temporary -- surface and then uses that as a mask: -- -- > renderWithSimilarSurface ContentAlpha 200 200 $ \tmpSurface -> do @@ -2026,7 +2026,7 @@ #endif -- | Creates an image surface of the specified format and dimensions. --- The initial contents of the surface is undefined; you must explicitely +-- The initial contents of the surface is undefined; you must explicitly -- clear the buffer, using, for example, 'rectangle' and 'fill' if you want it -- cleared. -- @@ -2046,7 +2046,7 @@ (\surface -> f surface) -- | Like 'withImageSurface' but creates a Surface that is managed by the --- Haskell memory manager rather than only being temporaily allocated. This +-- Haskell memory manager rather than only being temporarily allocated. This -- is more flexible and allows you to create surfaces that persist, which -- can be very useful, for example to cache static elements in an animation. -- @@ -2150,7 +2150,7 @@ -- number of bytes between rows. -- -- * The returned array is a flat representation of a three dimensional array: --- x-coordiante, y-coordinate and several channels for each color. The +-- x-coordinate, y-coordinate and several channels for each color. The -- format depends on the 'Format' of the surface: -- -- 'FormatARGB32': each pixel is 32 bits with alpha in the upper 8 bits, @@ -2163,7 +2163,7 @@ -- 'FormatA8': each pixel is 8 bits holding an alpha value -- -- 'FormatA1': each pixel is one bit where pixels are packed into 32 bit --- quantities. The ordering depends on the endianes of the platform. On a +-- quantities. The ordering depends on the endianness of the platform. On a -- big-endian machine, the first pixel is in the uppermost bit, on a -- little-endian machine the first pixel is in the least-significant bit. -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cairo-0.13.10.0/cairo.cabal new/cairo-0.13.11.0/cairo.cabal --- old/cairo-0.13.10.0/cairo.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/cairo-0.13.11.0/cairo.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ -cabal-version: 3.0 +cabal-version: 2.2 Name: cairo -Version: 0.13.10.0 +Version: 0.13.11.0 License: BSD-3-Clause License-file: COPYRIGHT Copyright: (c) 2001-2010 The Gtk2Hs Team, (c) Paolo Martini 2005, (c) Abraham Egnor 2003, 2004, (c) Aetion Technologies LLC 2004 @@ -15,7 +15,7 @@ exist various backends that allows rendering to Gtk windows, PDF, PS, PNG and SVG documents, amongst others. Category: Graphics -Tested-With: GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.1 +Tested-With: GHC == 9.10.1, GHC == 9.8.2, GHC == 9.6.6, GHC == 9.4.8, GHC == 9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2 extra-source-files: cairo-gtk2hs.h Data-Dir: demo @@ -53,15 +53,15 @@ custom-setup setup-depends: base >= 4.6 && <5, - Cabal >= 2.0 && < 3.11, + Cabal >= 2.2 && < 3.13, gtk2hs-buildtools >= 0.13.2.0 && < 0.14 Library build-depends: base >= 4.8 && < 5, utf8-string >= 0.2 && < 1.1, - text >= 1.0.0.0 && < 2.1, + text >= 1.0.0.0 && < 2.2, array < 0.6, - bytestring < 0.12, + bytestring < 0.13, mtl < 2.4 exposed-modules: Graphics.Rendering.Cairo Graphics.Rendering.Cairo.Matrix

1 0

commit ghc-cabal-doctest for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-cabal-doctest for openSUSE:Factory checked in at 2024-07-22 17:16:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cabal-doctest (Old) and /work/SRC/openSUSE:Factory/.ghc-cabal-doctest.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-cabal-doctest" Mon Jul 22 17:16:07 2024 rev:19 rq:1188625 version:1.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cabal-doctest/ghc-cabal-doctest.changes 2023-04-04 21:19:01.380655841 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-cabal-doctest.new.17339/ghc-cabal-doctest.changes 2024-07-22 17:16:42.286174129 +0200 @@ -1,0 +2,8 @@ +Wed Jun 26 21:59:54 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update cabal-doctest to version 1.0.10. + Upstream has renamed and modified the change log file(s) in this + release. Unfortunately, the automatic updater cannot reliable + determine relevant entries for this release. + +------------------------------------------------------------------- Old: ---- cabal-doctest-1.0.9.tar.gz cabal-doctest.cabal New: ---- cabal-doctest-1.0.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cabal-doctest.spec ++++++ --- /var/tmp/diff_new_pack.VSApBt/_old 2024-07-22 17:16:44.086246557 +0200 +++ /var/tmp/diff_new_pack.VSApBt/_new 2024-07-22 17:16:44.090246719 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-cabal-doctest # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name cabal-doctest %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.0.9 +Version: 1.0.10 Release: 0 Summary: A Setup.hs helper for running doctests 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… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-prof BuildRequires: ghc-base-devel @@ -70,7 +69,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -88,7 +86,7 @@ %license LICENSE %files devel -f %{name}-devel.files -%doc ChangeLog.md README.md +%doc README.md changelog.md %files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files %license LICENSE ++++++ cabal-doctest-1.0.9.tar.gz -> cabal-doctest-1.0.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-doctest-1.0.9/ChangeLog.md new/cabal-doctest-1.0.10/ChangeLog.md --- old/cabal-doctest-1.0.9/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/cabal-doctest-1.0.10/ChangeLog.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -# 1.0.9 -- 2021-11-07 - -* Support `GHC-9.2`, `base-4.16`, and `Cabal-3.6` (thanks Alistair Burrowes). - -# 1.0.8 -- 2019-10-02 - -* Pass `-package-env=-` when compiler supports it. -* Amend examples to `unsetEnv "GHC_ENVIRONMENT"`. - -# 1.0.7 -- 2019-08-26 - -* Make `Distribution.Extra.Doctest` `-Wall`-clean. -* Support `GHC-8.8`, `base-4.13`, and `Cabal-3.0`. - -# 1.0.6 -- 2018-01-28 - -* Hook `haddock` build too. Fixes issue when `haddock` fails, as - `Build_doctests` isn't generated. - -# 1.0.5 -- 2018-01-26 - -* Add a hack so `Build_doctests` module is automatically added to - to `other-modules` and `autogen-modules` when compiled with Cabal-2.0. - Thanks to that, we don't get warnings because of `-Wmissing-home-modules`. - -# 1.0.4 -- 2017-12-05 - -* Add support for doctests in executables and (with `Cabal-2.0` or later) - internal libraries. Refer to the `README` for more details. - -# 1.0.3 -- 2017-11-02 - -* Add an explicit `Prelude` import to `Build_doctests`. - -# 1.0.2 -- 2017-05-16 - -* Add `defaultMainAutoconfWithDoctests` and `addDoctestsUserHook`. -* Add support for `.hsc` and other preprocessed files - ([#8](https://github.com/phadej/cabal-doctest/issues/8)). -* Add support for `x-doctest-source-dirs` and `x-doctest-modules`. - -# 1.0.1 -- 2017-05-05 - -* Add support for `x-doctest-options` cabal-file field. -* Proper support for `GHC-8.2.1` and `Cabal-2.0.0.0`. -* Add support to `default-extensions` in library. - -# 1 -- 2017-01-31 - -* First version. Released on an unsuspecting world. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-doctest-1.0.9/README.md new/cabal-doctest-1.0.10/README.md --- old/cabal-doctest-1.0.9/README.md 2001-09-09 03:46:40.000000000 +0200 +++ new/cabal-doctest-1.0.10/README.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,71 +1,73 @@ cabal-doctest ============= -[![Hackage](https://img.shields.io/hackage/v/cabal-doctest.svg)](https://hackage.haskell.org/package/cabal-doctest) [![Haskell-CI](https://github.com/haskellari/cabal-doctest/actions/workflows/haskell-ci.yml/badge.svg?branch=master)](https://github.com/haskellari/cabal-doctest/actions/workflows/haskell-ci.yml) +[![Hackage](https://img.shields.io/hackage/v/cabal-doctest.svg)](https://hackage.haskell.org/package/cabal-doctest) [![Haskell-CI](https://github.com/ulidtko/cabal-doctest/actions/workflows/haskell-ci.yml/badge.svg?branch=master)](https://github.com/ulidtko/cabal-doctest/actions/workflows/haskell-ci.yml) -A `Setup.hs` helper for running `doctests`. +A `Setup.hs` helper for running [doctests][]. + +[doctests]: https://github.com/sol/doctest#readme Simple example -------------- -For the typical use case, namely a `.cabal` file with a single library containing -doctests, adapting the [simple example](https://github.com/phadej/cabal-doctest/tree/master/simple-example) -will be sufficient. +[simple example]: https://github.com/ulidtko/cabal-doctest/tree/master/simple-example +[simple-example.cabal]: https://github.com/ulidtko/cabal-doctest/tree/master/simple-example/simple-… -To use this library in your `Setup.hs`, you should specify a `custom-setup` -section in your `.cabal` file. For example: +Follow [simple example][] for the common case of a single-library `.cabal` package with doctests. -``` -custom-setup - setup-depends: - base >= 4 && <5, - Cabal, - cabal-doctest >= 1 && <1.1 -``` +To recap the example's code: -_Note:_ The `Cabal` dependency is only needed for `cabal-install < 2.4` -(see issue [haskell/cabal#4288](https://github.com/haskell/cabal/issues/4288)) +1. specify `build-type: Custom` in your `.cabal` file; -You'll also need to specify `build-type: Custom` at the top of the `.cabal` -file. Now put this into your `Setup.hs` file: +2. declare dependencies of `Setup.hs`: -```haskell -module Main where + ``` + custom-setup + setup-depends: + base >= 4 && <5, + cabal-doctest >= 1 && <1.1 + ``` -import Distribution.Extra.Doctest (defaultMainWithDoctests) + See [Notes](#notes) below for a caveat with cabal-install < 2.4. -main :: IO () -main = defaultMainWithDoctests "doctests" -``` +3. Populate `Setup.hs` like so: -When you build your project, this `Setup` will generate a `Build_doctests` -module. To use it in a testsuite, simply do this: + ```haskell + module Main where -```haskell -module Main where + import Distribution.Extra.Doctest (defaultMainWithDoctests) -import Build_doctests (flags, pkgs, module_sources) -import Data.Foldable (traverse_) -import System.Environment.Compat (unsetEnv) -import Test.DocTest (doctest) + main :: IO () + main = defaultMainWithDoctests "doctests" + ``` -main :: IO () -main = do - traverse_ putStrLn args -- optionally print arguments - unsetEnv "GHC_ENVIRONMENT" -- see 'Notes'; you may not need this - doctest args - where - args = flags ++ pkgs ++ module_sources -``` + Assuming your test-suite is called `doctests`, this `Setup` will generate a `Build_doctests` + module during package build. If your test-suite goes by name `foo`, + `defaultMainWithDoctests "foo"` creates a `Build_foo` module. -(The `System.Environment.Compat` module is from the `base-compat` -package. That's already in the transitive closure of `doctest`'s -dependencies. `System.Environment.unsetEnv` was added with GHC 7.8 so, -if you don't need to support versions of GHC older than 7.8, you can -use `System.Environment` from `base` instead.) +4. Use the generated module in a testsuite, simply like so: -Example with multiple .cabal components ---------------------------------------- + ```haskell + module Main where + + import Build_doctests (flags, pkgs, module_sources) + import Data.Foldable (traverse_) + import System.Environment (unsetEnv) + import Test.DocTest (doctest) + + main :: IO () + main = do + traverse_ putStrLn args -- optionally print arguments + unsetEnv "GHC_ENVIRONMENT" -- see 'Notes'; you may not need this + doctest args + where + args = flags ++ pkgs ++ module_sources + ``` + +Ultimately, `cabal test` or `stack test` should run the doctests of your package. + +Example with multiple cabal components +-------------------------------------- `cabal-doctest` also supports more exotic use cases where a `.cabal` file contains more components with doctests than just the main library, including: @@ -79,7 +81,7 @@ copies of the `flags`, `pkgs`, and `module_sources` values for each additional named component. -Simplest approach is to use `x-doctest-components` field, for example: +The simplest approach is to use `x-doctest-components` field in `.cabal`: ``` x-doctest-components: lib lib:internal exe:example ``` @@ -91,7 +93,7 @@ import Build_doctests (Component (..), components) import Data.Foldable (for_) -import System.Environment.Compat (unsetEnv) +import System.Environment (unsetEnv) import Test.DocTest (doctest) main :: IO () @@ -104,12 +106,10 @@ doctest args ``` -There is also a more explicit approach: if you have an executable named `foo`, -then separate values named `flags_exe_foo`, `pkgs_exe_foo`, and `module_sources_exe_foo` will -be generated in `Build_doctests`. If the name has hyphens in it -(e.g., `my-exe`), then `cabal-doctest` will convert those hyphens to -underscores (e.g., you'd get `flags_my_exe`, `pkgs_my_exe`, and -`module_sources_my_exe`). +There is also a more explicit approach: if you have an executable named `foo`, then +`Build_doctest` will contain `flags_exe_foo`, `pkgs_exe_foo`, and `module_sources_exe_foo`. +If the name has hyphens in it (e.g., `my-exe`), `cabal-doctest` will convert them to +underscores (e.g., you'd get `flags_my_exe`, `pkgs_my_exe`, `module_sources_my_exe`). Internal library `bar` values will have a `_lib_bar` suffix. An example testsuite driver for this use case might look like this: @@ -121,7 +121,7 @@ (flags, pkgs, module_sources, flags_exe_my_exe, pkgs_exe_my_exe, module_sources_exe_my_exe) import Data.Foldable (traverse_) -import System.Environment.Compat (unsetEnv) +import System.Environment (unsetEnv) import Test.DocTest main :: IO () @@ -139,14 +139,15 @@ exeArgs = flags_exe_my_exe ++ pkgs_exe_my_exe ++ module_sources_exe_my_exe ``` -See -[this example](https://github.com/phadej/cabal-doctest/tree/master/multiple-compo… -for more details. +See the [multiple-components-example][]. + +[multiple-components-example]: https://github.com/ulidtko/cabal-doctest/tree/master/multiple-components-ex… + Additional configuration ------------------------ -The `cabal-doctest` based `Setup.hs` supports few extensions fields +The `cabal-doctest` based `Setup.hs` supports a few extensions fields in `pkg.cabal` files to customise the `doctest` runner behaviour, without customising the default `doctest.hs`. @@ -156,28 +157,27 @@ x-doctest-options: -fdiagnostics-color=never x-doctest-source-dirs: test x-doctest-modules: Servant.Utils.LinksSpec - - ... ``` * `x-doctest-options` Additional arguments passed into `doctest` command. * `x-doctest-modules` Additional modules to `doctest`. May be useful if you - have `doctest` in test or executables (i.e not default library complonent). + have `doctest` in test or executables (i.e not default library component). * `x-doctest-src-dirs` Additional source directories to look for the modules. Notes ----- -* Recent versions of `Cabal` (for instance, 2.0) can choose to build a +* If support for cabal-install < 2.4 is required, you'll have to + add `Cabal` to `setup-depends`; see issue [haskell/cabal#4288][]. + +* Some versions of `Cabal` (for instance, 2.0) can choose to build a package's `doctest` test suite _before_ the library. However, in order for `cabal-doctest` to work correctly, the library _must_ be built first, as `doctest` relies on the presence of generated files that are only created - when the library is built. See - [#19](https://github.com/phadej/cabal-doctest/issues/19). + when the library is built. See [#19][]. A hacky workaround for this problem is to depend on the library itself in a - `doctests` test suite. See - [the simple example's .cabal file](https://github.com/phadej/cabal-doctest/blob/master/simple-example/si… + `doctests` test suite. See [simple-example.cabal][] for a demonstration. (This assumes that the test suite has the ability to read build artifacts from the library, a separate build component. In practice, this assumption holds, which is why this library works at all.) @@ -187,8 +187,13 @@ manually. * `stack` respects `custom-setup` starting from version 1.3.3. Before that - you have to use `explicit-setup-deps` setting in your `stack.yaml`. - ([stack/GH-2094](https://github.com/commercialhaskell/stack/issues/2094)) + you have to use `explicit-setup-deps` setting in your `stack.yaml`; + [stack#2094][]. + +* With base < 4.7 (GHC < 7.8, pre-2014), `System.Environment.unsetEnv` function + will need to be imported from `base-compat` library. It is already in transitive + dependencies of `doctest`. Simply declare the dependency upon `base-compat`, and + then `import System.Environment.Compat (unsetEnv)` if you need that old GHC. * You can use `x-doctest-options` field in `test-suite doctests` to pass additional flags to the `doctest`. @@ -211,22 +216,22 @@ to the `doctest` command. This way, `QuickCheck` and `template-haskell` are available to `doctest`, otherwise you'll get errors like: -``` + ``` Variable not in scope: mkName :: [Char] -> template-haskell-2.11.1.0:Language.Haskell.TH.Syntax.Name -``` + ``` -or + or -``` + ``` Variable not in scope: polyQuickCheck :: Language.Haskell.TH.Syntax.Name -> Language.Haskell.TH.Lib.ExpQ -``` + ``` -* From version 2, Stack sets the `GHC_ENVRIONMENT` variable, and GHC +* From version 2, Stack sets the `GHC_ENVIRONMENT` variable, and GHC (as invoked by `doctest`) will pick that up. This is undesirable: `cabal-doctest` passes all the necessary information on the command line already, and can lead to ambiguous module errors as GHC will @@ -240,9 +245,49 @@ failures, try manually unsetting `GHC_ENVIRONMENT` before invoking `doctest`. + * If you are on Nix. `doctest` will not pick up your version of GHC if you + don't point it towards it, and therefore will result in "cannot satisfy -package-id" errors. + You will need to set `NIX_GHC` and `NIX_GHC_LIBDIR` within your environment in order + for doctest to pick up your GHC. Put the following in `shell.nix` and run `nix-shell`. + + ```nix + # shell.nix + { pkgs ? import <nixpkgs> {} }: + let + myHaskell = (pkgs.haskellPackages.ghcWithHoogle (p: with p; [ + # Put your dependencies here + containers + hslogger + ])); + in + pkgs.mkShell { + name = "myPackage"; + + # These environment variables are important. Without these, + # doctest doesn't pick up nix's version of ghc, and will fail + # claiming it can't find your dependencies + shellHook = '' + export NIX_GHC=${myHaskell}/bin/ghc + export NIX_GHC_LIBDIR=${myHaskell}/lib/ghc-8.10.7 + ''; + buildInputs = with pkgs; [ + myHaskell + ]; + } + ``` + +[#19]: https://github.com/ulidtko/cabal-doctest/issues/19 +[haskell/cabal#4288]: https://github.com/haskell/cabal/issues/4288 +[stack#2094]: https://github.com/commercialhaskell/stack/issues/2094 + Copyright --------- Copyright 2017 Oleg Grenrus. +With contributions from: + * Ryan Scott + * Andreas Abel + * Max Ulidtko + Available under the BSD 3-clause license. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-doctest-1.0.9/cabal-doctest.cabal new/cabal-doctest-1.0.10/cabal-doctest.cabal --- old/cabal-doctest-1.0.9/cabal-doctest.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/cabal-doctest-1.0.10/cabal-doctest.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,58 +1,62 @@ name: cabal-doctest -version: 1.0.9 +version: 1.0.10 +-- x-revision: 0 synopsis: A Setup.hs helper for running doctests description: As of now (end of 2021), there isn't @cabal doctest@ command. Yet, to properly work, @doctest@ needs plenty of configuration. This library provides the common bits for writing a custom @Setup.hs@. -homepage: https://github.com/haskellari/cabal-doctest +homepage: https://github.com/ulidtko/cabal-doctest license: BSD3 license-file: LICENSE author: Oleg Grenrus <oleg.grenrus(a)iki.fi> -maintainer: Andreas Abel -copyright: (c) 2017 Oleg Grenrus +maintainer: Max Ulidtko <ulidtko(a)gmail.com> +copyright: (c) 2017-2020 Oleg Grenrus, 2020- package maintainers category: Distribution build-type: Simple cabal-version: >=1.10 extra-source-files: - ChangeLog.md + changelog.md README.md tested-with: - GHC == 7.0.4 - GHC == 7.2.2 - GHC == 7.4.2 - GHC == 7.6.3 - GHC == 7.8.4 - GHC == 7.10.3 - GHC == 8.0.2 - GHC == 8.2.2 - GHC == 8.4.4 - GHC == 8.6.5 - GHC == 8.8.4 + GHC == 9.10.1 + GHC == 9.8.2 + GHC == 9.6.5 + GHC == 9.4.8 + GHC == 9.2.8 + GHC == 9.0.2 GHC == 8.10.7 - GHC == 9.0.1 - GHC == 9.2.1 + GHC == 8.8.4 + GHC == 8.6.5 + GHC == 8.4.4 + GHC == 8.2.2 + GHC == 8.0.2 + -- 2023-10-14: Dropped CI support for GHC 7.x source-repository head type: git - location: https://github.com/haskellari/cabal-doctest + location: https://github.com/ulidtko/cabal-doctest library exposed-modules: Distribution.Extra.Doctest other-modules: other-extensions: build-depends: - base >=4.3 && <4.17 - , Cabal >=1.10 && <3.8 - , directory - , filepath + -- NOTE: contrary to PVP, some upper-bounds are intentionally set to major-major. + -- This is to increase signal-to-noise ratio of CI failures. "Too tight bounds" + -- is an extremely boring (and practically guaranteed, repeatedly) failure mode. + -- OTOH, genuine build failures due to breaking changes in dependencies are: + -- 1) unlikely to occur, as this package is so small, moreso regularly; + -- 2) best caught in CI pipelines that don't induce alert fatigue. + -- In any case, revisions may set tighter bounds afterwards, if exceptional + -- circumstances would warrant that. + base >=4.9 && <5 + , Cabal >=1.10 && <3.14 + , directory >=1.3 && <2 + , filepath >=1.4 && <2 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall - - if !impl(ghc >=7.2) - -- Work around a pattern-match coverage checking bug in GHC 7.0 - ghc-options: -fno-warn-overlapping-patterns diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-doctest-1.0.9/changelog.md new/cabal-doctest-1.0.10/changelog.md --- old/cabal-doctest-1.0.9/changelog.md 1970-01-01 01:00:00.000000000 +0100 +++ new/cabal-doctest-1.0.10/changelog.md 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,58 @@ +# 1.0.10 -- 2024-06-26 + +* Maintainership hand-over. See [cabal-doctest#79][]. +* Support GHC 9.4, 9.6, 9.8, 9.10. +* Drop support & CI for GHC < 8.0. + +[cabal-doctest#79]: https://github.com/ulidtko/cabal-doctest/issues/79 + +# 1.0.9 -- 2021-11-07 + +* Support `GHC-9.2`, `base-4.16`, and `Cabal-3.6` (thanks Alistair Burrowes). + +# 1.0.8 -- 2019-10-02 + +* Pass `-package-env=-` when compiler supports it. +* Amend examples to `unsetEnv "GHC_ENVIRONMENT"`. + +# 1.0.7 -- 2019-08-26 + +* Make `Distribution.Extra.Doctest` `-Wall`-clean. +* Support `GHC-8.8`, `base-4.13`, and `Cabal-3.0`. + +# 1.0.6 -- 2018-01-28 + +* Hook `haddock` build too. Fixes issue when `haddock` fails, as + `Build_doctests` isn't generated. + +# 1.0.5 -- 2018-01-26 + +* Add a hack so `Build_doctests` module is automatically added to + to `other-modules` and `autogen-modules` when compiled with Cabal-2.0. + Thanks to that, we don't get warnings because of `-Wmissing-home-modules`. + +# 1.0.4 -- 2017-12-05 + +* Add support for doctests in executables and (with `Cabal-2.0` or later) + internal libraries. Refer to the `README` for more details. + +# 1.0.3 -- 2017-11-02 + +* Add an explicit `Prelude` import to `Build_doctests`. + +# 1.0.2 -- 2017-05-16 + +* Add `defaultMainAutoconfWithDoctests` and `addDoctestsUserHook`. +* Add support for `.hsc` and other preprocessed files + ([#8](https://github.com/phadej/cabal-doctest/issues/8)). +* Add support for `x-doctest-source-dirs` and `x-doctest-modules`. + +# 1.0.1 -- 2017-05-05 + +* Add support for `x-doctest-options` cabal-file field. +* Proper support for `GHC-8.2.1` and `Cabal-2.0.0.0`. +* Add support to `default-extensions` in library. + +# 1 -- 2017-01-31 + +* First version. Released on an unsuspecting world. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-doctest-1.0.9/src/Distribution/Extra/Doctest.hs new/cabal-doctest-1.0.10/src/Distribution/Extra/Doctest.hs --- old/cabal-doctest-1.0.9/src/Distribution/Extra/Doctest.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/cabal-doctest-1.0.10/src/Distribution/Extra/Doctest.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,25 +1,29 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} --- | The provided 'generateBuildModule' generates 'Build_doctests' module. --- That module exports enough configuration, so your doctests could be simply +-- | See cabal-doctest README for full-fledged recipes & caveats. +-- +-- The provided 'generateBuildModule' generates a @Build_{suffix}@ module, with +-- caller-chosen @suffix@ that is usually @"doctests"@ -- module @Build_doctests@. +-- +-- That module exports just enough compiler flags, so that doctest could be simply -- -- @ -- module Main where -- -- import Build_doctests (flags, pkgs, module_sources) --- import Data.Foldable (traverse_) -- import Test.Doctest (doctest) -- -- main :: IO () --- main = do --- traverse_ putStrLn args -- optionally print arguments --- doctest args +-- main = doctest args -- where -- args = flags ++ pkgs ++ module_sources -- @ -- --- To use this library in the @Setup.hs@, you should specify a @custom-setup@ --- section in the cabal file, for example: +-- As this module-generation is done at build-time, 'generateBuildModule' must be +-- invoked from @Setup.hs@, which also necessarily means @build-type: Custom@. +-- +-- @Setup.hs@ can use libraries, but they must be declared as dependencies in the +-- @custom-setup@ stanza of the user's cabal file. To use @cabal-doctest@ then: -- -- @ -- custom-setup @@ -28,8 +32,8 @@ -- cabal-doctest >= 1 && <1.1 -- @ -- --- /Note:/ you don't need to depend on @Cabal@ if you use only --- 'defaultMainWithDoctests' in the @Setup.hs@. +-- Finally, simple shortcuts are provided to avoid an explicit dependency on @Cabal@ +-- from @setup-depends@: 'defaultMainWithDoctests' and 'defaultMainAutoconfWithDoctests'. -- module Distribution.Extra.Doctest ( defaultMainWithDoctests, @@ -125,7 +129,7 @@ (libraryNameString) #endif -#if MIN_VERSION_Cabal(3,6,0) +#if MIN_VERSION_Cabal(3,5,0) import Distribution.Utils.Path (getSymbolicPath) #endif @@ -160,7 +164,7 @@ -- Mains ------------------------------------------------------------------------------- --- | A default main with doctests: +-- | A default @Setup.hs@ main with doctests: -- -- @ -- import Distribution.Extra.Doctest @@ -174,7 +178,7 @@ -> IO () defaultMainWithDoctests = defaultMainWithHooks . doctestsUserHooks --- | Like 'defaultMainWithDoctests', for 'build-type: Configure' packages. +-- | Like 'defaultMainWithDoctests', but for packages with @build-type: Configure@. -- -- @since 1.0.2 defaultMainAutoconfWithDoctests @@ -183,14 +187,16 @@ defaultMainAutoconfWithDoctests n = defaultMainWithHooks (addDoctestsUserHook n autoconfUserHooks) --- | 'simpleUserHooks' with 'generateBuildModule' prepended to the 'buildHook'. +-- | 'simpleUserHooks' with 'generateBuildModule' already wired-in. doctestsUserHooks :: String -- ^ doctests test-suite name -> UserHooks doctestsUserHooks testsuiteName = addDoctestsUserHook testsuiteName simpleUserHooks --- | +-- | Compose 'generateBuildModule' into Cabal's 'UserHooks' (prepending the action). +-- +-- This is exported for advanced custom Setup-s. -- -- @since 1.0.2 addDoctestsUserHook :: String -> UserHooks -> UserHooks @@ -198,9 +204,9 @@ { buildHook = \pkg lbi hooks flags -> do generateBuildModule testsuiteName flags pkg lbi buildHook uh pkg lbi hooks flags - -- We use confHook to add "Build_Doctests" to otherModules and autogenModules. + -- We use confHook to add "Build_doctests" to otherModules and autogenModules. -- - -- We cannot use HookedBuildInfo as it let's alter only the library and executables. + -- We cannot use HookedBuildInfo as it lets alter only the library and executables. , confHook = \(gpd, hbi) flags -> confHook uh (amendGPD testsuiteName gpd, hbi) flags , haddockHook = \pkg lbi hooks flags -> do @@ -331,7 +337,7 @@ <- mapM makeAbsolute $ compAutogenDir -- autogenerated files : (distPref ++ "/build") -- preprocessed files (.hsc -> .hs); "build" is hardcoded in Cabal. -#if MIN_VERSION_Cabal(3,6,0) +#if MIN_VERSION_Cabal(3,5,0) : map getSymbolicPath (hsSourceDirs compBI) #else : hsSourceDirs compBI

1 0

commit ghc-brick for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-brick for openSUSE:Factory checked in at 2024-07-22 17:16:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-brick (Old) and /work/SRC/openSUSE:Factory/.ghc-brick.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-brick" Mon Jul 22 17:16:07 2024 rev:29 rq:1188624 version:2.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-brick/ghc-brick.changes 2024-03-20 21:15:48.297212144 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-brick.new.17339/ghc-brick.changes 2024-07-22 17:16:40.070084960 +0200 @@ -1,0 +2,18 @@ +Sun Jun 30 16:04:50 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update brick to version 2.3.2. + 2.3.2 + ----- + + Bug fixes: + * `FileBrowser`: if the `FileBrowser` was initialized with a `FilePath` + that ended in a slash, then if the user hit `Enter` on the `../` entry + to move to the parent directory, the only effect was the removal of + that trailing slash. This change trims the trailing slash so that the + expected move occurs whenever the `../` entry is selected. + * `Brick.Keybindings.Pretty.keybindingHelpWidget`: fixed a problem where + a key event with no name in a `KeyEvents` would cause a `fromJust` + exception. The pretty-printer now falls back to a placeholder + representation for such unnamed key events. + +------------------------------------------------------------------- Old: ---- brick-2.3.1.tar.gz New: ---- brick-2.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-brick.spec ++++++ --- /var/tmp/diff_new_pack.GB0j0a/_old 2024-07-22 17:16:41.458140811 +0200 +++ /var/tmp/diff_new_pack.GB0j0a/_new 2024-07-22 17:16:41.462140972 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-brick # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,13 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.3.1 +Version: 2.3.2 Release: 0 Summary: A declarative terminal user interface library License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof @@ -66,6 +67,8 @@ BuildRequires: ghc-text-zipper-prof BuildRequires: ghc-unix-compat-devel BuildRequires: ghc-unix-compat-prof +BuildRequires: ghc-unix-devel +BuildRequires: ghc-unix-prof BuildRequires: ghc-vector-devel BuildRequires: ghc-vector-prof BuildRequires: ghc-vty-crossplatform-devel @@ -132,6 +135,7 @@ %install %ghc_lib_install +%ghc_fix_rpath %{pkg_name}-%{version} %check %cabal_test @@ -144,6 +148,7 @@ %files -f %{name}.files %license LICENSE +%{_bindir}/brick-unix-suspend-demo %files devel -f %{name}-devel.files %doc CHANGELOG.md README.md docs ++++++ brick-2.3.1.tar.gz -> brick-2.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brick-2.3.1/CHANGELOG.md new/brick-2.3.2/CHANGELOG.md --- old/brick-2.3.1/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/brick-2.3.2/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -2,6 +2,20 @@ Brick changelog --------------- +2.3.2 +----- + +Bug fixes: +* `FileBrowser`: if the `FileBrowser` was initialized with a `FilePath` + that ended in a slash, then if the user hit `Enter` on the `../` entry + to move to the parent directory, the only effect was the removal of + that trailing slash. This change trims the trailing slash so that the + expected move occurs whenever the `../` entry is selected. +* `Brick.Keybindings.Pretty.keybindingHelpWidget`: fixed a problem where + a key event with no name in a `KeyEvents` would cause a `fromJust` + exception. The pretty-printer now falls back to a placeholder + representation for such unnamed key events. + 2.3.1 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brick-2.3.1/README.md new/brick-2.3.2/README.md --- old/brick-2.3.1/README.md 2001-09-09 03:46:40.000000000 +0200 +++ new/brick-2.3.2/README.md 2001-09-09 03:46:40.000000000 +0200 @@ -50,54 +50,56 @@ | Project | Description | | ------- | ----------- | -| [`tetris`](https://github.com/SamTay/tetris) | An implementation of the Tetris game | -| [`gotta-go-fast`](https://github.com/callum-oakley/gotta-go-fast) | A typing tutor | -| [`haskell-player`](https://github.com/potomak/haskell-player) | An `afplay` frontend | -| [`mushu`](https://github.com/elaye/mushu) | An `MPD` client | -| [`matterhorn`](https://github.com/matterhorn-chat/matterhorn) | A client for [Mattermost](https://about.mattermost.com/) | -| [`viewprof`](https://github.com/maoe/viewprof) | A GHC profile viewer | -| [`tart`](https://github.com/jtdaugherty/tart) | A mouse-driven ASCII art drawing program | -| [`silly-joy`](https://github.com/rootmos/silly-joy) | An interpreter for Joy | -| [`herms`](https://github.com/jackkiefer/herms) | A command-line tool for managing kitchen recipes | -| [`purebred`](https://github.com/purebred-mua/purebred) | A mail user agent | | [`2048Haskell`](https://github.com/8Gitbrix/2048Haskell) | An implementation of the 2048 game | +| [`babel-cards`](https://github.com/srhoulam/babel-cards) | A TUI spaced-repetition memorization tool. Similar to Anki. | | [`bhoogle`](https://github.com/andrevdm/bhoogle) | A [Hoogle](https://www.haskell.org/hoogle/) client | +| [`brewsage`](https://github.com/gerdreiss/brewsage#readme) | A TUI for Homebrew | +| [`brick-trading-journal`](https://codeberg.org/amano.kenji/brick-trading-journal) | A TUI program that calculates basic statistics from trades | +| [`Brickudoku`](https://github.com/Thecentury/brickudoku) | A hybrid of Tetris and Sudoku | +| [`cbookview`](https://github.com/mlang/chessIO) | A TUI for exploring polyglot chess opening book files | | [`clifm`](https://github.com/pasqu4le/clifm) | A file manager | -| [`towerHanoi`](https://github.com/shajenM/projects/tree/master/towerHanoi) | Animated solutions to The Tower of Hanoi | -| [`VOIDSPACE`](https://github.com/ChrisPenner/void-space) | A space-themed typing-tutor game | -| [`solitaire`](https://github.com/ambuc/solitaire) | The card game | -| [`sudoku-tui`](https://github.com/evanrelf/sudoku-tui) | A Sudoku implementation | -| [`summoner-tui`](https://github.com/kowainik/summoner/tree/master/summoner-tui) | An interactive frontend to the Summoner tool | -| [`wrapping-editor`](https://github.com/ta0kira/wrapping-editor) | An embeddable editor with support for Brick | +| [`codenames-haskell`](https://github.com/VigneshN1997/codenames-haskell) | An implementation of the Codenames game | +| [`fifteen`](https://github.com/benjaminselfridge/fifteen) | An implementation of the [15 puzzle](https://en.wikipedia.org/wiki/15_puzzle) | +| [`ghcup`](https://www.haskell.org/ghcup/) | A TUI for `ghcup`, the Haskell toolchain manager | | [`git-brunch`](https://github.com/andys8/git-brunch) | A git branch checkout utility | +| [`Giter`](https://gitlab.com/refaelsh/giter) | A UI wrapper around Git CLI inspired by [Magit](https://magit.vc/). | +| [`gotta-go-fast`](https://github.com/callum-oakley/gotta-go-fast) | A typing tutor | +| [`haradict`](https://github.com/srhoulam/haradict) | A TUI Arabic dictionary powered by [ElixirFM](https://github.com/otakar-smrz/elixir-fm) | | [`hascard`](https://github.com/Yvee1/hascard) | A program for reviewing "flash card" notes | -| [`ttyme`](https://github.com/evuez/ttyme) | A TUI for [Harvest](https://www.getharvest.com/) | -| [`ghcup`](https://www.haskell.org/ghcup/) | A TUI for `ghcup`, the Haskell toolchain manager | -| [`cbookview`](https://github.com/mlang/chessIO) | A TUI for exploring polyglot chess opening book files | -| [`thock`](https://github.com/rmehri01/thock) | A modern TUI typing game featuring online racing against friends | -| [`fifteen`](https://github.com/benjaminselfridge/fifteen) | An implementation of the [15 puzzle](https://en.wikipedia.org/wiki/15_puzzle) | +| [`haskell-player`](https://github.com/potomak/haskell-player) | An `afplay` frontend | +| [`herms`](https://github.com/jackkiefer/herms) | A command-line tool for managing kitchen recipes | +| [`hic-hac-hoe`](https://github.com/blastwind/hic-hac-hoe) | Play tic tac toe in terminal! | +| [`hledger-iadd`](http://github.com/rootzlevel/hledger-iadd) | An interactive terminal UI for adding hledger journal entries | +| [`hledger-ui`](https://github.com/simonmichael/hledger) | A terminal UI for the hledger accounting system. | +| [`homodoro`](https://github.com/c0nradLC/homodoro) | A terminal application to use the pomodoro technique and keep track of daily tasks | +| [`htyper`](https://github.com/Simon-Hostettler/htyper) | A typing speed test program | +| [`hyahtzee2`](https://github.com/DamienCassou/hyahtzee2#readme) | Famous Yahtzee dice game | +| [`kpxhs`](https://github.com/akazukin5151/kpxhs) | An interactive [Keepass](https://github.com/keepassxreboot/keepassxc/) database viewer | +| [`matterhorn`](https://github.com/matterhorn-chat/matterhorn) | A client for [Mattermost](https://about.mattermost.com/) | | [`maze`](https://github.com/benjaminselfridge/maze) | A Brick-based maze game | +| [`monalog`](https://github.com/goosedb/Monalog) | Terminal logs observer | +| [`mushu`](https://github.com/elaye/mushu) | An `MPD` client | +| [`mywork`](https://github.com/kquick/mywork) [[Hackage]](https://hackage.haskell.org/package/mywork) | A tool to keep track of the projects you are working on | | [`pboy`](https://github.com/2mol/pboy) | A tiny PDF organizer | -| [`hyahtzee2`](https://github.com/DamienCassou/hyahtzee2#readme) | Famous Yahtzee dice game | -| [`brewsage`](https://github.com/gerdreiss/brewsage#readme) | A TUI for Homebrew | +| [`purebred`](https://github.com/purebred-mua/purebred) | A mail user agent | | [`sandwich`](https://codedownio.github.io/sandwich/) | A test framework with a TUI interface | -| [`youbrick`](https://github.com/florentc/youbrick) | A feed aggregator and launcher for Youtube channels | +| [`silly-joy`](https://github.com/rootmos/silly-joy) | An interpreter for Joy | +| [`solitaire`](https://github.com/ambuc/solitaire) | The card game | +| [`sudoku-tui`](https://github.com/evanrelf/sudoku-tui) | A Sudoku implementation | +| [`summoner-tui`](https://github.com/kowainik/summoner/tree/master/summoner-tui) | An interactive frontend to the Summoner tool | | [`swarm`](https://github.com/byorgey/swarm/) | A 2D programming and resource gathering game | -| [`hledger-ui`](https://github.com/simonmichael/hledger) | A terminal UI for the hledger accounting system. | -| [`hledger-iadd`](http://github.com/rootzlevel/hledger-iadd) | An interactive terminal UI for adding hledger journal entries | -| [`wordle`](https://github.com/ivanjermakov/wordle) | An implementation of the Wordle game | -| [`kpxhs`](https://github.com/akazukin5151/kpxhs) | An interactive [Keepass](https://github.com/keepassxreboot/keepassxc/) database viewer | -| [`htyper`](https://github.com/Simon-Hostettler/htyper) | A typing speed test program | -| [`ullekha`](https://github.com/ajithnn/ullekha) | An interactive terminal notes/todo app with file/redis persistence | -| [`mywork`](https://github.com/kquick/mywork) [[Hackage]](https://hackage.haskell.org/package/mywork) | A tool to keep track of the projects you are working on | -| [`hic-hac-hoe`](https://github.com/blastwind/hic-hac-hoe) | Play tic tac toe in terminal! | -| [`babel-cards`](https://github.com/srhoulam/babel-cards) | A TUI spaced-repetition memorization tool. Similar to Anki. | -| [`codenames-haskell`](https://github.com/VigneshN1997/codenames-haskell) | An implementation of the Codenames game | -| [`haradict`](https://github.com/srhoulam/haradict) | A TUI Arabic dictionary powered by [ElixirFM](https://github.com/otakar-smrz/elixir-fm) | -| [`Giter`](https://gitlab.com/refaelsh/giter) | A UI wrapper around Git CLI inspired by [Magit](https://magit.vc/). | -| [`Brickudoku`](https://github.com/Thecentury/brickudoku) | A hybrid of Tetris and Sudoku | +| [`tart`](https://github.com/jtdaugherty/tart) | A mouse-driven ASCII art drawing program | +| [`tetris`](https://github.com/SamTay/tetris) | An implementation of the Tetris game | +| [`thock`](https://github.com/rmehri01/thock) | A modern TUI typing game featuring online racing against friends | | [`timeloop`](https://github.com/cdupont/timeloop) | A time-travelling demonstrator | -| [`brick-trading-journal`](https://codeberg.org/amano.kenji/brick-trading-journal) | A TUI program that calculates basic statistics from trades | +| [`towerHanoi`](https://github.com/shajenM/projects/tree/master/towerHanoi) | Animated solutions to The Tower of Hanoi | +| [`ttyme`](https://github.com/evuez/ttyme) | A TUI for [Harvest](https://www.getharvest.com/) | +| [`ullekha`](https://github.com/ajithnn/ullekha) | An interactive terminal notes/todo app with file/redis persistence | +| [`viewprof`](https://github.com/maoe/viewprof) | A GHC profile viewer | +| [`VOIDSPACE`](https://github.com/ChrisPenner/void-space) | A space-themed typing-tutor game | +| [`wordle`](https://github.com/ivanjermakov/wordle) | An implementation of the Wordle game | +| [`wrapping-editor`](https://github.com/ta0kira/wrapping-editor) | An embeddable editor with support for Brick | +| [`youbrick`](https://github.com/florentc/youbrick) | A feed aggregator and launcher for Youtube channels | These third-party packages also extend `brick`: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brick-2.3.1/brick.cabal new/brick-2.3.2/brick.cabal --- old/brick-2.3.1/brick.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/brick-2.3.2/brick.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: brick -version: 2.3.1 +version: 2.3.2 synopsis: A declarative terminal user interface library description: Write terminal user interfaces (TUIs) painlessly with 'brick'! You @@ -32,13 +32,22 @@ license-file: LICENSE author: Jonathan Daugherty <cygnus(a)foobox.com> maintainer: Jonathan Daugherty <cygnus(a)foobox.com> -copyright: (c) Jonathan Daugherty 2015-2023 +copyright: (c) Jonathan Daugherty 2015-2024 category: Graphics build-type: Simple cabal-version: 1.18 Homepage: https://github.com/jtdaugherty/brick/ Bug-reports: https://github.com/jtdaugherty/brick/issues -tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.4, GHC == 9.4.2 +tested-with: GHC == 8.2.2 + || == 8.4.4 + || == 8.6.5 + || == 8.8.4 + || == 8.10.7 + || == 9.0.2 + || == 9.2.8 + || == 9.4.8 + || == 9.6.3 + || == 9.8.1 extra-doc-files: README.md, docs/guide.rst, @@ -484,6 +493,22 @@ text, microlens +executable brick-unix-suspend-demo + hs-source-dirs: programs + ghc-options: -threaded -Wall -Wcompat -O2 + default-language: Haskell2010 + main-is: UnixSuspendDemo.hs + build-depends: base, + brick, + vty, + text, + vector, + mtl, + microlens >= 0.3.0.0, + microlens-th, + microlens-mtl, + unix + executable brick-edit-demo if !flag(demos) Buildable: False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brick-2.3.1/programs/UnixSuspendDemo.hs new/brick-2.3.2/programs/UnixSuspendDemo.hs --- old/brick-2.3.1/programs/UnixSuspendDemo.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/brick-2.3.2/programs/UnixSuspendDemo.hs 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,33 @@ +module Main where + +import qualified Graphics.Vty as V + +import qualified Brick.Main as M +import qualified Brick.Types as T +import Brick.Widgets.Core (str) +import qualified Brick.AttrMap as A +import System.Posix.Signals + +drawUI :: () -> [T.Widget ()] +drawUI () = [str "Press C-z to suspend or any other key to quit"] + +appEvent :: T.BrickEvent () e -> T.EventM () () () +appEvent (T.VtyEvent (V.EvKey (V.KChar 'z') [V.MCtrl])) = do + st <- T.get + M.suspendAndResume $ do + raiseSignal keyboardStop + return st +appEvent _ = + M.halt + +theApp :: M.App () e () +theApp = + M.App { M.appDraw = drawUI + , M.appChooseCursor = M.neverShowCursor + , M.appHandleEvent = appEvent + , M.appStartEvent = return () + , M.appAttrMap = const $ A.attrMap V.defAttr [] + } + +main :: IO () +main = M.defaultMain theApp () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brick-2.3.1/src/Brick/Keybindings/Pretty.hs new/brick-2.3.2/src/Brick/Keybindings/Pretty.hs --- old/brick-2.3.1/src/Brick/Keybindings/Pretty.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/brick-2.3.2/src/Brick/Keybindings/Pretty.hs 2001-09-09 03:46:40.000000000 +0200 @@ -25,7 +25,6 @@ import Brick import Data.List (sort, intersperse) -import Data.Maybe (fromJust) #if !(MIN_VERSION_base(4,11,0)) import Data.Monoid ((<>)) #endif @@ -124,19 +123,19 @@ ByKey b -> (Comment "(non-customizable key)", [Verbatim $ ppBinding b]) ByEvent ev -> - let name = fromJust $ keyEventName (keyConfigEvents kc) ev + let name = maybe (Comment "(unnamed)") Verbatim $ keyEventName (keyConfigEvents kc) ev in case lookupKeyConfigBindings kc ev of Nothing -> if not (null (allDefaultBindings kc ev)) - then (Verbatim name, Verbatim <$> ppBinding <$> allDefaultBindings kc ev) - else (Verbatim name, unbound) + then (name, Verbatim <$> ppBinding <$> allDefaultBindings kc ev) + else (name, unbound) Just Unbound -> - (Verbatim name, unbound) + (name, unbound) Just (BindingList bs) -> let result = if not (null bs) then Verbatim <$> ppBinding <$> bs else unbound - in (Verbatim name, result) + in (name, result) in (label, handlerDescription $ kehHandler h, evText) -- | Build a 'Widget' displaying key binding information for a single @@ -164,8 +163,8 @@ getText (Comment s) = s getText (Verbatim s) = s label = withDefAttr eventNameAttr $ case evName of - Comment s -> txt s -- TODO: was "; " <> s - Verbatim s -> txt s -- TODO: was: emph $ txt s + Comment s -> txt s + Verbatim s -> txt s in vBox [ withDefAttr eventDescriptionAttr $ txt desc , label <+> txt " = " <+> withDefAttr keybindingAttr (txt evText) ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brick-2.3.1/src/Brick/Widgets/FileBrowser.hs new/brick-2.3.2/src/Brick/Widgets/FileBrowser.hs --- old/brick-2.3.1/src/Brick/Widgets/FileBrowser.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/brick-2.3.2/src/Brick/Widgets/FileBrowser.hs 2001-09-09 03:46:40.000000000 +0200 @@ -154,7 +154,7 @@ import Data.Monoid #endif import Data.Int (Int64) -import Data.List (sortBy, isSuffixOf) +import Data.List (sortBy, isSuffixOf, dropWhileEnd) import qualified Data.Set as Set import qualified Data.Vector as V import Lens.Micro @@ -282,7 +282,7 @@ -> IO (FileBrowser n) newFileBrowser selPredicate name mCwd = do initialCwd <- FP.normalise <$> case mCwd of - Just path -> return path + Just path -> return $ removeTrailingSlash path Nothing -> D.getCurrentDirectory let b = FileBrowser { fileBrowserWorkingDirectory = initialCwd @@ -298,6 +298,22 @@ setWorkingDirectory initialCwd b +-- | Removes any trailing slash(es) from the supplied FilePath (which should +-- indicate a directory). This does not remove a sole slash indicating the root +-- directory. +-- +-- This is done because if the FileBrowser is initialized with an initial working +-- directory that ends in a slash, then selecting the "../" entry to move to the +-- parent directory will cause the removal of the trailing slash, but it will not +-- otherwise cause any change, misleading the user into thinking no action was +-- taken (the disappearance of the trailing slash is unlikely to be noticed). +-- All subsequent parent directory selection operations are processed normally, +-- and the 'fileBrowserWorkingDirectory' never ends in a trailing slash +-- thereafter (except at the root directory). +removeTrailingSlash :: FilePath -> FilePath +removeTrailingSlash "/" = "/" +removeTrailingSlash d = dropWhileEnd (== '/') d + -- | A file entry selector that permits selection of all file entries -- except directories. Use this if you want users to be able to navigate -- directories in the browser. If you want users to be able to select

1 0

commit ghc-blaze-markup for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-blaze-markup for openSUSE:Factory checked in at 2024-07-22 17:16:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-blaze-markup (Old) and /work/SRC/openSUSE:Factory/.ghc-blaze-markup.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-blaze-markup" Mon Jul 22 17:16:06 2024 rev:30 rq:1188623 version:0.8.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-blaze-markup/ghc-blaze-markup.changes 2023-10-08 12:21:46.837626209 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-blaze-markup.new.17339/ghc-blaze-markup.changes 2024-07-22 17:16:37.645987423 +0200 @@ -1,0 +2,6 @@ +Thu Jul 4 12:01:48 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update blaze-markup to version 0.8.3.0 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-blaze-markup.spec ++++++ --- /var/tmp/diff_new_pack.HDo7kW/_old 2024-07-22 17:16:39.350055989 +0200 +++ /var/tmp/diff_new_pack.HDo7kW/_new 2024-07-22 17:16:39.350055989 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-blaze-markup # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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/1.cabal… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof ++++++ blaze-markup.cabal ++++++ --- /var/tmp/diff_new_pack.HDo7kW/_old 2024-07-22 17:16:39.394057759 +0200 +++ /var/tmp/diff_new_pack.HDo7kW/_new 2024-07-22 17:16:39.398057921 +0200 @@ -1,7 +1,7 @@ Cabal-version: >= 1.10 Name: blaze-markup Version: 0.8.3.0 -x-revision: 1 +x-revision: 2 Homepage: http://jaspervdj.be/blaze Bug-Reports: http://github.com/jaspervdj/blaze-markup/issues License: BSD3 @@ -20,9 +20,10 @@ Build-type: Simple Tested-with: - GHC == 9.8.0 - GHC == 9.6.3 - GHC == 9.4.7 + GHC == 9.10.1 + GHC == 9.8.2 + GHC == 9.6.6 + GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 GHC == 8.10.7 @@ -31,7 +32,6 @@ GHC == 8.4.4 GHC == 8.2.2 GHC == 8.0.2 - GHC == 7.10.3 Extra-source-files: CHANGELOG @@ -74,17 +74,17 @@ Build-depends: -- Copied from regular dependencies... - base - , blaze-builder - , text - , bytestring + base >= 4 && < 5 + , blaze-builder >= 0.3 && < 0.5 + , text >= 0.10 && < 2.2 + , bytestring >= 0.9 && < 0.13 -- Extra dependencies , HUnit >= 1.2 && < 1.7 - , QuickCheck >= 2.7 && < 2.15 + , QuickCheck >= 2.7 && < 3 , containers >= 0.3 && < 0.8 , tasty >= 1.0 && < 1.6 , tasty-hunit >= 0.10 && < 0.11 - , tasty-quickcheck >= 0.10 && < 0.11 + , tasty-quickcheck >= 0.10 && < 1 Source-repository head Type: git

1 0

commit ghc-attoparsec-aeson for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-attoparsec-aeson for openSUSE:Factory checked in at 2024-07-22 17:16:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-attoparsec-aeson (Old) and /work/SRC/openSUSE:Factory/.ghc-attoparsec-aeson.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-attoparsec-aeson" Mon Jul 22 17:16:03 2024 rev:2 rq:1188621 version:2.2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-attoparsec-aeson/ghc-attoparsec-aeson.changes 2024-03-20 21:15:26.476394365 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-attoparsec-aeson.new.17339/ghc-attoparsec-aeson.changes 2024-07-22 17:16:35.513901636 +0200 @@ -1,0 +2,6 @@ +Fri May 17 00:08:28 UTC 2024 - Peter Simons <psimons(a)suse.com> + +- Update attoparsec-aeson to version 2.2.2.0. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- attoparsec-aeson-2.2.0.1.tar.gz New: ---- attoparsec-aeson-2.2.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-attoparsec-aeson.spec ++++++ --- /var/tmp/diff_new_pack.Q3fX8B/_old 2024-07-22 17:16:36.249931251 +0200 +++ /var/tmp/diff_new_pack.Q3fX8B/_new 2024-07-22 17:16:36.253931411 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-attoparsec-aeson # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name attoparsec-aeson %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 2.2.0.1 +Version: 2.2.2.0 Release: 0 Summary: Parsing of aeson's Value with attoparsec License: BSD-3-Clause @@ -34,6 +34,8 @@ BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-devel BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-character-ps-devel +BuildRequires: ghc-character-ps-prof BuildRequires: ghc-integer-conversion-devel BuildRequires: ghc-integer-conversion-prof BuildRequires: ghc-primitive-devel ++++++ attoparsec-aeson-2.2.0.1.tar.gz -> attoparsec-aeson-2.2.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attoparsec-aeson-2.2.0.1/attoparsec-aeson.cabal new/attoparsec-aeson-2.2.2.0/attoparsec-aeson.cabal --- old/attoparsec-aeson-2.2.0.1/attoparsec-aeson.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/attoparsec-aeson-2.2.2.0/attoparsec-aeson.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,11 +1,11 @@ -cabal-version: 1.12 +cabal-version: 2.2 name: attoparsec-aeson -version: 2.2.0.1 +version: 2.2.2.0 synopsis: Parsing of aeson's Value with attoparsec description: Parsing of aeson's Value with attoparsec, originally from aeson. -license: BSD3 +license: BSD-3-Clause license-file: LICENSE category: Parsing copyright: @@ -19,16 +19,15 @@ bug-reports: https://github.com/haskell/aeson/issues build-type: Simple tested-with: - GHC ==8.2.2 - || ==8.4.4 - || ==8.6.5 + GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 - || ==9.4.7 - || ==9.6.3 - || ==9.8.1 + || ==9.4.8 + || ==9.6.5 + || ==9.8.2 + || ==9.10.1 library hs-source-dirs: src @@ -41,13 +40,13 @@ other-modules: Data.Aeson.Internal.ByteString Data.Aeson.Internal.Text - Data.Aeson.Internal.Word8 build-depends: - aeson >=2.2.0.0 && <2.3 + , aeson >=2.2.2.0 && <2.3 , attoparsec >=0.14.2 && <0.15 - , base >=4.10.0.0 && <5 + , base >=4.12.0.0 && <5 , bytestring >=0.10.8.2 && <0.13 + , character-ps ^>=0.1 , integer-conversion >=0.1 && <0.2 , primitive >=0.8.0.0 && <0.10 , scientific >=0.3.7.0 && <0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attoparsec-aeson-2.2.0.1/src/Data/Aeson/Internal/Word8.hs new/attoparsec-aeson-2.2.2.0/src/Data/Aeson/Internal/Word8.hs --- old/attoparsec-aeson-2.2.0.1/src/Data/Aeson/Internal/Word8.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/attoparsec-aeson-2.2.2.0/src/Data/Aeson/Internal/Word8.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -{-# LANGUAGE PatternSynonyms #-} -module Data.Aeson.Internal.Word8 where - -import Data.Word (Word8) - -------------------------------------------------------------------------------- --- Word8 ASCII codes as patterns -------------------------------------------------------------------------------- - --- GHC-8.0 doesn't support giving multiple pattern synonyms type signature at once - --- spaces -pattern W8_SPACE :: Word8 -pattern W8_NL :: Word8 -pattern W8_CR :: Word8 -pattern W8_TAB :: Word8 - -pattern W8_SPACE = 0x20 -pattern W8_NL = 0x0a -pattern W8_CR = 0x0d -pattern W8_TAB = 0x09 - --- punctuation -pattern W8_BACKSLASH :: Word8 -pattern W8_DOUBLE_QUOTE :: Word8 -pattern W8_DOT :: Word8 -pattern W8_COMMA :: Word8 -pattern W8_COLON :: Word8 - -pattern W8_BACKSLASH = 92 -pattern W8_COMMA = 44 -pattern W8_DOT = 46 -pattern W8_DOUBLE_QUOTE = 34 -pattern W8_COLON = 58 - --- parentheses -pattern W8_CLOSE_CURLY :: Word8 -pattern W8_CLOSE_SQUARE :: Word8 -pattern W8_OPEN_SQUARE :: Word8 -pattern W8_OPEN_CURLY :: Word8 - -pattern W8_OPEN_CURLY = 123 -pattern W8_OPEN_SQUARE = 91 -pattern W8_CLOSE_CURLY = 125 -pattern W8_CLOSE_SQUARE = 93 - --- operators -pattern W8_MINUS :: Word8 -pattern W8_PLUS :: Word8 - -pattern W8_PLUS = 43 -pattern W8_MINUS = 45 - --- digits -pattern W8_0 :: Word8 -pattern W8_9 :: Word8 - -pattern W8_0 = 48 -pattern W8_9 = 57 - --- lower case -pattern W8_e :: Word8 -pattern W8_f :: Word8 -pattern W8_n :: Word8 -pattern W8_t :: Word8 - -pattern W8_e = 101 -pattern W8_f = 102 -pattern W8_n = 110 -pattern W8_t = 116 - --- upper case -pattern W8_E :: Word8 -pattern W8_E = 69 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attoparsec-aeson-2.2.0.1/src/Data/Aeson/Parser/Internal.hs new/attoparsec-aeson-2.2.2.0/src/Data/Aeson/Parser/Internal.hs --- old/attoparsec-aeson-2.2.0.1/src/Data/Aeson/Parser/Internal.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/attoparsec-aeson-2.2.2.0/src/Data/Aeson/Parser/Internal.hs 2001-09-09 03:46:40.000000000 +0200 @@ -70,11 +70,11 @@ import qualified Data.ByteString.Unsafe as B import qualified Data.Scientific as Sci import qualified Data.Vector as Vector (empty, fromList, fromListN, reverse) +import qualified Data.Word8.Patterns as W8 import Data.Aeson.Types (IResult(..), JSONPath, Object, Result(..), Value(..), Key) import Data.Aeson.Internal.Text import Data.Aeson.Decoding (unescapeText) -import Data.Aeson.Internal.Word8 -- $setup -- >>> :set -XOverloadedStrings @@ -142,7 +142,7 @@ objectValues mkObject str val = do skipSpace w <- A.peekWord8' - if w == W8_CLOSE_CURLY + if w == W8.RIGHT_CURLY then A.anyWord8 >> return KM.empty else loop [] where @@ -153,9 +153,9 @@ loop acc = do k <- (str A.<?> "object key") <* skipSpace <* (char ':' A.<?> "':'") v <- (val A.<?> "object value") <* skipSpace - ch <- A.satisfy (\w -> w == W8_COMMA || w == W8_CLOSE_CURLY) A.<?> "',' or '}'" + ch <- A.satisfy (\w -> w == W8.COMMA || w == W8.RIGHT_CURLY) A.<?> "',' or '}'" let acc' = (k, v) : acc - if ch == W8_COMMA + if ch == W8.COMMA then skipSpace >> loop acc' else case mkObject acc' of Left err -> fail err @@ -176,14 +176,14 @@ arrayValues val = do skipSpace w <- A.peekWord8' - if w == W8_CLOSE_SQUARE + if w == W8.RIGHT_SQUARE then A.anyWord8 >> return Vector.empty else loop [] 1 where loop acc !len = do v <- (val A.<?> "json list value") <* skipSpace - ch <- A.satisfy (\w -> w == W8_COMMA || w == W8_CLOSE_SQUARE) A.<?> "',' or ']'" - if ch == W8_COMMA + ch <- A.satisfy (\w -> w == W8.COMMA || w == W8.RIGHT_SQUARE) A.<?> "',' or ']'" + if ch == W8.COMMA then skipSpace >> loop (v:acc) (len+1) else return (Vector.reverse (Vector.fromListN len (v:acc))) {-# INLINE arrayValues #-} @@ -230,13 +230,13 @@ skipSpace w <- A.peekWord8' case w of - W8_DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_) - W8_OPEN_CURLY -> A.anyWord8 *> object_ mkObject value_ - W8_OPEN_SQUARE -> A.anyWord8 *> array_ value_ - W8_f -> string "false" $> Bool False - W8_t -> string "true" $> Bool True - W8_n -> string "null" $> Null - _ | w >= W8_0 && w <= W8_9 || w == W8_MINUS + W8.DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_) + W8.LEFT_CURLY -> A.anyWord8 *> object_ mkObject value_ + W8.LEFT_SQUARE -> A.anyWord8 *> array_ value_ + W8.LOWER_F -> string "false" $> Bool False + W8.LOWER_T -> string "true" $> Bool True + W8.LOWER_N -> string "null" $> Null + _ | w >= W8.DIGIT_0 && w <= W8.DIGIT_9 || w == W8.HYPHEN -> Number <$> scientific | otherwise -> fail "not a valid json value" {-# INLINE jsonWith #-} @@ -282,15 +282,15 @@ skipSpace w <- A.peekWord8' case w of - W8_DOUBLE_QUOTE -> do + W8.DOUBLE_QUOTE -> do !s <- A.anyWord8 *> jstring_ return (String s) - W8_OPEN_CURLY -> A.anyWord8 *> object_' mkObject value_ - W8_OPEN_SQUARE -> A.anyWord8 *> array_' value_ - W8_f -> string "false" $> Bool False - W8_t -> string "true" $> Bool True - W8_n -> string "null" $> Null - _ | w >= W8_0 && w <= W8_9 || w == W8_MINUS + W8.LEFT_CURLY -> A.anyWord8 *> object_' mkObject value_ + W8.LEFT_SQUARE -> A.anyWord8 *> array_' value_ + W8.LOWER_F -> string "false" $> Bool False + W8.LOWER_T -> string "true" $> Bool True + W8.LOWER_N -> string "null" $> Null + _ | w >= W8.DIGIT_0 && w <= W8.DIGIT_9 || w == W8.HYPHEN -> do !n <- scientific return (Number n) @@ -312,7 +312,7 @@ -- | Parse a quoted JSON string. jstring :: Parser Text -jstring = A.word8 W8_DOUBLE_QUOTE *> jstring_ +jstring = A.word8 W8.DOUBLE_QUOTE *> jstring_ -- | Parse a JSON Key key :: Parser Key @@ -322,11 +322,11 @@ jstring_ :: Parser Text {-# INLINE jstring_ #-} jstring_ = do - s <- A.takeWhile (\w -> w /= W8_DOUBLE_QUOTE && w /= W8_BACKSLASH && w >= 0x20 && w < 0x80) + s <- A.takeWhile (\w -> w /= W8.DOUBLE_QUOTE && w /= W8.BACKSLASH && w >= 0x20 && w < 0x80) mw <- A.peekWord8 case mw of Nothing -> fail "string without end" - Just W8_DOUBLE_QUOTE -> A.anyWord8 $> unsafeDecodeASCII s + Just W8.DOUBLE_QUOTE -> A.anyWord8 $> unsafeDecodeASCII s Just w | w < 0x20 -> fail "unescaped control character" _ -> jstringSlow s @@ -341,8 +341,8 @@ startState = False go a c | a = Just False - | c == W8_DOUBLE_QUOTE = Nothing - | otherwise = let a' = c == W8_BACKSLASH + | c == W8.DOUBLE_QUOTE = Nothing + | otherwise = let a' = c == W8.BACKSLASH in Just a' decodeWith :: Parser Value -> (Value -> Result a) -> L.ByteString -> Maybe a @@ -438,7 +438,7 @@ -- | The only valid whitespace in a JSON document is space, newline, -- carriage return, and tab. skipSpace :: Parser () -skipSpace = A.skipWhile $ \w -> w == W8_SPACE || w == W8_NL || w == W8_CR || w == W8_TAB +skipSpace = A.skipWhile $ \w -> w == W8.SPACE || w == W8.LF || w == W8.CR || w == W8.TAB {-# INLINE skipSpace #-} ------------------ Copy-pasted and adapted from attoparsec ------------------ @@ -449,7 +449,7 @@ decimal0 :: Parser Integer decimal0 = do digits <- A.takeWhile1 isDigit_w8 - if B.length digits > 1 && B.unsafeHead digits == W8_0 + if B.length digits > 1 && B.unsafeHead digits == W8.DIGIT_0 then fail "leading zero" else return (byteStringToInteger digits) @@ -457,25 +457,25 @@ scientific :: Parser Scientific scientific = do sign <- A.peekWord8' - let !positive = not (sign == W8_MINUS) - when (sign == W8_PLUS || sign == W8_MINUS) $ + let !positive = not (sign == W8.HYPHEN) + when (sign == W8.PLUS || sign == W8.HYPHEN) $ void A.anyWord8 n <- decimal0 let f fracDigits = SP (B.foldl' step n fracDigits) (negate $ B.length fracDigits) - step a w = a * 10 + fromIntegral (w - W8_0) + step a w = a * 10 + fromIntegral (w - W8.DIGIT_0) dotty <- A.peekWord8 SP c e <- case dotty of - Just W8_DOT -> A.anyWord8 *> (f <$> A.takeWhile1 isDigit_w8) - _ -> pure (SP n 0) + Just W8.PERIOD -> A.anyWord8 *> (f <$> A.takeWhile1 isDigit_w8) + _ -> pure (SP n 0) let !signedCoeff | positive = c | otherwise = -c - (A.satisfy (\ex -> case ex of W8_e -> True; W8_E -> True; _ -> False) *> + (A.satisfy (\ex -> case ex of W8.LOWER_E -> True; W8.UPPER_E -> True; _ -> False) *> fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|> return (Sci.scientific signedCoeff e) {-# INLINE scientific #-}

1 0

commit python-djangorestframework-simplejwt for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-djangorestframework-simplejwt for openSUSE:Factory checked in at 2024-07-22 17:15:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-djangorestframework-simplejwt (Old) and /work/SRC/openSUSE:Factory/.python-djangorestframework-simplejwt.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-djangorestframework-simplejwt" Mon Jul 22 17:15:54 2024 rev:7 rq:1188599 version:5.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-djangorestframework-simplejwt/python-djangorestframework-simplejwt.changes 2024-06-25 23:08:44.065054856 +0200 +++ /work/SRC/openSUSE:Factory/.python-djangorestframework-simplejwt.new.17339/python-djangorestframework-simplejwt.changes 2024-07-22 17:16:23.961436803 +0200 @@ -1,0 +2,5 @@ +Fri Jul 19 11:26:13 UTC 2024 - Markéta Machová <mmachova(a)suse.com> + +- Add upstream patch fix-tests.patch to fix tests with Django 5 + +------------------------------------------------------------------- New: ---- fix-tests.patch BETA DEBUG BEGIN: New: - Add upstream patch fix-tests.patch to fix tests with Django 5 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-djangorestframework-simplejwt.spec ++++++ --- /var/tmp/diff_new_pack.ReeNrd/_old 2024-07-22 17:16:24.505458693 +0200 +++ /var/tmp/diff_new_pack.ReeNrd/_new 2024-07-22 17:16:24.505458693 +0200 @@ -24,6 +24,8 @@ License: MIT URL: https://github.com/davesque/django-rest-framework-simplejwt Source: https://files.pythonhosted.org/packages/source/d/djangorestframework-simple… +# PATCH-FIX-UPSTREAM https://github.com/jazzband/djangorestframework-simplejwt/pull/769 Fix tests +Patch0: fix-tests.patch BuildRequires: %{python_module Django} BuildRequires: %{python_module PyJWT} BuildRequires: %{python_module djangorestframework} ++++++ fix-tests.patch ++++++ From 0b50ee6721155ce0f652d4c1f47dcbb10c191894 Mon Sep 17 00:00:00 2001 From: Mike <mike(a)zivix.com> Date: Mon, 4 Dec 2023 17:48:36 -0800 Subject: [PATCH] Fix tests (#769) --- rest_framework_simplejwt/utils.py | 5 ++--- tests/test_init.py | 5 ++--- tests/test_utils.py | 11 ++++------- 3 files changed, 8 insertions(+), 13 deletions(-) Index: djangorestframework_simplejwt-5.3.1/rest_framework_simplejwt/utils.py =================================================================== --- djangorestframework_simplejwt-5.3.1.orig/rest_framework_simplejwt/utils.py +++ djangorestframework_simplejwt-5.3.1/rest_framework_simplejwt/utils.py @@ -5,7 +5,6 @@ from typing import Callable from django.conf import settings from django.utils.functional import lazy -from django.utils.timezone import is_naive, make_aware def get_md5_hash_password(password: str) -> str: @@ -16,8 +15,8 @@ def get_md5_hash_password(password: str) def make_utc(dt: datetime) -> datetime: - if settings.USE_TZ and is_naive(dt): - return make_aware(dt, timezone=timezone.utc) + if settings.USE_TZ and dt.tzinfo is None: + return dt.replace(tzinfo=timezone.utc) return dt Index: djangorestframework_simplejwt-5.3.1/tests/test_utils.py =================================================================== --- djangorestframework_simplejwt-5.3.1.orig/tests/test_utils.py +++ djangorestframework_simplejwt-5.3.1/tests/test_utils.py @@ -1,7 +1,6 @@ -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone from django.test import TestCase -from django.utils import timezone from freezegun import freeze_time from rest_framework_simplejwt.utils import ( @@ -24,11 +23,11 @@ class TestMakeUtc(TestCase): with self.settings(USE_TZ=False): dt = make_utc(dt) - self.assertTrue(timezone.is_naive(dt)) + self.assertTrue(dt.tzinfo is None) with self.settings(USE_TZ=True): dt = make_utc(dt) - self.assertTrue(timezone.is_aware(dt)) + self.assertTrue(dt.tzinfo is not None) self.assertEqual(dt.utcoffset(), timedelta(seconds=0)) @@ -39,9 +38,7 @@ class TestAwareUtcnow(TestCase): with freeze_time(now): # Should return aware utcnow if USE_TZ == True with self.settings(USE_TZ=True): - self.assertEqual( - timezone.make_aware(now, timezone=timezone.utc), aware_utcnow() - ) + self.assertEqual(now.replace(tzinfo=timezone.utc), aware_utcnow()) # Should return naive utcnow if USE_TZ == False with self.settings(USE_TZ=False):

1 0

commit python-azure-storage-file-share for openSUSE:Factory
by Source-Sync 22 Jul '24

22 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-azure-storage-file-share for openSUSE:Factory checked in at 2024-07-22 17:15:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-azure-storage-file-share (Old) and /work/SRC/openSUSE:Factory/.python-azure-storage-file-share.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-azure-storage-file-share" Mon Jul 22 17:15:49 2024 rev:24 rq:1188601 version:12.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-azure-storage-file-share/python-azure-storage-file-share.changes 2024-05-14 13:39:05.136170717 +0200 +++ /work/SRC/openSUSE:Factory/.python-azure-storage-file-share.new.17339/python-azure-storage-file-share.changes 2024-07-22 17:16:20.641303212 +0200 @@ -1,0 +2,11 @@ +Fri Jul 19 09:00:27 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com> + +- New upstream release + + Version 12.17.0 + + For detailed information about changes see the + CHANGELOG.md file provided with this package +- Drop extra LICENSE.txt as upstream now ships its own +- Rename LICENSE.txt to LICENSE in %files section +- Update Requires from setup.py + +------------------------------------------------------------------- Old: ---- LICENSE.txt azure-storage-file-share-12.16.0.tar.gz New: ---- azure-storage-file-share-12.17.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-azure-storage-file-share.spec ++++++ --- /var/tmp/diff_new_pack.b9bz4n/_old 2024-07-22 17:16:21.197325585 +0200 +++ /var/tmp/diff_new_pack.b9bz4n/_new 2024-07-22 17:16:21.197325585 +0200 @@ -18,14 +18,13 @@ %{?sle15_python_module_pythons} Name: python-azure-storage-file-share -Version: 12.16.0 +Version: 12.17.0 Release: 0 Summary: Azure Storage File Share client library for Python License: MIT Group: Development/Languages/Python URL: https://github.com/Azure/azure-sdk-for-python Source: https://files.pythonhosted.org/packages/source/a/azure-storage-file-share/a… -Source1: LICENSE.txt BuildRequires: %{python_module azure-nspkg >= 3.0.0} BuildRequires: %{python_module azure-storage-nspkg >= 3.0.0} BuildRequires: %{python_module pip} @@ -65,7 +64,6 @@ %setup -q -n azure-storage-file-share-%{version} %build -install -m 644 %{SOURCE1} %{_builddir}/azure-storage-file-share-%{version} %pyproject_wheel %install ++++++ azure-storage-file-share-12.16.0.tar.gz -> azure-storage-file-share-12.17.0.tar.gz ++++++ ++++ 4793 lines of diff (skipped)

1 0