Merge pull request #38757 from dotlambda/conan-1.2.3

conan: 1.1.1 -> 1.2.3
This commit is contained in:
Robert Schütz 2018-04-12 15:20:35 +02:00 committed by GitHub
commit 04001d8be7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 11 deletions

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, python, packaging, unittest2 }:
buildPythonPackage rec {
pname = "deprecation";
version = "2.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "e8d0dc5a17d7d551730e5f23ff3a53fc9e438364b9efb47d41c3e9b05522eabe";
};
propagatedBuildInputs = [ packaging ];
checkInputs = [ unittest2 ];
checkPhase = ''
${python.interpreter} -m unittest discover
'';
meta = with lib; {
description = "A library to handle automated deprecations";
homepage = https://deprecation.readthedocs.io/;
license = licenses.asl20;
};
}

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

@ -2107,6 +2107,8 @@ in {
demjson = callPackage ../development/python-modules/demjson { };
deprecation = callPackage ../development/python-modules/deprecation { };
derpconf = callPackage ../development/python-modules/derpconf { };
deskcon = self.buildPythonPackage rec {