summary refs log tree commit diff
path: root/gnu/packages/build-tools.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-05-16 09:25:11 +0200
committerMarius Bakke <marius@gnu.org>2021-05-22 17:08:13 +0200
commitdfd6ca1908bae66eaa12ecd02bc9133e73055a77 (patch)
treefe528bb6fef0a7e622fab3ad539b0bb9dd5a0a9c /gnu/packages/build-tools.scm
parentc52eddc70fac9c24d557f54bc190e14ce1b1ba1d (diff)
downloadguix-dfd6ca1908bae66eaa12ecd02bc9133e73055a77.tar.gz
gnu: Meson: Remove special versions.
* gnu/packages/audio.scm (lv2-speech-denoiser, libaudec)[arguments]: Remove
 #:meson.
* gnu/packages/build-tools.scm (meson): Update to 0.57.2.
(meson-0.55, meson-next): Remove variables.
* gnu/packages/datastructures.scm (tllist)[arguments]: Remove.
* gnu/packages/fontutils.scm (fcft)[arguments]: Likewise.
* gnu/packages/gimp.scm (babl, gegl)[arguments]: Remove #:meson.
* gnu/packages/gtk.scm (gdk-pixbuf)[arguments]: Likewise.
* gnu/packages/lua.scm (emilua)[arguments]: Likewise.
* gnu/packages/music.scm (zrythm)[arguments]: Likewise.
* gnu/packages/terminals.scm (foot)[arguments]: Likewise.
* gnu/packages/virtualization.scm (qemu)[native-inputs]: Change from
MESON-NEXT to MESON.
(libvirt)[arguments]: Remove #:meson.
* gnu/packages/wm.scm (wlroots, sway)[arguments]: Likewise.
Diffstat (limited to 'gnu/packages/build-tools.scm')
-rw-r--r--gnu/packages/build-tools.scm32
1 files changed, 2 insertions, 30 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 88247cc911..91e774f692 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -264,7 +264,7 @@ files and generates build instructions for the Ninja build system.")
 (define-public meson
   (package
     (name "meson")
-    (version "0.56.2")
+    (version "0.57.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/mesonbuild/meson/"
@@ -272,7 +272,7 @@ files and generates build instructions for the Ninja build system.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1x47vc7023w8w90r6jda5hk2jsh68i66x49gckdgixw32fwvvf1w"))))
+                "1iac7p99zfgkznq4qlnkk7b8xwwlilcrnkf33sczm56yqnqyg0rs"))))
     (build-system python-build-system)
     (arguments
      `(;; FIXME: Tests require many additional inputs and patching many
@@ -295,34 +295,6 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that
 resembles Python.")
     (license license:asl2.0)))
 
-;; Added temporarily for packages that need it.
-;; TODO: Remove when core-updates is merged.
-(define-public meson-0.55
-  (package
-    (inherit meson)
-    (version "0.55.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mesonbuild/meson/"
-                                  "releases/download/" version  "/meson-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb"))))))
-
-(define-public meson-next
-  (package
-    (inherit meson)
-    (version "0.57.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mesonbuild/meson/"
-                                  "releases/download/" version  "/meson-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1iac7p99zfgkznq4qlnkk7b8xwwlilcrnkf33sczm56yqnqyg0rs"))))))
-
 (define-public premake4
   (package
     (name "premake")