diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 04:42:45 +0200 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-21 08:32:39 +0200 |
commit | 9073a0cb8b2f419785a60969e11e96733f29b200 (patch) | |
tree | 8d08d9b935dd4567ad24e1928820b98a9879e48c /pkgs/development/tools/build-managers/meson | |
parent | 3c83abd60f6aa72b2d3f868ad9d0af15f4c9bcec (diff) | |
download | nixpkgs-9073a0cb8b2f419785a60969e11e96733f29b200.tar nixpkgs-9073a0cb8b2f419785a60969e11e96733f29b200.tar.gz nixpkgs-9073a0cb8b2f419785a60969e11e96733f29b200.tar.bz2 nixpkgs-9073a0cb8b2f419785a60969e11e96733f29b200.tar.lz nixpkgs-9073a0cb8b2f419785a60969e11e96733f29b200.tar.xz nixpkgs-9073a0cb8b2f419785a60969e11e96733f29b200.tar.zst nixpkgs-9073a0cb8b2f419785a60969e11e96733f29b200.zip |
meson: 0.53.2 → 0.54.0
https://mesonbuild.com/Release-notes-for-0-54-0.html
Diffstat (limited to 'pkgs/development/tools/build-managers/meson')
-rw-r--r-- | pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch | 30 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 4 |
2 files changed, 14 insertions, 20 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 591927c1528..bd81efd5208 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,25 +1,19 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -375,18 +375,13 @@ - ''' - if option.endswith('dir') and os.path.isabs(value) and \ +@@ -483,7 +483,6 @@ class CoreData: + return value + if option.endswith('dir') and value.is_absolute() and \ option not in builtin_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. -- if os.path.commonpath([value, prefix]) != str(PurePath(prefix)): -- m = 'The value of the {!r} option is {!r} which must be a ' \ -- 'subdir of the prefix {!r}.\nNote that if you pass a ' \ -- 'relative path, it is assumed to be a subdir of prefix.' -- raise MesonException(m.format(option, value, prefix)) -- # Convert path to be relative to prefix -- skip = len(prefix) + 1 -- value = value[skip:] -+ if os.path.commonpath([value, prefix]) == str(PurePath(prefix)): -+ # Convert path to be relative to prefix -+ skip = len(prefix) + 1 -+ value = value[skip:] - return value - - def init_builtins(self): +@@ -495,7 +494,7 @@ class CoreData: + try: + value = value.relative_to(prefix) + except ValueError: +- raise MesonException(msg.format(option, value, prefix)) ++ pass + if '..' in str(value): + raise MesonException(msg.format(option, value, prefix)) + return value.as_posix() diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 3ac8e641eb6..15b0a5ffcd0 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -19,11 +19,11 @@ let in python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.53.2"; + version = "0.54.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8="; + sha256 = "3eVybXeBEqy9Sme7NjOrLuddM9HoeaYoOntKRMM2PCc="; }; postFixup = '' |