nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

resholve: fold in python package deps

Protects resholve and dependents from breakages as py27 support is
removed (or rots).

+69 -4
+1
pkgs/development/misc/resholve/default.nix
··· 22 22 resholve = callPackage ./resholve.nix { 23 23 inherit (source) rSrc version; 24 24 inherit (deps.oil) oildev; 25 + inherit (deps) configargparse; 25 26 inherit resholve-utils; 26 27 }; 27 28 # funcs to validate and phrase invocations of resholve
+63 -2
pkgs/development/misc/resholve/deps.nix
··· 1 - { callPackage 1 + { lib 2 + , callPackage 3 + , fetchFromGitHub 2 4 , python27 3 5 , ... 4 6 }: ··· 17 15 18 16 rec { 19 17 # binlore = callPackage ./binlore.nix { }; 20 - oil = callPackage ./oildev.nix { inherit python27; }; 18 + oil = callPackage ./oildev.nix { 19 + inherit python27; 20 + inherit six; 21 + inherit typing; 22 + }; 23 + configargparse = python27.pkgs.buildPythonPackage rec { 24 + pname = "configargparse"; 25 + version = "1.5.3"; 26 + 27 + src = fetchFromGitHub { 28 + owner = "bw2"; 29 + repo = "ConfigArgParse"; 30 + rev = "v${version}"; 31 + sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; 32 + }; 33 + 34 + doCheck = false; 35 + 36 + pythonImportsCheck = [ "configargparse" ]; 37 + 38 + meta = with lib; { 39 + description = "A drop-in replacement for argparse"; 40 + homepage = "https://github.com/bw2/ConfigArgParse"; 41 + license = licenses.mit; 42 + }; 43 + }; 44 + six = python27.pkgs.buildPythonPackage rec { 45 + pname = "six"; 46 + version = "1.16.0"; 47 + 48 + src = python27.pkgs.fetchPypi { 49 + inherit pname version; 50 + sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; 51 + }; 52 + 53 + doCheck = false; 54 + 55 + meta = { 56 + description = "A Python 2 and 3 compatibility library"; 57 + homepage = "https://pypi.python.org/pypi/six/"; 58 + license = lib.licenses.mit; 59 + }; 60 + }; 61 + typing = python27.pkgs.buildPythonPackage rec { 62 + pname = "typing"; 63 + version = "3.10.0.0"; 64 + 65 + src = python27.pkgs.fetchPypi { 66 + inherit pname version; 67 + sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; 68 + }; 69 + 70 + doCheck = false; 71 + 72 + meta = with lib; { 73 + description = "Backport of typing module to Python versions older than 3.5"; 74 + homepage = "https://docs.python.org/3/library/typing.html"; 75 + license = licenses.psfl; 76 + }; 77 + }; 21 78 }
+3 -1
pkgs/development/misc/resholve/oildev.nix
··· 13 13 , cmark 14 14 , file 15 15 , glibcLocales 16 + , six 17 + , typing 16 18 }: 17 19 18 20 rec { ··· 97 95 98 96 nativeBuildInputs = [ re2c file makeWrapper ]; 99 97 100 - propagatedBuildInputs = with python27.pkgs; [ six typing ]; 98 + propagatedBuildInputs = [ six typing ]; 101 99 102 100 doCheck = true; 103 101
+2 -1
pkgs/development/misc/resholve/resholve.nix
··· 6 6 , rSrc 7 7 , version 8 8 , oildev 9 + , configargparse 9 10 , binlore 10 11 , resholve-utils 11 12 }: ··· 20 19 21 20 propagatedBuildInputs = [ 22 21 oildev 23 - python27.pkgs.configargparse 22 + configargparse 24 23 ]; 25 24 26 25 postPatch = ''