Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/build-support/closure-info.nix

@@ -4,13 +4,13 @@
 # "nix-store --load-db" and "nix-store --register-validity
 # --hash-given".
 
-{ stdenvNoCC, coreutils, jq }:
+{ stdenv, coreutils, jq }:
 
 { rootPaths }:
 
 assert builtins.langVersion >= 5;
 
-stdenvNoCC.mkDerivation {
+stdenv.mkDerivation {
   name = "closure-info";
 
   __structuredAttrs = true;

pkgs/by-name/af/affine/package.nix

@@ -16,10 +16,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let
   };
 in {
   pname = "affine";
-  version = "0.16.0";
+  version = "0.17.0";
   src = fetchurl {
     url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip";
-    hash = "sha256-6F6BzEnseqdzkEUVgUa9eu7MkyNsvucK9lGL+dsKhwc=";
+    hash = "sha256-7Gaiv3XBxpHcI4curNlkN8kXcJZrD4WQS8ciqcabRMs=";
   };
   nativeBuildInputs = [
     copyDesktopItems

pkgs/by-name/ai/airgorah/package.nix

@@ -0,0 +1,74 @@
+{
+  rustPlatform,
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  glib,
+  pango,
+  gdk-pixbuf,
+  graphene,
+  gtk4,
+  copyDesktopItems,
+  makeDesktopItem,
+  wrapGAppsHook4,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "airgorah";
+  version = "0.7.3";
+
+  src = fetchFromGitHub {
+    owner = "martin-olivier";
+    repo = "airgorah";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA=";
+  };
+
+  cargoHash = "sha256-sJFOpxBW6Z8ewfyhJuxZByJNgaEmezw15OQt9KjFaec=";
+
+  nativeBuildInputs = [
+    pkg-config
+    copyDesktopItems
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    glib
+    pango
+    gdk-pixbuf
+    graphene
+    gtk4
+  ];
+
+  postInstall = ''
+    install -Dm644 icons/app_icon.png $out/share/icons/hicolor/1024x1024/apps/airgorah.png
+  '';
+
+  dessktopItems = [
+    (makeDesktopItem {
+      name = "airgorah";
+      comment = "A WiFi auditing software that can perform deauth attacks and passwords cracking";
+      desktopName = "airgorah";
+      exec = "pkexec airgorah";
+      icon = "airgorah";
+      categories = [
+        "Network"
+        "Monitor"
+        "Utility"
+        "GTK"
+      ];
+      type = "Application";
+      terminal = false;
+    })
+  ];
+
+  meta = {
+    description = "WiFi security auditing software mainly based on aircrack-ng tools suite";
+    homepage = "https://github.com/martin-olivier/airgorah";
+    changelog = "https://github.com/martin-olivier/airgorah/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    mainProgram = "airgorah";
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/bi/bilibili/package.nix

@@ -1,29 +1,40 @@
-{ lib
-, stdenv
-, fetchurl
-, electron
-, zstd
-, makeWrapper
+{
+  lib,
+  stdenv,
+  fetchurl,
+  electron_30,
+  dpkg,
+  makeWrapper,
+  commandLineArgs ? "",
 }:
-
-stdenv.mkDerivation rec {
-  pname = "bilibili";
-  version = "1.14.0-1";
-  src = fetchurl {
+let
+  version = "1.14.0-2";
+  srcs = {
+    x86_64-linux = fetchurl {
       url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
-    hash = "sha256-4+DGL/DNR3wLFUff17OquAM6dOkcsXFNeCqA7ITtCaI=";
+      hash = "sha256-QQMdEpKE7r/fPMaX/yEoaa7KjilhiPMYLRvGPkv1jds=";
     };
-
+    aarch64-linux = fetchurl {
+      url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_arm64.deb";
+      hash = "sha256-UaGI4BLhfoYluZpARsj+I0iEmFXYYNfl4JWhBWOOip0=";
+    };
+  };
+  src =
+    srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+in
+stdenv.mkDerivation {
+  pname = "bilibili";
+  inherit src version;
   unpackPhase = ''
     runHook preUnpack
-
-    ar x $src
-    tar -I ${zstd}/bin/zstd -xvf data.tar.zst
-
+    dpkg -x $src ./
     runHook postUnpack
   '';
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    dpkg
+  ];
 
   installPhase = ''
     runHook preInstall
@@ -32,20 +43,31 @@ stdenv.mkDerivation rec {
     cp -r usr/share $out/share
     sed -i "s|Exec=.*|Exec=$out/bin/bilibili|" $out/share/applications/*.desktop
     cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt
-    makeWrapper ${electron}/bin/electron $out/bin/bilibili \
+    makeWrapper ${lib.getExe electron_30} $out/bin/bilibili \
       --argv0 "bilibili" \
-      --add-flags "$out/opt/app.asar"
+      --add-flags "$out/opt/app.asar" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Electron-based bilibili desktop client";
     homepage = "https://github.com/msojocs/bilibili-linux";
-    license = with licenses; [ unfree mit ];
-    maintainers = with maintainers; [ jedsek kashw2 ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = with lib.licenses; [
+      unfree
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      jedsek
+      kashw2
+      bot-wxt1221
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     mainProgram = "bilibili";
   };
 }

pkgs/by-name/ku/kubetui/package.nix

@@ -0,0 +1,42 @@
+{
+  rustPlatform,
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  darwin,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "kubetui";
+  version = "1.5.3";
+
+  src = fetchFromGitHub {
+    owner = "sarub0b0";
+    repo = "kubetui";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-0K0h/MaQClJDqgF0qQO2INb+hpzxfSikAti+751MX/8=";
+  };
+
+  checkFlags = [
+    "--skip=workers::kube::store::tests::kubeconfigからstateを生成"
+  ];
+
+  buildInputs = lib.optionals (stdenv.isDarwin) (
+    with darwin.apple_sdk;
+    [
+      frameworks.CoreGraphics
+      frameworks.AppKit
+    ]
+  );
+  cargoHash = "sha256-kfAErXqjdLn2jaCtr+eI0+0v4TcE8Hpx0DDECnuYp5w=";
+
+  meta = {
+    homepage = "https://github.com/sarub0b0/kubetui";
+    changelog = "https://github.com/sarub0b0/kubetui/releases/tag/v${version}";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    license = lib.licenses.mit;
+    description = "Intuitive TUI tool for real-time monitoring and exploration of Kubernetes resources";
+    mainProgram = "kubetui";
+  };
+}

pkgs/by-name/ra/rainfrog/package.nix

@@ -7,7 +7,7 @@
   stdenv,
 }:
 let
-  version = "0.2.4";
+  version = "0.2.5";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3B56081ZiQPVFAheea2c7h2hQyruWI/q2crb4temVZc=";
+    hash = "sha256-+jjVowyyjM344LRDl+xFPxQ7qfjIMOMVzFiDgUHBMKw=";
   };
 
-  cargoHash = "sha256-rO9tSgtO9q1ad0lzD8aINZhDupR5Q27ZPZPX/S7BM+I=";
+  cargoHash = "sha256-0Wtsquus63fwaP7YUi/QelCJGU2cH1RWAYQWY9YbfMw=";
 
   buildInputs = lib.optionals stdenv.isDarwin (
     with darwin.apple_sdk.frameworks;

pkgs/by-name/yu/yudit/package.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  xorg,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "yudit";
+  version = "3.1.0";
+
+  src = fetchurl {
+    url = "https://www.yudit.org/download/yudit-${finalAttrs.version}.tar.gz";
+    hash = "sha256-oYgjTWEnNXaE9Sw9bGpLnY9avQ99tnJWa/RE73p85Vc=";
+  };
+
+  buildInputs = [
+    xorg.libX11
+  ];
+
+  meta = {
+    description = "Free Unicode plain-text editor for Unix-like systems";
+    homepage = "https://www.yudit.org/";
+    changelog = "https://www.yudit.org/download/CHANGELOG.TXT";
+    mainProgram = "yudit";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    # Might work on Darwin but currently fails, and upstream doesn't officially
+    # supports it.
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/development/tools/picotool/default.nix

@@ -1,16 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk, mbedtls_2 }:
 
 stdenv.mkDerivation rec {
   pname = "picotool";
-  version = "1.1.2";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = pname;
     rev = version;
-    sha256 = "sha256-OcQJeiva6X2rUyh1rJ+w4O2dWxaR7MwMfbHlnWuBVb8=";
+    sha256 = "sha256-z7EFk3qxg1PoKZQpUQqjhttZ2RkhhhiMdYc9TkXzkwk=";
   };
 
+  postPatch = ''
+    # necessary for signing/hashing support. our pico-sdk does not come with
+    # it by default, and it shouldn't due to submodule size. pico-sdk uses
+    # an upstream version of mbedtls 2.x so we patch ours in directly.
+    substituteInPlace lib/CMakeLists.txt \
+      --replace-fail "''$"'{PICO_SDK_PATH}/lib/mbedtls' '${mbedtls_2.src}'
+  '';
+
   buildInputs = [ libusb1 pico-sdk ];
   nativeBuildInputs = [ cmake pkg-config ];
   cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ];
@@ -21,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/raspberrypi/picotool";
-    description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary";
+    description = "Tool for interacting with RP2040/RP2350 device(s) in BOOTSEL mode, or with an RP2040/RP2350 binary";
     mainProgram = "picotool";
     license = licenses.bsd3;
     maintainers = with maintainers; [ muscaln ];

pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix

@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "hourly-weather";
-  version = "6.1.0";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "decompil3d";
     repo = "lovelace-hourly-weather";
     rev = version;
-    hash = "sha256-IvwWeksEnq44PhCpUXVufYb8w5XEX9Dk0LMLLeM7Dps=";
+    hash = "sha256-dDWdVAVrZrZIyGG9gOyLohxRZ3DGfjbvW3gGCLqZr+A=";
   };
 
-  npmDepsHash = "sha256-4uQfaYMg533xZobAl6+/9+FsHAFBm03wrF01nDa53Qg=";
+  npmDepsHash = "sha256-UzbMDlVOef6dO+tOeTHBBeuT578brklibbfma+VVYD8=";
 
   env.CYPRESS_INSTALL_BINARY = "0";