diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-07-04 13:12:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 13:12:03 +0200 |
| commit | a5de6179cb656ea572963b2b8059e3f8d8d7fd63 (patch) | |
| tree | 060c6fface94ea5e021598e43e60f36c68f557e4 /pkgs/development/tools/build-managers | |
| parent | d6d304cd1246e2a1a302490cc0399ce3efc1681a (diff) | |
| parent | 9b16b5e381aeff13484507ed3ce4db608efb8398 (diff) | |
| download | nixpkgs-a5de6179cb656ea572963b2b8059e3f8d8d7fd63.tar nixpkgs-a5de6179cb656ea572963b2b8059e3f8d8d7fd63.tar.gz nixpkgs-a5de6179cb656ea572963b2b8059e3f8d8d7fd63.tar.bz2 nixpkgs-a5de6179cb656ea572963b2b8059e3f8d8d7fd63.tar.lz nixpkgs-a5de6179cb656ea572963b2b8059e3f8d8d7fd63.tar.xz nixpkgs-a5de6179cb656ea572963b2b8059e3f8d8d7fd63.tar.zst nixpkgs-a5de6179cb656ea572963b2b8059e3f8d8d7fd63.zip | |
Merge pull request #129137 from bjornfor/fix-conan
conan: fix build after python3Packages updates
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 19 |
1 files changed, 18 insertions, 1 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; { |