From e442c9084ba66e37a63c79ece5c27537778f5f50 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 15 Aug 2022 14:36:50 +0200 Subject: [PATCH] =?UTF-8?q?meson:=200.63.0=20=E2=86=92=200.63.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/mesonbuild/meson/compare/0.63.0...0.63.1 --- .../tools/build-managers/meson/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index b28c3a64cc28..866fa303148a 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -10,11 +10,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.63.0"; + version = "0.63.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-O1HUUXRMK8cYOFJOyNls1PjEeT1bjV0NCpyKT3yUzW8="; + sha256 = "Bv4TKXIT1v8BIcXVqrJaVu+Tj/7FdBTtYIb9onLLZek="; }; patches = [ @@ -23,14 +23,6 @@ python3.pkgs.buildPythonApplication rec { # https://github.com/mesonbuild/meson/pull/6827 ./more-env-vars.patch - # Use more binutils variables, so we don't have to define them in stdenv. - # pr has been merged - # https://github.com/mesonbuild/meson/pull/10640 - (fetchpatch { - url = "https://github.com/mesonbuild/meson/commit/8a8ab9a8e0c2cefb6faa0734e52803c74790576c.patch"; - sha256 = "sha256-BdBf1NB4SZLFyFRDzD0p//XUgUeAHpo6XXUtsHdCgKE="; - }) - # Unlike libtool, vanilla Meson does not pass any information # about the path library will be installed to to g-ir-scanner, # breaking the GIR when path other than ${!outputLib}/lib is used.