diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-09-24 22:49:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 22:49:25 +0200 |
| commit | 17f5821f94b3918dc03281a13419f59cbc30d5df (patch) | |
| tree | 873521c8760097ed0a29f3145fd502d6953e1ee6 | |
| parent | a8cda1109046202a93bb55cb9f1d6900329e7fac (diff) | |
| parent | 87a69dafa38addf24c9e1cba9115ebcb33791136 (diff) | |
Merge pull request #98228 from jtojnar/meson-0.55.3
meson: 0.55.1 → 0.55.3
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 11 |
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 aa11ba7638bb..8421fb7d70a0 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 |