forked from mirrors/nixpkgs
resholve: fold in python package deps
Protects resholve and dependents from breakages as py27 support is removed (or rots).
This commit is contained in:
parent
2ee8b6ee74
commit
4fabafb699
|
@ -22,6 +22,7 @@ rec {
|
|||
resholve = callPackage ./resholve.nix {
|
||||
inherit (source) rSrc version;
|
||||
inherit (deps.oil) oildev;
|
||||
inherit (deps) configargparse;
|
||||
inherit resholve-utils;
|
||||
};
|
||||
# funcs to validate and phrase invocations of resholve
|
||||
|
|
65
pkgs/development/misc/resholve/deps.nix
generated
65
pkgs/development/misc/resholve/deps.nix
generated
|
@ -1,4 +1,6 @@
|
|||
{ callPackage
|
||||
{ lib
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, python27
|
||||
, ...
|
||||
}:
|
||||
|
@ -15,5 +17,64 @@
|
|||
|
||||
rec {
|
||||
# binlore = callPackage ./binlore.nix { };
|
||||
oil = callPackage ./oildev.nix { inherit python27; };
|
||||
oil = callPackage ./oildev.nix {
|
||||
inherit python27;
|
||||
inherit six;
|
||||
inherit typing;
|
||||
};
|
||||
configargparse = python27.pkgs.buildPythonPackage rec {
|
||||
pname = "configargparse";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bw2";
|
||||
repo = "ConfigArgParse";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "configargparse" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A drop-in replacement for argparse";
|
||||
homepage = "https://github.com/bw2/ConfigArgParse";
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
six = python27.pkgs.buildPythonPackage rec {
|
||||
pname = "six";
|
||||
version = "1.16.0";
|
||||
|
||||
src = python27.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A Python 2 and 3 compatibility library";
|
||||
homepage = "https://pypi.python.org/pypi/six/";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
typing = python27.pkgs.buildPythonPackage rec {
|
||||
pname = "typing";
|
||||
version = "3.10.0.0";
|
||||
|
||||
src = python27.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Backport of typing module to Python versions older than 3.5";
|
||||
homepage = "https://docs.python.org/3/library/typing.html";
|
||||
license = licenses.psfl;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
, cmark
|
||||
, file
|
||||
, glibcLocales
|
||||
, six
|
||||
, typing
|
||||
}:
|
||||
|
||||
rec {
|
||||
|
@ -95,7 +97,7 @@ rec {
|
|||
|
||||
nativeBuildInputs = [ re2c file makeWrapper ];
|
||||
|
||||
propagatedBuildInputs = with python27.pkgs; [ six typing ];
|
||||
propagatedBuildInputs = [ six typing ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
, rSrc
|
||||
, version
|
||||
, oildev
|
||||
, configargparse
|
||||
, binlore
|
||||
, resholve-utils
|
||||
}:
|
||||
|
@ -19,7 +20,7 @@ python27.pkgs.buildPythonApplication {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
oildev
|
||||
python27.pkgs.configargparse
|
||||
configargparse
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
Loading…
Reference in a new issue