mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues Wiki Activity

conan: 1.5.2 -> 1.6.0

Browse source
This commit is contained in:
Robert Schütz 2018-07-24 09:38:55 +02:00 committed by Frederik Rietdijk
parent c7228f8654
commit a576b2ea64
1 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ lib, python }: { lib, python3, fetchpatch, git }:
let newPython = python.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.1.0";
@ -16,30 +16,48 @@ let newPython = python.override {
sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3"; sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
}; };
}); });
astroid = super.astroid.overridePythonAttrs (oldAttrs: rec {
version = "1.6.5";
src = oldAttrs.src.override {
inherit version;
sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a";
};
});
pylint = super.pylint.overridePythonAttrs (oldAttrs: rec {
version = "1.8.4";
src = oldAttrs.src.override {
inherit version;
sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9";
};
});
}; };
}; };
in newPython.pkgs.buildPythonApplication rec { in newPython.pkgs.buildPythonApplication rec {
version = "1.5.2"; version = "1.6.0";
pname = "conan"; pname = "conan";
src = newPython.pkgs.fetchPypi { src = newPython.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0r5ymq27j60py1fb396zshq7z6adda34a857lwrj3k8hqhs0ihpp"; sha256 = "386476d3af1fa390e4cd96e737876e7d1f1c0bca09519e51fd44c1bb45990caa";
}; };
postPatch = '' # Bump PyYAML to 3.13
# Remove pylint constraint patches = fetchpatch {
substituteInPlace conans/requirements.txt --replace ", <1.9.0" "" url = https://github.com/conan-io/conan/commit/9d3d7a5c6e89b3aa321735557e5ad3397bb80568.patch;
''; sha256 = "1qdy6zj3ypl1bp9872mzaqg1gwigqldxb1glvrkq3p4za62p546k";
};
checkInputs = with newPython.pkgs; [ checkInputs = [
git
] ++ (with newPython.pkgs; [
nose nose
parameterized parameterized
mock mock
webtest webtest
codecov codecov
]; ]);
propagatedBuildInputs = with newPython.pkgs; [ propagatedBuildInputs = with newPython.pkgs; [
requests fasteners pyyaml pyjwt colorama patch requests fasteners pyyaml pyjwt colorama patch
@ -47,9 +65,10 @@ in newPython.pkgs.buildPythonApplication rec {
future pygments mccabe deprecation future pygments mccabe deprecation
]; ];
preCheck = '' 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; {