Merge master into staging-next

2024-09-21 06:04:19 +00:00
parent 3cafcf5ed6 2643f688f7
commit 1884aacefd
23 changed files with 3730 additions and 2066 deletions
@@ -3422,6 +3422,12 @@
    githubId = 5241813;
    name = "Carter Sande";
  };
+  casaca = {
+    name = "J McNutt";
+    email = "jmacasac@hotmail.com";
+    github = "casaca24";
+    githubId = 87252279;
+  };
  casey = {
    email = "casey@rodarmor.net";
    github = "casey";
@@ -12264,6 +12270,12 @@
    githubId = 15693688;
    name = "Lucas Eduardo Wendt";
  };
+  lucastso10 = {
+    email = "lucastso10@gmail.com";
+    github = "lucastso10";
+    githubId = 84486266;
+    name = "Lucas Teixeira Soares";
+  };
  lucc = {
    email = "lucc+nix@posteo.de";
    github = "lucc";
@@ -16575,6 +16587,12 @@
    githubId = 358550;
    name = "Philip Lykke Carlsen";
  };
+  plebhash = {
+    name = "plebhash";
+    email = "plebhash@proton.me";
+    github = "plebhash";
+    githubId = 147345153;
+  };
  pleshevskiy = {
    email = "dmitriy@pleshevski.ru";
    github = "pleshevskiy";
@@ -19917,6 +19935,12 @@
    github = "srounce";
    githubId = 60792;
  };
