diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/build-managers/conan/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/tools/build-managers/conan/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index 9ea57a27f027..eb0c4c9e76c2 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -3,20 +3,21 @@ , fetchFromGitHub , git , pkg-config +, xcbuild , python3 , zlib }: python3.pkgs.buildPythonApplication rec { pname = "conan"; - version = "2.0.5"; + version = "2.0.14"; format = "setuptools"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = "refs/tags/${version}"; - hash = "sha256-+ohUOQ9WBER/X0TDklf/qZCm9LhM1I1QRmED4FnkweM="; + hash = "sha256-zPN6OlEWYc/OvUb7LHF1/mZYrieG8n2bLcZ/IzwlvtE="; }; nativeBuildInputs = with python3.pkgs; [ @@ -45,15 +46,12 @@ python3.pkgs.buildPythonApplication rec { pyopenssl ]; - pythonRelaxDeps = [ - # This can be removed once conan is updated to 2.0.7+ - "PyYAML" - ]; - nativeCheckInputs = [ git pkg-config zlib + ] ++ lib.optionals (stdenv.isDarwin) [ + xcbuild.xcrun ] ++ (with python3.pkgs; [ mock parameterized |