diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-10-20 11:25:39 +0900 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2024-11-27 12:43:04 +0100 |
| commit | b74d4f1dfcfa89d52185fa0054dc5a8bd7ebfa1d (patch) | |
| tree | 032a8a5cd5d86bddf251793a8acee2bfbe4dfe03 | |
| parent | 1880e9432143df0176a1d2928ee55ec3dde0f28c (diff) | |
| download | guix-b74d4f1dfcfa89d52185fa0054dc5a8bd7ebfa1d.tar.gz guix-b74d4f1dfcfa89d52185fa0054dc5a8bd7ebfa1d.zip | |
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
| -rw-r--r-- | gnu/packages/build-tools.scm | 17 | ||||
| -rw-r--r-- | 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 b6b991247a..b5bc299287 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -296,7 +296,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/" @@ -304,7 +304,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 @@ -332,19 +332,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 b8accb737d..8a59247080 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12375,7 +12375,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 |