Unverified Commit c568d4ba authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

python313Packages.commoncode: 32.4.0 -> 32.4.2,...

python313Packages.commoncode: 32.4.0 -> 32.4.2, python313Packages.container-inspector: 33.0.1 -> 33.1.0 (#483963)
parents 85b0331e f5523172
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -14,16 +14,16 @@
  text-unidecode,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "commoncode";
  version = "32.4.0";
  version = "32.4.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "nexB";
    repo = "commoncode";
    tag = "v${version}";
    hash = "sha256-k9E/Yz6G3IHJPf3BlscZNSL4Qk9WyGU3vXA+U+GwWA0=";
    tag = "v${finalAttrs.version}";
    hash = "sha256-A2FE+qhLQahuAtptP3hCnIUgh7j61Wf02avO6DM0b5E=";
  };

  dontConfigure = true;
@@ -66,8 +66,8 @@ buildPythonPackage rec {
  meta = {
    description = "Set of common utilities, originally split from ScanCode";
    homepage = "https://github.com/nexB/commoncode";
    changelog = "https://github.com/nexB/commoncode/blob/${src.tag}/CHANGELOG.rst";
    changelog = "https://github.com/nexB/commoncode/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
    license = lib.licenses.asl20;
    maintainers = [ ];
  };
}
})
+8 −8
Original line number Diff line number Diff line
@@ -10,23 +10,23 @@
  setuptools-scm,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "container-inspector";
  version = "33.0.1";
  version = "33.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "nexB";
    repo = "container-inspector";
    tag = "v${version}";
    hash = "sha256-bXJ4UIDVhiU0DurEeRiyLlSUrNRgwoMqAxXxGb/CcJs=";
    tag = "v${finalAttrs.version}";
    hash = "sha256-uwfqPh4e5zNO0K5rKZ2pxgOkX/KF9pzCsKdYbQuw9MA=";
  };

  dontConfigure = true;

  build-system = [ setuptools-scm ];

  propagatedBuildInputs = [
  dependencies = [
    attrs
    click
    dockerfile-parse
@@ -40,8 +40,8 @@ buildPythonPackage rec {
  meta = {
    description = "Suite of analysis utilities and command line tools for container images";
    homepage = "https://github.com/nexB/container-inspector";
    changelog = "https://github.com/nexB/container-inspector/releases/tag/v${version}";
    license = with lib.licenses; [ asl20 ];
    changelog = "https://github.com/nexB/container-inspector/releases/tag/v${finalAttrs.src.tag}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ fab ];
  };
}
})
+41 −0
Original line number Diff line number Diff line
{
  lib,
  buildPythonPackage,
  fetchFromGitHub,
  pyahocorasick,
  pytestCheckHook,
  setuptools-scm,
  setuptools,
}:

buildPythonPackage rec {
  pname = "multiregex";
  version = "2.0.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "quantco";
    repo = "multiregex";
    tag = version;
    hash = "sha256-S10FJwtFNK4CarE2YAcUM38hRYTDL0Vp4B8NqGvJs5M=";
  };

  build-system = [
    setuptools
    setuptools-scm
  ];

  dependencies = [ pyahocorasick ];

  nativeCheckInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "multiregex" ];

  meta = {
    description = "Quickly match many regexes against a string";
    homepage = "https://github.com/quantco/multiregex";
    changelog = "https://github.com/quantco/multiregex/blob/${src.tag}/CHANGELOG.rst";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ fab ];
  };
}
+7 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@
  license-expression,
  lxml,
  markupsafe,
  multiregex,
  packageurl-python,
  packaging,
  parameter-expansion-patched,
@@ -60,12 +61,13 @@

buildPythonPackage rec {
  pname = "scancode-toolkit";
  version = "32.4.1";
  version = "32.5.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-qZUILeB1lGv0V9Uq81/aOI9pJTtayfZH/O5kwNnpf28=";
    pname = "scancode_toolkit";
    inherit version;
    hash = "sha256-WXAZCk0aRmKb1UU1ud95mZFHAMC9U+gDRd9w7TZTVSA=";
  };

  dontConfigure = true;
@@ -101,6 +103,7 @@ buildPythonPackage rec {
    license-expression
    lxml
    markupsafe
    multiregex
    packageurl-python
    packaging
    parameter-expansion-patched
@@ -126,9 +129,7 @@ buildPythonPackage rec {
    xmltodict
  ];

  nativeBuildInputs = [
    writableTmpDirAsHomeHook
  ];
  nativeBuildInputs = [ writableTmpDirAsHomeHook ];

  nativeCheckInputs = [ pytestCheckHook ];

+6 −16
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@
  buildPythonPackage,
  click,
  fetchFromGitHub,
  fetchpatch,
  license-expression,
  ply,
  pytestCheckHook,
@@ -17,27 +16,18 @@
  xmltodict,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
  pname = "spdx-tools";
  version = "0.8.3";
  version = "0.8.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "spdx";
    repo = "tools-python";
    tag = "v${version}";
    hash = "sha256-r7+RYGoq3LJYN1jYfwzb1r3fc/kL+CPd4pmGATFq8Pw=";
    tag = "v${finalAttrs.version}";
    hash = "sha256-loD+YXRCEYRynOKf7Da43SA7JQVYP1IzJe2f7ssJTtI=";
  };

  patches = [
    # https://github.com/spdx/tools-python/issues/844
    (fetchpatch {
      name = "beartype-0.20-compat.patch";
      url = "https://github.com/spdx/tools-python/pull/841/commits/3b13bd5af36a2b78f5c87fdbadc3f2601d2dcd8d.patch";
      hash = "sha256-8sQNGRss4R1olsw+xGps3NICyimBxKv47TaSrCcnVhA=";
    })
  ];

  build-system = [
    setuptools
    setuptools-scm
@@ -73,8 +63,8 @@ buildPythonPackage rec {
  meta = {
    description = "SPDX parser and tools";
    homepage = "https://github.com/spdx/tools-python";
    changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md";
    changelog = "https://github.com/spdx/tools-python/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ fab ];
  };
}
})
Loading