Merge pull request #271877 from fabaff/scancode-fix

python311Packages.scancode-toolkit: 32.0.6 -> 32.0.8

authored by Fabian Affolter and committed by GitHub 411d94a1 ca05cd31

+16 -27
+16 -27
pkgs/development/python-modules/scancode-toolkit/default.nix
··· 16 16 , extractcode-libarchive 17 17 , fasteners 18 18 , fetchPypi 19 - , fetchpatch 20 19 , fingerprints 21 20 , ftfy 22 21 , gemfileparser2 ··· 48 47 , pythonOlder 49 48 , requests 50 49 , saneyaml 50 + , setuptools 51 51 , spdx-tools 52 52 , text-unidecode 53 53 , toml 54 54 , typecode 55 55 , typecode-libmagic 56 - , typing 57 56 , urlpy 58 57 , xmltodict 59 58 , zipp ··· 61 60 62 61 buildPythonPackage rec { 63 62 pname = "scancode-toolkit"; 64 - version = "32.0.6"; 63 + version = "32.0.8"; 64 + pyproject = true; 65 65 66 - disabled = pythonOlder "3.6"; 66 + disabled = pythonOlder "3.7"; 67 67 68 68 src = fetchPypi { 69 69 inherit pname version; 70 - hash = "sha256-suqk7LOnZgSJGlaHq81LDOSCHZWdsJOUbma6MEpHxSM="; 70 + hash = "sha256-W6Ev1MV8cZU4bauAfmuZsBzMJKz7xpw8siO3Afn5mc8="; 71 71 }; 72 72 73 73 dontConfigure = true; 74 74 75 + nativeBuildInputs = [ 76 + setuptools 77 + ]; 78 + 75 79 propagatedBuildInputs = [ 76 80 attrs 77 81 beautifulsoup4 ··· 126 130 xmltodict 127 131 ] ++ lib.optionals (pythonOlder "3.9") [ 128 132 zipp 129 - ] ++ lib.optionals (pythonOlder "3.7") [ 130 - typing 131 133 ]; 132 134 133 135 nativeCheckInputs = [ 134 136 pytestCheckHook 135 137 ]; 136 138 137 - patches = [ 138 - (fetchpatch { 139 - name = "${pname}-allow-stable-spdx-tools.patch"; 140 - url = "https://github.com/nexB/scancode-toolkit/commit/d89ab6584d3df6b7eb1d1394559e9d967d6db6ae.patch"; 141 - includes = [ "src/*" ]; 142 - hash = "sha256-AU3vJlOxmCy3yvkupVaAVxAKxJI3ymXEk+A5DWSkfOM="; 143 - }) 144 - ]; 145 - 146 - postPatch = '' 147 - substituteInPlace setup.cfg \ 148 - --replace "pdfminer.six >= 20200101" "pdfminer.six" \ 149 - --replace "pluggy >= 0.12.0, < 1.0" "pluggy" \ 150 - --replace "pygmars >= 0.7.0" "pygmars" \ 151 - --replace "license_expression >= 21.6.14" "license_expression" \ 152 - --replace "intbitset >= 2.3.0, < 3.0" "intbitset" \ 153 - --replace "spdx_tools == 0.7.0a3" "spdx_tools" 154 - ''; 155 - 156 139 # Importing scancode needs a writeable home, and preCheck happens in between 157 140 # pythonImportsCheckPhase and pytestCheckPhase. 158 141 postInstall = '' ··· 163 146 "scancode" 164 147 ]; 165 148 166 - # takes a long time and doesn't appear to do anything 149 + disabledTestPaths = [ 150 + # Tests are outdated 151 + "src/formattedcode/output_spdx.py" 152 + "src/scancode/cli.py" 153 + ]; 154 + 155 + # Takes a long time and doesn't appear to do anything 167 156 dontStrip = true; 168 157 169 158 meta = with lib; {