diff options
author | Timo Kaufmann <timokau@zoho.com> | 2018-03-15 12:41:11 +0100 |
---|---|---|
committer | Timo Kaufmann <timokau@zoho.com> | 2018-03-15 13:48:58 +0100 |
commit | 488835ec6e8f7c115b2bd6ee37d9eaebe0f86485 (patch) | |
tree | f611681e06936a993c1ae0f248644ebcded43ef5 /pkgs/development/tools/build-managers/conan | |
parent | 2e7577c99b53357ba3f0076d808e83273394b70a (diff) | |
download | nixlib-488835ec6e8f7c115b2bd6ee37d9eaebe0f86485.tar nixlib-488835ec6e8f7c115b2bd6ee37d9eaebe0f86485.tar.gz nixlib-488835ec6e8f7c115b2bd6ee37d9eaebe0f86485.tar.bz2 nixlib-488835ec6e8f7c115b2bd6ee37d9eaebe0f86485.tar.lz nixlib-488835ec6e8f7c115b2bd6ee37d9eaebe0f86485.tar.xz nixlib-488835ec6e8f7c115b2bd6ee37d9eaebe0f86485.tar.zst nixlib-488835ec6e8f7c115b2bd6ee37d9eaebe0f86485.zip |
conan: Locally pin deps, enable tests
Diffstat (limited to 'pkgs/development/tools/build-managers/conan')
-rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 62 |
1 files changed, 46 insertions, 16 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 6350798e1086..04d7d93455e9 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,29 +1,59 @@ -{ lib, buildPythonApplication, fetchPypi -, requests, fasteners, pyyaml, pyjwt, colorama, patch -, bottle, pluginbase, six, distro11, pylint, node-semver2 -, future, pygments, mccabe -, fetchpatch -}: - -buildPythonApplication rec { - version = "1.1.1"; +{ lib, fetchpatch, python }: + +let newPython = python.override { + packageOverrides = self: super: { + distro = super.distro.overridePythonAttrs (oldAttrs: rec { + version = "1.1.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j"; + }; + }); + node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec { + version = "0.2.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3"; + }; + }); + }; +}; + +in newPython.pkgs.buildPythonApplication rec { + version = "1.1.1"; # remove patch below when updating pname = "conan"; - src = fetchPypi { + src = newPython.pkgs.fetchPypi { inherit pname version; sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl"; }; - propagatedBuildInputs = [ + checkInputs = with newPython.pkgs; [ + nose + parameterized + mock + webtest + codecov + ]; + + propagatedBuildInputs = with newPython.pkgs; [ requests fasteners pyyaml pyjwt colorama patch - bottle pluginbase six distro11 pylint node-semver2 + bottle pluginbase six distro pylint node-semver future pygments mccabe ]; - # enable tests once all of these pythonPackages available: - # [ nose nose_parameterized mock webtest codecov ] - # update 2018-03-11: only nose_parameterized is missing - doCheck = false; + patches = [ + # already merged, remove with the next package update + (fetchpatch { + url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch"; + sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7"; + }) + ]; + + preCheck = '' + export HOME="$TMP/conan-home" + mkdir -p "$HOME" + ''; meta = with lib; { homepage = https://conan.io; |