From 0d1c745d7a7bd3af335a512f71b009916d9793bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 18 Apr 2022 15:43:48 +0200 Subject: [PATCH] conan: pin distro==1.5.0 to fix build Or else the build fails with ERROR: No matching distribution found for distro<=1.6.0,>=1.0.2 since distro==1.7.0 in nixpkgs now. --- pkgs/development/tools/build-managers/conan/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index e4a616f9995e..8978a0635c8c 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -48,6 +48,13 @@ let newPython = python3.override { sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; }; }); + distro = super.distro.overridePythonAttrs (oldAttrs: rec { + version = "1.5.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f"; + }; + }); }; };