Unverified Commit 4d516724 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 66a3cd62 d0eb1f66

pkgs/by-name/et/etherape/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
  libtool,

  gtk3,

  libpcap,

  goocanvas2,

  popt,

  itstool,

  libxml2,
@@ -14,12 +13,14 @@ 


stdenv.mkDerivation rec {

  pname = "etherape";

  version = "0.9.20";

  version = "0.9.21";

  src = fetchurl {

    url = "mirror://sourceforge/etherape/etherape-${version}.tar.gz";

    sha256 = "sha256-9UsQtWOXB1yYofGS4rMIF+ISWBsJKd0DBOFfqOr1n5Y=";

    sha256 = "sha256-SckN87uIDTxg36xERMqPxdaLqPNrgg7V+Hc4HJoHF1w=";

  };



  strictDeps = true;



  nativeBuildInputs = [

    itstool

    pkg-config
@@ -29,7 +30,6 @@ stdenv.mkDerivation rec { 
    libtool

    gtk3

    libpcap

    goocanvas2

    popt

  ];

pkgs/by-name/na/nats-server/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ 


buildGoModule rec {

  pname = "nats-server";

  version = "2.11.9";

  version = "2.12.0";



  src = fetchFromGitHub {

    owner = "nats-io";

    repo = "nats-server";

    rev = "v${version}";

    hash = "sha256-F35qklJRa9IUikVNhh8c34KF3l41yfPXl0aig1iQq1g=";

    hash = "sha256-Ln4e58jIrZZRbgf1+b28sNT1hyNSZepH5oo71OWVFII=";

  };



  vendorHash = "sha256-ti2Y4ev8INMNudfwmPhmKGCManRj2cFTw6Fh7kkvDQc=";

  vendorHash = "sha256-533w30v681ZYOEL+gCkF7XOXsUmW1DV2+Eukgd/OcxE=";



  doCheck = false;

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

+10 −9
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 
}:

let

  pname = "open-webui";

  version = "0.6.28";

  version = "0.6.30";



  src = fetchFromGitHub {

    owner = "open-webui";

    repo = "open-webui";

    tag = "v${version}";

    hash = "sha256-677M1IxWhdJ3AO8DPlW4eUYnOo/mCNu+11IPdaey9ks=";

    hash = "sha256-0gQlzqHFVcayN1/Z5Ou1Gv1+VQMMwk7QrvVXV92EFp0=";

  };



  frontend = buildNpmPackage rec {
@@ -32,7 +32,7 @@ let 
      url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";

    };



    npmDepsHash = "sha256-vsgdf7+h16VBF+bTxzdNeHNzsYV65KWNZ6Ga3N7fB5A=";

    npmDepsHash = "sha256-AYChUMU8vLNaJPfIbX1SThx01uV3V6QpN6OjYrerg5U=";



    # See https://github.com/open-webui/open-webui/issues/15880

    npmFlags = [
@@ -107,12 +107,10 @@ python3Packages.buildPythonApplication rec { 
      black

      boto3

      chromadb

      colbert-ai

      cryptography

      ddgs

      docx2txt

      einops

      elasticsearch

      extract-msg

      fake-useragent

      fastapi
@@ -159,15 +157,12 @@ python3Packages.buildPythonApplication rec { 
      peewee-migrate

      pgvector

      pillow

      pinecone-client

      playwright

      psutil

      pyarrow

      pycrdt

      pydub

      pyjwt

      pymdown-extensions

      pymilvus

      pymysql

      pypandoc

      pypdf
@@ -178,7 +173,6 @@ python3Packages.buildPythonApplication rec { 
      python-socketio

      pytube

      pyxlsb

      qdrant-client

      rank-bm25

      rapidocr-onnxruntime

      redis
@@ -206,9 +200,16 @@ python3Packages.buildPythonApplication rec { 
    ];



    all = [

      colbert-ai

      elasticsearch

      moto

      gcp-storage-emulator

      playwright

      oracledb

      pinecone-client

      pymilvus

      pymongo

      qdrant-client

    ]

    ++ moto.optional-dependencies.s3

    ++ postgres;

pkgs/by-name/op/opencloud/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ let 
in

buildGoModule rec {

  pname = "opencloud";

  version = "3.4.0";

  version = "3.5.0";



  src = fetchFromGitHub {

    owner = "opencloud-eu";

    repo = "opencloud";

    tag = "v${version}";

    hash = "sha256-uoGgsz0BUUVuSEZrTX8b294FbVqL2YPFg7JoyRpH8Do=";

    hash = "sha256-NPBz9pevjDUqDrEg/S6Vtk+jAA9f2H95ehO8EgcB1eY=";

  };



  postPatch = ''

pkgs/by-name/op/opencloud/web.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,19 +9,19 @@ 


stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "opencloud-web";

  version = "3.3.0";

  version = "4.0.0";



  src = fetchFromGitHub {

    owner = "opencloud-eu";

    repo = "web";

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

    hash = "sha256-QBIAy3S8pss6NhN7V+AovWMoYZmu0cHbi6E7lUugYzU=";

    hash = "sha256-IMFbDPVn32offVIHHxQvHjauQLGYnFf/s1mAo6OF7Mk=";

  };



  pnpmDeps = pnpm_10.fetchDeps {

    inherit (finalAttrs) pname version src;

    fetcherVersion = 1;

    hash = "sha256-KYSjgDrl/IC+xi/GN+DqB0H6q0HWT7sjzGk/YvfTmHA=";

    hash = "sha256-CHImAISDPhjfhB+Qj3fuo6jaOyi+wBVwuLm8ODzRU4M=";

  };



  nativeBuildInputs = [