[Git][haskell-team/package-plan][master] 2 commits: Add regex-pcre2 and make regex use it

Scott Talbert (@swt2c) gitlab at salsa.debian.org
Wed Feb 19 03:30:48 GMT 2025


Scott Talbert pushed to branch master at Debian Haskell Group / package-plan


Commits:
0ca128ca by Pete Ryland at 2025-02-19T09:22:40+11:00
Add regex-pcre2 and make regex use it

- - - - -
1d14f847 by Pete Ryland at 2025-02-19T09:22:40+11:00
Remove patches no longer needed from ed25519

- - - - -


9 changed files:

- .gitlab-ci.yml
- README.md
- packages.txt
- − patches/ed25519/0.0.5.0/newer-directory
- − patches/ed25519/0.0.5.0/newer-doctest
- − patches/ed25519/0.0.5.0/newer-quickcheck
- − patches/ed25519/0.0.5.0/series
- patches/regex/1.1.0.2/series
- patches/regex/1.1.0.2/pcre-not-builtin → patches/regex/1.1.0.2/use-pcre2


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -8,6 +8,6 @@ build:
   script:
     - apt-get update
     - apt-get install -y --no-install-recommends cabal-install ghc dctrl-tools patchutils libtext-patch-perl libfile-slurp-perl libipc-run-perl liblist-moreutils-perl libdpkg-perl
-    - apt-get install -y --no-install-recommends --no-install-suggests pkg-config libxft-dev libcairo-dev libatk1.0-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev libvte-2.91-dev libgsasl-dev  libgirepository1.0-dev libhdf5-serial-dev libxml2-dev libpcre3-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libzmq3-dev libyaml-dev
+    - apt-get install -y --no-install-recommends --no-install-suggests pkg-config libxft-dev libcairo-dev libatk1.0-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev libvte-2.91-dev libgsasl-dev  libgirepository1.0-dev libhdf5-serial-dev libxml2-dev libpcre2-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libzmq3-dev libyaml-dev
     - HOME=/builds/haskell-team/package-plan cabal update
     - HOME=/builds/haskell-team/package-plan ./test-packages.pl


=====================================
README.md
=====================================
@@ -89,7 +89,7 @@ The script has a few dependencies, so run
       libxft-dev libcairo-dev libatk1.0-dev libdbusmenu-glib-dev \
       libdbusmenu-gtk3-dev libvte-2.91-dev libgsasl-dev \
       libgirepository1.0-dev libhdf5-serial-dev libxml2-dev \
-      libpcre3-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev \
+      libpcre2-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev \
       libsdl2-ttf-dev libzmq3-dev ca-certificates libyaml-dev
 
 To test the package plan, run
@@ -138,9 +138,9 @@ The following Dockerfile may help test in a reproducible environment
     RUN apt-get install git cabal-install ghc dctrl-tools patchutils \
      libtext-patch-perl libfile-slurp-perl libipc-run-perl \
      liblist-moreutils-perl libdpkg-perl pkg-config libxft-dev libcairo-dev \
-     libatk1.0-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev libgtk+2.0-dev \
+     libatk1.0-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev \
      libvte-2.91-dev libgsasl-dev libgirepository1.0-dev libhdf5-serial-dev \
-     libxml2-dev libpcre3-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev \
+     libxml2-dev libpcre2-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev \
      libsdl2-ttf-dev libzmq3-dev ca-certificates libyaml-dev
 
     # Replace the following with


=====================================
packages.txt
=====================================
@@ -740,8 +740,8 @@ pandoc-citeproc-preamble 1.7 binary
 pandoc-cli 3.1.11.1 binary=pandoc key
 pandoc-lua-engine 0.2.1.2
 pandoc-lua-marshal 0.2.9
-pandoc-sidenote 0.23.0.0
 pandoc-server 0.1.0.5
+pandoc-sidenote 0.23.0.0
 pandoc-types 1.23.1
 pango 0.13.11.0
 panic 0.4.0.1
@@ -841,6 +841,7 @@ regex-applicative-text 0.1.0.1 ignore # https://bugs.debian.org/1082416
 regex-base 0.94.0.2
 regex-compat 0.95.2.1
 regex-pcre 0.95.0.0 key ignore # dependency of ganeti, https://bugs.debian.org/1000067
+regex-pcre2 1.0.0.0
 regex-pcre-builtin 0.95.2.3.8.44 avoid
 regex-posix 0.96.0.1
 regexpr 0.5.4 obsolete # https://bugs.debian.org/1082536


=====================================
patches/ed25519/0.0.5.0/newer-directory deleted
=====================================
@@ -1,13 +0,0 @@
-Index: b/ed25519.cabal
-===================================================================
---- a/ed25519.cabal
-+++ b/ed25519.cabal
-@@ -130,7 +130,7 @@ test-suite doctests
-     build-depends:
-       base      >= 4    && < 5,
-       filepath  >= 1.0  && < 1.5,
--      directory >= 1.0  && < 1.3,
-+      directory >= 1.0,
-       doctest   >= 0.10 && < 0.12
- 
- -------------------------------------------------------------------------------


=====================================
patches/ed25519/0.0.5.0/newer-doctest deleted
=====================================
@@ -1,13 +0,0 @@
-Index: b/ed25519.cabal
-===================================================================
---- a/ed25519.cabal
-+++ b/ed25519.cabal
-@@ -131,7 +131,7 @@ test-suite doctests
-       base      >= 4    && < 5,
-       filepath  >= 1.0  && < 1.5,
-       directory >= 1.0,
--      doctest   >= 0.10 && < 0.12
-+      doctest   >= 0.10
- 
- -------------------------------------------------------------------------------
- -- Build pt 3: benchmarks


=====================================
patches/ed25519/0.0.5.0/newer-quickcheck deleted
=====================================
@@ -1,13 +0,0 @@
-Index: b/ed25519.cabal
-===================================================================
---- a/ed25519.cabal
-+++ b/ed25519.cabal
-@@ -98,7 +98,7 @@ test-suite properties
-     build-depends:
-       base        >= 4   && < 5,
-       bytestring  >= 0.9 && < 0.12,
--      QuickCheck  >= 2.4 && < 2.9,
-+      QuickCheck  >= 2.4,
-       ed25519
- 
- --


=====================================
patches/ed25519/0.0.5.0/series deleted
=====================================
@@ -1,3 +0,0 @@
-newer-directory
-newer-quickcheck
-newer-doctest


=====================================
patches/regex/1.1.0.2/series
=====================================
@@ -1 +1 @@
-pcre-not-builtin
+use-pcre2


=====================================
patches/regex/1.1.0.2/pcre-not-builtin → patches/regex/1.1.0.2/use-pcre2
=====================================
@@ -5,7 +5,7 @@
        , hashable             >= 1.2
        , regex-base           >= 0.93
 -      , regex-pcre-builtin   >= 0.94
-+      , regex-pcre           >= 0.94
++      , regex-pcre2          >= 1.0
        , regex-tdfa           >= 1.3.1.0
        , template-haskell     >= 2.7
        , text                 >= 1.2



View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/da9c1faae59ca79415f9d343a837d4def05736da...1d14f84749c6a87e12de4168c173e5af2e201174

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/da9c1faae59ca79415f9d343a837d4def05736da...1d14f84749c6a87e12de4168c173e5af2e201174
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20250219/3a0c3e32/attachment-0001.htm>


More information about the Pkg-haskell-commits mailing list