public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118702 from aanderse/conan

Browse Source 
conan: 1.27.0 -> 1.35.0
This commit is contained in:
Sandro 2021-04-08 22:43:24 +02:00 committed by GitHub
commit a5f6343808
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/tools/build-managers/conan/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3, fetchFromGitHub, git, pkg-config, fetchpatch }: { lib, stdenv, python3, fetchFromGitHub, git, pkg-config }:
# Note: # Note:
# Conan has specific dependency demands; check # Conan has specific dependency demands; check
@ -14,20 +14,6 @@
let newPython = python3.override { let newPython = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
distro = super.distro.overridePythonAttrs (oldAttrs: rec {
version = "1.1.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j";
};
patches = oldAttrs.patches or [] ++ [
# Don't raise import error on non-linux os. Remove after upgrading to distro≥1.2.0
(fetchpatch {
url = "https://github.com/nir0s/distro/commit/25aa3f8c5934346dc838387fc081ce81baddeb95.patch";
sha256 = "0m09ldf75gacazh2kr04cifgsqfxg670vk4ypl62zv7fp3nyd5dc";
})
];
});
node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec { node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec {
version = "0.6.1"; version = "0.6.1";
src = oldAttrs.src.override { src = oldAttrs.src.override {
@ -35,25 +21,25 @@ let newPython = python3.override {
sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0"; sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
}; };
}); });
pluginbase = super.pluginbase.overridePythonAttrs (oldAttrs: rec { urllib3 = super.urllib3.overridePythonAttrs (oldAttrs: rec {
version = "0.7"; version = "1.25.11";
src = oldAttrs.src.override { src = oldAttrs.src.override {
inherit version; inherit version;
sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; sha256 = "18hpzh1am1dqx81fypn57r2wk565fi4g14292qrc5jm1h9dalzld";
}; };
}); });
}; };
}; };
in newPython.pkgs.buildPythonApplication rec { in newPython.pkgs.buildPythonApplication rec {
version = "1.27.0"; version = "1.35.0";
pname = "conan"; pname = "conan";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "conan-io"; owner = "conan-io";
repo = "conan"; repo = "conan";
rev = version; rev = version;
sha256 = "0ncqs1p4g23fmzgdmwppgxr8w275h38hgjdzs456cgivz8xs9rjl"; sha256 = "19rgylkjxvv47vz5vgh46rw108xskpv7lmax8y2fnm2wd1j3bq9c";
}; };
propagatedBuildInputs = with newPython.pkgs; [ propagatedBuildInputs = with newPython.pkgs; [
@ -95,12 +81,7 @@ in newPython.pkgs.buildPythonApplication rec {
postPatch = '' postPatch = ''
substituteInPlace conans/requirements.txt \ substituteInPlace conans/requirements.txt \
--replace "PyYAML>=3.11, <3.14.0" "PyYAML" \ --replace "deprecation>=2.0, <2.1" "deprecation"
--replace "deprecation>=2.0, <2.1" "deprecation" \
--replace "idna==2.6" "idna" \
--replace "cryptography>=1.3.4, <2.4.0" "cryptography" \
--replace "pyOpenSSL>=16.0.0, <19.0.0" "pyOpenSSL" \
--replace "six>=1.10.0,<=1.14.0" "six"
''; '';
meta = with lib; { meta = with lib; {