diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-04 12:01:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 12:01:40 +0000 |
| commit | 5a31e44bd3b2866d0cc513befd4d0cfe633f53e1 (patch) | |
| tree | 1e4720ec0ffa4057d34397f8b0f5ef7f56ebf8da /pkgs/development/tools | |
| parent | c852543c1fc05b539357c49ebaf7b951b7ff27b8 (diff) | |
| parent | a6fdcf8d5293f99ed9484354b3eed7320744a62c (diff) | |
| download | nixpkgs-5a31e44bd3b2866d0cc513befd4d0cfe633f53e1.tar nixpkgs-5a31e44bd3b2866d0cc513befd4d0cfe633f53e1.tar.gz nixpkgs-5a31e44bd3b2866d0cc513befd4d0cfe633f53e1.tar.bz2 nixpkgs-5a31e44bd3b2866d0cc513befd4d0cfe633f53e1.tar.lz nixpkgs-5a31e44bd3b2866d0cc513befd4d0cfe633f53e1.tar.xz nixpkgs-5a31e44bd3b2866d0cc513befd4d0cfe633f53e1.tar.zst nixpkgs-5a31e44bd3b2866d0cc513befd4d0cfe633f53e1.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/ccls/wrapper | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 8c150e114f9..f59e74b02f4 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -39,6 +39,22 @@ let newPython = python3.override { "test_ec_verify_should_return_false_if_signature_invalid" ]; }); + # conan needs jinja2<3 + jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { + version = "2.11.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; + }; + }); + # old jinja2 needs old markupsafe + markupsafe = super.markupsafe.overridePythonAttrs (oldAttrs: rec { + version = "1.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; + }; + }); }; }; @@ -92,7 +108,8 @@ in newPython.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace conans/requirements.txt \ - --replace "deprecation>=2.0, <2.1" "deprecation" + --replace "deprecation>=2.0, <2.1" "deprecation" \ + --replace "six>=1.10.0,<=1.15.0" "six>=1.10.0,<=1.16.0" ''; meta = with lib; { diff --git a/pkgs/development/tools/misc/ccls/wrapper b/pkgs/development/tools/misc/ccls/wrapper index c92bc6b40d1..294b60893a3 100644 --- a/pkgs/development/tools/misc/ccls/wrapper +++ b/pkgs/development/tools/misc/ccls/wrapper @@ -4,6 +4,6 @@ printf -v extraArgs ',\"%s\"' \ $(cat @clang@/nix-support/libc-cflags \ @clang@/nix-support/libcxx-cxxflags) \ ${NIX_CFLAGS_COMPILE} -initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}]}}" +initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}],\"resourceDir\":\"@clang@/resource-root\"}}" exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" |