diff mbox series

[bug#70181,v2] gnu: gama: Update to 2.30

Message ID 9c263430136ce9e9736d8f68a096c936cf9635f1.1713251422.git.atai@atai.org
State New
Headers show
Series [bug#70181,v2] gnu: gama: Update to 2.30 | expand

Commit Message

Andy Tai April 16, 2024, 7:11 a.m. UTC 
* gnu/packages/gps.scm (gama): Update to 2.30
  [arguments](configure-flags): add option to force not
  to use local copy of expat

Change-Id: I41f3f037b60b3dd89c8ccb990a800edb041cbc62
---
 gnu/packages/gps.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)


base-commit: 4d67912265aa921084040d633238ca30c7dc4199

Comments

Christopher Baines April 17, 2024, 5:10 p.m. UTC | #1 
Andy Tai <atai@atai.org> writes:

> * gnu/packages/gps.scm (gama): Update to 2.30
>   [arguments](configure-flags): add option to force not
>   to use local copy of expat
>
> Change-Id: I41f3f037b60b3dd89c8ccb990a800edb041cbc62
> ---
>  gnu/packages/gps.scm | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)

That looks better, I've pushed this to master as
46e54988057ece26b81cad20d33f39d383287e18.

Chris
diff mbox series

Patch

diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 75197ad23c..d342785ca4 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -27,6 +27,7 @@ 
 (define-module (gnu packages gps)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system scons)
@@ -141,7 +142,7 @@  (define-public gpscorrelate
 (define-public gama
   (package
     (name "gama")
-    (version "2.29")
+    (version "2.30")
     (source
       (origin
         (method url-fetch)
@@ -149,14 +150,19 @@  (define-public gama
                             version ".tar.gz"))
         (sha256
          (base32
-          "04dlh1pdaiq059ssrxa4yn24iqgjrzy2mq7s9n1pgrzlzz3a63y0"))
+          "0yph6q7a0dy2r2vsrkjg26q8v988pcvnaay5lk6q7k06plpr2x1m"))
         (modules '((guix build utils)))
         (snippet
          '(begin
             (delete-file-recursively "lib/expat")
             (for-each delete-file (find-files "doc/fig" "\\.pdf$"))))))
     (build-system gnu-build-system)
-    (arguments '(#:parallel-tests? #f)) ; race condition
+    (arguments
+        (list
+            #:configure-flags
+            #~(list "--enable-expat_1_1=no") ;force not to use of local copy of expat
+
+            #:parallel-tests? #f)) ; race condition
     (native-inputs
      (list libxml2 yaml-cpp))
     (inputs