Unverified Commit ef4c87bd authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #319304 from drupol/bump/open-webui/0-3-3 

open-webui: 0.3.2 -> 0.3.3
parents 4b755b0f 7d13180f

pkgs/by-name/op/open-webui/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -7,19 +7,19 @@ 
}:

let

  pname = "open-webui";

  version = "0.3.2";

  version = "0.3.3";



  src = fetchFromGitHub {

    owner = "open-webui";

    repo = "open-webui";

    rev = "v${version}";

    hash = "sha256-hUm4UUQUFoDRrAg+RqIo735iQs8304OUJlT91vILmXo=";

    hash = "sha256-hEO00R96vOi4FlUY46ajBvw0PUc2hA7tAS+hldXNLzY=";

  };



  frontend = buildNpmPackage {

    inherit pname version src;



    npmDepsHash = "sha256-VdGneemYLMuMczjQB6I35Ry2kyIuAe2IaeDus/NvzK8=";

    npmDepsHash = "sha256-BeN9e74/D5jv+t214llmVhU/IJWfjRpUy5EFBAH+K4k=";



    # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`

    # Until this is solved, running python packages from the browser will not work.
@@ -73,6 +73,7 @@ python3.pkgs.buildPythonApplication rec { 
    boto3

    chromadb

    docx2txt

    duckduckgo-search

    extract-msg

    fake-useragent

    fastapi
@@ -85,7 +86,6 @@ python3.pkgs.buildPythonApplication rec { 
    langchain-chroma

    langchain-community

    langfuse

    litellm

    markdown

    opencv4

    openpyxl

pkgs/development/python-modules/curl-cffi/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 


buildPythonPackage rec {

  pname = "curl-cffi";

  version = "0.6.4";

  version = "0.7.0";



  src = fetchFromGitHub {

    owner = "yifeikong";

    repo = "curl_cffi";

    rev = "refs/tags/v${version}";

    hash = "sha256-bNBpZAIdfub2osByo827RBw/gouCmNt8uVN0y1KdcUk=";

    hash = "sha256-txrJNUzswAPeH4Iazn0iKJI0Rqk0HHRoDrtTfDHKMoo=";

  };



  patches = [ ./use-system-libs.patch ];

pkgs/development/python-modules/duckduckgo-search/default.nix

+4 −36
Original line number Diff line number Diff line
@@ -8,42 +8,10 @@ 
  orjson,

  curl-cffi,



  # To build orjson

  rustPlatform,



  # Optional dependencies

  lxml,

}:

let

  curl-cffi_0_7_0 = curl-cffi.overrideAttrs (

    final: old: {

      version = "0.7.0b4";

      src = fetchFromGitHub {

        owner = "yifeikong";

        repo = "curl_cffi";

        rev = "v${final.version}";

        hash = "sha256-txrJNUzswAPeH4Iazn0iKJI0Rqk0HHRoDrtTfDHKMoo=";

      };

    }

  );



  orjson_3_10_3 = orjson.overrideAttrs (

    final: old: {

      version = "3.10.3";

      src = fetchFromGitHub {

        owner = "ijl";

        repo = "orjson";

        rev = "refs/tags/${final.version}";

        hash = "sha256-bK6wA8P/IXEbiuJAx7psd0nUUKjR1jX4scFfJr1MBAk=";

      };

      cargoDeps = rustPlatform.fetchCargoTarball {

        inherit (final) src;

        name = "${old.pname}-${final.version}";

        hash = "sha256-ilGq+/gPSuNwURUWy2ZxInzmUv+PxYMxd8esxrMpr2o=";

      };

    }

  );

in

buildPythonPackage rec {

  pname = "duckduckgo-search";

  version = "v5.3.1";
@@ -58,12 +26,12 @@ buildPythonPackage rec { 
    hash = "sha256-T7rlB3dU7y+HbHr1Ss9KkejlXFORhnv9Va7cFTRtfQU=";

  };



  nativeBuildInputs = [ setuptools ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [

  dependencies = [

    click

    orjson_3_10_3

    curl-cffi_0_7_0

    curl-cffi

    orjson

  ];



  passthru.optional-dependencies = {

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

+8 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
  pytestCheckHook,

  pythonOlder,

  setuptools,

  substituteAll,

}:



buildPythonPackage rec {
@@ -30,12 +31,18 @@ buildPythonPackage rec { 
      url = "https://github.com/jiaaro/pydub/commit/66c1bf7813ae8621a71484fdcdf609734c0d8efd.patch";

      hash = "sha256-3OIzvTgGK3r4/s5y7izHvouB4uJEmjO6cgKvegtTf7A=";

    })

    # Fix paths to ffmpeg, ffplay and ffprobe

    (substituteAll {

      src = ./ffmpeg-fix-path.patch;

      ffmpeg = lib.getExe ffmpeg-full;

      ffplay = lib.getExe' ffmpeg-full "ffplay";

      ffprobe = lib.getExe' ffmpeg-full "ffprobe";

    })

  ];



  nativeBuildInputs = [ setuptools ];



  nativeCheckInputs = [

    ffmpeg-full

    pytestCheckHook

  ];

pkgs/development/python-modules/pydub/ffmpeg-fix-path.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
diff --git a/pydub/utils.py b/pydub/utils.py

index 2694f90..7764b3f 100644

--- a/pydub/utils.py

+++ b/pydub/utils.py

@@ -172,7 +172,7 @@ def get_encoder_name():

     else:

         # should raise exception

         warn("Couldn't find ffmpeg or avconv - defaulting to ffmpeg, but may not work", RuntimeWarning)

-        return "ffmpeg"

+        return "@ffmpeg@"





 def get_player_name():

@@ -186,7 +186,7 @@ def get_player_name():

     else:

         # should raise exception

         warn("Couldn't find ffplay or avplay - defaulting to ffplay, but may not work", RuntimeWarning)

-        return "ffplay"

+        return "@ffplay@"





 def get_prober_name():

@@ -200,7 +200,7 @@ def get_prober_name():

     else:

         # should raise exception

         warn("Couldn't find ffprobe or avprobe - defaulting to ffprobe, but may not work", RuntimeWarning)

-        return "ffprobe"

+        return "@ffprobe@"