Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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