summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers/meson
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-09-11 21:17:00 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-09-18 20:05:56 +0200
commit87a69dafa38addf24c9e1cba9115ebcb33791136 (patch)
treec7ff7245e4af2d3e52aa5b51720daf3cc5845aa8 /pkgs/development/tools/build-managers/meson
parent786d9316ad2dd77ebc9e72e47f64698095b25962 (diff)
downloadnixpkgs-87a69dafa38addf24c9e1cba9115ebcb33791136.tar
nixpkgs-87a69dafa38addf24c9e1cba9115ebcb33791136.tar.gz
nixpkgs-87a69dafa38addf24c9e1cba9115ebcb33791136.tar.bz2
nixpkgs-87a69dafa38addf24c9e1cba9115ebcb33791136.tar.lz
nixpkgs-87a69dafa38addf24c9e1cba9115ebcb33791136.tar.xz
nixpkgs-87a69dafa38addf24c9e1cba9115ebcb33791136.tar.zst
nixpkgs-87a69dafa38addf24c9e1cba9115ebcb33791136.zip
meson: 0.55.1 → 0.55.3
Diffstat (limited to 'pkgs/development/tools/build-managers/meson')
-rw-r--r--pkgs/development/tools/build-managers/meson/default.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index aa11ba7638b..8421fb7d70a 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -9,21 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "0.55.1";
+  version = "0.55.3";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "O1dB+ITgSSi9+hlHRn/wavpsmOYjwlzvda33HKOc4IA=";
+    sha256 = "19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb";
   };
 
   patches = [
-    # Meson 0.55.0 incorrectly considers skipped tests as failures,
-    # which makes some packages like gjs fail to build.
-    (fetchpatch {
-      url = "https://github.com/mesonbuild/meson/commit/7db49db67d4aa7582cf46feb7157235e66aa95b1.diff";
-      sha256 = "1chq52sgk24afdlswssr8n8p6fa2wz8rjlxvkjhpqg1kg3qnqc9p";
-    })
-
     # Upstream insists on not allowing bindir and other dir options
     # outside of prefix for some reason:
     # https://github.com/mesonbuild/meson/issues/2561