Unverified Commit b2ca3204 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

python3Packages.aggregate6: 1.0.14 -> 1.0.15 (#513398)

parents 12a95b5c 26fe4964

pkgs/development/python-modules/aggregate6/default.nix

+4 −11
Original line number Diff line number Diff line
@@ -3,33 +3,26 @@ 
  buildPythonPackage,

  fetchFromGitHub,

  setuptools,

  py-radix-sr,

  py-radix,

  versionCheckHook,

  pytestCheckHook,

}:



buildPythonPackage rec {

  pname = "aggregate6";

  version = "1.0.14";

  version = "1.0.15";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "job";

    repo = "aggregate6";

    rev = version;

    hash = "sha256-sF5F4AIIQuMTuWE3zoBE1akJX9QSmAaRp1qgoHzSJMo=";

    hash = "sha256-GXIZ2aNZUeiVkhmo2jdwIEk9jL/in2KuuKgi//TQGq0=";

  };



  # py-radix-sr is a fork, with fixes

  # NOTE: it should be worth switching to py-radix again in the future as there

  #       is still development sadly currently without a new release.

  postPatch = ''

    substituteInPlace setup.py --replace-fail 'py-radix==0.10.0' 'py-radix-sr'

  '';



  build-system = [ setuptools ];



  dependencies = [ py-radix-sr ];

  dependencies = [ py-radix ];



  nativeCheckInputs = [

    pytestCheckHook

pkgs/development/python-modules/py-radix/default.nix

0 → 100644
+30 −0
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchFromGitHub,

  pytestCheckHook,

}:



buildPythonPackage (finalAttrs: {

  pname = "py-radix";

  version = "1.1.0";

  format = "setuptools";



  src = fetchFromGitHub {

    owner = "mjschultz";

    repo = "py-radix";

    tag = "v${finalAttrs.version}";

    hash = "sha256-++QuZEwOHKjOsIbwLmDy30PvyG0Xe29l45PvOF+YWYw=";

  };



  pythonImportsCheck = [ "radix" ];



  nativeCheckInputs = [ pytestCheckHook ];



  meta = {

    description = "Python radix tree implementation for IPv4 and IPv6 prefix matching";

    homepage = "https://github.com/mjschultz/py-radix";

    license = lib.licenses.bsdOriginal;

    maintainers = with lib.maintainers; [ marcel ];

  };

})

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -13235,6 +13235,8 @@ self: super: with self; { 














  py-pdf-parser = callPackage ../development/python-modules/py-pdf-parser { };



























  py-radix = callPackage ../development/python-modules/py-radix { };



























  py-radix-sr = callPackage ../development/python-modules/py-radix-sr { };





























  py-rust-stemmers = callPackage ../development/python-modules/py-rust-stemmers { };