Unverified Commit 11f96b54 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

python3Packages.rembg: 2.0.69 -> 2.0.72 (#478840)

parents 16d143a8 c2526df7

pkgs/by-name/on/onnxruntime/nvcc-gsl.patch

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake

index ebf20ab21b..2aa5d9e908 100644

--- a/cmake/external/onnxruntime_external_deps.cmake

+++ b/cmake/external/onnxruntime_external_deps.cmake

@@ -403,15 +403,6 @@ if (CPUINFO_SUPPORTED)

 endif()

 

 if(onnxruntime_USE_CUDA)

-  onnxruntime_fetchcontent_declare(

-    GSL

-    URL ${DEP_URL_microsoft_gsl}

-    URL_HASH SHA1=${DEP_SHA1_microsoft_gsl}

-    PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/gsl/1064.patch

-    EXCLUDE_FROM_ALL

-    FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL

-  )

-else()

   onnxruntime_fetchcontent_declare(

     GSL

     URL ${DEP_URL_microsoft_gsl}

pkgs/by-name/on/onnxruntime/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -103,11 +103,6 @@ effectiveStdenv.mkDerivation rec { 
    # https://github.com/microsoft/onnxruntime/pull/15661

    # https://github.com/microsoft/onnxruntime/pull/20509

    ./cpuinfo-logging.patch

  ]

  ++ lib.optionals cudaSupport [

    # We apply the referenced 1064.patch ourselves to our nix dependency.

    #  FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0

    ./nvcc-gsl.patch

  ];



  nativeBuildInputs = [

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

+37 −16
Original line number Diff line number Diff line
@@ -2,16 +2,15 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  setuptools,

  wheel,

  versionCheckHook,

  withCli ? false,



  # build-system

  poetry-core,

  poetry-dynamic-versioning,



  # dependencies

  jsonschema,

  numpy,

  onnxruntime,

  opencv-python-headless,

  pillow,

  pooch,

  pymatting,
@@ -27,31 +26,44 @@ 
  filetype,

  gradio,

  python-multipart,

  sniffio,

  uvicorn,

  watchdog,



  # tests

  versionCheckHook,



  withCli ? false,

}:



buildPythonPackage rec {

buildPythonPackage (finalAttrs: {

  pname = "rembg";

  version = "2.0.69";

  version = "2.0.72";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "danielgatis";

    repo = "rembg";

    tag = "v${version}";

    hash = "sha256-9Ncs1DHPG3ouU5yFyeH0M2ZCQ9yHqJhVjkDO8fNSqIg=";

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

    hash = "sha256-KYpqRuC7EjgH0UqgIoMaeHF3oQSI87j6J3bcqU+43Wo=";

  };



  env.POETRY_DYNAMIC_VERSIONING_BYPASS = finalAttrs.version;



  build-system = [

    setuptools

    wheel

    poetry-core

    poetry-dynamic-versioning

  ];



  pythonRelaxDeps = [

    "jsonschema"

    "pillow"

    "pymatting"

    "scikit-image"

  ];

  dependencies = [

    jsonschema

    numpy

    opencv-python-headless

    onnxruntime

    pillow

    pooch
@@ -60,7 +72,7 @@ buildPythonPackage rec { 
    scipy

    tqdm

  ]

  ++ lib.optionals withCli optional-dependencies.cli;

  ++ lib.optionals withCli finalAttrs.passthru.optional-dependencies.cli;



  optional-dependencies = {

    cli = [
@@ -71,6 +83,7 @@ buildPythonPackage rec { 
      filetype

      gradio

      python-multipart

      sniffio

      uvicorn

      watchdog

    ];
@@ -83,16 +96,24 @@ buildPythonPackage rec { 
  postInstall = lib.optionalString (!withCli) "rm -r $out/bin";



  # not running python tests, as they require network access

  nativeCheckInputs = lib.optionals withCli [ versionCheckHook ];

  nativeCheckInputs = lib.optionals withCli [

    versionCheckHook

  ];

  versionCheckKeepEnvironment = [

    # Otherwise, fail with:

    # RuntimeError: cannot cache function '_make_tree': no locator available for file

    # '{{storeDir}}/lib/python3.13/site-packages/pymatting/util/kdtree.py'

    "NUMBA_CACHE_DIR"

  ];



  pythonImportsCheck = [ "rembg" ];



  meta = {

    description = "Tool to remove background from images";

    homepage = "https://github.com/danielgatis/rembg";

    changelog = "https://github.com/danielgatis/rembg/releases/tag/${src.tag}";

    changelog = "https://github.com/danielgatis/rembg/releases/tag/${finalAttrs.src.tag}";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ defelo ];

    mainProgram = "rembg";

  };

}
 
})