+  sshine = {
+    email = "simon@simonshine.dk";
+    github = "sshine";
+    githubId = 50879;
+    name = "Simon Shine";
+  };
  SShrike = {
    email = "severen@shrike.me";
    github = "severen";
@@ -2,18 +2,20 @@

 buildGoModule rec {
  pname = "tanka";
-  version = "0.27.1";
+  version = "0.28.0";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-4ChTYwRp9R8U97hH1Bgrxr5a/5IoWRAmFgJbD7oJpO4=";
+    sha256 = "sha256-MDZXnI0FAeQJI7GbPT5/EB4ldOtGSnFEbojXzE9ll+Q=";
  };

-  vendorHash = "sha256-u2l3cX8PKHUCPkHuCOyED2LLWygYCDJEhfTjycEBzHI=";
+  vendorHash = "sha256-N4zGZ+fYQA7UdPI8ie55gG3FnFrI/XvyJJiZ3D40qlQ=";

  doCheck = false;
+  # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK
+  env.GOWORK = "off";

  subPackages = [ "cmd/tk" ];

@@ -12,13 +12,13 @@

 buildNpmPackage rec {
  pname = "bitwarden-cli";
-  version = "2024.8.2";
+  version = "2024.9.0";

  src = fetchFromGitHub {
    owner = "bitwarden";
    repo = "clients";
    rev = "cli-v${version}";
-    hash = "sha256-F/UbaNKkyf8AoTSa0B0Ipdr5Z8qAkbk7tJ0Cdq7gk+U=";
+    hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w=";
  };

  postPatch = ''
@@ -28,7 +28,7 @@ buildNpmPackage rec {

  nodejs = nodejs_20;

-  npmDepsHash = "sha256-SnrK26QaxHYKX0532rGBASjx9PwxKSsVFRzZ3Cs2GPk=";
+  npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk=";

  nativeBuildInputs = [
    (python3.withPackages (ps: with ps; [ setuptools ]))
@@ -11,11 +11,11 @@
 }:
 let
  pname = "cursor";
-  version = "0.40.4";
+  version = "0.41.1";
  appKey = "230313mzl4w4u92";
  src = fetchurl {
-    url = "https://download.todesktop.com/${appKey}/cursor-0.40.4-build-2409052yfcjagw2-x86_64.AppImage";
-    hash = "sha256-ZURE8UoLPw+Qo1e4xuwXgc+JSwGrgb/6nfIGXMacmSg=";
+    url = "https://download.todesktop.com/${appKey}/cursor-0.41.1-build-2409189xe3envg5-x86_64.AppImage";
+    hash = "sha256-9zqktOR5UOMLkKLD1uJ8eNSujWnnyKAN9H8ejrgcfVU=";
  };
  appimageContents = appimageTools.extractType2 { inherit version pname src; };
 in
@@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation {
        latestLinux="$(curl -s https://download.todesktop.com/${appKey}/latest-linux.yml)"
        version="$(echo "$latestLinux" | yq -r .version)"
        filename="$(echo "$latestLinux" | yq -r '.files[] | .url | select(. | endswith(".AppImage"))')"
-        update-source-version cursor "$version" "" "https://download.todesktop.com/${appKey}/$filename" --source-key=src.src
+        update-source-version code-cursor "$version" "" "https://download.todesktop.com/${appKey}/$filename" --source-key=src.src
      '';
    });
  };
@@ -0,0 +1,50 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  python3Packages,
+  libiconv,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "granian";
+  version = "1.5.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "emmett-framework";
+    repo = "granian";
+    rev = "v${version}";
+    hash = "sha256-3kwdPLOkKKSY1w42av3ejarrRKNtai8KB80ZrujSjPo=";
+  };
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "pyo3-log-0.11.0" = "sha256-UU8064vM7cf20lwfifyPC205CY4tIgif0slDz/Pjf9Q=";
+    };
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  buildInputs = [
+    libiconv
+  ];
+
+  dependencies = [
+    python3Packages.uvloop
+    python3Packages.click
+  ];
+
+  meta = {
+    description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications";
+    homepage = "https://github.com/emmett-framework/granian";
+    license = lib.licenses.bsd3;
+    mainProgram = "granian";
+    maintainers = with lib.maintainers; [ lucastso10 ];
+    platforms = lib.platforms.unix;
+  };
+}
@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchFromSourcehut,
+  installShellFiles,
+  makeBinaryWrapper,
+  gv,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "klong";
+  version = "20221212";
+
+  src = fetchurl {
+    url = "https://t3x.org/klong/klong${version}.tgz";
+    hash = "sha256-XhpIdyKKPGQ6mdv9LXPmC8P6hW4mFawv54yANw5/lrQ=";
+  };
+
+  docs = fetchFromSourcehut {
+    owner = "~nut";
+    repo = "klong-docs";
+    rev = "350da558709e3728df60ddf45fafe09e3fb89139";
+    hash = "sha256-yfvXljjJwCETWPa70zXhaQJOHhZYR2k+BKAd0Dw/U70=";
+  };
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    installShellFiles
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -m 555 -Dt $out/bin kg kplot
+    install -m 444 -Dt $out/lib/klong lib/*.kg
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/kg --prefix KLONGPATH : $out/lib/klong
+    wrapProgram $out/bin/kplot --prefix PATH : ${
+      lib.makeBinPath [
+        "$out"
+        gv
+      ]
+    }
+    installManPage $docs/*.1
+  '';
+
+  meta = {
+    description = "Simple Array programming language";
+    homepage = "https://t3x.org/klong";
+    mainProgram = "kg";
+    maintainers = [ lib.maintainers.casaca ];
+    platforms = lib.platforms.all;
+    license = with lib.licenses; [
+      publicDomain
+      cc0
+    ];
+  };
+}
@@ -38,7 +38,7 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "liana";
-  version = "6.0";
+  version = "6.0"; # keep in sync with lianad

  src = fetchFromGitHub {
    owner = "wizardsardine";
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  udev,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "lianad";
+  version = "6.0"; # keep in sync with liana
+
+  src = fetchFromGitHub {
+    owner = "wizardsardine";
+    repo = "liana";
+    rev = "v${version}";
+    hash = "sha256-LLDgo4GoRTVYt72IT0II7O5wiMDrvJhe0f2yjzxQgsE=";
+  };
+
+  cargoHash = "sha256-a4hLtDXnEeTa0e1LcMkEPKEqGBp5bzWseq5Pe5ZYF1M=";
+
+  buildInputs = [ udev ];
+
+  postInstall = ''
+    install -Dm0644 ./contrib/lianad_config_example.toml $out/etc/liana/config.toml
+  '';
+
+  # bypass broken unit tests
+  doCheck = false;
+
+  meta = {
+    mainProgram = "lianad";
+    description = "Bitcoin wallet leveraging on-chain timelocks for safety and recovery";
+    homepage = "https://wizardsardine.com/liana";
+    license = lib.licenses.bsd3;
+    maintainers = [
+      lib.maintainers.dunxen
+      lib.maintainers.plebhash
+    ];
+    platforms = lib.platforms.linux;
+    broken = stdenv.isAarch64;
+  };
+}
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "parallel-hashmap";
-  version = "1.3.12";
+  version = "1.4.0";

  src = fetchFromGitHub {
    owner = "greg7mdp";
    repo = "parallel-hashmap";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-6KhzXUxa4WOsRrPmSSgguFxRGTOTIaxiJBFFSzOhch0=";
+    hash = "sha256-19rWcnMtWgqYlLylUjgI/p3aAM0Ois3CKoMuMmLQHmM=";
  };

  postPatch = ''
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenv, nodejs, pnpm, buildGoModule, mage, writeShellScriptBin, nixosTests }:

 let
-  version = "0.24.1";
+  version = "0.24.3";
  src = fetchFromGitHub {
    owner = "go-vikunja";
    repo = "vikunja";
    rev = "v${version}";
-    hash = "sha256-39S7Xl8He+unIkAZ9GnjqWHBOfdDj4rSUmrExB+Q6Vc=";
+    hash = "sha256-UT2afhjEangilvflmxxahj7pEiJUWxqUL1Eni1JvuRI=";
  };

  frontend = stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +17,7 @@ let

    pnpmDeps = pnpm.fetchDeps {
      inherit (finalAttrs) pname version src sourceRoot;
-      hash = "sha256-iEcic/oQ33IO9tWqIQGfyjSY4YpJ8FckaI59qTgdq3c=";
+      hash = "sha256-QUhq1wc+vHCfY2wC0aikAMHmy8I/TOawMX659eqlm3I=";
    };

    nativeBuildInputs = [
@@ -67,7 +67,7 @@ buildGoModule {
    in
    [ fakeGit mage ];

-  vendorHash = "sha256-oOa9qTy5jNYq05Tbp9hI4L0OBtKtglhk6Uz380nZH1Y=";
+  vendorHash = "sha256-d2BNzsBeWlpZGbU7PkXWO5e9FLJA/Wda5ImXwqh/WV4=";

  inherit frontend;

@@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "libmanette";
-  version = "0.2.7";
+  version = "0.2.9";

  outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-zd1cAqExBywZxs3m8sss1X6ufay1DRTDN+/ZgLqlGlE=";
+    hash = "sha256-KTZr5UUvYKdMZfxk/+LXTt3U5uaCTCzvpWekO9kraI8=";
  };

  nativeBuildInputs = [
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "django-model-utils";
-  version = "4.5.1";
+  version = "5.0.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "jazzband";
    repo = "django-model-utils";
    rev = "refs/tags/${version}";
-    hash = "sha256-GaBTCrEwEkJyVeY5YVptPioYcmivyQtBKjs+TgC9IqA=";
+    hash = "sha256-iRtTYXsgD8NYG3k9ZWAr2Nwazo3HUa6RgdbMeDxc7NI=";
  };

  build-system = [ setuptools-scm ];
@@ -110,8 +110,7 @@ buildPythonPackage rec {
      # flaky, sometimes fail to strip uuid from AIMessageChunk before comparing to test value
      "test_map_stream"
      # Compares with machine-specific timings
-      "test_rate_limit_invoke"
-      "test_rate_limit_stream"
+      "test_rate_limit"
      # flaky: assert (1726352133.7419367 - 1726352132.2697523) < 1
      "test_benchmark_model"

@@ -0,0 +1,68 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  langchain-core,
+  ollama,
+
+  # testing
+  langchain-standard-tests,
+  pytestCheckHook,
+  pytest-asyncio,
+  syrupy,
+
+  nix-update-script,
+}:
+
+buildPythonPackage rec {
+  pname = "langchain-ollama";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "langchain-ai";
+    repo = "langchain";
+    rev = "refs/tags/langchain-ollama==${version}";
+    hash = "sha256-NtlJqIevdaoOO4oDqKsL4OFbw8tHb3FjV9LrTytOGKE=";
+  };
+
+  sourceRoot = "${src.name}/libs/partners/ollama";
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    langchain-core
+    ollama
+  ];
+
+  nativeCheckInputs = [
+    langchain-standard-tests
+    pytestCheckHook
+    pytest-asyncio
+    syrupy
+  ];
+
+  pytestFlagsArray = [ "tests/unit_tests" ];
+
+  pythonImportsCheck = [ "langchain_ollama" ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "langchain-ollama==(.*)"
+    ];
+  };
+
+  meta = {
+    changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-ollama==${version}";
+    description = "Integration package connecting Ollama and LangChain";
+    homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/ollama";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sarahec ];
+  };
+}
@@ -6,12 +6,12 @@

 buildPythonPackage rec {
  pname = "pyttsx3";
-  version = "2.91";
+  version = "2.97";
  format = "wheel";

  src = fetchPypi {
    inherit pname version format;
-    sha256 = "sha256-jxkhfE1lpGhw4LgvLn6xVw7CssqAUX++7gleVPdvc+I=";
+    sha256 = "sha256-GM4wZDtnutHZc2H7s6PHyo/MdQ7Y6YrCJuu2I7AeSw8=";
    dist = "py3";
    python = "py3";
  };
@@ -1,10 +1,11 @@
 {
  lib,
+  buildPythonPackage,
  fetchFromGitHub,
-  python3Packages,
+  setuptools,
 }:

-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
  pname = "zulip-emoji-mapping";
  version = "1.0.1";
  pyproject = true;
@@ -16,7 +17,7 @@ python3Packages.buildPythonPackage rec {
    hash = "sha256-logm5uAnLAcFqI7mUxKEO9ZmHqRkd6CFiCW4B5tqZzg=";
  };

-  build-system = with python3Packages; [
+  build-system = [
    setuptools
  ];

@@ -8,11 +8,11 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "sea-orm-cli";
-  version = "0.12.15";
+  version = "1.0.1";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-eRsWQXaE8zzECPY+xxVIwTylbuSPT6ABamI4WNVkw8M=";
+    hash = "sha256-b1Nlt3vsLDajTiIW9Vn51Tv9gXja8/ZZBD62iZjh3KY=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ]
    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];

-  cargoHash = "sha256-sIyKkTO2DSLkRAlSUSRQYrZb8UtKZrszjn2jELNOSOU=";
+  cargoHash = "sha256-ZGM+Y67ycBiukgEBUq+WiA1OUCGahya591gM6CGwzMQ=";

  meta = with lib; {
    homepage = "https://www.sea-ql.org/SeaORM";
@@ -64,6 +64,8 @@

  smartthinq-sensors = callPackage ./smartthinq-sensors {};

+  solax_modbus = callPackage ./solax_modbus {};
+
  solis-sensor = callPackage ./solis-sensor {};

  somweb = callPackage ./somweb {};
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  pymodbus,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "wills106";
+  domain = "solax_modbus";
+  version = "2024.09.4";
+
+  src = fetchFromGitHub {
+    owner = "wills106";
+    repo = "homeassistant-solax-modbus";
+    rev = "refs/tags/${version}";
+    hash = "sha256-xWWsV57ozzEQWRfO1t4EbwD7DWiB1go+iJbTLPuufJs=";
+  };
+
+  dependencies = [ pymodbus ];
+
+  meta = {
+    changelog = "https://github.com/wills106/homeassistant-solax-modbus/releases/tag/${version}";
+    description = "SolaX Power Modbus custom_component for Home Assistant (Supports some Ginlong Solis, Growatt, Sofar Solar, TIGO TSI & Qcells Q.Volt Hyb)";
+    homepage = "https://github.com/wills106/homeassistant-solax-modbus";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ Luflosi ];
+  };
+}
@@ -18,11 +18,11 @@ let
  '';
 in stdenv.mkDerivation rec {
  pname = "keycloak";
-  version = "25.0.5";
+  version = "25.0.6";

  src = fetchzip {
    url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
-    hash = "sha256-2PEQjdz+r/qRJxlu0jI2watkNOUkf4bUCkcNPrLsaMg=";
+    hash = "sha256-1VHixRgErao/1ZEJv+rlnNmUd2NT35X89D8wuUhYF08=";
  };

  nativeBuildInputs = [ makeWrapper jre ];
@@ -6825,6 +6825,8 @@ self: super: with self; {

  langchain-mongodb = callPackage ../development/python-modules/langchain-mongodb { };

+  langchain-ollama = callPackage ../development/python-modules/langchain-ollama { };
+
  langchain-openai = callPackage ../development/python-modules/langchain-openai { };

  langchain-standard-tests = callPackage ../development/python-modules/langchain-standard-tests { };