lol

Merge pull request #204536 from tjni/spsdk

authored by

Sandro and committed by
GitHub
9949ac47 3ec56548

+61 -25
+49
pkgs/development/python-modules/click-command-tree/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , fetchpatch 5 + , click 6 + , pytestCheckHook 7 + }: 8 + 9 + buildPythonPackage rec { 10 + pname = "click-command-tree"; 11 + version = "1.1.0"; 12 + format = "setuptools"; 13 + 14 + src = fetchFromGitHub { 15 + owner = "whwright"; 16 + repo = pname; 17 + rev = version; 18 + hash = "sha256-vFOcn+ibyLZnhU3OQMtnHI04UqAY2/CCvhq4EEU4XFo="; 19 + }; 20 + 21 + patches = [ 22 + (fetchpatch { 23 + name = "remove-setup-downloading-flake8.patch"; 24 + url = "https://github.com/whwright/click-command-tree/commit/1ecfcfa29bf01e1131e6ec712bd7338ac1283dc8.patch"; 25 + hash = "sha256-u5jsNfEo1+XNlkVGPCM/rsDPnYko6cr2z2si9nq+sLA="; 26 + }) 27 + ]; 28 + 29 + propagatedBuildInputs = [ 30 + click 31 + ]; 32 + 33 + checkInputs = [ 34 + pytestCheckHook 35 + ]; 36 + 37 + pytestFlagsArray = [ 38 + "tests.py" 39 + ]; 40 + 41 + pythonImportsCheck = [ "click_command_tree" ]; 42 + 43 + meta = with lib; { 44 + description = "click plugin to show the command tree of your CLI"; 45 + homepage = "https://github.com/whwright/click-command-tree"; 46 + license = licenses.mit; 47 + maintainers = with maintainers; [ tjni ]; 48 + }; 49 + }
+10 -25
pkgs/development/python-modules/spsdk/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , dos2unix 6 5 , pythonRelaxDepsHook 7 6 , asn1crypto ··· 9 8 , bincopy 10 9 , bitstring 11 10 , click 11 + , click-command-tree 12 12 , click-option-group 13 13 , cmsis-pack-manager 14 14 , commentjson ··· 33 33 34 34 buildPythonPackage rec { 35 35 pname = "spsdk"; 36 - version = "1.6.3"; 36 + version = "1.8.0"; 37 37 38 38 src = fetchFromGitHub { 39 39 owner = "NXPmicro"; 40 40 repo = pname; 41 41 rev = version; 42 - sha256 = "sha256-JMhd2XdbjEN6SUzFgcBHd/dStiuYeXXis6pfijSfUso="; 42 + hash = "sha256-yCmkOrUe5XqbuHeo7F84j1gmdzpdpCRWdD9V74U64c4="; 43 43 }; 44 44 45 - patches = [ 46 - # https://github.com/NXPmicro/spsdk/pull/43 47 - (fetchpatch { 48 - name = "cryptography-37-compat.patch"; 49 - url = "https://github.com/NXPmicro/spsdk/commit/a85b854de1093de593d27fa64de442224ab2e0fd.patch"; 50 - sha256 = "sha256-4pXV/8RaNuGl7KNdoGD/8YnPQ2ZmUQOjXWA/Yy0Kxu8="; 51 - }) 52 - # https://github.com/NXPmicro/spsdk/pull/41 53 - (fetchpatch { 54 - name = "blhost-click-8-1-compat.patch"; 55 - url = "https://github.com/NXPmicro/spsdk/commit/5112b1b69aa681d265035475e73d28ea0c8cb6ab.patch"; 56 - sha256 = "sha256-Okz6Er6OVuAA5IlB5IabSa/gUSLa+E2Ltd+J3uoIg6o="; 57 - }) 45 + nativeBuildInputs = [ 46 + pythonRelaxDepsHook 58 47 ]; 59 48 60 - nativeBuildInputs = [ pythonRelaxDepsHook ]; 61 49 pythonRelaxDeps = [ 62 50 "bincopy" 63 51 "bitstring" 64 52 "cmsis-pack-manager" 65 - "cryptography" 66 53 "deepmerge" 67 54 "jinja2" 68 55 "pylink-square" 69 56 "pyocd" 70 57 ]; 71 - pythonRemoveDeps = [ "pyocd-pemicro" ]; 58 + 59 + pythonRemoveDeps = [ 60 + "pyocd-pemicro" 61 + ]; 72 62 73 63 propagatedBuildInputs = [ 74 64 asn1crypto ··· 76 66 bincopy 77 67 bitstring 78 68 click 69 + click-command-tree 79 70 click-option-group 80 71 cmsis-pack-manager 81 72 commentjson ··· 99 90 checkInputs = [ 100 91 pytestCheckHook 101 92 voluptuous 102 - ]; 103 - 104 - disabledTests = [ 105 - # tests also fail on debian, so presumable they are broken 106 - "test_elftosb_mbi_signed" 107 - "test_elftosb_sb31" 108 93 ]; 109 94 110 95 pythonImportsCheck = [ "spsdk" ];
+2
pkgs/top-level/python-packages.nix
··· 1760 1760 1761 1761 clickclick = callPackage ../development/python-modules/clickclick { }; 1762 1762 1763 + click-command-tree = callPackage ../development/python-modules/click-command-tree { }; 1764 + 1763 1765 click-completion = callPackage ../development/python-modules/click-completion { }; 1764 1766 1765 1767 click-configfile = callPackage ../development/python-modules/click-configfile { };