alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

conan: 1.1.1 -> 1.2.3

Browse source
This commit is contained in:
Robert Schütz 2018-04-11 12:23:06 +02:00
parent 36ce7ac867
commit 13dadd48b5
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/tools/build-managers/conan/default.nix
View file

@ -20,12 +20,12 @@ let newPython = python.override {
}; };
in newPython.pkgs.buildPythonApplication rec { in newPython.pkgs.buildPythonApplication rec {
version = "1.1.1"; # remove patch below when updating version = "1.2.3";
pname = "conan"; pname = "conan";
src = newPython.pkgs.fetchPypi { src = newPython.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl"; sha256 = "623e92d99cd0f4ec92552b23af66a6bb066071e213659f502480bb9a96d7be23";
}; };
checkInputs = with newPython.pkgs; [ checkInputs = with newPython.pkgs; [
@ -39,15 +39,7 @@ in newPython.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with newPython.pkgs; [ propagatedBuildInputs = with newPython.pkgs; [
requests fasteners pyyaml pyjwt colorama patch requests fasteners pyyaml pyjwt colorama patch
bottle pluginbase six distro pylint node-semver bottle pluginbase six distro pylint node-semver
future pygments mccabe future pygments mccabe deprecation
];
patches = [
# already merged, remove with the next package update
(fetchpatch {
url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch";
sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7";
})
]; ];
preCheck = '' preCheck = ''