From d607564d6824612f3c9f8a4e7d5477981a1b1193 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Sat, 22 Feb 2020 12:37:36 +0100 Subject: [PATCH] meson: 0.52.1 -> 0.53.2 https://mesonbuild.com/Release-notes-for-0-53-0.html https://github.com/mesonbuild/meson/releases/tag/0.53.0 https://github.com/mesonbuild/meson/releases/tag/0.53.1 https://github.com/mesonbuild/meson/releases/tag/0.53.2 --- .../tools/build-managers/meson/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index e4d4994a7814..f9f4c344e322 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,6 +1,5 @@ { lib , python3Packages -, fetchpatch , stdenv , writeTextDir , substituteAll @@ -20,11 +19,11 @@ let in python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.52.1"; + version = "0.53.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan"; + sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8="; }; postFixup = '' @@ -62,14 +61,6 @@ python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) - - # Fix detecting incorrect compiler in the store path hash. - # https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964 - # https://github.com/mesonbuild/meson/pull/6185 - (fetchpatch { - url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch"; - sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb"; - }) ]; setupHook = ./setup-hook.sh;