diff options
author | adisbladis <adisbladis@gmail.com> | 2018-02-06 13:38:46 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-06 13:38:46 +0800 |
commit | b4f0bdcfcc0f954db8aa6da1523628278e90ee52 (patch) | |
tree | 217e0b8dcba868485d811622aa647dc17f2124d1 | |
parent | da82aff2b05c684cc8239627b54a30002281e35b (diff) | |
parent | 295934adda0932cba7aefdd78c86d259408ba3d5 (diff) | |
download | nixlib-b4f0bdcfcc0f954db8aa6da1523628278e90ee52.tar nixlib-b4f0bdcfcc0f954db8aa6da1523628278e90ee52.tar.gz nixlib-b4f0bdcfcc0f954db8aa6da1523628278e90ee52.tar.bz2 nixlib-b4f0bdcfcc0f954db8aa6da1523628278e90ee52.tar.lz nixlib-b4f0bdcfcc0f954db8aa6da1523628278e90ee52.tar.xz nixlib-b4f0bdcfcc0f954db8aa6da1523628278e90ee52.tar.zst nixlib-b4f0bdcfcc0f954db8aa6da1523628278e90ee52.zip |
Merge pull request #34650 from ryantm/bear
bear: 2.2.1 -> 2.3.11
-rw-r--r-- | pkgs/development/tools/build-managers/bear/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/bear/ignore_wrapper.patch | 40 |
2 files changed, 18 insertions, 27 deletions
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 2bfec89aa660..6afec72de5fd 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.2.1"; + version = "2.3.11"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "1rwar5nvvhfqws4nwyifaysqs3nxpphp48lx9mdg5n6l4z7drz0n"; + sha256 = "0r6ykvclq9ws055ssd8w33dicmk5l9pisv0fpzkks700n8d3z9f3"; }; nativeBuildInputs = [ cmake ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; }; } - diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch index 16d7a9bfd3e4..f70e3811f654 100644 --- a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch +++ b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch @@ -1,31 +1,23 @@ ---- Bear-2.2.1-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 -+++ Bear-2.2.1-src-patch/bear/main.py.in 2016-11-02 20:23:38.050134984 +0100 -@@ -48,6 +48,7 @@ +--- Bear-2.3.11-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 ++++ Bear-2.3.11-src-patch/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 +@@ -49,6 +49,7 @@ import shutil import contextlib import logging +from distutils.spawn import find_executable - # Ignored compiler options map for compilation database creation. - # The map is used in `split_command` method. (Which does ignore and classify -@@ -447,7 +448,6 @@ - # do extra check on number of source files - return result if result.files else None + # Map of ignored compiler option for the creation of a compilation database. + # This map is used in _split_command method, which classifies the parameters +@@ -540,7 +541,11 @@ + any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX) -- - def split_compiler(command): - """ A predicate to decide the command is a compiler call or not. - -@@ -467,7 +467,11 @@ - for pattern in COMPILER_CPP_PATTERNS) - - if command: # not empty list will allow to index '0' and '1:' -- executable = os.path.basename(command[0]) -+ absolute_executable = os.path.realpath(find_executable(command[0])) -+ if 'wrapper' in absolute_executable: -+ return None + if command: # not empty list will allow to index '0' and '1:' +- executable = os.path.basename(command[0]) # type: str ++ absolute_executable = os.path.realpath(find_executable(command[0])) ++ if 'wrapper' in absolute_executable: ++ return None + -+ executable = os.path.basename(absolute_executable) - parameters = command[1:] - # 'wrapper' 'parameters' and - # 'wrapper' 'compiler' 'parameters' are valid. ++ executable = os.path.basename(absolute_executable) # type: str + parameters = command[1:] # type: List[str] + # 'wrapper' 'parameters' and + # 'wrapper' 'compiler' 'parameters' are valid. \ No newline at end of file |