Merge staging-next into staging

pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "debugpy";
     publisher = "ms-python";
-    version = "2024.6.0";
-    hash = "sha256-VlPe65ViBur5P6L7iRKdGnmbNlSCwYrdZAezStx8Bz8=";
+    version = "2025.0.1";
+    hash = "sha256-IPjQY8G1JvpcjZWRsk1+Z8yIZ1UG0jIxmNsNXcHr+bs=";
   };
 
   meta = {

pkgs/applications/emulators/libretro/cores/fceumm.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fceumm";
-  version = "0-unstable-2024-11-23";
+  version = "0-unstable-2025-02-12";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-fceumm";
-    rev = "449db5de6b56e9d44fc685e1b38399f0b233bd28";
-    hash = "sha256-yD75ohq7dJwXt6t3RLMwTtmdLGLS3/eb98uBlnazWDk=";
+    rev = "26f92531a95a9a74f45a8bf13fc9f3f48cde2976";
+    hash = "sha256-XtSuZEfu03dFMQUX4VvpeFLzoWG3TeIBQG4cQkap+t8=";
   };
 
   meta = {

pkgs/applications/emulators/libretro/cores/gambatte.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2025-01-24";
+  version = "0-unstable-2025-02-14";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "cd1e180b1edf6e6853cf4d501adac0538076de34";
-    hash = "sha256-NwxditChigU8dUhmv6pnoreG1kp7cZlLBTAexNqbiAo=";
+    rev = "659f38b8e01211da4383e40dfcd102c846a19dc5";
+    hash = "sha256-EKtXKYTYW4c0CngKrZ2QgUkObUynChZAo8cOcLVHdWE=";
   };
 
   meta = {

pkgs/applications/emulators/libretro/cores/parallel-n64.nix

@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "parallel-n64";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2025-02-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "parallel-n64";
-    rev = "e372c5e327dcd649e9d840ffc3d88480b6866eda";
-    hash = "sha256-q4octB5XDdl4PtLYVZfBgydVBNaOwzu9dPBY+Y68lVo=";
+    rev = "a1e6d69f819cd25a30c701d244315f648818a163";
+    hash = "sha256-cg7FmjNqhCE4UeQzvWvgnJ2ChbOJT8iPh3Ed65Hq2iY=";
   };
 
   extraBuildInputs = [

pkgs/applications/networking/browsers/firefox/common.nix

@@ -425,6 +425,7 @@ buildStdenv.mkDerivation {
     "--disable-updater"
     "--enable-application=${application}"
     "--enable-default-toolkit=${toolkit}"
+    "--with-app-name=${binaryName}"
     "--with-distribution-id=org.nixos"
     "--with-libclang-path=${lib.getLib llvmPackagesBuildBuild.libclang}/lib"
     "--with-wasi-sysroot=${wasiSysRoot}"

pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix

@@ -9,6 +9,7 @@
 
 buildMozillaMach rec {
   pname = "firefox-beta";
+  binaryName = pname;
   version = "135.0b9";
   applicationName = "Mozilla Firefox Beta";
   src = fetchurl {
@@ -27,7 +28,7 @@ buildMozillaMach rec {
     # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
     maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
     license = lib.licenses.mpl20;
-    mainProgram = "firefox";
+    mainProgram = binaryName;
   };
   tests = {
     inherit (nixosTests) firefox-beta;

pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix

@@ -9,6 +9,7 @@
 
 buildMozillaMach rec {
   pname = "firefox-devedition";
+  binaryName = pname;
   version = "135.0b9";
   applicationName = "Mozilla Firefox Developer Edition";
   requireSigning = false;
@@ -29,7 +30,7 @@ buildMozillaMach rec {
     # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
     maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
     license = lib.licenses.mpl20;
-    mainProgram = "firefox";
+    mainProgram = binaryName;
   };
   tests = {
     inherit (nixosTests) firefox-devedition;

pkgs/applications/networking/browsers/floorp/default.nix

@@ -28,7 +28,6 @@
     };
 
     extraConfigureFlags = [
-      "--with-app-name=${pname}"
       "--with-app-basename=${applicationName}"
       "--with-unsigned-addon-scopes=app,system"
       "--enable-proxy-bypass-protection"

pkgs/applications/networking/browsers/librewolf/librewolf.nix

@@ -9,7 +9,6 @@ rec {
   extraPatches = [ "${source}/patches/pref-pane/pref-pane-small.patch" ];
 
   extraConfigureFlags = [
-    "--with-app-name=librewolf"
     "--with-unsigned-addon-scopes=app,system"
   ];
 

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -642,11 +642,11 @@
     "vendorHash": null
   },
   "ibm": {
-    "hash": "sha256-Wq8YYVDp+hUa3iZGK2umW89v5itwK1Ig1aHIb4ojXis=",
+    "hash": "sha256-dmHsNNA4gKOiNLmhJ74ryNfgh2kl3zVRMVLg4UUQCPo=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.75.1",
+    "rev": "v1.75.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-k1EQbBnpdkC7FdvyRTM8AAhUIAk3hY4CBD9wOVQnMIs="
   },

pkgs/applications/version-management/pass-git-helper/default.nix

@@ -11,14 +11,14 @@
 
 buildPythonApplication rec {
   pname = "pass-git-helper";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "languitar";
     repo = "pass-git-helper";
     tag = "v${version}";
-    sha256 = "sha256-Dc7oM5xzRCdD6M/F3jetg3JA1KMTITyONd8Tf9VpU5A=";
+    sha256 = "sha256-Y+Y/WcVY5XrxhLoixWwsi9TMkWsJ+jXbs1rZuzo3MFo=";
   };
 
   build-system = [ setuptools ];

pkgs/by-name/ci/circt/package.nix

@@ -19,12 +19,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "circt";
-  version = "1.105.0";
+  version = "1.106.0";
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "circt";
     rev = "firtool-${version}";
-    hash = "sha256-1LnCvXcGDQ1pBEux2yX6crPaWdcoWbLHFALtjoGJGL0=";
+    hash = "sha256-uVvW8Rh4qCHJrkImHEwOySxszeKHGMGiEY5zmu3tk10=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix

@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "fcitx5-pinyin-moegirl";
-  version = "20250113";
+  version = "20250209";
 
   src = fetchurl {
     url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
-    hash = "sha256-Z6MqYZMpvTGcz61NnzZQy63GXfcaTWE8dezPoYht6q0=";
+    hash = "sha256-+EIXBIu3OE59VpnAWalmiNqD4FsvuSgRr79OQCqrgMA=";
   };
 
   dontUnpack = true;

pkgs/by-name/fu/fum/package.nix

@@ -11,17 +11,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "fum";
-  version = "0.9.17";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "qxb3";
     repo = "fum";
     tag = "v${version}";
-    hash = "sha256-E9Z8bs5bdNcXHRJIkzcISIz8R1wnZu8sO6tXQp+5bpQ=";
+    hash = "sha256-0359ThCHM14uSQFNoKWm88Bk3aOxyhkulSvoXcpNJMc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-yrDukkbbXqS2iAdtY4WZS6VkqSbyeBXWkn2Od4+mWLw=";
+  cargoHash = "sha256-XyMf9v9Pfl+j2E1BnNl8SkDvu/0LZ6av9/dsDc0zA8U=";
 
   nativeBuildInputs = [
     autoPatchelfHook

pkgs/by-name/gi/gitify/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gitify";
-  version = "5.18.0";
+  version = "6.1.0";
 
   src = fetchFromGitHub {
     owner = "gitify-app";
     repo = "gitify";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-INeOQY39IepcqigThymEcBjkrQkIC/9Py+g32/VBpmg=";
+    hash = "sha256-3vpt8irwDYdWqX4Vt7WdmQfePqIRkv07LootFLaQGZI=";
   };
 
   nativeBuildInputs = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-86RiBzZwoyDX5l9wV3JiUo4efkol3sKH3tlu61D7D+0=";
+    hash = "sha256-HW8v5DhbWXmMU2vD2NutbY7eMVzeW1FzYXOs3NRsUw0=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

pkgs/by-name/gi/gitleaks/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gitleaks";
-  version = "8.23.3";
+  version = "8.24.0";
 
   src = fetchFromGitHub {
     owner = "zricethezav";
     repo = "gitleaks";
     tag = "v${version}";
-    hash = "sha256-K1TjgpV6e3R5QJGglU47G/eNRDexIpPcy0x5+XmkqrQ=";
+    hash = "sha256-4LkM65njb2L8aCLBmKo18gNXX93zXCGh/e/+xdS+wek=";
   };
 
-  vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA=";
+  vendorHash = "sha256-J9cQUXVDqSTykoUOCaKGgyYzkcv7Uss6tNra42Sofw8=";
 
   ldflags = [
     "-s"

pkgs/by-name/ha/harbor-cli/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "harbor-cli";
-  version = "0.0.2";
+  version = "0.0.3";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     rev = "v${version}";
-    hash = "sha256-baS4UHjmE2eURFMDBhXbx9lcKPArb2RH2NVDt3MPE4s=";
+    hash = "sha256-Vfr7e5UQ34TkirywuYJPrkxRA6yJp3/ivfCJOnh34MY=";
   };
 
-  vendorHash = "sha256-rw2VPRi0VTm7/zVnQ8zL5f4mbzYKnmuxgCbgrpcukaU=";
+  vendorHash = "sha256-zQV3YJJ5cu24SVS6LCuZbM5EfGZyNPt8f1N0B3befD0=";
 
   excludedPackages = [ "dagger" ];
 

pkgs/by-name/hc/hcledit/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "hcledit";
-  version = "0.2.16";
+  version = "0.2.17";
 
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ULoqb9+GQB+Rg5p/Lqa1gHvZDDAmcfNE6FOK/R5mVK8=";
+    hash = "sha256-4PBEcOK16YXQhrQ6Yrtcb6vTE6h6sSY3Ymuxi+mEUt8=";
   };
 
-  vendorHash = "sha256-V7Ppb5u6to8bc0TWgJirC04N9lMOYav/dgEPWHzvGro=";
+  vendorHash = "sha256-d1cxzGVBOwNAoOxGanRJas4jocxj6B6k5C1hxZi7/Ak=";
 
   meta = with lib; {
     description = "Command line editor for HCL";

pkgs/by-name/k8/k8sgpt/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "k8sgpt";
-  version = "0.3.48";
+  version = "0.3.49";
 
   src = fetchFromGitHub {
     owner = "k8sgpt-ai";
     repo = "k8sgpt";
     rev = "v${version}";
-    hash = "sha256-hnPmFVplLso5O/9Q6zgzqdNId4kAoujLX+IFJ5G2Otg=";
+    hash = "sha256-Ytn/Ycb0k0odEjp5meTX4pls/vPM+eR7bMzuXHYyJwQ=";
   };
 
-  vendorHash = "sha256-K9do7u13w2a/9jI7LRtbRvjKJcFU9AnDp2u+ZWSVxw0=";
+  vendorHash = "sha256-QwLIDUtNMJarwQYWSp739Nfgf7lGmohAXaMga4g93DI=";
 
   # https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED
   env.CGO_ENABLED = 0;

pkgs/by-name/k9/k9s/package.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.40.3";
+  version = "0.40.5";
 
   src = fetchFromGitHub {
     owner = "derailed";
     repo = "k9s";
     rev = "v${version}";
-    hash = "sha256-7juy1j2YULP76YIjwzaXRPfbzZ/cIIzH1v5nddl0bKk=";
+    hash = "sha256-HntKFQnuPJ0i3yd7ItJNROs9decU6lMIxR2ptrc9yRc=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-I0gUTyLLOiTm6LiEFHwylYA1I8+/365GxFs8nSARcy0=";
+  vendorHash = "sha256-O62yKTOW0ZyHyP/PA6cMWHdKjnvaPqm/bXAPtJbhxeY=";
 
   # TODO investigate why some config tests are failing
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);

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

@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "kuttl";
-  version = "0.21.0";
+  version = "0.22.0";
   cli = "kubectl-kuttl";
 
   src = fetchFromGitHub {
     owner = "kudobuilder";
     repo = "kuttl";
     rev = "v${version}";
-    sha256 = "sha256-0eETF9kf5e0E7R9CEANZC854r7/P/wjxeVgx90TdRFg=";
+    sha256 = "sha256-M9sZNrze7v1dj0j+hOo30kB87YKxFF/hZJ7R2C/Pzwg=";
   };
 
-  vendorHash = "sha256-QYdeYmp++sAvgDPWpEscfm4n0lRejLTPZPGbVPCoWmk=";
+  vendorHash = "sha256-WhgmseJVfhvVHARI2XaMkRE/sIfpeJj0JzYiAgza6jQ=";
 
   subPackages = [ "cmd/kubectl-kuttl" ];
 

pkgs/by-name/le/ledger-live-desktop/package.nix

@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.98.0";
+  version = "2.100.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-wYSs7PIj5eA5C/5msbZb+OkcC3Hrhi57yyYrKZ0mvCM=";
+    hash = "sha256-WDSlVcWOwri8CT4AD9/tahx5upJvKCQp45wltPp8zI8=";
   };
 
   appimageContents = appimageTools.extractType2 {

pkgs/by-name/le/lego/package.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lego";
-  version = "4.19.2";
+  version = "4.22.2";
 
   src = fetchFromGitHub {
     owner = "go-acme";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-O4lzOZUiicmahxcbzPsEU2+tPDTCUun2JLeWZjpTZIQ=";
+    repo = "lego";
+    tag = "v${version}";
+    hash = "sha256-tvvTaRPOmNX0D8QvgA+8u5XsMxnT9PK4PMBcL6RHSIE=";
   };
 
-  vendorHash = "sha256-BcE/8pxQdJp9vttLo4wDSUswJnaBhIn/mlt3ZcOf2wA=";
+  vendorHash = "sha256-T6ZeQKrdz16zwppkFei21JjwGsoPLHazHTZew822xdU=";
 
   doCheck = false;
 

pkgs/by-name/md/md-tangle/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonPackage rec {
   pname = "md-tangle";
-  version = "1.3.1";
+  version = "1.4.4";
 
   # By some strange reason, fetchPypi fails miserably
   src = fetchFromGitHub {
     owner = "joakimmj";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-cUME2AHK/Fva+1TSTE6hNu0SE/V1FOwcSxWF0+iZhS4=";
+    tag = "v${version}";
+    hash = "sha256-PkOKSsyY8uwS4mhl0lB+KGeUvXfEc7PUDHZapHMYv4c=";
   };
 
   # Pure Python application, uses only standard modules and comes without

pkgs/by-name/md/mdbook-pdf/package.nix

@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook-pdf";
-  version = "0.1.10";
+  version = "0.1.11";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-zRoO84ij7zF1I8ijXS/oApMKfS3e04+5/CgahAemqCA=";
+    hash = "sha256-1VMVobiRCCUv8aWLxNbaDSvNs1Pt2jlsVPzfrieOudc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-cZNTfhrpuEoAXviog/qq2PWii/wycxxq5l/vFHW1f6k=";
+  cargoHash = "sha256-t3dlmeJNaHySIhJdJmSaeS0mXM7TgAUa/0hcG06lHvo=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/na/namespace-cli/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "namespace-cli";
-  version = "0.0.402";
+  version = "0.0.403";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${version}";
-    hash = "sha256-1QqBfi9OL2b+mR2ubtErVtIFXIK95vO9WrzrdZWqqAo=";
+    hash = "sha256-J9TR9jk9Tp4lIDGfxibapA6BX18APkN1p8XH9C11W1Y=";
   };
 
-  vendorHash = "sha256-narbmKAmVFtTR8JkGkem8aHScoXiZ+0V+3a9Vkd7BSA=";
+  vendorHash = "sha256-PoJy/tpjkUkxHiJZNFzl2UXj29iojwL9g6YrAEkSvKk=";
 
   subPackages = [
     "cmd/nsc"

pkgs/by-name/no/notonoto-35/package.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+  fontforge,
+  python3,
+}:
+
+let
+  python3' = python3.withPackages (
+    ps: with ps; [
+      fonttools
+      ttfautohint-py
+    ]
+  );
+in
+
+stdenvNoCC.mkDerivation rec {
+  pname = "notonoto-35";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "yuru7";
+    repo = "NOTONOTO";
+    tag = "v${version}";
+    hash = "sha256-1dbx4yC8gL41OEAE/LNDyoDb4xhAwV5h8oRmdlPULUo=";
+  };
+
+  nativeBuildInputs = [
+    fontforge
+    python3'
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    fontforge --script fontforge_script.py --35
+    python3 ./fonttools_script.py
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 build/*.ttf -t $out/share/fonts/truetype/notonoto-35
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Programming font that combines Noto Sans Mono and Noto Sans JP";
+    homepage = "https://github.com/yuru7/NOTONOTO";
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ genga898 ];
+    platforms = lib.platforms.all;
+  };
+}

pkgs/by-name/no/notonoto-console/package.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+  fontforge,
+  python3,
+}:
+
+let
+  python3' = python3.withPackages (
+    ps: with ps; [
+      fonttools
+      ttfautohint-py
+    ]
+  );
+in
+
+stdenvNoCC.mkDerivation rec {
+  pname = "notonoto-console";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "yuru7";
+    repo = "NOTONOTO";
+    tag = "v${version}";
+    hash = "sha256-1dbx4yC8gL41OEAE/LNDyoDb4xhAwV5h8oRmdlPULUo=";
+  };
+
+  nativeBuildInputs = [
+    fontforge
+    python3'
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    fontforge --script fontforge_script.py --console
+    python3 ./fonttools_script.py
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 build/*.ttf -t $out/share/fonts/truetype/notonoto-console
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Programming font that combines Noto Sans Mono and Noto Sans JP";
+    homepage = "https://github.com/yuru7/NOTONOTO";
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ genga898 ];
+    platforms = lib.platforms.all;
+  };
+}

pkgs/by-name/no/notonoto-hs-35/package.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+  fontforge,
+  python3,
+}:
+
+let
+  python3' = python3.withPackages (
+    ps: with ps; [
+      fonttools
+      ttfautohint-py
+    ]
+  );
+in
+
+stdenvNoCC.mkDerivation rec {
+  pname = "notonoto-hs-35";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "yuru7";
+    repo = "NOTONOTO";
+    tag = "v${version}";
+    hash = "sha256-1dbx4yC8gL41OEAE/LNDyoDb4xhAwV5h8oRmdlPULUo=";
+  };
+
+  nativeBuildInputs = [
+    fontforge
+    python3'
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    fontforge --script fontforge_script.py --hidden-zenkaku-space --35
+    python3 ./fonttools_script.py
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 build/*.ttf -t $out/share/fonts/truetype/notonoto-hs-35
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Programming font that combines Noto Sans Mono and Noto Sans JP";
+    homepage = "https://github.com/yuru7/NOTONOTO";
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ genga898 ];
+    platforms = lib.platforms.all;
+  };
+}

pkgs/by-name/no/notonoto-hs-console/package.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+  fontforge,
+  python3,
+}:
+
+let
+  python3' = python3.withPackages (
+    ps: with ps; [
+      fonttools
+      ttfautohint-py
+    ]
+  );
+in
+
+stdenvNoCC.mkDerivation rec {
+  pname = "notonoto-hs-console";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "yuru7";
+    repo = "NOTONOTO";
+    tag = "v${version}";
+    hash = "sha256-1dbx4yC8gL41OEAE/LNDyoDb4xhAwV5h8oRmdlPULUo=";
+  };
+
+  nativeBuildInputs = [
+    fontforge
+    python3'
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    fontforge --script fontforge_script.py --hidden-zenkaku-space --console
+    python3 ./fonttools_script.py
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 build/*.ttf -t $out/share/fonts/truetype/notonoto-hs-console
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Programming font that combines Noto Sans Mono and Noto Sans JP";
+    homepage = "https://github.com/yuru7/NOTONOTO";
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ genga898 ];
+    platforms = lib.platforms.all;
+  };
+}

pkgs/by-name/nu/numix-icon-theme-circle/package.nix

@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-circle";
-  version = "24.12.12";
+  version = "25.01.31";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "sha256-jN1WjZP+k9/kj8/ZsWocy0OYgUW5M6MqTF3A7u550tk=";
+    sha256 = "sha256-+gb4nyVNF6bjYCEiRq/L3wO4ZoUG4lt5l0vxye8inrQ=";
   };
 
   nativeBuildInputs = [ gtk3 ];

pkgs/by-name/ol/ollama/package.nix

@@ -2,21 +2,22 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  fetchpatch,
   buildEnv,
   linkFarm,
-  overrideCC,
   makeWrapper,
   stdenv,
   addDriverRunpath,
   nix-update-script,
 
   cmake,
-  gcc12,
   gitMinimal,
   clblast,
   libdrm,
   rocmPackages,
+  rocmGpuTargets ? rocmPackages.clr.gpuTargets or [ ],
   cudaPackages,
+  cudaArches ? cudaPackages.cudaFlags.realArches or [ ],
   darwin,
   autoAddDriverRunpath,
   versionCheckHook,
@@ -43,17 +44,17 @@ assert builtins.elem acceleration [
 let
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.5.7";
+  version = "0.5.11";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${version}";
-    hash = "sha256-DW7gHNyW1ML8kqgMFsqTxS/30bjNlWmYmeov2/uZn00=";
+    hash = "sha256-Yc/FwIoPvzYSxlrhjkc6xFL5iCunDYmZkG16MiWVZck=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-1uk3Oi0n4Q39DVZe3PnZqqqmlwwoHmEolcRrib0uu4I=";
+  vendorHash = "sha256-wtmtuwuu+rcfXsyte1C4YLQA4pnjqqxFmH1H18Fw75g=";
 
   validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [
     "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, "
@@ -172,6 +173,15 @@ goBuild {
     ++ lib.optionals enableCuda cudaLibs
     ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks;
 
+  patches = [
+    # don't try to build x86_64 architectures on linux-aarch64
+    # NOTE: should be removed after 0.5.11
+    (fetchpatch {
+      url = "https://github.com/ollama/ollama/commit/08a299e1d0636056b09d669f9aa347139cde6ec0.patch";
+      hash = "sha256-PC9jQklPAN/ZdHlQEQ6/RweGGBiUPDehHyaboX0tRZk=";
+    })
+  ];
+
   # replace inaccurate version number with actual release version
   postPatch = ''
     substituteInPlace version/version.go \
@@ -187,24 +197,35 @@ goBuild {
 
   preBuild =
     let
-      dist_cmd =
-        if cudaRequested then
-          "dist_cuda_v${cudaMajorVersion}"
-        else if rocmRequested then
-          "dist_rocm"
-        else
-          "dist";
+      removeSMPrefix =
+        str:
+        let
+          matched = builtins.match "sm_(.*)" str;
+        in
+        if matched == null then str else builtins.head matched;
+
+      cudaArchitectures = builtins.concatStringsSep ";" (builtins.map removeSMPrefix cudaArches);
+      rocmTargets = builtins.concatStringsSep ";" rocmGpuTargets;
+
+      cmakeFlagsCudaArchitectures = lib.optionalString enableCuda "-DCMAKE_CUDA_ARCHITECTURES='${cudaArchitectures}'";
+      cmakeFlagsRocmTargets = lib.optionalString enableRocm "-DAMDGPU_TARGETS='${rocmTargets}'";
+
     in
-    # build llama.cpp libraries for ollama
     ''
-      make ${dist_cmd} -j $NIX_BUILD_CORES
+      cmake -B build \
+        -DCMAKE_SKIP_BUILD_RPATH=ON \
+        -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
+        ${cmakeFlagsCudaArchitectures} \
+        ${cmakeFlagsRocmTargets} \
+
+      cmake --build build -j $NIX_BUILD_CORES
     '';
 
-  postInstall = lib.optionalString (stdenv.hostPlatform.isx86 || enableRocm || enableCuda) ''
-    # copy libggml_*.so and runners into lib
-    # https://github.com/ollama/ollama/blob/v0.4.4/llama/make/gpu.make#L90
+  # ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations)
+  # https://github.com/ollama/ollama/blob/v0.5.11/docs/development.md#library-detection
+  postInstall = ''
     mkdir -p $out/lib
-    cp -r dist/*/lib/* $out/lib/
+    cp -r build/lib/ollama $out/lib/
   '';
 
   postFixup =
@@ -261,6 +282,7 @@ goBuild {
       abysssol
       dit7ya
       elohmeier
+      prusnak
       roydubnium
     ];
   };

pkgs/by-name/op/openvas-scanner/package.nix

@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openvas-scanner";
-  version = "23.15.3";
+  version = "23.15.4";
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "openvas-scanner";
     tag = "v${version}";
-    hash = "sha256-9TzS/w/FZSawrc505aeaGJlz4m6k4Q4loCVgChzKs30=";
+    hash = "sha256-9IHxpskPiXONqO6V6wHLPxJV8yi7orU6zpRvO2/+THg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/pi/picocrypt/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
   stdenv,
   copyDesktopItems,
@@ -13,20 +13,20 @@
   wrapGAppsHook3,
 }:
 
-buildGoModule rec {
+buildGo124Module rec {
   pname = "picocrypt";
-  version = "1.46";
+  version = "1.47";
 
   src = fetchFromGitHub {
     owner = "Picocrypt";
     repo = "Picocrypt";
     tag = version;
-    hash = "sha256-2kY/EK/tICA5vVT79Qy3oHKMWuoEPwXUI7FYnFuiLVQ=";
+    hash = "sha256-O/n9dJz8cdJwldOXnsG8W8OZU5WeSmNys746HxRHvdc=";
   };
 
   sourceRoot = "${src.name}/src";
 
-  vendorHash = "sha256-fcDsPUDsZsgwI2MudvNaGKIIe55JsMCNgDs7Jz2HF9A=";
+  vendorHash = "sha256-9xB0D5Og/eiWUZGMog6lBoze4GrdvBOtNAKcMc3AdIE=";
 
   ldflags = [
     "-s"

pkgs/by-name/pl/pluto/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.21.1";
+  version = "5.21.3";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-BGfTgL5xAudgGAyINVq9eyyUHRb6iZ/eEO5qxUl5cI0=";
+    hash = "sha256-/gq6BdlNG9vUazVt7Ucvv2679BytUEZrx6u8znnsxG4=";
   };
 
   vendorHash = "sha256-PABCma+pfguDHxRhvQYCHcjr7Epy2AteC+QiXbAx04k=";

pkgs/by-name/po/power-profiles-daemon/package.nix

@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "power-profiles-daemon";
-  version = "0.23";
+  version = "0.30";
 
   outputs = [
     "out"
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "upower";
     repo = "power-profiles-daemon";
     rev = finalAttrs.version;
-    hash = "sha256-kX8adu+GXxkaHtARUKp51K3Jf9xO+l12vctsJzIavyM=";
+    hash = "sha256-iQUhA46BEln8pyIBxM/MY7An8BzfiFjxZdR/tUIj4S4=";
   };
 
   nativeBuildInputs =

pkgs/by-name/pu/pulumi-esc/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pulumi-esc";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "esc";
     rev = "v${version}";
-    hash = "sha256-Bzg3MFxyyu6CUvwrHSScg9aEJ7JQbL/YICRbn4Zjc3s=";
+    hash = "sha256-X6QX2bCvHwxIXw1Z1PE4bfLphJCSVW1os9pQyZAdTnk=";
   };
 
   subPackages = "cmd/esc";

pkgs/by-name/py/pyenv/package.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyenv";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     tag = "v${version}";
-    hash = "sha256-RDBIe26IAGn3Mj+zof55GxMI7mwL9JQGjN3egUhhhgg=";
+    hash = "sha256-YCCkt1lHDK91qXQXCafy1PFLr+wZgTe/9qM9gR0Xzk0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ro/rosa/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "rosa";
-  version = "1.2.49";
+  version = "1.2.50";
 
   src = fetchFromGitHub {
     owner = "openshift";
     repo = "rosa";
     rev = "v${version}";
-    hash = "sha256-x1P9Z0TpKw90/eLJHMcoO7niqSM3F+iFVKKTcJAstng=";
+    hash = "sha256-+jJbfU1DAgFNrYVA2Q1khUQKA64WOg/3H4zmX8KCg7w=";
   };
   vendorHash = null;
 

pkgs/by-name/se/sem/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "sem";
-  version = "0.30.1";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "semaphoreci";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-C4n6pmqNdZr4kEz/MZgQjwATpjhelkCA0nDyCR/k0mc=";
+    sha256 = "sha256-w/QxN8ntfyoHKVLRIawN0SoUI2oTQg8gNzVUiXR7Klc=";
   };
 
   vendorHash = "sha256-p8+M+pRp12P7tYlFpXjU94JcJOugQpD8rFdowhonh74=";

pkgs/by-name/sp/spl/package.nix

@@ -6,18 +6,18 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "spl";
-  version = "0.4.2";
+  version = "0.4.3";
 
   passthru.updateScript = nix-update-script { };
 
   src = fetchgit {
     url = "https://git.tudbut.de/tudbut/spl";
     rev = "v${version}";
-    hash = "sha256-cU6qSh4HM3os/A1w0+5TSZLkS2Y/C864qvmixkxPAh8=";
+    hash = "sha256-ckj50psQ2/r7Bw03J2VjHx0R1zY5xivJfvB9HNxnJLw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Ra3pNw3NJ9hSSxb1O7piMD+1cPeofTAYbdM9WRlwYKo=";
+  cargoHash = "sha256-rq6GO+5qXM22JoAGdAM3Bb6/U0+x5sRYUjnZQUpzcGA=";
 
   meta = {
     description = "Simple, concise, concatenative scripting language";

pkgs/by-name/um/umu-launcher-unwrapped/no-umu-version-json.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index b82053d..37db8c9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -50,7 +50,7 @@ fix_shebangs:
- umu/umu_version.json: umu/umu_version.json.in
- 	$(info :: Updating $(@) )
- 	cp $(<) $(<).tmp
--	sed 's|##UMU_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp
-+	sed 's|##UMU_VERSION##|@version@|g' -i $(<).tmp
- 	mv $(<).tmp $(@)
- 
- .PHONY: version

pkgs/by-name/um/umu-launcher-unwrapped/package.nix

@@ -1,51 +1,69 @@
 {
-  python3Packages,
-  fetchFromGitHub,
-  lib,
   bash,
+  cargo,
+  fetchFromGitHub,
   hatch,
+  lib,
+  python3Packages,
+  rustPlatform,
   scdoc,
-  replaceVars,
-  fetchpatch2,
+  writableTmpDirAsHomeHook,
+  withTruststore ? true,
+  withDeltaUpdates ? true,
 }:
 python3Packages.buildPythonPackage rec {
   pname = "umu-launcher-unwrapped";
-  version = "1.1.4";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "Open-Wine-Components";
     repo = "umu-launcher";
     tag = version;
-    hash = "sha256-TOsVK6o2V8D7CLzVOkLs8AClrZmlVQTfeii32ZIQCu4=";
+    hash = "sha256-bZ6Ywc524NrapkFrwFiWbqmVe1j0hunEH9YKrYQ8R2E=";
   };
 
-  # Both patches can be safely removed with the next release
-  patches = [
-    # Patch to avoid running `git describe`
-    # Fixed by https://github.com/Open-Wine-Components/umu-launcher/pull/289 upstream
-    (replaceVars ./no-umu-version-json.patch { inherit version; })
-    # Patch to use PREFIX in the installer call
-    (fetchpatch2 {
-      url = "https://github.com/Open-Wine-Components/umu-launcher/commit/602a2f84a05a63f7b1b1c4d8ca85d99fdaec2cd2.diff";
-      hash = "sha256-BMinTXr926V3HlzHHabxHKvy8quEvxsZKu1hoTGQT00=";
-    })
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    hash = "sha256-nU4xZn9NPd7NgexiaNYLdo4BCbH98duZ07XYeUiceP0=";
+  };
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    python3Packages.pytestCheckHook
   ];
 
   nativeBuildInputs = [
-    python3Packages.build
+    cargo
     hatch
-    scdoc
+    python3Packages.build
     python3Packages.installer
+    rustPlatform.cargoSetupHook
+    scdoc
   ];
 
-  pythonPath = [
-    python3Packages.filelock
-    python3Packages.xlib
-  ];
+  pythonPath =
+    with python3Packages;
+    [
+      pyzstd
+      urllib3
+      xlib
+    ]
+    ++ lib.optionals withTruststore [
+      truststore
+    ]
+    ++ lib.optionals withDeltaUpdates [
+      cbor2
+      xxhash
+    ];
 
   pyproject = false;
   configureScript = "./configure.sh";
 
+  configureFlags = [
+    "--use-system-pyzstd"
+    "--use-system-urllib"
+  ];
+
   makeFlags = [
     "PYTHONDIR=$(PREFIX)/${python3Packages.python.sitePackages}"
     "PYTHON_INTERPRETER=${lib.getExe python3Packages.python}"
@@ -54,6 +72,17 @@ python3Packages.buildPythonPackage rec {
     "SHELL_INTERPRETER=${lib.getExe bash}"
   ];
 
+  disabledTests = [
+    # Broken? Asserts that $STEAM_RUNTIME_LIBRARY_PATH is non-empty
+    # Fails with AssertionError: '' is not true : Expected two elements in STEAM_RUNTIME_LIBRARY_PATHS
+    "test_game_drive_empty"
+    "test_game_drive_libpath_empty"
+
+    # Broken? Tests parse_args with no options (./umu_run.py)
+    # Fails with AssertionError: SystemExit not raised
+    "test_parse_args_noopts"
+  ];
+
   meta = {
     description = "Unified launcher for Windows games on Linux using the Steam Linux Runtime and Tools";
     changelog = "https://github.com/Open-Wine-Components/umu-launcher/releases/tag/${version}";

pkgs/by-name/ya/yafc-ce/package.nix

@@ -12,13 +12,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "yafc-ce";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "shpaass";
     repo = "yafc-ce";
     rev = finalAttrs.version;
-    hash = "sha256-pBnAUrDnOabQq7D1YJ41aJq9MSPIHQ6K8ix5TLwkrZ0=";
+    hash = "sha256-d0LLwol68ywwFsUx7gC4S1MF+3HUTt7+F6rcL1j0Oj8=";
   };
 
   projectFile = [ "Yafc/Yafc.csproj" ];

pkgs/development/python-modules/flow-record/default.nix

@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "flow-record";
-  version = "3.18";
+  version = "3.19";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "flow.record";
     tag = version;
-    hash = "sha256-tEKmwDZOoGIXfJqxIat6WTbEv4EkiwkJGMpNxfv2Zd0=";
+    hash = "sha256-9slOisPr2pW18zurBoJ8AA55fGuBA4QP1tY7YSLiYEM=";
   };
 
   build-system = [
@@ -71,7 +71,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for defining and creating structured data";
     homepage = "https://github.com/fox-it/flow.record";
-    changelog = "https://github.com/fox-it/flow.record/releases/tag/${version}";
+    changelog = "https://github.com/fox-it/flow.record/releases/tag/${src.tag}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/huggingface-hub/default.nix

@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "huggingface-hub";
-  version = "0.28.1";
+  version = "0.29.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "huggingface_hub";
     tag = "v${version}";
-    hash = "sha256-QrbwpJub4+pfbFERBk6GSZDSrjoCPniO+kB5hiddk28=";
+    hash = "sha256-9G5oq8X5/MtHZAOM7QHoMyRePPFwMe4Wa66y+japxwA=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/json-repair/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.35.0";
+  version = "0.39.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
     tag = "v${version}";
-    hash = "sha256-39MxXX3bBYLmpaUpNYLWq+8Huoy0zQSyURQiZvXFaZc=";
+    hash = "sha256-hvJbIyxck+a6zUMT/lSYF6GZufuSm6cSthX9ebgI8ms=";
   };
 
   build-system = [ setuptools ];
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to repair invalid JSON, commonly used to parse the output of LLMs";
     homepage = "https://github.com/mangiucugna/json_repair/";
-    changelog = "https://github.com/mangiucugna/json_repair/releases/tag/${version}";
+    changelog = "https://github.com/mangiucugna/json_repair/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ greg ];
   };

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pubnub";
-  version = "10.1.0";
+  version = "10.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "pubnub";
     repo = "python";
     tag = version;
-    hash = "sha256-8CASMWTDeIi+UgScZk8R5kWN7Qsu8Bx5JChAFoPQ7iw=";
+    hash = "sha256-9qy2ltxDKpEcfgDQDOqhZnEQSLk1VFE5WInJkz8YWCM=";
   };
 
   pythonRelaxDeps = [ "httpx" ];
@@ -67,7 +67,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python-based APIs for PubNub";
     homepage = "https://github.com/pubnub/python";
-    changelog = "https://github.com/pubnub/python/releases/tag/${version}";
+    changelog = "https://github.com/pubnub/python/releases/tag/${src.tag}";
     # PubNub Software Development Kit License Agreement
     # https://github.com/pubnub/python/blob/master/LICENSE
     license = licenses.unfreeRedistributable;

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

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvicare";
-  version = "2.41.0";
+  version = "2.43.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openviess";
     repo = "PyViCare";
     tag = version;
-    hash = "sha256-iNv70l8xHxiF+ifKf0gkJ5W/aOuek/9QYCF8pm6xBiw=";
+    hash = "sha256-dVUb3v8r+1Kkh6BCWtny1F2vzynSRijT62OnrQCTTao=";
   };
 
   postPatch = ''
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "PyViCare" ];
 
   meta = with lib; {
-    changelog = "https://github.com/openviess/PyViCare/releases/tag/${version}";
+    changelog = "https://github.com/openviess/PyViCare/releases/tag/${src.tag}";
     description = "Python Library to access Viessmann ViCare API";
     homepage = "https://github.com/somm15/PyViCare";
     license = with licenses; [ asl20 ];

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

@@ -0,0 +1,62 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+  zstd-c,
+}:
+buildPythonPackage rec {
+  pname = "pyzstd";
+  version = "0.16.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Rogdham";
+    repo = "pyzstd";
+    tag = version;
+    hash = "sha256-Az+0m1XUFxExBZK8bcjK54Zt2d5ZlAKRMZRdr7rPcss=";
+  };
+
+  postPatch = ''
+    # pyzst specifies setuptools<74 because 74+ drops `distutils.msvc9compiler`,
+    # required for Python 3.9 under Windows
+    substituteInPlace pyproject.toml \
+        --replace-fail '"setuptools>=64,<74"' '"setuptools"'
+  '';
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  build-system = [
+    setuptools
+  ];
+
+  buildInputs = [
+    zstd-c
+  ];
+
+  pypaBuildFlags = [
+    "--config-setting=--global-option=--dynamic-link-zstd"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pyzstd"
+  ];
+
+  meta = {
+    description = "Python bindings to Zstandard (zstd) compression library";
+    homepage = "https://pyzstd.readthedocs.io";
+    changelog = "https://github.com/Rogdham/pyzstd/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      MattSturgeon
+      PopeRigby
+    ];
+  };
+}

pkgs/development/python-modules/tencentcloud-sdk-python/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1320";
+  version = "3.0.1321";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-2ZT6uTUP6oEuHlkxp5EJxZNw3hN8LUUDV9Mt8dNXF58=";
+    hash = "sha256-KE+tZtikP1WU/WS1nGd/b69/GOKaKG7ToVJ72LD7XVc=";
   };
 
   build-system = [ setuptools ];

pkgs/development/tools/devbox/default.nix

@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "devbox";
-  version = "0.13.7";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "jetpack-io";
     repo = pname;
     rev = version;
-    hash = "sha256-D56yT/A3aT9k6uEJv8NYEeHjjKzNiXMveLoOlQSjDKU=";
+    hash = "sha256-ka3knS57Nc9LvGxr2DitcfI7VlkqsVXIi/llFFMb14g=";
   };
 
   ldflags = [
@@ -27,7 +27,7 @@ buildGoModule rec {
   # integration tests want file system access
   doCheck = false;
 
-  vendorHash = "sha256-xsx+bFjvYpLYE+Sok+4zlsK6i9QLg04fdWQoN5zC2CY=";
+  vendorHash = "sha256-og8FrWOC3Cq3KucXYcpiI1BHQS9kRPQkxyaDypFYdn0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/os-specific/linux/systemd/default.nix

@@ -120,7 +120,12 @@
   withLibBPF ?
     lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0"
     # assumes hard floats
-    && (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6")
+    && (
+      stdenv.hostPlatform.isAarch
+      ->
+        stdenv.hostPlatform.parsed.cpu ? version
+        && lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6"
+    )
     # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211
     && !stdenv.hostPlatform.isMips64
     # can't find gnu/stubs-32.h

pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "junos-czerwonk-exporter";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "junos_exporter";
     rev = version;
-    sha256 = "sha256-a9DvmVgIXiM4DjTg2BmdPbJCpFmyD+ZoUc5VPEEFVp8=";
+    sha256 = "sha256-Pr4M2ReXOTSXj2sBpuHEzAB1PaYbK8MWmTdasDA+/5o=";
   };
 
-  vendorHash = "sha256-DjNxXvMliM7MPv9gAOblnA5CkVcrXLlpaR8NOiZ65yc=";
+  vendorHash = "sha256-HT0P7u9JDYlPb1afLDqOL9II1WNrq1b9Q7340EcCm0Q=";
 
   meta = with lib; {
     description = "Exporter for metrics from devices running JunOS";

pkgs/top-level/all-packages.nix

@@ -13406,16 +13406,10 @@ with pkgs;
 
   firefox = wrapFirefox firefox-unwrapped { };
   firefox-beta = wrapFirefox firefox-beta-unwrapped {
-    nameSuffix = "-beta";
     desktopName = "Firefox Beta";
-    wmClass = "firefox-beta";
-    icon = "firefox-beta";
   };
   firefox-devedition = wrapFirefox firefox-devedition-unwrapped {
-    nameSuffix = "-devedition";
     desktopName = "Firefox Developer Edition";
-    wmClass = "firefox-devedition";
-    icon = "firefox-devedition";
   };
 
   firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { };

pkgs/top-level/python-packages.nix

@@ -11022,6 +11022,10 @@ self: super: with self; {
 
   pyzipper = callPackage ../development/python-modules/pyzipper { };
 
+  pyzstd = callPackage ../development/python-modules/pyzstd {
+    zstd-c = pkgs.zstd;
+  };
+
   plac = callPackage ../development/python-modules/plac { };
 
   plaid-python = callPackage ../development/python-modules/plaid-python { };