diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
| commit | 2fec9c6e297e02718db6be53d645524f0052a7bc (patch) | |
| tree | 93e73a98dfaa40b290a6e15cf7f61054e5dc59e0 /pkgs/development/tools/build-managers | |
| parent | e9961bf9a9f7410c2891c7e86c21ed6388c70d78 (diff) | |
| parent | ba816ee08721d0c2f5f7e6652091bed085ac7687 (diff) | |
| download | nixpkgs-2fec9c6e297e02718db6be53d645524f0052a7bc.tar nixpkgs-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.gz nixpkgs-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.bz2 nixpkgs-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.lz nixpkgs-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.xz nixpkgs-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.zst nixpkgs-2fec9c6e297e02718db6be53d645524f0052a7bc.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/development/tools/build-managers/conan/default.nix
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 423a952026a..6350798e108 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,26 +1,28 @@ { lib, buildPythonApplication, fetchPypi , requests, fasteners, pyyaml, pyjwt, colorama, patch -, bottle, pluginbase, six, distro, pylint, node-semver +, bottle, pluginbase, six, distro11, pylint, node-semver2 , future, pygments, mccabe +, fetchpatch }: buildPythonApplication rec { - version = "1.0.4"; + version = "1.1.1"; pname = "conan"; src = fetchPypi { inherit pname version; - sha256 = "6f5cea887ecd6285bd83ae2acc3f76ed06dd52a79c106fe686d210b3ead89060"; + sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl"; }; propagatedBuildInputs = [ requests fasteners pyyaml pyjwt colorama patch - bottle pluginbase six distro pylint node-semver + bottle pluginbase six distro11 pylint node-semver2 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; meta = with lib; { |