conan: 1.6.0 -> 1.11.2
This commit is contained in:
parent
a5aae4c04c
commit
efe4a6d205
|
@ -1,80 +1,73 @@
|
||||||
{ lib, python3, fetchpatch, git }:
|
{ lib, python3, git }:
|
||||||
|
|
||||||
let newPython = python3.override {
|
let newPython = python3.override {
|
||||||
packageOverrides = self: super: {
|
packageOverrides = self: super: {
|
||||||
distro = super.distro.overridePythonAttrs (oldAttrs: rec {
|
distro = super.distro.overridePythonAttrs (oldAttrs: rec {
|
||||||
version = "1.1.0";
|
version = "1.2.0";
|
||||||
src = oldAttrs.src.override {
|
src = oldAttrs.src.override {
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j";
|
sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec {
|
node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec {
|
||||||
version = "0.2.0";
|
version = "0.6.1";
|
||||||
src = oldAttrs.src.override {
|
src = oldAttrs.src.override {
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
|
sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
astroid = super.astroid.overridePythonAttrs (oldAttrs: rec {
|
future = super.future.overridePythonAttrs (oldAttrs: rec {
|
||||||
version = "1.6.5";
|
version = "0.16.0";
|
||||||
src = oldAttrs.src.override {
|
src = oldAttrs.src.override {
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a";
|
sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
pylint = super.pylint.overridePythonAttrs (oldAttrs: rec {
|
tqdm = super.tqdm.overridePythonAttrs (oldAttrs: rec {
|
||||||
version = "1.8.4";
|
version = "4.28.1";
|
||||||
src = oldAttrs.src.override {
|
src = oldAttrs.src.override {
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9";
|
sha256 = "1fyybgbmlr8ms32j7h76hz5g9xc6nf0644mwhc40a0s5k14makav";
|
||||||
};
|
};
|
||||||
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
in newPython.pkgs.buildPythonApplication rec {
|
in newPython.pkgs.buildPythonApplication rec {
|
||||||
version = "1.6.0";
|
version = "1.11.2";
|
||||||
pname = "conan";
|
pname = "conan";
|
||||||
|
|
||||||
src = newPython.pkgs.fetchPypi {
|
src = newPython.pkgs.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "386476d3af1fa390e4cd96e737876e7d1f1c0bca09519e51fd44c1bb45990caa";
|
sha256 = "0b4r9n6541jjp2lsdzc1nc6mk1a953w0d4ynjss3ns7pp89y4nd4";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Bump PyYAML to 3.13
|
|
||||||
patches = fetchpatch {
|
|
||||||
url = https://github.com/conan-io/conan/commit/9d3d7a5c6e89b3aa321735557e5ad3397bb80568.patch;
|
|
||||||
sha256 = "1qdy6zj3ypl1bp9872mzaqg1gwigqldxb1glvrkq3p4za62p546k";
|
|
||||||
};
|
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
git
|
git
|
||||||
] ++ (with newPython.pkgs; [
|
] ++ (with newPython.pkgs; [
|
||||||
|
codecov
|
||||||
|
mock
|
||||||
|
node-semver
|
||||||
nose
|
nose
|
||||||
parameterized
|
parameterized
|
||||||
mock
|
|
||||||
webtest
|
webtest
|
||||||
codecov
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
propagatedBuildInputs = with newPython.pkgs; [
|
propagatedBuildInputs = with newPython.pkgs; [
|
||||||
requests fasteners pyyaml pyjwt colorama patch
|
colorama deprecation distro fasteners bottle
|
||||||
bottle pluginbase six distro pylint node-semver
|
future node-semver patch pygments pluginbase
|
||||||
future pygments mccabe deprecation
|
pyjwt pylint pyyaml requests six tqdm
|
||||||
];
|
];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
export HOME="$TMP/conan-home"
|
export HOME="$TMP/conan-home"
|
||||||
mkdir -p "$HOME"
|
mkdir -p "$HOME"
|
||||||
nosetests conans.test
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = https://conan.io;
|
homepage = https://conan.io;
|
||||||
description = "Decentralized and portable C/C++ package manager";
|
description = "Decentralized and portable C/C++ package manager";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ HaoZeke ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue