guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: meson: Update to 1.5.2.


From: guix-commits
Subject: 02/02: gnu: meson: Update to 1.5.2.
Date: Sun, 20 Oct 2024 00:11:05 -0400 (EDT)

apteryx pushed a commit to branch meson-parallel-tests
in repository guix.

commit cae020c66688c59202f851524b548ca4ef4be7fb
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 20 11:25:39 2024 +0900

    gnu: meson: Update to 1.5.2.
    
    * gnu/packages/build-tools.scm (meson): Update to 1.5.2.
    (meson-1.5): Delete variable.
    * gnu/packages/gnome.scm (gitg) [arguments]: Delete #:meson argument.
    
    Change-Id: Ic8dba9f4d0f52b1ba5761764d5bf4413cc190250
---
 gnu/packages/build-tools.scm | 17 ++---------------
 gnu/packages/gnome.scm       |  1 -
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 21df25e4f5..05a305ccc1 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -293,7 +293,7 @@ files and generates build instructions for the Ninja build 
system.")
 (define-public meson
   (package
     (name "meson")
-    (version "1.2.1")
+    (version "1.5.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/mesonbuild/meson/";
@@ -301,7 +301,7 @@ files and generates build instructions for the Ninja build 
system.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1x9rnrbwvzhnzmz4zqag44w06khks8wckcajxsbr8m4760akmnxi"))))
+                "02wi62k9w7716xxdgrrx68q89vaq3ncnbpw5ms0g27npn2df0mgr"))))
     (build-system python-build-system)
     (arguments
      (list #:tests? #f                  ;disabled to avoid extra dependencies
@@ -329,19 +329,6 @@ files}, are written in a custom domain-specific language 
(@dfn{DSL}) that
 resembles Python.")
     (license license:asl2.0)))
 
-(define-public meson-1.5
-  (package
-    (inherit meson)
-    (version "1.5.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mesonbuild/meson/";
-                                  "releases/download/" version  "/meson-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1vab706pw1q17vh9rbsmlirgiji3k6wljl735lxffp95vwx56zjn"))))))
-
 (define-public meson-python
   (package
     (name "meson-python")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cf3d1a1496..d63f543d8e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12353,7 +12353,6 @@ higher level porcelain stuff.")
     (build-system meson-build-system)
     (arguments
      (list
-      #:meson meson-1.5                 ; XXX: breaks with Meson 1.2
       #:glib-or-gtk? #t
       #:build-type "release"            ; don't look at -Wformat…
       #:phases



reply via email to

[Prev in Thread] Current Thread [Next in Thread]