Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: - pkgs/by-name/ca/cargo-show-asm/package.nix - pkgs/by-name/ja/jay/package.nix
2025-02-03 20:29:14 +01:00
parent 3e85aef925 e1677fa3aa
commit 35ab2d574c
23 changed files with 216 additions and 55 deletions
@@ -1302,6 +1302,18 @@ final: prev:
    meta.homepage = "https://github.com/giuxtaposition/blink-cmp-copilot/";
  };

+  blink-cmp-spell = buildVimPlugin {
+    pname = "blink-cmp-spell";
+    version = "2025-02-01";
+    src = fetchFromGitHub {
+      owner = "ribru17";
+      repo = "blink-cmp-spell";
+      rev = "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d";
+      sha256 = "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6";
+    };
+    meta.homepage = "https://github.com/ribru17/blink-cmp-spell/";
+  };
+
  blink-compat = buildVimPlugin {
    pname = "blink.compat";
    version = "2025-01-20";
@@ -106,6 +106,7 @@ https://github.com/max397574/better-escape.nvim/,,
 https://github.com/LunarVim/bigfile.nvim/,,
 https://github.com/APZelos/blamer.nvim/,HEAD,
 https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD,
+https://github.com/ribru17/blink-cmp-spell/,HEAD,
 https://github.com/fang2hou/blink-copilot/,HEAD,
 https://github.com/moyiz/blink-emoji.nvim/,HEAD,
 https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD,
@@ -1,18 +1,18 @@
 {
  "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0dz8zpb1la98y63x7qs00s28bzn10ycipwsf6a5lvyhzzgpl253a"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "0sn4m1djj8npdx90mny7cwc843ri9q4s0w906rgabjw2v1h56qz0"
  },
  "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "04qsn75xzfl29fksnb0rzcj7cfdi84smmhn9v47l423zbgr30pfv"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "1mk8xjc4zj3a6jm53drwicqsipy58faxmq990s14lqvrhh3qjnh4"
  },
  "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "1bk8skws87561n06mkwh92c93v5rinf8nmwydn06p8crz9ggp5q6"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "0s1h6lksn83r71ia61h9cjwiqigz9nw9n9jm92749782c8zi918x"
  },
  "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.0%2Bk3s1/k3s-images.txt",
-    "sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-images.txt",
+    "sha256": "08qxykq9aylfgm24g8ybki62r2sdzvnmv72pan4i2nn0js93nnk9"
  }
 }
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.32.0+k3s1";
-  k3sCommit = "cca8facaa33a3ec7897349a8740fd96029590c31";
-  k3sRepoSha256 = "0l8mciwv2wr266zxv9zc5wpgf92gqvzg4d08z4g63wbvsi7zflzh";
-  k3sVendorHash = "sha256-3hY67A6GbzB2ki5GB7GmmmGG5A4cup17zhkUNiN1chk=";
+  k3sVersion = "1.32.1+k3s1";
+  k3sCommit = "6a322f122729e0e668ca67fd9f0e993541bdce49";
+  k3sRepoSha256 = "00ljl6mzbyvyy25cz0k511wmm1zhllvz0l2ns72ic4xjg9sxq6zi";
+  k3sVendorHash = "sha256-/VQslKifAKFo57Zut9F8jWWNuMRFlMgpGo/FoqutT7Q=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
  k3sRootVersion = "0.14.1";
