Merge staging-next into staging

pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix

@@ -20,13 +20,13 @@
 
 melpaBuild {
   pname = "voicemacs";
-  version = "0-unstable-2024-10-11";
+  version = "0-unstable-2024-12-11";
 
   src = fetchFromGitHub {
     owner = "jcaw";
     repo = "voicemacs";
-    rev = "d8dade06a48994ff04f48e1177eed4e9243cbcb1";
-    hash = "sha256-kCuwjMl3pPWQNoXEl+oK6YoOLpk8kazLb69RwiGltAA=";
+    rev = "fb6133f59d3062a0cb2396353d9a1edd2af4750a";
+    hash = "sha256-7JF6c5T+Dl3/S3zMHwvf7lsnsPWoZStE1FiVobJHgyI=";
   };
 
   patches = [

pkgs/applications/misc/blender/default.nix

@@ -88,6 +88,8 @@
 }:
 
 let
+  stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
+
   embreeSupport =
     (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;
   openImageDenoiseSupport =
@@ -110,7 +112,7 @@ let
   };
 in
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv'.mkDerivation (finalAttrs: {
   pname = "blender";
   version = "4.3.2";
 

pkgs/applications/version-management/subversion/default.nix

@@ -94,6 +94,12 @@ let
 
         patches = [ ./apr-1.patch ] ++ extraPatches;
 
+        # remove vendored swig-3 files as these will shadow the swig provided
+        # ones and result in compile errors
+        postPatch = ''
+          rm subversion/bindings/swig/proxy/{perlrun.swg,pyrun.swg,python.swg,rubydef.swg,rubyhead.swg,rubytracking.swg,runtime.swg,swigrun.swg}
+        '';
+
         # We are hitting the following issue even with APR 1.6.x
         # -> https://issues.apache.org/jira/browse/SVN-4813
         # "-P" CPPFLAG is needed to build Python bindings and subversionClient

pkgs/by-name/an/anydesk/package.nix

@@ -10,8 +10,10 @@
   cairo,
   gdk-pixbuf,
   glib,
-  gnome2,
-  gtk2,
+  gtk3,
+  dbus,
+  harfbuzz,
+  libz,
   libGLU,
   libGL,
   pango,
@@ -48,10 +50,12 @@ stdenv.mkDerivation (finalAttrs: {
       cairo
       gdk-pixbuf
       glib
-      gtk2
+      gtk3
+      dbus
+      harfbuzz
+      libz
       stdenv.cc.cc
       pango
-      gnome2.gtkglext
       libGLU
       libGL
       minizip
@@ -112,18 +116,15 @@ stdenv.mkDerivation (finalAttrs: {
       --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" \
       $out/bin/anydesk
 
-    # pangox is not actually necessary (it was only added as a part of gtkglext)
-    patchelf \
-      --remove-needed libpangox-1.0.so.0 \
-      $out/bin/anydesk
-
     wrapProgram $out/bin/anydesk \
       --prefix PATH : ${
         lib.makeBinPath [
           lsb-release
           pciutils
         ]
-      }
+      } \
+      --prefix GDK_BACKEND : x11 \
+      --set GTK_THEME Adwaita
   '';
 
   passthru = {

pkgs/by-name/ch/chezmoi/package.nix

@@ -8,16 +8,16 @@
 let
   argset = {
     pname = "chezmoi";
-    version = "2.55.0";
+    version = "2.56.0";
 
     src = fetchFromGitHub {
       owner = "twpayne";
       repo = "chezmoi";
       rev = "v${argset.version}";
-      hash = "sha256-S9g0v/p3Hv6yMKz3OPtaZrtkyvIXbtFW4GlGxeGqx+M=";
+      hash = "sha256-PjbfGWERJmV/vHF9BitsA8Cn9oTcCwJOnUgvTV6v7mg=";
     };
 
-    vendorHash = "sha256-hmNb712gnQsJSjfhVKlNTkFx/Nmx0rkJMFRdcwJj3ZA=";
+    vendorHash = "sha256-ACGXJqpELysLRFoWHtCMrAFjdmuYoP+ZpCQZYOd/GoE=";
 
     nativeBuildInputs = [
       installShellFiles

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

@@ -19,12 +19,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "circt";
-  version = "1.99.1";
+  version = "1.99.2";
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "circt";
     rev = "firtool-${version}";
-    hash = "sha256-pnC8BLf2encv7UR10q6rTTpAZ6T0fETwumwTSu+Q8Ro=";
+    hash = "sha256-zX+mzbfucrXdFN4+j+nAptn3HVLPKVUd55cQRHrpIJg=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/ea/easytier/package.nix

@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "easytier";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "EasyTier";
     repo = "EasyTier";
     tag = "v${version}";
-    hash = "sha256-kPKCsKsTNT0vuESquILQJxBltP5MJ6/wKrPGx2g1Z78=";
+    hash = "sha256-qWICiY2g/wXT0Bt7lrCg7GgL1futOhelViB59UCLPro=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-/avdvHl7rfATGxHS5F1drK/J4pT+srX0+qRzA3cniAk=";
+  cargoHash = "sha256-SpGW/RAbQUFdxqEKRPrTp5MXng7BLiSnofoJG8NsjsU=";
 
   nativeBuildInputs = [ protobuf ];
 

pkgs/by-name/ef/efitools/package.nix

@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's#/usr/include/efi#${gnu-efi}/include/efi/#g' Make.rules
     sed -i -e 's#/usr/lib64/gnuefi#${gnu-efi}/lib/#g' Make.rules
     sed -i -e 's#$(DESTDIR)/usr#$(out)#g' Make.rules
+    sed -i '$asign-efi-sig-list.o flash-var.o: CFLAGS += -D_GNU_SOURCE' Makefile
     substituteInPlace lib/console.c --replace "EFI_WARN_UNKOWN_GLYPH" "EFI_WARN_UNKNOWN_GLYPH"
     patchShebangs .
   '';

pkgs/by-name/fo/forgejo-cli/package.nix

@@ -7,8 +7,6 @@
   oniguruma,
   openssl,
   zlib,
-  stdenv,
-  darwin,
 }:
 let
   version = "0.2.0";
@@ -29,23 +27,16 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      libgit2
-      oniguruma
-      openssl
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        Security
-        SystemConfiguration
-      ]
-    );
+  buildInputs = [
+    libgit2
+    oniguruma
+    openssl
+    zlib
+  ];
 
   env = {
     RUSTONIG_SYSTEM_LIBONIG = true;
+    BUILD_TYPE = "nixpkgs";
   };
 
   meta = {

pkgs/by-name/gd/gdu/package.nix

@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "gdu";
-  version = "5.29.0";
+  version = "5.30.1";
 
   src = fetchFromGitHub {
     owner = "dundee";
     repo = "gdu";
     rev = "refs/tags/v${version}";
-    hash = "sha256-w48I7HU/pA53Pq6ZVwtby+YvFddVUjj8orL40Gifqoo=";
+    hash = "sha256-3SymmE3J+lphyRKTQ+sLsnXaBvLyjJRlwpy79U4+t5o=";
   };
 
   vendorHash = "sha256-aKhHC3sPRyi/l9BxeUgx+3TdYulb0cI9WxuPvbLoswg=";

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

@@ -7,7 +7,7 @@
 
 let
   pname = "lefthook";
-  version = "1.9.2";
+  version = "1.10.1";
 in
 buildGoModule {
   inherit pname version;
@@ -16,10 +16,10 @@ buildGoModule {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${version}";
-    hash = "sha256-Q1MGE6GQRz+X2LAd4+CN16peI7dR27vbbrBW3uAIIu8=";
+    hash = "sha256-M+JbbrHmN+ayLKXostvsVdSueXG7CHJXPRyOjWoabpI=";
   };
 
-  vendorHash = "sha256-zzIdqEmKlkauJSAtow/+NWK+Cxy3WQdgr/IGkiArbis=";
+  vendorHash = "sha256-phXZUKmadtWmevSXGOxu3NRIdAYCALiD3yepvMTLmT4=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/lg/lgogdownloader/package.nix

@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lgogdownloader";
-  version = "3.15";
+  version = "3.16";
 
   src = fetchFromGitHub {
     owner = "Sude-";
     repo = "lgogdownloader";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-h2N5pRwwZZ3jAvRrT4Ebk4N5WO9tQjDrp8KRqriwUi4=";
+    hash = "sha256-coPUPercfpB8LilBn5Uww9rEM+X9QAgzDECtQ1Ui/hg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/lo/looking-glass-client/nanosvg-unvendor.diff

@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3755adc..55e1eb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,7 @@ include(OptimizeForNative) # option(OPTIMIZE_FOR_NATIVE)
+ include(UninstallTarget)
+
+ find_package(PkgConfig)
++find_package(NanoSVG REQUIRED)
+ pkg_check_modules(FONTCONFIG REQUIRED IMPORTED_TARGET fontconfig)
+
+ option(ENABLE_OPENGL "Enable the OpenGL renderer"       ON)
+@@ -106,7 +107,6 @@ include_directories(
+   ${PROJECT_SOURCE_DIR}/include
+   ${CMAKE_BINARY_DIR}
+   ${CMAKE_BINARY_DIR}/include
+-  ${PROJECT_TOP}/repos/nanosvg/src
+ )
+
+ link_libraries(
+@@ -161,6 +161,7 @@ target_compile_definitions(looking-glass-client PRIVATE CIMGUI_DEFINE_ENUMS_AND_
+ target_link_libraries(looking-glass-client
+   ${EXE_FLAGS}
+   PkgConfig::FONTCONFIG
++  NanoSVG::nanosvg
+   lg_resources
+   lg_common
+   displayservers

pkgs/by-name/lo/looking-glass-client/package.nix

@@ -14,6 +14,7 @@
   libffi,
   expat,
   libGL,
+  nanosvg,
 
   libX11,
   libxkbcommon,
@@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU=";
       stripLen = 1;
     })
+    ./nanosvg-unvendor.diff
   ];
 
   nativeBuildInputs = [
@@ -88,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
       nettle
       fontconfig
       libffi
+      nanosvg
     ]
     ++ lib.optionals xorgSupport [
       libxkbcommon

pkgs/by-name/ow/owmods-cli/package.nix

@@ -17,16 +17,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "owmods-cli";
-  version = "0.14.3";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "ow-mods";
     repo = "ow-mod-man";
     rev = "cli_v${version}";
-    hash = "sha256-ONvmTBF9y3NMQx1KgNhJt+0nV57xc9cLalpfDqrTSq0=";
+    hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw=";
   };
 
-  cargoHash = "sha256-I4OX27LHpT5YYW6yEhX+sCuA8m0KZd/qud4xdEUzkyA=";
+  cargoHash = "sha256-qiimnkUDiFoz/68GYi0QTuYYBjowC01c3GSxUIMjNT4=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/pk/pkgsite/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "pkgsite";
-  version = "0-unstable-2024-12-16";
+  version = "0-unstable-2024-12-26";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "06c6edf28e6c1a9f5567f7141512681ba5b75f60";
-    hash = "sha256-zsb4NxTxyH354fHtVo8xtFxzOw7XeEnxupfQlh4fAHo=";
+    rev = "8bad909da0cbaf239510644c5a91d1be27376d9f";
+    hash = "sha256-EsShGqT2Pk8VdxNRplliPb5+VoD05/sQzGNTsk0VZEI=";
   };
 
   vendorHash = "sha256-Ijcj1Nq4WjXcUqmoDkpO9I4rl/4/TMXFMQVAlEK11R8=";

pkgs/by-name/sl/slackdump/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "slackdump";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hdSsvV1mQet61pWeo5icDhFxAVNP5QU1fdb1YgyXVWU=";
+    hash = "sha256-szo5n1sVv9PZUW77k/1qLuU0URl0FNB4cO5vqokoZ2c=";
   };
 
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@@ -30,7 +30,7 @@ buildGoModule rec {
       "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
     ];
 
-  vendorHash = "sha256-LjZP00YL0Coc7yY0Bm7AaYoAP37vQVJpVYPxuEnVEp4=";
+  vendorHash = "sha256-aDLeYi4nsMKxtE59au6I3mSEY0/6Vo0ujWFbLca+0wQ=";
 
   meta = {
     homepage = "https://github.com/rusq/slackdump";

pkgs/by-name/sq/sqlitestudio/package.nix

@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "sqlitestudio";
-  version = "3.4.12";
+  version = "3.4.13";
 
   src = fetchFromGitHub {
     owner = "pawelsalawa";
     repo = "sqlitestudio";
     rev = version;
-    hash = "sha256-KPHiJTAxRQ3ZNnkKpfj877vTHEPRKNwy7wHfseftukQ=";
+    hash = "sha256-k7ZedSw4Y1WIUH5IflSrEv4h7zsx40tB8A4/qr9OW9E=";
   };
 
   nativeBuildInputs =

pkgs/by-name/ux/uxn/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uxn";
-  version = "1.0-unstable-2024-11-30";
+  version = "1.0-unstable-2024-12-25";
 
   src = fetchFromSourcehut {
     owner = "~rabbits";
     repo = "uxn";
-    rev = "ac3f9ccb20dcbd63180d121d0df43efa01a91a8f";
-    hash = "sha256-YHRdELTVf6BNa7HFu1buAG9HKRdpx++XjU60P2huY/Q=";
+    rev = "c93972cae22be2300d1cade49142546cf162da50";
+    hash = "sha256-SXzuNfiCQaQxC2AOwm2+SYMb4Z3vQE+g1yolRoPaCQc=";
   };
 
   outputs = [

pkgs/development/python-modules/async-cache/default.nix

@@ -2,11 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "async-cache";
   version = "1.1.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iamsinghrajat";
@@ -15,10 +18,16 @@ buildPythonPackage rec {
     hash = "sha256-AVSdtWPs1c8AE5PNOq+BdXzBXkI0aeFVzxxPl/ATyU0=";
   };
 
-  meta = with lib; {
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "cache" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
     description = "Caching solution for asyncio";
     homepage = "https://github.com/iamsinghrajat/async-cache";
-    license = licenses.mit;
-    maintainers = [ maintainers.lukegb ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.lukegb ];
   };
 }

pkgs/development/python-modules/azure-appconfiguration/default.nix

@@ -11,7 +11,7 @@
 buildPythonPackage rec {
   pname = "azure-appconfiguration";
   version = "1.7.1";
-  pyporject = true;
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 

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

@@ -0,0 +1,71 @@
+{
+  lib,
+  aiohttp,
+  aioresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  habitipy,
+  hatch-regex-commit,
+  hatchling,
+  mashumaro,
+  orjson,
+  pillow,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  syrupy,
+}:
+
+buildPythonPackage rec {
+  pname = "habiticalib";
+  version = "0.3.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.12";
+
+  src = fetchFromGitHub {
+    owner = "tr4nt0r";
+    repo = "habiticalib";
+    tag = "v${version}";
+    hash = "sha256-gv0ZrjJPP2ZgBSt221Hjloksu4QE4Iqm1z36YN5p2GI=";
+  };
+
+  build-system = [
+    hatch-regex-commit
+    hatchling
+  ];
+
+  dependencies = [
+    aiohttp
+    habitipy
+    mashumaro
+    orjson
+    pillow
+  ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+    syrupy
+  ];
+
+  pytestFlagsArray = [ "--snapshot-update" ];
+
+  pythonImportsCheck = [ "habiticalib" ];
+
+  disabledTests = [
+    # AssertionError
+    "test_generate_avatar"
+  ];
+
+  meta = {
+    description = "Library for the Habitica API";
+    homepage = "https://github.com/tr4nt0r/habiticalib";
+    changelog = "https://github.com/tr4nt0r/habiticalib/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/orbax-checkpoint/default.nix

@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.10.3";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     tag = "v${version}";
-    hash = "sha256-BTg4kUz5jfoK2uR/deqqJb8PYoj+FfkuoMZAeSjKKnA=";
+    hash = "sha256-pVRXWJfiiqV2ZFM0CgXdwD6/lnRa1HFFPrfS5975mVA=";
   };
 
   sourceRoot = "${src.name}/checkpoint";

pkgs/top-level/python-packages.nix

@@ -5740,6 +5740,8 @@ self: super: with self; {
 
   habitipy = callPackage ../development/python-modules/habitipy { };
 
+  habiticalib = callPackage ../development/python-modules/habiticalib { };
+
   hachoir = callPackage ../development/python-modules/hachoir { };
 
   hacking = callPackage ../development/python-modules/hacking { };