[Git][haskell-team/package-plan][master] 3 commits: Update the packages needed for local testing

[Scott Talbert (@swt2c)]

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


Commits:
1646aed3 by Pete Ryland at 2024-11-22T14:15:49+01:00
Update the packages needed for local testing

- - - - -
b9011cd8 by Pete Ryland at 2024-11-22T14:15:49+01:00
Fix patch for store-0.7.18, update git-annex to match the archive

- - - - -
9e358f2f by Scott Talbert at 2024-11-23T01:00:22+00:00
Merge branch 'wip/pdr/fix-build' into 'master'

Fix for the recent build errors

See merge request haskell-team/package-plan!26
- - - - -


4 changed files:

- README.md
- packages.txt
- patches/store/0.7.18/no-nats
- test-packages.pl


Changes:

=====================================
README.md
=====================================
@@ -83,9 +83,14 @@ Running the package plan
 
 The script has a few dependencies, so run
 
-    apt-get install libfile-slurp-perl libipc-run-perl \
-      liblist-moreutils-perl libtext-patch-perl libdpkg-perl \
-      cabal-install dctrl-tools patchutils
+    apt install build-essential devscripts 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 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 ca-certificates libyaml-dev
 
 To test the package plan, run
 
@@ -130,9 +135,13 @@ The following Dockerfile may help test in a reproducible environment
 
     ENV DEBIAN_FRONTEND="noninteractive"
     RUN apt-get update
-    RUN apt-get install --yes libfile-slurp-perl libipc-run-perl \
-     liblist-moreutils-perl libtext-patch-perl libdpkg-perl \
-     dctrl-tools patchutils git cabal-install ghc
+    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 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 ca-certificates libyaml-dev
 
     # Replace the following with
     # git clone <URI> -b <BRANCH_NAME>


=====================================
packages.txt
=====================================
@@ -366,7 +366,7 @@ gi-gtk-hs 0.3.16
 gi-harfbuzz 0.0.10
 gio 0.13.11.0
 gi-pango 1.0.30
-git-annex 10.20240927 binary key -f-ConcurrentOutput
+git-annex 10.20241031 binary key -f-ConcurrentOutput
 githash 0.1.7.0
 github 0.29
 gitit 0.15.1.2 key


=====================================
patches/store/0.7.18/no-nats
=====================================
@@ -2,7 +2,7 @@ Index: b/store.cabal
 ===================================================================
 --- a/store.cabal
 +++ b/store.cabal
-@@ -81,7 +81,6 @@ library
+@@ -82,7 +82,6 @@ library
      , lifted-base >=0.2.3.3
      , monad-control >=0.3.3.0
      , mono-traversable >=0.7.0
@@ -10,7 +10,7 @@ Index: b/store.cabal
      , network >=2.6.0.2
      , primitive >=0.6
      , resourcet >=1.1.3.3
-@@ -150,7 +149,6 @@ test-suite store-test
+@@ -151,7 +150,6 @@ test-suite store-test
      , lifted-base >=0.2.3.3
      , monad-control >=0.3.3.0
      , mono-traversable >=0.7.0
@@ -18,7 +18,7 @@ Index: b/store.cabal
      , network >=2.6.0.2
      , primitive >=0.6
      , resourcet >=1.1.3.3
-@@ -215,7 +213,6 @@ benchmark store-bench
+@@ -216,7 +214,6 @@ benchmark store-bench
      , lifted-base >=0.2.3.3
      , monad-control >=0.3.3.0
      , mono-traversable >=0.7.0
@@ -26,7 +26,7 @@ Index: b/store.cabal
      , network >=2.6.0.2
      , primitive >=0.6
      , resourcet >=1.1.3.3
-@@ -289,7 +286,6 @@ benchmark store-weigh
+@@ -290,7 +287,6 @@ benchmark store-weigh
      , lifted-base >=0.2.3.3
      , monad-control >=0.3.3.0
      , mono-traversable >=0.7.0


=====================================
test-packages.pl
=====================================
@@ -347,6 +347,7 @@ __END__
 			if ($patch) {
 				$patch =~ s/\r//g;
 				$content =~ s/\r//g;
+				#print "$content\n\n$patch\n\n";
 				$content = patch($content, $patch, STYLE => "Unified");
 			} else {
 				#print "Ignoring $patchfile\n";



View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/90a4bdd598ccadff06fdd6e28de03f85d1b2cc55...9e358f2f6f35ce591677f735f74ffac616d49112

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/90a4bdd598ccadff06fdd6e28de03f85d1b2cc55...9e358f2f6f35ce591677f735f74ffac616d49112
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/20241123/f0e97652/attachment-0001.htm>