diff --git a/pkgs/by-name/me/meson/007-darwin-case-sensitivity.patch b/pkgs/by-name/me/meson/007-darwin-case-sensitivity.patch deleted file mode 100644 index aea0348f4b63..000000000000 --- a/pkgs/by-name/me/meson/007-darwin-case-sensitivity.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a908a574daf8bac10bb2a0ee3771052d2167a85f Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Sun, 3 Dec 2023 15:41:20 -0500 -Subject: [PATCH] Fix test failure on Darwin on a case-sensitive fs - -This was encountered while looking into an issue with -https://github.com/NixOS/nixpkgs/pull/268583. - -I run my Nix store on case-sensitive APFS, so the test fails due to -trying to link `-framework ldap` instead of `-framework LDAP`. ---- - test cases/osx/5 extra frameworks/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test cases/osx/5 extra frameworks/meson.build b/test cases/osx/5 extra frameworks/meson.build -index f6c01e63a1bd..96532846c632 100644 ---- a/test cases/osx/5 extra frameworks/meson.build -+++ b/test cases/osx/5 extra frameworks/meson.build -@@ -7,7 +7,7 @@ dep_main = dependency('Foundation') - assert(dep_main.type_name() == 'extraframeworks', 'type_name is ' + dep_main.type_name()) - - # https://github.com/mesonbuild/meson/issues/10002 --ldap_dep = dependency('ldap', method : 'extraframework') -+ldap_dep = dependency('LDAP', method : 'extraframework') - assert(ldap_dep.type_name() == 'extraframeworks', 'type_name is ' + ldap_dep.type_name()) - - stlib = static_library('stat', 'stat.c', install : true, dependencies: [opengl_dep, ldap_dep]) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 86ac76ffafbb..9064b9eaf793 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -18,13 +18,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-Jt3PWnbv/8P6Rvf3E/Yli2vdtfgx3CmsW+jlc9CK5KA="; + hash = "sha256-KNNtHi3jx0MRiOgmluA4ucZJWB2WeIYdApfHuspbCqg="; }; patches = [ @@ -65,9 +65,6 @@ python3.pkgs.buildPythonApplication rec { # Nixpkgs cctools does not have bitcode support. ./006-disable-bitcode.patch - - # https://github.com/mesonbuild/meson/pull/12587 - ./007-darwin-case-sensitivity.patch ]; buildInputs = lib.optionals (python3.pythonOlder "3.9") [