Merge master into staging-next

nixos/modules/services/monitoring/librenms.nix

@@ -603,10 +603,14 @@ in
         ''
       )
       + ''
-        # clear cache after update
+        # clear cache after update and regenerate optimizations
         OLD_VERSION=$(cat ${cfg.dataDir}/version)
         if [[ $OLD_VERSION != "${package.version}" ]]; then
           rm -r ${cfg.dataDir}/cache/*
+          ${artisanWrapper}/bin/librenms-artisan view:clear
+          ${artisanWrapper}/bin/librenms-artisan optimize:clear
+          ${artisanWrapper}/bin/librenms-artisan view:cache
+          ${artisanWrapper}/bin/librenms-artisan optimize
           echo "${package.version}" > ${cfg.dataDir}/version
         fi
 

pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix

@@ -5,14 +5,15 @@
   stdenv,
   vimUtils,
   nix-update-script,
+  git,
 }:
 let
-  version = "0.8.1";
+  version = "0.8.2";
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
     tag = "v${version}";
-    hash = "sha256-hlz1t9W9CEdUw6Fgs+sDLbzX+hdkPyqbOhXKPd8NBDY=";
+    hash = "sha256-b+7be0ShxFhkUfQo0QTnYaaEE62HQKF5g+xCuTrPRXE=";
   };
   libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
   blink-fuzzy-lib = rustPlatform.buildRustPackage {
@@ -22,6 +23,8 @@ let
     useFetchCargoVendor = true;
     cargoHash = "sha256-t84hokb2loZ6FPPt4eN8HzgNQJrQUdiG5//ZbmlasWY=";
 
+    nativeBuildInputs = [ git ];
+
     env = {
       # TODO: remove this if plugin stops using nightly rust
       RUSTC_BOOTSTRAP = true;
@@ -29,7 +32,7 @@ let
   };
 in
 vimUtils.buildVimPlugin {
-  pname = "blink-cmp";
+  pname = "blink.cmp";
   inherit version src;
   preInstall = ''
     mkdir -p target/release

pkgs/applications/editors/vscode/extensions/default.nix

@@ -5059,8 +5059,8 @@ let
         mktplcRef = {
           name = "uiua-vscode";
           publisher = "uiua-lang";
-          version = "0.0.56";
-          hash = "sha256-4uze2hmTV8sNDSdlvwLf1Z/4dGn4pda0mT0FCg/xWqM=";
+          version = "0.0.61";
+          hash = "sha256-cKiIva4nzROp+bbwkMxBvguLMXVe/9uGcdhVhLxmae0=";
         };
         meta = {
           description = "VSCode language extension for Uiua";

pkgs/applications/virtualization/qemu/default.nix

@@ -4,7 +4,7 @@
 , sigtool
 , makeWrapper, removeReferencesTo
 , attr, libcap, libcap_ng, socat, libslirp
-, CoreServices, Cocoa, Hypervisor, Kernel, rez, setfile, vmnet
+, apple-sdk_13, rez, setfile
 , guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal
 , numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, numactl
 , seccompSupport ? stdenv.hostPlatform.isLinux && !minimal, libseccomp
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ]
     ++ lib.optionals (!userOnly) [ curl ]
     ++ lib.optionals ncursesSupport [ ncurses ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel vmnet ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]
     ++ lib.optionals seccompSupport [ libseccomp ]
     ++ lib.optionals numaSupport [ numactl ]
     ++ lib.optionals alsaSupport [ alsa-lib ]

pkgs/by-name/az/azure-storage-azcopy/package.nix

@@ -30,9 +30,6 @@ buildGoModule rec {
     homepage = "https://github.com/Azure/azure-storage-azcopy";
     changelog = "https://github.com/Azure/azure-storage-azcopy/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [
-      colemickens
-      kashw2
-    ];
+    maintainers = with maintainers; [ kashw2 ];
   };
 }

pkgs/by-name/bi/bicep/updater.sh

@@ -4,7 +4,7 @@
 set -eo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-deps_file="$(realpath "./deps.nix")"
+deps_file="$(realpath "./deps.json")"
 new_version="$(curl -s "https://api.github.com/repos/azure/bicep/releases?per_page=1" | jq -r '.[0].name')"
 old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
 

pkgs/by-name/co/cordless/package.nix

@@ -24,6 +24,6 @@ buildGoModule rec {
     description = "Discord terminal client";
     mainProgram = "cordless";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ colemickens ];
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/by-name/da/darktable/package.nix

@@ -2,121 +2,130 @@
   lib,
   stdenv,
   fetchurl,
-  libsoup_2_4,
-  graphicsmagick,
-  json-glib,
-  wrapGAppsHook3,
-  cairo,
+
+  # nativeBuildInputs
   cmake,
-  ninja,
-  curl,
-  perl,
   desktop-file-utils,
+  intltool,
+  llvmPackages,
+  ninja,
+  perl,
+  pkg-config,
+  wrapGAppsHook3,
+
+  # buildInputs
+  SDL2,
+  adwaita-icon-theme,
+  cairo,
+  curl,
   exiv2,
   glib,
   glib-networking,
-  ilmbase,
+  gmic,
+  graphicsmagick,
   gtk3,
-  intltool,
+  icu,
+  ilmbase,
+  isocodes,
+  jasper,
+  json-glib,
   lcms2,
   lensfun,
-  libX11,
+  libaom,
+  libavif,
   libexif,
   libgphoto2,
+  libheif,
   libjpeg,
+  libjxl,
   libpng,
   librsvg,
+  libsecret,
+  libsoup_2_4,
   libtiff,
-  libjxl,
-  openexr_3,
-  osm-gps-map,
-  pkg-config,
-  sqlite,
+  libwebp,
   libxslt,
+  lua,
+  openexr_3,
   openjpeg,
+  osm-gps-map,
+  pcre,
+  portmidi,
   pugixml,
+  sqlite,
+  # Linux only
   colord,
   colord-gtk,
-  libwebp,
-  libsecret,
-  adwaita-icon-theme,
-  SDL2,
+  libX11,
   ocl-icd,
-  pcre,
+  # Darwin only
   gtk-mac-integration,
-  isocodes,
-  llvmPackages,
-  gmic,
-  libavif,
-  icu,
-  jasper,
-  libheif,
-  libaom,
-  portmidi,
-  lua,
+
+  versionCheckHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.8.1";
+  version = "5.0.0";
   pname = "darktable";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    hash = "sha256-kBsOLK7Tb7hhn99MYO37jTETS5R9MFS1xm/VXDivWZE=";
+    hash = "sha256-6qE25uYku1MScoLiaq+gRBq8wYm1U3FGXh9aikk/o6E=";
   };
 
   nativeBuildInputs = [
     cmake
-    ninja
-    llvmPackages.llvm
-    pkg-config
-    intltool
-    perl
     desktop-file-utils
+    intltool
+    llvmPackages.llvm
+    ninja
+    perl
+    pkg-config
     wrapGAppsHook3
   ];
 
   buildInputs =
     [
+      SDL2
+      adwaita-icon-theme
       cairo
       curl
       exiv2
       glib
       glib-networking
+      gmic
+      graphicsmagick
       gtk3
+      icu
       ilmbase
+      isocodes
+      jasper
+      json-glib
       lcms2
       lensfun
+      libaom
+      libavif
       libexif
       libgphoto2
+      libheif
       libjpeg
+      libjxl
       libpng
       librsvg
-      libtiff
-      libjxl
-      openexr_3
-      sqlite
-      libxslt
-      libsoup_2_4
-      graphicsmagick
-      json-glib
-      openjpeg
-      pugixml
-      libwebp
       libsecret
-      SDL2
-      adwaita-icon-theme
+      libsoup_2_4
+      libtiff
+      libwebp
+      libxslt
+      lua
+      openexr_3
+      openjpeg
       osm-gps-map
       pcre
-      isocodes
-      gmic
-      libavif
-      icu
-      jasper
-      libheif
-      libaom
       portmidi
-      lua
+      pugixml
+      sqlite
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       colord
@@ -156,12 +165,23 @@ stdenv.mkDerivation rec {
       )
     '';
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script {
+    rev-prefix = "release-";
+  };
+
+  meta = {
     description = "Virtual lighttable and darkroom for photographers";
     homepage = "https://www.darktable.org";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/darktable-org/darktable/releases/tag/release-${version}";
+    license = lib.licenses.gpl3Plus;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [
       flosse
       mrVanDalo
       paperdigits

pkgs/by-name/de/devenv/package.nix

@@ -1,16 +1,16 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
-  makeWrapper,
+  makeBinaryWrapper,
+  installShellFiles,
   rustPlatform,
   testers,
   cachix,
-  darwin,
   sqlx-cli,
   nixVersions,
   openssl,
   pkg-config,
+  glibcLocalesUtf8,
   devenv, # required to run version test
 }:
 
@@ -55,20 +55,41 @@ rustPlatform.buildRustPackage {
   '';
 
   nativeBuildInputs = [
-    makeWrapper
+    installShellFiles
+    makeBinaryWrapper
     pkg-config
     sqlx-cli
   ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.SystemConfiguration
-    ];
+  buildInputs = [ openssl ];
 
-  postInstall = ''
-    wrapProgram $out/bin/devenv --set DEVENV_NIX ${devenv_nix} --prefix PATH ":" "$out/bin:${cachix}/bin"
-  '';
+  postInstall =
+    let
+      setDefaultLocaleArchive = lib.optionalString (glibcLocalesUtf8 != null) ''
+        --set-default LOCALE_ARCHIVE ${glibcLocalesUtf8}/lib/locale/locale-archive
+      '';
+    in
+    ''
+      wrapProgram $out/bin/devenv \
+        --prefix PATH ":" "$out/bin:${cachix}/bin" \
+        --set DEVENV_NIX ${devenv_nix} \
+        ${setDefaultLocaleArchive}
+
+      # Generate manpages
+      cargo xtask generate-manpages --out-dir man
+      installManPage man/*
+
+      # Generate shell completions
+      compdir=./completions
+      for shell in bash fish zsh; do
+        cargo xtask generate-shell-completion $shell --out-dir $compdir
+      done
+
+      installShellCompletion --cmd devenv \
+        --bash $compdir/devenv.bash \
+        --fish $compdir/devenv.fish \
+        --zsh $compdir/_devenv
+    '';
 
   passthru.tests = {
     version = testers.testVersion {

pkgs/by-name/dx/dxvk_2/package.nix

@@ -37,13 +37,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dxvk";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "doitsujin";
     repo = "dxvk";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wmn3ErYl3hhInrDQeY3OZK76yzwW2OJc1f+unMBzJQE=";
+    hash = "sha256-be1TDfUivl+tjcwT/VYWMV2lP7uxFfCXVPSApKgoC78=";
     fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
   };
 

pkgs/by-name/go/gopls/package.nix

@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "gopls";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
     rev = "gopls/v${version}";
-    hash = "sha256-SfW53MF7xd2ETaTjYUK8qI/vUVISIh5cXz2jRZxhhfk=";
+    hash = "sha256-NLUIFNooOOA4LEL5nZNdP9TvDkQUqLjKi44kZtOxeuI=";
   };
 
   modRoot = "gopls";
-  vendorHash = "sha256-mQFwjkXkSs3nJIqlRKTCg6PvtmVq891Netd9WrB0wfA=";
+  vendorHash = "sha256-wH3YRiok3YWNzw9ejXMMitq58SxrNWXiKYKz2Hf0ZlM=";
 
   # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
   ldflags = [ "-X main.version=v${version}" ];

pkgs/by-name/hy/hyprland-qtutils/package.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  gcc14Stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  hyprutils,
+  pciutils,
+  qt6,
+}:
+let
+  inherit (lib.strings) makeBinPath;
+in
+gcc14Stdenv.mkDerivation (finalAttrs: {
+  pname = "hyprland-qtutils";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "hyprwm";
+    repo = "hyprland-qtutils";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Zp2cQOo1D7WH7ml5nV7mLyto0l19gTaWnbDb6zty1Qs=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    hyprutils
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtwayland
+  ];
+
+  preFixup = ''
+    qtWrapperArgs+=(--prefix PATH : "${makeBinPath [ pciutils ]}")
+  '';
+
+  meta = {
+    description = "Hyprland QT/qml utility apps";
+    homepage = "https://github.com/hyprwm/hyprland-qtutils";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.fufexan ];
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/by-name/hy/hyprland/info.json

@@ -1,7 +1,7 @@
 {
-  "branch": "v0.46.1-b",
-  "commit_hash": "254fc2bc6000075f660b4b8ed818a6af544d1d64",
-  "commit_message": "version: bump to 0.46.1",
-  "date": "2024-12-17",
-  "tag": "v0.46.1"
+  "branch": "v0.46.2-b",
+  "commit_hash": "0bd541f2fd902dbfa04c3ea2ccf679395e316887",
+  "commit_message": "version: bump to 0.46.2",
+  "date": "2024-12-19",
+  "tag": "v0.46.2"
 }

pkgs/by-name/hy/hyprland/package.nix

@@ -15,6 +15,7 @@
   git,
   hyprcursor,
   hyprgraphics,
+  hyprland-qtutils,
   hyprlang,
   hyprutils,
   hyprwayland-scanner,
@@ -84,14 +85,14 @@ assert assertMsg (!hidpiXWayland)
 
 customStdenv.mkDerivation (finalAttrs: {
   pname = "hyprland" + optionalString debug "-debug";
-  version = "0.46.1";
+  version = "0.46.2";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprland";
     fetchSubmodules = true;
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-0SVRQJeKsdwaTO7pMM0MwTXyVwKNQ4m1f2mvcPnZttM=";
+    hash = "sha256-dj9dpVwpyTmUyVu4jtaIU39bHgVkoZjv6cgYfWyHc9E=";
   };
 
   postPatch = ''
@@ -197,6 +198,7 @@ customStdenv.mkDerivation (finalAttrs: {
         --suffix PATH : ${
           makeBinPath [
             binutils
+            hyprland-qtutils
             pciutils
             pkgconf
           ]

pkgs/by-name/ku/kube-router/package.nix

@@ -31,7 +31,7 @@ buildGoModule rec {
     description = "All-in-one router, firewall and service proxy for Kubernetes";
     mainProgram = "kube-router";
     license = licenses.asl20;
-    maintainers = with maintainers; [ colemickens johanot ];
+    maintainers = with maintainers; [ johanot ];
     platforms = platforms.linux;
   };
 }

pkgs/by-name/li/libjpeg_turbo/package.nix

@@ -127,7 +127,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     maintainers = with maintainers; [
       vcunat
-      colemickens
       kamadorueda
     ];
     platforms = platforms.all;

pkgs/by-name/mx/mxt-app/package.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Command line utility for Atmel maXTouch devices";
     homepage = "https://github.com/atmel-maxtouch/mxt-app";
     license = licenses.bsd2;
-    maintainers = [ maintainers.colemickens ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "mxt-app";
   };

pkgs/by-name/na/natscli/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "natscli";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "natscli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hLjiY4+01t1ZlP+N8qBG0YiDiw6VdTdeNkrwHwthrjk=";
+    hash = "sha256-kdoBHTJq/Sj27BOD4NFDVpMlywG5H7vGRS6uUbPscOY=";
   };
 
-  vendorHash = "sha256-T6VcyklwfRS012ZRzqxkahn9YYrQGky/znTqLIkAoK0=";
+  vendorHash = "sha256-RM0PskgKT+n2EQkoIwIbCAwh03TLdcwj7g8AjXBeZPY=";
 
   ldflags = [
     "-X main.version=${version}"

pkgs/by-name/ne/newsboat/package.nix

@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "newsboat";
-  version = "2.37";
+  version = "2.38";
 
   src = fetchFromGitHub {
     owner = "newsboat";
     repo = "newsboat";
     rev = "r${version}";
-    hash = "sha256-RNvzGGvicujqkRWVHBwnlROuhpH5XqPNWmx6q7n4g+U=";
+    hash = "sha256-RekP88qZ4VaH5JG190BbVrBHnoUr+UVWvFmdPeyY8Yw=";
   };
 
-  cargoHash = "sha256-EBA+ucegXr3YtU2K7bhwli8O+knnugMMUuSksDuaY9E=";
+  cargoHash = "sha256-mripE0oeMLn9svhKH/dcH7VKYHGyZKfrDcoBdL+QcDQ=";
 
   # TODO: Check if that's still needed
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

pkgs/by-name/nu/nuclei-templates/package.nix

@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.1.0";
+  version = "10.1.1";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QQPsj6s1CuEBfUI5L3gV8v2d4CxgoCOlsXe8FIkSJjU=";
+    hash = "sha256-WqGeNT3OLs5oY/b81fJh3R9b84vXYzn2u5hY9yI2kGM=";
   };
 
   installPhase = ''

pkgs/by-name/ph/phpdocumentor/package.nix

@@ -6,16 +6,16 @@
 
 php.buildComposerProject (finalAttrs: {
   pname = "phpdocumentor";
-  version = "3.5.3";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "phpDocumentor";
     repo = "phpDocumentor";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zpAKygpxyKYfefa5ag76saTSQNLon/v3rYkl0Nj2+FM=";
+    hash = "sha256-8TQlqXhZ3rHmOAuxsBYa+7JD+SxMQY0NZgCyElStFag=";
   };
 
-  vendorHash = "sha256-VNlAzWueF7ZXBpr9RrJghMPrAUof7f1DCh1osFIwFfs=";
+  vendorHash = "sha256-5EArmUc3a4+k0YncsPEfeJRR2uDgNKdIDONwQ8cAeVE=";
 
   # Needed because of the unbound version constraint on phpdocumentor/json-path
   composerStrictValidation = false;

pkgs/by-name/re/restic-browser/package.nix

@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  cargo-tauri_1,
+  nodejs,
+  npmHooks,
+  pkg-config,
+  wrapGAppsHook3,
+  webkitgtk_4_0,
+  dbus,
+  darwin,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "restic-browser";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "emuell";
+    repo = "restic-browser";
+    rev = "v${version}";
+    hash = "sha256-KE9pa4P6WyzNo3CxPKgREb6EEkUEQSuhihn938XN45A=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "tauri-plugin-window-state-0.1.1" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
+    };
+  };
+
+  npmDeps = fetchNpmDeps {
+    name = "${pname}-npm-deps-${version}";
+    inherit src;
+    hash = "sha256-OhJQ+rhtsEkwrPu+V6ITkXSJT6RJ8pYFATo0VfJaijc=";
+  };
+
+  nativeBuildInputs =
+    [
+      cargo-tauri_1.hook
+
+      nodejs
+      npmHooks.npmConfigHook
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      pkg-config
+      wrapGAppsHook3
+    ];
+
+  buildInputs =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      webkitgtk_4_0
+      dbus
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        WebKit
+      ]
+    );
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = cargoRoot;
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/bin
+    ln -s $out/Applications/Restic-Browser.app/Contents/MacOS/Restic-Browser $out/bin/${meta.mainProgram}
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A GUI to browse and restore restic backup repositories";
+    homepage = "https://github.com/emuell/restic-browser";
+    changelog = "https://github.com/emuell/restic-browser/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ js6pak ];
+    mainProgram = "restic-browser";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+}

pkgs/by-name/si/siyuan/package.nix

@@ -35,20 +35,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.1.13";
+  version = "3.1.16";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+jlJTsGvElumUV1NdYed0XthmY1MFNqWMgDmTQObIA4=";
+    hash = "sha256-8+Gz9AuxmK2hOApRZ2b1+rROOG94EBJR3pyp8YwtgiA=";
   };
 
   kernel = buildGo123Module {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-uK++FoWCoeb05TyUhh0PK+wkTmzTko0K7oLodoGAWt8=";
+    vendorHash = "sha256-B2pGXs0IN5WhNHoFgTufd46q60RNvWzNdwoCxpayYC8=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-uv3gahbSW81gHMx0sQoUbW4Oyzvo6iD5u1izX8vXkwA=";
+    hash = "sha256-LlQdfRGsBn3IZWKSUqH5tAljXnWanuFXO2x+Wi3on7E=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";
@@ -141,7 +141,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     inherit (finalAttrs.kernel) goModules; # this tricks nix-update into also updating the kernel goModules FOD
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "^v(\\d+\\.\\d+\\.\\d+)$"
+      ];
+    };
   };
 
   meta = {
@@ -149,7 +154,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://b3log.org/siyuan/";
     license = lib.licenses.agpl3Plus;
     mainProgram = "siyuan";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      ltrump
+    ];
     platforms = lib.attrNames platformIds;
   };
 })

pkgs/by-name/sn/sn-pro/package.nix

@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec {
     description = "SN Pro Font Family";
     homepage = "https://github.com/supernotes/sn-pro";
     license = licenses.ofl;
-    maintainers = with maintainers; [ colemickens ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }

pkgs/by-name/ti/tigerbeetle/package.nix

@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-acQPLcWGQE4dgI94ngTvKySK50rc9t/jpM42U0dFKFY=";
-    "x86_64-linux" = "sha256-fAzu95N+6uS3VzqxdX76vC+CH61TsQrmW3/2ip4kIzo=";
-    "aarch64-linux" = "sha256-jL2jEshjf6fd79kPFnei7VG3qjYFJke8A/3DG2jxE+Y=";
+    "universal-macos" = "sha256-S5XeCgJaJxD6zaoWi2aIPl1chZPfQPvmeSLBvimMp9s=";
+    "x86_64-linux" = "sha256-BLPrhDzbEy/EjNexJ6jXKH7sIGDVzzL01Fbs60jyoCQ=";
+    "aarch64-linux" = "sha256-aG1fxb2BObP8ftcxyO2MyL7JsinyzoXtJ2Ha0FqDG6Y=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.17";
+  version = "0.16.19";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

pkgs/by-name/ui/uiua/stable.nix

@@ -1,7 +1,7 @@
 rec {
-  version = "0.13.0";
+  version = "0.14.1";
   rev = version;
-  hash = "sha256-5IqJ/lvozXzc7LRUzxpG04M3Nir+3h+GoL7dqTgC9J8=";
-  cargoHash = "sha256-0hbE2ZH7daw/VQLe51CxOIborABDF0x00kTyx9NCs9g=";
+  hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc=";
+  cargoHash = "sha256-0ZK87aX3akEPEXIsFrbOvTfhW24TZCuCcSVp+j8ylyg=";
   updateScript = ./update-stable.sh;
 }

pkgs/by-name/ui/uiua/unstable.nix

@@ -1,7 +1,7 @@
 rec {
-  version = "0.14.0-rc.3";
+  version = "0.14.1";
   rev = version;
-  hash = "sha256-znHHohWMoVttubvYx5h3b7pQcQVYhn3nZLFoHrJsits=";
-  cargoHash = "sha256-d+N5ij5zbQRZwkLtwLAM7BY82G/tNsdkUb6/7wnD51g=";
+  hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc=";
+  cargoHash = "sha256-0ZK87aX3akEPEXIsFrbOvTfhW24TZCuCcSVp+j8ylyg=";
   updateScript = ./update-unstable.sh;
 }

pkgs/by-name/vl/vlc/package.nix

@@ -12,7 +12,11 @@
   fetchpatch,
   fetchurl,
   # Please unpin FFmpeg on the next upstream release.
-  ffmpeg_6,
+  # Currently FFmpeg is pinned to 4.x because VAAPI acceleration is broken when
+  # building with newer versions:
+  # https://code.videolan.org/videolan/vlc/-/issues/26772
+  # This is intentional by upstream but VLC 4.0 will support newer FFmpeg.
+  ffmpeg_4,
   flac,
   fluidsynth,
   freefont_ttf,
@@ -139,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
       avahi
       dbus
       faad2
-      ffmpeg_6
+      ffmpeg_4
       flac
       fluidsynth
       fribidi

pkgs/development/beam-modules/elixir-ls/default.nix

@@ -11,12 +11,12 @@
 
 let
   pname = "elixir-ls";
-  version = "0.24.1";
+  version = "0.25.0";
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
     rev = "v${version}";
-    hash = "sha256-d5O7DGEKuwHbjxwJa3HNtaycQIzFTi74UxszRH7TVzQ=";
+    hash = "sha256-7Lrv62R0otFPAfUAip1H4VcnBaV4QyDZkcBZTW7yq8I=";
   };
 in
 mixRelease {
@@ -32,7 +32,7 @@ mixRelease {
   mixFodDeps = fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version elixir;
-    hash = "sha256-OxQeIdqjY/k02q+nLQnZ+/Zxy/bdjjSCRrVu0usQcsc=";
+    hash = "sha256-yR2ttnrtYcWFotBMIfOLmJzEO9NKy3SqiKJZ4mmlkdA=";
   };
 
   # elixir-ls is an umbrella app

pkgs/development/python-modules/notifications-python-client/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "notifications-python-client";
-  version = "10.0.0";
+  version = "10.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "alphagov";
     repo = "notifications-python-client";
     rev = "refs/tags/${version}";
-    hash = "sha256-qjiI+aTJLOz3XSTHKrpZrJ/wg1xP+V7ww0//xX3Kf1E=";
+    hash = "sha256-k4q6FS3wjolt4+qtDQlunBLmCCPgLgrhr8zgOMEX4QU=";
   };
 
   postPatch = ''

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

@@ -45,7 +45,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "pyHanko";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HJkCQ5YDVr17gtY4PW89ep7GwFdP21/ruBEKm7j3+Qo=";
   };
 
@@ -92,36 +92,51 @@ buildPythonPackage rec {
     requests-mock
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  disabledTestPaths = [
-    # ModuleNotFoundError: No module named 'csc_dummy'
-    "pyhanko_tests/test_csc.py"
-  ];
+  disabledTestPaths =
+    [
+      # ModuleNotFoundError: No module named 'csc_dummy'
+      "pyhanko_tests/test_csc.py"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # OSError: One or more parameters passed to a function were not valid.
+      "pyhanko_tests/cli_tests"
+    ];
 
-  disabledTests = [
-    # Most of the test require working with local certificates,
-    # contacting OSCP or performing requests
-    "test_generic_data_sign_legacy"
-    "test_generic_data_sign"
-    "test_cms_v3_sign"
-    "test_detached_cms_with_self_reported_timestamp"
-    "test_detached_cms_with_tst"
-    "test_detached_cms_with_content_tst"
-    "test_detached_cms_with_wrong_content_tst"
-    "test_detached_with_malformed_content_tst"
-    "test_noop_attribute_prov"
-    "test_detached_cades_cms_with_tst"
-    "test_read_qr_config"
-    "test_no_changes_policy"
-    "test_bogus_metadata_manipulation"
-    "test_tamper_sig_obj"
-    "test_signed_file_diff_proxied_objs"
-    "test_pades_revinfo_live"
-    "test_diff_fallback_ok"
-    "test_no_diff_summary"
-    "test_ocsp_embed"
-    "test_ts_fetch_aiohttp"
-    "test_ts_fetch_requests"
-  ];
+  disabledTests =
+    [
+      # Most of the test require working with local certificates,
+      # contacting OSCP or performing requests
+      "test_generic_data_sign_legacy"
+      "test_generic_data_sign"
+      "test_cms_v3_sign"
+      "test_detached_cms_with_self_reported_timestamp"
+      "test_detached_cms_with_tst"
+      "test_detached_cms_with_content_tst"
+      "test_detached_cms_with_wrong_content_tst"
+      "test_detached_with_malformed_content_tst"
+      "test_noop_attribute_prov"
+      "test_detached_cades_cms_with_tst"
+      "test_read_qr_config"
+      "test_no_changes_policy"
+      "test_bogus_metadata_manipulation"
+      "test_tamper_sig_obj"
+      "test_signed_file_diff_proxied_objs"
+      "test_pades_revinfo_live"
+      "test_diff_fallback_ok"
+      "test_no_diff_summary"
+      "test_ocsp_embed"
+      "test_ts_fetch_aiohttp"
+      "test_ts_fetch_requests"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # OSError: One or more parameters passed to a function were not valid.
+      "test_detached_cms_with_duplicated_attr"
+      "test_detached_cms_with_wrong_tst"
+      "test_diff_analysis_add_extensions_dict"
+      "test_diff_analysis_update_indirect_extensions_not_all_path"
+      "test_no_certificates"
+      "test_ocsp_without_nextupdate_embed"
+    ];
 
   pythonImportsCheck = [ "pyhanko" ];
 

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

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyprobables";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,10 +18,10 @@ buildPythonPackage rec {
     owner = "barrust";
     repo = "pyprobables";
     rev = "refs/tags/v${version}";
-    hash = "sha256-maikrZlBzhv35zPXmKqdJzAz6eZDmluLUvkOkaPTCDU=";
+    hash = "sha256-yJUYGfy+d+Xfk1DUDvBeWk0EcNPuW4DcUHx3G3jzEdc=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Probabilistic data structures";
     homepage = "https://github.com/barrust/pyprobables";
-    changelog = "https://github.com/barrust/pyprobables/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/barrust/pyprobables/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "slack-sdk";
-  version = "3.33.5";
+  version = "3.34.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "slackapi";
     repo = "python-slack-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-kpilxg/S9/U6lJW8FsMvcdGh+qqDH0Kr66sc+HsY2DM=";
+    hash = "sha256-aL8XOlvnAxT9cgPf8EvJT80FmlgL2Vhu7JxDRHkUoSM=";
   };
 
   postPatch = ''

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

@@ -86,11 +86,16 @@ buildPythonPackage rec {
     ''
     + lib.optionalString rocmSupport ''
       substituteInPlace tinygrad/runtime/autogen/hip.py \
-        --replace-fail "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \
-        --replace-fail "/opt/rocm/lib/libhiprtc.so" "${rocmPackages.clr}/lib/libhiprtc.so" \
+        --replace-fail "/opt/rocm/" "${rocmPackages.clr}/"
+
+      substituteInPlace tinygrad/runtime/support/compiler_hip.py \
+        --replace-fail "/opt/rocm/include" "${rocmPackages.clr}/include"
+
+      substituteInPlace tinygrad/runtime/support/compiler_hip.py \
+        --replace-fail "/opt/rocm/llvm" "${rocmPackages.llvm.llvm}"
 
       substituteInPlace tinygrad/runtime/autogen/comgr.py \
-        --replace-fail "/opt/rocm/lib/libamd_comgr.so" "${rocmPackages.rocm-comgr}/lib/libamd_comgr.so"
+        --replace-fail "/opt/rocm/" "${rocmPackages.rocm-comgr}/"
     '';
 
   build-system = [ setuptools ];

pkgs/development/python-modules/types-awscrt/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-awscrt";
-  version = "0.23.4";
+  version = "0.23.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_awscrt";
     inherit version;
-    hash = "sha256-sbm7EPM34/6PX1CIYOs1TZ/gk/AuFIWVWp4L3U4lAHQ=";
+    hash = "sha256-QFvOjCgfnnxskqIpIlzAvxDTBymmpgESMhM4m9UkuLE=";
   };
 
   build-system = [ setuptools ];

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "weheat";
-  version = "2024.11.26";
+  version = "2024.12.22";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "wefabricate";
     repo = "wh-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-KM1LcO+hmhG+9yyrL2QpeO+SKumR+SKyc+66NJMJijk=";
+    hash = "sha256-hd0mqdcj+rvrYCvxhK3ewuiDekWUgTD7JypjL/EMqv8=";
   };
 
   pythonRelaxDeps = [

pkgs/games/sgt-puzzles/default.nix

@@ -12,6 +12,7 @@
   wrapGAppsHook3,
   nixosTests,
   writeScript,
+  halibut,
   isMobile ? false,
 }:
 
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
     perl
     pkg-config
     wrapGAppsHook3
+    halibut # For help pages
   ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString isMobile "-DSTYLUS_BASED";

pkgs/os-specific/linux/vendor-reset/default.nix

@@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-Klu2uysbF5tH7SqVl815DwR7W+Vx6PyVDDLwoMZiqBI=";
   };
 
+  patches = [
+    # This is a temporary, vendored version of this upstream PR:
+    # https://github.com/gnif/vendor-reset/pull/86
+    # As soon as it is merged, we should be able to update this
+    # module and remove the patch.
+    ./fix-linux-6.12-build.patch
+  ];
+
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];

pkgs/os-specific/linux/vendor-reset/fix-linux-6.12-build.patch

@@ -0,0 +1,56 @@
+From ab1b34848097587aca1f248958358ddb1dc90917 Mon Sep 17 00:00:00 2001
+From: mfrischknecht <manuel.frischknecht@gmail.com>
+Date: Sat, 23 Nov 2024 23:43:53 +0100
+Subject: [PATCH 1/2] Import `unaligned.h` from `linux`
+
+`asm/unaligned.h` has been moved to `linux/unaligned.h` since Linux v. 6.12.
+C.f. e.g. https://github.com/torvalds/linux/commit/5f60d5f6bbc12e782fac78110b0ee62698f3b576
+---
+ src/amd/amdgpu/atom.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/amd/amdgpu/atom.c b/src/amd/amdgpu/atom.c
+index 333961f..d14c849 100644
+--- a/src/amd/amdgpu/atom.c
++++ b/src/amd/amdgpu/atom.c
+@@ -29,7 +29,7 @@
+ #include <linux/slab.h>
+ #include <linux/delay.h>
+ #include <linux/version.h>
+-#include <asm/unaligned.h>
++#include <linux/unaligned.h>
+ 
+ //#include <drm/drm_util.h>
+ //#include <drm/drm_print.h>
+
+From 54ffd6a012e7567b0288bc5fcc3678b545bd5aec Mon Sep 17 00:00:00 2001
+From: mfrischknecht <manuel.frischknecht@gmail.com>
+Date: Wed, 27 Nov 2024 07:09:37 +0100
+Subject: [PATCH 2/2] Make new include path conditional
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+…so the module builds for both kernels below 6.12 and above. Thanks, @VoodaGod!
+
+Co-authored-by: Jason Rensburger <l33tjas.0n@gmail.com>
+---
+ src/amd/amdgpu/atom.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/amd/amdgpu/atom.c b/src/amd/amdgpu/atom.c
+index d14c849..36d45ff 100644
+--- a/src/amd/amdgpu/atom.c
++++ b/src/amd/amdgpu/atom.c
+@@ -29,7 +29,11 @@
+ #include <linux/slab.h>
+ #include <linux/delay.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
++#include <asm/unaligned.h>
++#else
+ #include <linux/unaligned.h>
++#endif
+ 
+ //#include <drm/drm_util.h>
+ //#include <drm/drm_print.h>

pkgs/shells/fish/plugins/bang-bang.nix

@@ -0,0 +1,23 @@
+{
+  lib,
+  buildFishPlugin,
+  fetchFromGitHub,
+}:
+buildFishPlugin {
+  pname = "bang-bang";
+  version = "0-unstable-2023-07-23";
+
+  src = fetchFromGitHub {
+    owner = "oh-my-fish";
+    repo = "plugin-bang-bang";
+    rev = "ec991b80ba7d4dda7a962167b036efc5c2d79419";
+    hash = "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=";
+  };
+
+  meta = {
+    description = "Bash style history substitution for Oh My Fish";
+    homepage = "https://github.com/oh-my-fish/plugin-bang-bang";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ theobori ];
+  };
+}

pkgs/shells/fish/plugins/default.nix

@@ -5,6 +5,8 @@ lib.makeScope newScope (self: with self; {
 
   autopair = callPackage ./autopair.nix { };
 
+  bang-bang = callPackage ./bang-bang.nix { };
+
   bobthefish = callPackage ./bobthefish.nix { };
 
   bobthefisher = callPackage ./bobthefisher.nix { };

pkgs/top-level/all-packages.nix

@@ -11974,7 +11974,7 @@ with pkgs;
 
   rabbitmq-server = callPackage ../by-name/ra/rabbitmq-server/package.nix rec {
     erlang = erlang_27;
-    elixir = pkgs.elixir.override { inherit erlang; };
+    elixir = elixir_1_17.override { inherit erlang; };
   };
 
   qcal = callPackage ../tools/networking/qcal/default.nix { };
@@ -15183,17 +15183,8 @@ with pkgs;
   eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };
 
   qemu = callPackage ../applications/virtualization/qemu {
-    inherit (darwin.apple_sdk_12_3.frameworks) CoreServices Cocoa Hypervisor Kernel vmnet;
     inherit (darwin.stubs) rez setfile;
     inherit (darwin) sigtool;
-    stdenv =
-      if stdenv.hostPlatform.isDarwin then
-        overrideSDK stdenv {
-          darwinSdkVersion = "12.3";
-          darwinMinVersion = "12.0";
-        }
-      else
-        stdenv;
   };
 
   qemu-python-utils = python3Packages.toPythonApplication (