diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-02-20 15:25:04 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-02-20 15:27:20 +0100 |
commit | 3242c2f8aeb12697318b83b13d30574cae8c0cbf (patch) | |
tree | 9ee57115666c610bde159f7589784b623e403dbb /pkgs/development/tools/build-managers/meson | |
parent | 7d4b0acfb5adf93b2b30880dece74e9764c8a178 (diff) | |
download | nixpkgs-3242c2f8aeb12697318b83b13d30574cae8c0cbf.tar nixpkgs-3242c2f8aeb12697318b83b13d30574cae8c0cbf.tar.gz nixpkgs-3242c2f8aeb12697318b83b13d30574cae8c0cbf.tar.bz2 nixpkgs-3242c2f8aeb12697318b83b13d30574cae8c0cbf.tar.lz nixpkgs-3242c2f8aeb12697318b83b13d30574cae8c0cbf.tar.xz nixpkgs-3242c2f8aeb12697318b83b13d30574cae8c0cbf.tar.zst nixpkgs-3242c2f8aeb12697318b83b13d30574cae8c0cbf.zip |
meson: 0.56.0 → 0.57.1
- https://mesonbuild.com/Release-notes-for-0-57-0.html - https://github.com/mesonbuild/meson/releases/tag/0.57.0 - https://github.com/mesonbuild/meson/releases/tag/0.57.1
Diffstat (limited to 'pkgs/development/tools/build-managers/meson')
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch index e5ac95d0b9d..4eb292a2e52 100644 --- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -1,14 +1,14 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -491,7 +491,6 @@ class CoreData: +@@ -506,7 +506,6 @@ class CoreData: return value - if option.endswith('dir') and value.is_absolute() and \ - option not in builtin_dir_noprefix_options: + if option.name.endswith('dir') and value.is_absolute() and \ + option not in BULITIN_DIR_NOPREFIX_OPTIONS: - # Value must be a subdir of the prefix # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -@@ -503,7 +502,7 @@ class CoreData: +@@ -518,7 +517,7 @@ class CoreData: try: value = value.relative_to(prefix) except ValueError: diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 7009aa4898f..de82609a548 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.56.0"; + version = "0.57.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "04vj250bwrzq7c0z1r96b0z0vgirvn0m367wm3ygqmfdy67x6799"; + sha256 = "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj"; }; patches = [ diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch index ada58fff6d4..4b2606e2d69 100644 --- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -1,8 +1,8 @@ -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 219b62ec8..e3ceaddbd 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice, +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index 756dd8193..a5cc6ef8b 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -151,7 +151,7 @@ def _get_env_var(for_machine: MachineChoice, is_cross: bool, var_name: str) -> T # compiling we fall back on the unprefixed host version. This # allows native builds to never need to worry about the 'BUILD_*' # ones. |