@@ -10,15 +10,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-show-asm";
-  version = "0.2.46";
+  version = "0.2.47";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-MiODtrEE/arK5SiSs/YuFWBkSQkSUrPqUZcjFd+HNbg=";
+    hash = "sha256-ZXqcBAB6gxtukQ51JPVl7qUM7eAhiBgmeZZD2pF5q2g=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-8PxjPjb/ewLIK/bS6IYy/NBJQZirXWKSiz2c/lzg8zU=";
+  cargoHash = "sha256-Luts8Pe1ZltA84GQJONsDSdeOSm0F+oJ5gNJDGYBPaQ=";

  nativeBuildInputs = [
    installShellFiles
@@ -3,34 +3,58 @@
  stdenvNoCC,
  fetchurl,
  unzip,
+  makeBinaryWrapper,
+  versionCheckHook,
+  writeShellScript,
+  coreutils,
+  xcbuild,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "cyberduck";
-  version = "9.0.0.41777";
+  version = "9.1.2.42722";

  src = fetchurl {
    url = "https://update.cyberduck.io/Cyberduck-${finalAttrs.version}.zip";
-    hash = "sha256-oDTFkoX4uu+X5vLDHn+tGoNB/Pd9ncdFE8dGS6PT5wg=";
+    hash = "sha256-oGerVv6CteMl+MJ9AfGYmo6Iv6i7BFUCF+E3My6UH6I=";
  };
  sourceRoot = ".";

-  nativeBuildInputs = [ unzip ];
+  nativeBuildInputs = [
+    unzip
+    makeBinaryWrapper
+  ];

  installPhase = ''
    runHook preInstall

    mkdir -p $out/Applications
    cp -r Cyberduck.app $out/Applications
+    makeWrapper $out/Applications/Cyberduck.app/Contents/MacOS/Cyberduck $out/bin/cyberduck

    runHook postInstall
  '';

-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = writeShellScript "version-check" ''
+    marketing_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1" | ${coreutils}/bin/tr -d '"')
+    build_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1")
+
+    echo $marketing_version.$build_version
+  '';
+  versionCheckProgramArg = [ "${placeholder "out"}/Applications/Cyberduck.app/Contents/Info.plist" ];
+  doInstallCheck = true;
+
+  meta = {
    description = "Libre file transfer client for Mac and Windows";
    homepage = "https://cyberduck.io";
-    license = licenses.gpl3Plus;
+    changelog = "https://cyberduck.io/changelog/";
+    license = lib.licenses.gpl3Plus;
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ emilytrau ];
-    platforms = platforms.darwin;
+    maintainers = with lib.maintainers; [
+      emilytrau
+      DimitarNestorov
+    ];
+    platforms = lib.platforms.darwin;
+    mainProgram = "cyberduck";
  };
 })
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;

 buildNpmPackage rec {
  pname = "Iosevka${toString set}";
-  version = "32.4.0";
+  version = "32.5.0";

  src = fetchFromGitHub {
    owner = "be5invis";
    repo = "iosevka";
    rev = "v${version}";
-    hash = "sha256-kB4CsC/hHstajLcVYBxO7RD0lsZymrxlUha4cRtQ7Ak=";
+    hash = "sha256-MzsAkq5l4TP19UJNPW/8hvIqsJd94pADrrv8wLG6NMQ=";
  };

-  npmDepsHash = "sha256-Qr7fN49qyaqaSutrdT7HjWis7jjwYR/S2kxkHs7EhXY=";
+  npmDepsHash = "sha256-HeqwpZyHLHdMhd/UfXVBonMu+PhStrLCxAMuP/KuTT8=";

  nativeBuildInputs =
    [
@@ -15,17 +15,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "jay";
-  version = "1.7.0";
+  version = "1.9.0";

  src = fetchFromGitHub {
    owner = "mahkoh";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-VAg59hmI38hJzkh/Vtv6LjrqQFLaq7rIGtk9sfQe1TA=";
+    sha256 = "sha256-RGBFIYVeunMhZbpRExKYh7VlhodOsCN7WzN/7UPEJdc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-1Jf0uZYxk7I6dn+eFtohBoZtOJatvFEYom4A0dZbKYQ=";
+  cargoHash = "sha256-vW+87tqc9bJ/xDOqcgz3PrqEkf7daZp3nb0hwXDxULI=";

  SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";

@@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "kubefirst";
-  version = "2.7.9";
+  version = "2.8.0";

  src = fetchFromGitHub {
    owner = "konstructio";
    repo = "kubefirst";
    tag = "v${version}";
-    hash = "sha256-nBYwvOgkkx3NXELK+h9SpapoMjAVauI9leCPhKNZfh0=";
+    hash = "sha256-WggQdhMFbUbJ2bAj2oSveIHMg1HWPj0I14qiE3PTGqE=";
  };

-  vendorHash = "sha256-DYEEkduud1sXVao7xbJoyvmMhfMJUPswIs3v20tncwo=";
+  vendorHash = "sha256-WjucnfiMxthygFaxseggMmlkF/Oih310O56Y7lW+11E=";

  ldflags = [
    "-s"
@@ -12,14 +12,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libxisf";
-  version = "0.2.12";
+  version = "0.2.13";

  src = fetchFromGitea {
    domain = "gitea.nouspiro.space";
    owner = "nou";
    repo = "libXISF";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-QhshgKyf9s5U5JMa5TZelIo1tpJGlsOQePPG1kEfbq8=";
+    hash = "sha256-vc42Jw7kBbQYu+/6jakxFnSuVkS8t6ZyYuSMLGMnEn4=";
  };

  patches = [
@@ -9,16 +9,16 @@

 buildNpmPackage rec {
  pname = "redocly";
-  version = "1.26.0";
+  version = "1.27.2";

  src = fetchFromGitHub {
    owner = "Redocly";
    repo = "redocly-cli";
    rev = "@redocly/cli@${version}";
-    hash = "sha256-jBfAMrmJ9+k1Fx2gZoQ8UiTT13tSvxXUKXNCW3vmuUY=";
+    hash = "sha256-79zB7ydbgS+9us+saFiYBPHILoATP00x+Y1hAgPsPk4=";
  };

-  npmDepsHash = "sha256-IcyX+LmMduE8CY6wNSTv0D4c3vCZu48EXsUSsqfOqFQ=";
+  npmDepsHash = "sha256-EYhX1zAio+f1PGfQUQIFkc9Ve9jLIG7/1xgOI0JAZ5s=";

  npmBuildScript = "prepare";

@@ -5,7 +5,7 @@
 }:
 let
  pname = "saucectl";
-  version = "0.191.0";
+  version = "0.192.0";
 in
 buildGoModule {
  inherit pname version;
@@ -14,7 +14,7 @@ buildGoModule {
    owner = "saucelabs";
    repo = "saucectl";
    tag = "v${version}";
-    hash = "sha256-cOgjNoJwcNu04YNqjeVaGIVauApYhFjLTa34HXV78sg=";
+    hash = "sha256-p7NWIjiaXM96PfmBohkfc1PQ6ZtE0pEeBVLemJiowXg=";
  };

  ldflags = [
@@ -22,7 +22,7 @@ buildGoModule {
    "-X github.com/saucelabs/saucectl/internal/version.GitCommit=${version}"
  ];

-  vendorHash = "sha256-NJBEIUeTasoIAeaGm+RdmfeELodXcnpxcxxQFaUJf4o=";
+  vendorHash = "sha256-N8e8k8vAyVY57iqHU6P88hn9NS3Mdfbgx5P8/wDcmMY=";

  checkFlags = [ "-skip=^TestNewRequestWithContext$" ];

@@ -31,13 +31,13 @@ let
 in
 buildGoModule rec {
  pname = "telepresence2";
-  version = "2.21.1";
+  version = "2.21.2";

  src = fetchFromGitHub {
    owner = "telepresenceio";
    repo = "telepresence";
    rev = "v${version}";
-    hash = "sha256-YXGhgxpNVk1u8pFJmN194OP8wFVaMfFRiK0yitxFBPo=";
+    hash = "sha256-Tblba2vSZvnKCKvkp+QczyhiqNBx4Qpj7BfqYkdMd18=";
  };

  propagatedBuildInputs = [
@@ -51,7 +51,7 @@ buildGoModule rec {
    export CGO_ENABLED=0
  '';

-  vendorHash = "sha256-7ZMFKApMjxDBGuk5q+Px7ovIPO8SteNuZ1d1IdPtme0=";
+  vendorHash = "sha256-Halc2oPLYagmI7+vF8LMqBLVEcdjkHdpWYV558jLJjo=";

  ldflags = [
    "-s"
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "corral";
-  version = "0.8.1";
+  version = "0.8.2";

  src = fetchFromGitHub {
    owner = "ponylang";
    repo = "corral";
    rev = finalAttrs.version;
-    hash = "sha256-cbiw7OaU6HyAp/dHV5FVI7B7mam0GUb95EkR/Grwu0k=";
+    hash = "sha256-arcMtCSbXFLBT2ygdj44UKMdGStlgHyiBgt5xZpPRhs=";
  };

  strictDeps = true;
@@ -6,11 +6,11 @@

 buildOctavePackage rec {
  pname = "instrument-control";
-  version = "0.9.3";
+  version = "0.9.4";

  src = fetchurl {
    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-5ZufEs761qz0nKt0YYikJccqEtK+Qs9UcnJlRsW8VCM=";
+    sha256 = "sha256-AfrQQy1EuMpO6qGYz+sh4EW5eYi6fE6KaRxro0psSN8=";
  };

  meta = with lib; {
@@ -0,0 +1,43 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  dacite,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pyjwt,
+}:
+
+buildPythonPackage rec {
+  pname = "igloohome-api";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "keithle888";
+    repo = "igloohome-api";
+    tag = "v${version}";
+    hash = "sha256-CFxVZiga6008oNbacK12t7U8mOvL8YgEgQ82MsvZ46w=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+    dacite
+    pyjwt
+  ];
+
+  pythonImportsCheck = [ "igloohome_api" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/keithle888/igloohome-api/releases/tag/${src.tag}";
+    description = "Python package for using igloohome's API";
+    homepage = "https://github.com/keithle888/igloohome-api";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
@@ -0,0 +1,42 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  mashumaro,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "python-google-drive-api";
+  version = "0.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tronikos";
+    repo = "python-google-drive-api";
+    tag = "v${version}";
+    hash = "sha256-JvPaMD7UHDqCQCoh1Q8jNFw4R7Jbp2YQDBI3xVp1L1g=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    mashumaro
+  ];
+
+  pythonImportsCheck = [ "google_drive_api" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python client library for Google Drive API";
+    homepage = "https://github.com/tronikos/python-google-drive-api";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
@@ -0,0 +1,33 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "qbusmqttapi";
+  version = "1.2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Qbus-iot";
+    repo = "qbusmqttapi";
+    tag = "v${version}";
+    hash = "sha256-daa+AwoOLJRaMzaUCai6pbYd8ux9v8NTR/mnsss/r4c=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "qbusmqttapi" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    description = "MQTT API for Qbus Home Automation";
+    homepage = "https://github.com/Qbus-iot/qbusmqttapi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
@@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "simsimd";
-  version = "6.2.3";
+  version = "6.3.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "ashvardanian";
    repo = "simsimd";
    tag = "v${version}";
-    hash = "sha256-9+m1NkXwlHtqeXvsyYhhT+7KNZ1aFUxxA/+i3GbQvgs=";
+    hash = "sha256-RQgPjU2uOxOnDacIARMAkKvnUIHLzRsaxLERmTrLj1Q=";
  };

  build-system = [
@@ -12,9 +12,9 @@ let
  variants = {
    # ./update-zen.py zen
    zen = {
-      version = "6.12.10"; # zen
+      version = "6.13.1"; # zen
      suffix = "zen1"; # zen
-      sha256 = "1kd3bcnhlarnrpl87mrdb5r9k2jdq7m8607ai847dkmncw7q2d1q"; # zen
+      sha256 = "1n22hsjl77qby2s4wf9y6z3kbcw7yziiniv2x43xixgkl12ajvk5"; # zen
      isLqx = false;
    };
    # ./update-zen.py lqx
@@ -82,7 +82,7 @@ let
 in
 buildPythonApplication rec {
  pname = "xpra";
-  version = "6.2.2";
+  version = "6.2.3";

  stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv;

@@ -90,7 +90,7 @@ buildPythonApplication rec {
    owner = "Xpra-org";
    repo = "xpra";
    rev = "v${version}";
-    hash = "sha256-YLz2Ex3gHabicPbGj5BFP1pwU/8K/bu4R7cWi1Fu2oM=";
+    hash = "sha256-5f6yHz3uc5qsU1F6D8r0KPo8tbrFP4pfxXTvIJYqKuI=";
  };

  patches = [
@@ -22,17 +22,17 @@ in

 rustPlatform.buildRustPackage rec {
  pname = "vaultwarden";
-  version = "1.33.0";
+  version = "1.33.1";

  src = fetchFromGitHub {
    owner = "dani-garcia";
    repo = "vaultwarden";
    rev = version;
-    hash = "sha256-2lZfPPHHAoY12cXpkeJnvMab+C3T5O7KdmVpKqRQkgQ=";
+    hash = "sha256-p5SgXqeafEqPQmSKEtcPCHvxODxrEX4gNmpb2ybmpO4=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-f+884HV9oopvr/2UfWk0sw2DW2cU3c16F+5vGc6+IL0=";
+  cargoHash = "sha256-B9RztnkIbYVWdx85p1WEskwTdFrUruD0UJ7qFIg8vy8=";

  # used for "Server Installed" version in admin panel
  env.VW_VERSION = version;
@@ -6252,6 +6252,8 @@ self: super: with self; {
    inherit (pkgs) cgal libxml2;
  };

+  igloohome-api = callPackage ../development/python-modules/igloohome-api { };
+
  ignite = callPackage ../development/python-modules/ignite { };

  igraph = callPackage ../development/python-modules/igraph {
@@ -9521,6 +9523,8 @@ self: super: with self; {

  python-debian = callPackage ../development/python-modules/python-debian { };

+  python-google-drive-api = callPackage ../development/python-modules/python-google-drive-api { };
+
  python-hcl2 = callPackage ../development/python-modules/python-hcl2 { };

  python-lorem = callPackage ../development/python-modules/python-lorem { };
@@ -13755,6 +13759,8 @@ self: super: with self; {

  qasync = callPackage ../development/python-modules/qasync { };

+  qbusmqttapi = callPackage ../development/python-modules/qbusmqttapi { };
+
  qcelemental = callPackage ../development/python-modules/qcelemental { };

  qcengine = callPackage ../development/python-modules/qcengine { };