From 87a69dafa38addf24c9e1cba9115ebcb33791136 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 11 Sep 2020 21:17:00 +0200 Subject: [PATCH] =?UTF-8?q?meson:=200.55.1=20=E2=86=92=200.55.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/build-managers/meson/default.nix | 11 ++--------- 1 file 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