Merge master into staging-next

doc/release-notes/rl-2505.section.md

@@ -351,6 +351,8 @@
 
 - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details.
 
+- `tpm2-pkcs11` now has the variant `tpm2-pkcs11-fapi`, which has been patched to default to the Feature API backend. It has also been split into `tpm2-pkcs11-esapi`, which _only_ supports the older Enhanced System API backend. Note the [differences](https://github.com/tpm2-software/tpm2-pkcs11/blob/1.9.1/docs/FAPI.md), and that `tpm2-pkcs11` itself still needs `TPM2_PKCS11_BACKEND=fapi` exported in order to use the Feature API, whereas `tpm2-pkcs11-fapi` does not, and `tpm2-pkcs11-esapi` just does not support fapi entirely.
+
 - For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default.
 
 - In `dovecot` package removed hard coding path to module directory.

nixos/modules/services/web-apps/gancio.nix

@@ -57,7 +57,7 @@ in
             default = "http${
               lib.optionalString config.services.nginx.virtualHosts."${cfg.settings.hostname}".enableACME "s"
             }://${cfg.settings.hostname}";
-            defaultText = lib.literalExpression ''"https://''${cfg.settings.hostname}"'';
+            defaultText = lib.literalExpression ''"https://''${config.services.gancio.settings.hostname}"'';
             example = "https://demo.gancio.org/gancio";
             description = "The full URL under which the server is reachable.";
           };
@@ -89,9 +89,7 @@ in
               readOnly = true;
               type = types.nullOr types.str;
               default = if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null;
-              defaultText = ''
-                if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null
-              '';
+              defaultText = ''if config.services.gancio.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null'';
             };
             host = mkOption {
               description = ''
@@ -100,9 +98,7 @@ in
               readOnly = true;
               type = types.nullOr types.str;
               default = if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null;
-              defaultText = ''
-                if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null
-              '';
+              defaultText = ''if config.services.gancio.settings.db.dialect == "postgres" then "/run/postgresql" else null'';
             };
             database = mkOption {
               description = ''
@@ -111,9 +107,7 @@ in
               readOnly = true;
               type = types.nullOr types.str;
               default = if cfg.settings.db.dialect == "postgres" then cfg.user else null;
-              defaultText = ''
-                if cfg.settings.db.dialect == "postgres" then cfg.user else null
-              '';
+              defaultText = ''if config.services.gancio.settings.db.dialect == "postgres" then cfg.user else null'';
             };
           };
           log_level = mkOption {
@@ -174,10 +168,14 @@ in
     environment.systemPackages = [
       (pkgs.runCommand "gancio" { } ''
         mkdir -p $out/bin
-        echo "#!${pkgs.runtimeShell}
-          cd /var/lib/gancio/
-          exec ${lib.getExe cfg.package} ''${1:---help}
-        " > $out/bin/gancio
+        echo '#!${pkgs.runtimeShell}
+        cd /var/lib/gancio/
+        sudo=exec
+        if [[ "$USER" != ${cfg.user} ]]; then
+          sudo="exec /run/wrappers/bin/sudo -u ${cfg.user}"
+        fi
+        $sudo ${lib.getExe cfg.package} ''${1:--help}
+        ' > $out/bin/gancio
         chmod +x $out/bin/gancio
       '')
     ];

pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix

@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "RooVeterinaryInc";
     name = "roo-cline";
-    version = "3.13.0";
-    hash = "sha256-vVl8hMMpCrLP+/U6KJ3Qz/q0OYgQuEMfu8UzpScER8o=";
+    version = "3.13.2";
+    hash = "sha256-ezmBS84RonkqlguLcgGZa4663GpY6yReKKb+r6YzQms=";
   };
 
   passthru.updateScript = vscode-extensions-update-script { };

pkgs/applications/science/biology/mrtrix/default.nix

@@ -18,28 +18,63 @@
   libXext,
   less,
   withGui ? true,
+  fetchFromGitLab,
+  fetchpatch,
 }:
 
+let
+  # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19'
+  # https://github.com/NixOS/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c
+  eigen' = (
+    eigen.overrideAttrs (old: rec {
+      version = "3.4.0";
+      src = fetchFromGitLab {
+        owner = "libeigen";
+        repo = "eigen";
+        tag = version;
+        hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw=";
+      };
+      patches = (old.patches or [ ]) ++ [
+        # Fixes e.g. onnxruntime on aarch64-darwin:
+        # https://hydra.nixos.org/build/248915128/nixlog/1,
+        # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392.
+        #
+        # The patch is from
+        # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699)
+        # which is two years old,
+        # but Eigen hasn't had a release in two years either:
+        # https://gitlab.com/libeigen/eigen/-/issues/2699.
+        (fetchpatch {
+          url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch";
+          hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0=";
+        })
+      ];
+    })
+  );
+in
+
 stdenv.mkDerivation rec {
   pname = "mrtrix";
-  version = "3.0.4";
+  version = "3.0.4-unstable-2025-04-09";
 
   src = fetchFromGitHub {
     owner = "MRtrix3";
     repo = "mrtrix3";
-    tag = version;
-    hash = "sha256-87zBAoBLWQPccGS37XyQ8H0GhL01k8GQFgcLL6IwbcM=";
+    rev = "7843bfc53a75f465901804ccf3fd6797d77531dd";
+    hash = "sha256-C4Io3VkX10eWia4djrYvN12fWmwm0j1G60I8lmFH49w=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
-    eigen
     makeWrapper
+    less
+    python
   ] ++ lib.optional withGui qt5.wrapQtAppsHook;
 
   buildInputs =
     [
       ants
+      eigen'
       python
       fftw
       libtiff
@@ -58,36 +93,47 @@ stdenv.mkDerivation rec {
   nativeInstallCheckInputs = [ bc ];
 
   postPatch = ''
-    patchShebangs ./build ./configure ./run_tests ./bin/*
+    patchShebangs --build ./build ./configure ./run_tests
+    patchShebangs --host ./bin/*
 
     # patching interpreters before fixup is needed for tests:
-    patchShebangs ./bin/*
     patchShebangs testing/binaries/data/vectorstats/*py
 
     substituteInPlace ./run_tests  \
-      --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' ""
+      --replace-fail 'git submodule update --init $datadir >> $LOGFILE 2>&1' ""
 
+    # reduce build noise
+    substituteInPlace ./configure \
+      --replace-fail "[ '-Wall' ]" "[]"
+
+    # fix error output (cuts off after a few lines otherwise)
     substituteInPlace ./build  \
-      --replace '"less -RX "' '"${less}/bin/less -RX "'
+      --replace-fail 'stderr=subprocess.PIPE' 'stderr=None'
   '';
 
   configurePhase = ''
-    export EIGEN_CFLAGS="-isystem ${eigen}/include/eigen3"
+    runHook preConfigure
+    export EIGEN_CFLAGS="-isystem ${eigen'}/include/eigen3"
     unset LD  # similar to https://github.com/MRtrix3/mrtrix3/issues/1519
     ./configure ${lib.optionalString (!withGui) "-nogui"};
+    runHook postConfigure
   '';
 
   buildPhase = ''
+    runHook preBuild
     ./build
     (cd testing && ../build)
+    runHook postBuild
   '';
 
   installCheckPhase = ''
+    runHook preInstallCheck
     ./run_tests units
     ./run_tests binaries
 
     # can also `./run_tests scripts`, but this fails due to lack of FSL package
     # (and there's no convenient way to disable individual tests)
+    runHook postInstallCheck
   '';
   doInstallCheck = true;
 
@@ -99,13 +145,19 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  postInstall = ''
-    for prog in $out/bin/*; do
-      if [[ -x "$prog" ]]; then
-        wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]}
-      fi
-    done
-  '';
+  preFixup =
+    if withGui then
+      ''
+        qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ants ]})
+      ''
+    else
+      ''
+        for prog in $out/bin/*; do
+          if [[ -x "$prog" ]]; then
+            wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]}
+          fi
+        done
+      '';
 
   meta = with lib; {
     broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);

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

@@ -0,0 +1,247 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  jetbrains,
+  autoPatchelfHook,
+  fontconfig,
+  libXinerama,
+  libXrandr,
+  file,
+  gtk3,
+  glib,
+  cups,
+  lcms2,
+  alsa-lib,
+  libGL,
+  libvlc,
+  libidn,
+  pulseaudio,
+  ffmpeg,
+  libva,
+  libdvbpsi,
+  libogg,
+  chromaprint,
+  protobuf_21,
+  libgcrypt,
+  libdvdnav,
+  libsecret,
+  aribb24,
+  libavc1394,
+  libmpcdec,
+  libvorbis,
+  libebml,
+  faad2,
+  libjpeg8,
+  libkate,
+  librsvg,
+  xorg,
+  libsForQt5,
+  libupnp,
+  aalib,
+  libcaca,
+  libmatroska,
+  libopenmpt-modplug,
+  libsidplayfp,
+  shine,
+  libarchive,
+  gnupg,
+  srt,
+  libshout,
+  ffmpeg_6,
+  libmpeg2,
+  xcbutilkeysyms,
+  lirc,
+  lua5_2,
+  taglib,
+  libspatialaudio,
+  libmtp,
+  speexdsp,
+  libsamplerate,
+  sox,
+  libmad,
+  libnotify,
+  taglib_1,
+  zvbi,
+  libdc1394,
+  libcddb,
+  libbluray,
+  libdvdread,
+  libvncserver,
+  twolame,
+  samba,
+  libnfs,
+  flac,
+  writeShellScript,
+  nix-update,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "animeko";
+  version = "4.8.2";
+
+  src = fetchFromGitHub {
+    owner = "open-ani";
+    repo = "animeko";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Y6ox1IgXsnFEU6NY1i3m8Jn+vwjrQpTz6kRKrd2F8SQ=";
+    fetchSubmodules = true;
+  };
+
+  postPatch = ''
+    echo "jvm.toolchain.version=21" >> local.properties
+    sed -i "s/^version.name=.*/version.name=${finalAttrs.version}/" gradle.properties
+    sed -i "s/^package.version=.*/package.version=${finalAttrs.version}/" gradle.properties
+  '';
+
+  gradleBuildTask = "createReleaseDistributable";
+
+  gradleUpdateTask = finalAttrs.gradleBuildTask;
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+    silent = false;
+    useBwrap = false;
+  };
+
+  env.JAVA_HOME = jetbrains.jdk;
+
+  gradleFlags = [ "-Dorg.gradle.java.home=${jetbrains.jdk}" ];
+
+  nativeBuildInputs = [
+    gradle
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    fontconfig
+    libXinerama
+    libXrandr
+    file
+    shine
+    libmpeg2
+    gtk3
+    glib
+    cups
+    lcms2
+    alsa-lib
+    libidn
+    pulseaudio
+    ffmpeg
+    faad2
+    libjpeg8
+    libkate
+    librsvg
+    xorg.libXpm
+    libsForQt5.qt5.qtsvg
+    libsForQt5.qt5.qtbase
+    libsForQt5.qt5.qtx11extras
+    libupnp
+    aalib
+    libcaca
+    libva
+    libdvbpsi
+    libogg
+    chromaprint
+    protobuf_21
+    libgcrypt
+    libsecret
+    aribb24
+    twolame
+    libmpcdec
+    libvorbis
+    libebml
+    libmatroska
+    libopenmpt-modplug
+    libavc1394
+    libmtp
+    libsidplayfp
+    libarchive
+    gnupg
+    srt
+    libshout
+    ffmpeg_6
+    xcbutilkeysyms
+    lirc
+    lua5_2
+    taglib
+    libspatialaudio
+    speexdsp
+    libsamplerate
+    sox
+    libmad
+    libnotify
+    zvbi
+    libdc1394
+    libcddb
+    libbluray
+    libdvdread
+    libvncserver
+    samba
+    libnfs
+    taglib_1
+    libdvdnav
+    flac
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libmpcdec.so.6"
+    "libsidplay2.so.1"
+    "libresid-builder.so.0"
+    "libsrt-gnutls.so.1.5"
+    "liblua5.2.so.0"
+    "libspatialaudio.so.0"
+    "libdc1394.so.25"
+    "libx265.so.199"
+    "libdca.so.0"
+    "liba52-0.7.4.so"
+    "libFLAC.so.12"
+  ];
+
+  dontWrapQtApps = true;
+
+  doCheck = false;
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r app/desktop/build/compose/binaries/main-release/app/Ani $out
+    chmod +x $out/lib/runtime/lib/jcef_helper
+    substituteInPlace app/desktop/appResources/linux-x64/animeko.desktop \
+      --replace-fail "icon" "animeko"
+    install -Dm644 app/desktop/appResources/linux-x64/animeko.desktop $out/share/applications/animeko.desktop
+    install -Dm644 app/desktop/appResources/linux-x64/icon.png $out/share/pixmaps/animeko.png
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    patchelf --add-needed libGL.so.1 \
+      --add-rpath ${
+        lib.makeLibraryPath [
+          libGL
+          libvlc
+        ]
+      } $out/bin/Ani
+  '';
+
+  passthru.updateScript = writeShellScript "update-animeko" ''
+    ${lib.getExe nix-update} animeko
+    $(nix-build -A animeko.mitmCache.updateScript)
+  '';
+
+  meta = {
+    description = "One-stop platform for finding, following and watching anime";
+    homepage = "https://github.com/open-ani/animeko";
+    mainProgram = "Ani";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ emaryn ];
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode
+    ];
+    platforms = [ "x86_64-linux" ];
+  };
+})

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

@@ -1,6 +1,5 @@
 {
   lib,
-  runCommand,
   fetchFromGitHub,
   buildNpmPackage,
   pkg-config,
@@ -10,7 +9,6 @@
   makeDesktopItem,
   copyDesktopItems,
   commandLineArgs ? "",
-  nix-update-script,
 }:
 
 let
@@ -113,17 +111,6 @@ buildNpmPackage {
     })
   ];
 
-  passthru.updateScript = nix-update-script {
-    # Prevent updating to versions with '-' in them.
-    # Necessary since Anytype uses Electron-based 'MAJOR.MINOR.PATCH(-{alpha,beta})?' versioning scheme where each
-    #  {alpha,beta} version increases the PATCH version, releasing a new full release version in GitHub instead of a
-    #  pre-release version.
-    extraArgs = [
-      "--version-regex"
-      "[^-]*"
-    ];
-  };
-
   meta = {
     inherit description;
     homepage = "https://anytype.io/";

pkgs/by-name/ap/appimagekit/nix.patch

@@ -1,82 +0,0 @@
-Submodule lib/libappimage contains modified content
-diff --git a/lib/libappimage/cmake/dependencies.cmake b/lib/libappimage/cmake/dependencies.cmake
-index 8d96484..c7b17a1 100644
---- a/lib/libappimage/cmake/dependencies.cmake
-+++ b/lib/libappimage/cmake/dependencies.cmake
-@@ -91,9 +91,18 @@ if(NOT USE_SYSTEM_SQUASHFUSE)
-         INCLUDE_DIRS "<SOURCE_DIR>"
-     )
- else()
--    message(STATUS "Using system squashfuse")
-+    message(STATUS "Using system squashfsfuse from ${SQUASHFUSE}")
-
--    import_pkgconfig_target(TARGET_NAME libsquashfuse PKGCONFIG_TARGET squashfuse)
-+    add_library(libsquashfuse INTERFACE IMPORTED GLOBAL)
-+
-+    set(squashfuse_INCLUDE_DIRS "${SQUASHFUSE}/include")
-+    set(squashfuse_LIBRARIES "${SQUASHFUSE}/lib/libsquashfuse.a;${SQUASHFUSE}/lib/libsquashfuse_ll.a;${SQUASHFUSE}/lib/libfuseprivate.a")
-+
-+    set_property(
-+      TARGET libsquashfuse
-+      PROPERTY INTERFACE_LINK_LIBRARIES ${squashfuse_LIBRARIES}
-+    )
-+    include_directories(${squashfuse_INCLUDE_DIRS})
- endif()
-
-
-diff --git a/src/appimagetool.c b/src/appimagetool.c
-index 6b37419..23425e7 100644
---- a/src/appimagetool.c
-+++ b/src/appimagetool.c
-@@ -38,7 +38,7 @@
- #include <argp.h>
-
- #include <fcntl.h>
--#include "squashfuse.h"
-+#include <squashfuse.h>
-
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -96,7 +96,7 @@ static void die(const char *msg) {
- }
-
- /* Function that prints the contents of a squashfs file
--* using libsquashfuse (#include "squashfuse.h") */
-+* using libsquashfuse (#include <squashfuse.h>) */
- int sfs_ls(char* image) {
-     sqfs_err err = SQFS_OK;
-     sqfs_traverse trv;
-diff --git a/src/appimagetoolnoglib.c b/src/appimagetoolnoglib.c
-index f900e76..ffa87f8 100644
---- a/src/appimagetoolnoglib.c
-+++ b/src/appimagetoolnoglib.c
-@@ -3,7 +3,7 @@
-
- #include <stdlib.h>
- #include <fcntl.h>
--#include "squashfuse.h"
-+#include <squashfuse.h>
-
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -118,7 +118,7 @@ int is_regular_file(const char *path)
- }
-
- /* Function that prints the contents of a squashfs file
-- * using libsquashfuse (#include "squashfuse.h") */
-+ * using libsquashfuse (#include <squashfuse.h>) */
- int sfs_ls(char* image) {
- 	sqfs_err err = SQFS_OK;
- 	sqfs_traverse trv;
-diff --git a/src/runtime.c b/src/runtime.c
-index bada3af..70a642b 100644
---- a/src/runtime.c
-+++ b/src/runtime.c
-@@ -29,7 +29,7 @@
-
- #define _GNU_SOURCE
-
--#include "squashfuse.h"
-+#include <squashfuse.h>
- #include <squashfs_fs.h>
- #include <nonstd.h>

pkgs/by-name/ap/appimagekit/package.nix

@@ -1,175 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  cmake,
-  autoconf,
-  automake,
-  libtool,
-  makeWrapper,
-  wget,
-  xxd,
-  desktop-file-utils,
-  file,
-  gnupg,
-  glib,
-  zlib,
-  cairo,
-  openssl,
-  fuse,
-  xz,
-  squashfuse,
-  inotify-tools,
-  libarchive,
-  squashfsTools,
-  gtest,
-}:
-
-let
-
-  appimagekit_src = fetchFromGitHub {
-    owner = "AppImage";
-    repo = "AppImageKit";
-    rev = "8bbf694455d00f48d835f56afaa1dabcd9178ba6";
-    hash = "sha256-pqg+joomC5CI9WdKP/h/XKPsruMgZEaIOjPLOqnNPZw=";
-    fetchSubmodules = true;
-  };
-
-  # squashfuse adapted to nix from cmake expression in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake"
-  appimagekit_squashfuse = squashfuse.overrideAttrs rec {
-    pname = "squashfuse";
-    version = "unstable-2016-10-09";
-
-    src = fetchFromGitHub {
-      owner = "vasi";
-      repo = pname;
-      rev = "1f980303b89c779eabfd0a0fdd36d6a7a311bf92";
-      sha256 = "sha256-BZd1+7sRYZHthULKk3RlgMIy4uCUei45GbSEiZxLPFM=";
-    };
-
-    patches = [
-      "${appimagekit_src}/lib/libappimage/src/patches/squashfuse.patch"
-      "${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.patch"
-    ];
-
-    postPatch = ''
-      cp -v ${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.[hc] .
-    '';
-
-    # Workaround build failure on -fno-common toolchains:
-    #   ld: libsquashfuse_ll.a(libfuseprivate_la-fuseprivate.o):(.bss+0x8):
-    #     multiple definition of `have_libloaded'; runtime.4.o:(.bss.have_libloaded+0x0): first defined here
-    env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-    preConfigure = ''
-      sed -i "/PKG_CHECK_MODULES.*/,/,:./d" configure
-      sed -i "s/typedef off_t sqfs_off_t/typedef int64_t sqfs_off_t/g" common.h
-    '';
-
-    configureFlags = [
-      "--disable-demo"
-      "--disable-high-level"
-      "--without-lzo"
-      "--without-lz4"
-    ];
-
-    postConfigure = ''
-      sed -i "s|XZ_LIBS = -llzma |XZ_LIBS = -Bstatic -llzma/|g" Makefile
-    '';
-
-    # only static libs and header files
-    installPhase = ''
-      mkdir -p $out/lib $out/include
-      cp -v ./.libs/*.a $out/lib
-      cp -v ./*.h $out/include
-    '';
-  };
-
-in
-stdenv.mkDerivation rec {
-  pname = "appimagekit";
-  version = "unstable-2020-12-31";
-
-  src = appimagekit_src;
-
-  patches = [ ./nix.patch ];
-
-  postPatch = ''
-    patchShebangs src/embed-magic-bytes-in-file.sh
-  '';
-
-  nativeBuildInputs = [
-    pkg-config
-    cmake
-    autoconf
-    automake
-    libtool
-    wget
-    xxd
-    desktop-file-utils
-    makeWrapper
-  ];
-
-  buildInputs = [
-    glib
-    zlib
-    cairo
-    openssl
-    fuse
-    xz
-    inotify-tools
-    libarchive
-    squashfsTools
-    appimagekit_squashfuse
-  ];
-
-  preConfigure = ''
-    export HOME=$(pwd)
-  '';
-
-  cmakeFlags = [
-    "-DUSE_SYSTEM_XZ=ON"
-    "-DUSE_SYSTEM_SQUASHFUSE=ON"
-    "-DSQUASHFUSE=${appimagekit_squashfuse}"
-    "-DUSE_SYSTEM_LIBARCHIVE=ON"
-    "-DUSE_SYSTEM_GTEST=ON"
-    "-DUSE_SYSTEM_MKSQUASHFS=ON"
-    "-DTOOLS_PREFIX=${stdenv.cc.targetPrefix}"
-  ];
-
-  postInstall = ''
-    mkdir -p $out/lib/appimagekit
-    cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/"
-    cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin"
-
-    wrapProgram "$out/bin/appimagetool" \
-      --prefix PATH : "${
-        lib.makeBinPath [
-          file
-          gnupg
-        ]
-      }" \
-      --unset SOURCE_DATE_EPOCH
-  '';
-
-  nativeCheckInputs = [ gtest ];
-
-  # for debugging
-  passthru = {
-    squashfuse = appimagekit_squashfuse;
-  };
-
-  meta = with lib; {
-    description = "Tool to package desktop applications as AppImages";
-    longDescription = ''
-      AppImageKit is an implementation of the AppImage format that
-      provides tools such as appimagetool and appimaged for handling
-      AppImages.
-    '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ taeer ];
-    homepage = src.meta.homepage;
-    platforms = platforms.linux;
-  };
-}

pkgs/by-name/ch/chatterino2/common.nix

@@ -7,6 +7,7 @@
   boost,
   openssl,
   libsecret,
+  libnotify,
   libavif,
   kdePackages,
 }:
@@ -24,13 +25,17 @@ stdenv.mkDerivation {
       qtsvg
       qt5compat
       qtkeychain
+      qtimageformats
     ])
     ++ [
       boost
       openssl
       libsecret
     ]
-    ++ lib.optional stdenv.hostPlatform.isLinux kdePackages.qtwayland
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      kdePackages.qtwayland
+      libnotify
+    ]
     ++ lib.optional enableAvifSupport libavif;
 
   cmakeFlags = [

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

@@ -12,13 +12,13 @@
   (
     finalAttrs: _: {
       pname = "chatterino2";
-      version = "2.5.2";
+      version = "2.5.3";
 
       src = fetchFromGitHub {
         owner = "Chatterino";
         repo = "chatterino2";
         tag = "v${finalAttrs.version}";
-        hash = "sha256-nrw4dQ7QjPPMbZXMC+p3VgUQKwc1ih6qS13D9+9oNuw=";
+        hash = "sha256-W2sqlqL6aa68aQ3nE161G64x7K7p8iByX03g1dseQbs=";
         fetchSubmodules = true;
       };
 

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

@@ -13,13 +13,13 @@
   (
     finalAttrs: _: {
       pname = "chatterino7";
-      version = "7.5.2";
+      version = "7.5.3";
 
       src = fetchFromGitHub {
         owner = "SevenTV";
         repo = "chatterino7";
         tag = "v${finalAttrs.version}";
-        hash = "sha256-kQeW9Qa8NPs47xUlqggS4Df4fxIoknG8O5IBdOeIo+4=";
+        hash = "sha256-KrAr3DcQDjb+LP+vIf0qLSSgII0m5rNwhncLNHlLaC8=";
         fetchSubmodules = true;
       };
 

pkgs/by-name/dr/drawterm/package.nix

@@ -0,0 +1,102 @@
+{
+  stdenv,
+  lib,
+  fetchFrom9Front,
+  unstableGitUpdater,
+  installShellFiles,
+  makeWrapper,
+  apple-sdk_13,
+  xorg,
+  pkg-config,
+  wayland-scanner,
+  pipewire,
+  wayland,
+  wayland-protocols,
+  libxkbcommon,
+  wlr-protocols,
+  pulseaudio,
+  nixosTests,
+  withWayland ? false,
+}:
+let
+  withXorg = !(withWayland || stdenv.hostPlatform.isDarwin);
+in
+stdenv.mkDerivation {
+  pname = "drawterm";
+  version = "0-unstable-2025-03-18";
+
+  src = fetchFrom9Front {
+    owner = "plan9front";
+    repo = "drawterm";
+    rev = "0b43ac046ca81d78e9eca535ab1e92971d30405a";
+    hash = "sha256-L0a81zwzIKwnRK/Mu/kW1oHoJCroa+VDNGj7CI90WMQ=";
+  };
+
+  enableParallelBuilding = true;
+  strictDeps = true;
+  nativeBuildInputs =
+    [
+      installShellFiles
+      makeWrapper
+    ]
+    ++ lib.optionals withWayland [
+      pkg-config
+      wayland-scanner
+    ];
+
+  buildInputs =
+    lib.optionals withWayland [
+      pipewire
+      wayland
+      wayland-protocols
+      libxkbcommon
+      wlr-protocols
+    ]
+    ++ lib.optionals withXorg [
+      xorg.libX11
+      xorg.libXt
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_13;
+
+  makeFlags =
+    lib.optional withWayland "CONF=linux"
+    ++ lib.optional (!(withWayland || stdenv.hostPlatform.isDarwin)) "CONF=unix"
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "CONF=osx-cocoa"
+      "CC=clang"
+    ];
+
+  installPhase =
+    ''
+      installManPage drawterm.1
+    ''
+    + lib.optionalString withWayland ''
+      install -Dm755 -t $out/bin/ drawterm
+    ''
+    + lib.optionalString (!(withWayland || stdenv.hostPlatform.isDarwin)) ''
+      # wrapping the oss output with pulse seems to be the easiest
+      mv drawterm drawterm.bin
+      install -Dm755 -t $out/bin/ drawterm.bin
+      makeWrapper ${pulseaudio}/bin/padsp $out/bin/drawterm --add-flags $out/bin/drawterm.bin
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/{Applications,bin}
+      mv gui-cocoa/drawterm.app $out/Applications/
+      mv drawterm $out/Applications/drawterm.app/
+      ln -s $out/Applications/drawterm.app/drawterm $out/bin/
+    '';
+
+  passthru = {
+    updateScript = unstableGitUpdater { shallowClone = false; };
+    tests = nixosTests.drawterm;
+  };
+
+  meta = {
+    description = "Connect to Plan 9 CPU servers from other operating systems";
+    homepage = "https://drawterm.9front.org/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ moody ];
+    platforms = with lib.platforms; linux ++ darwin;
+    mainProgram = "drawterm";
+  };
+}

pkgs/by-name/ed/eduli/package.nix

@@ -10,8 +10,8 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchzip {
     name = "${pname}-${version}";
-    url = "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip";
-    sha256 = "0b4kjdk0h0hx446swi0wzawia0mf16qh9b6v4h4nqg8qx0p2sd3c";
+    url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip";
+    hash = "sha256-/X5jPtjOvJTUbiKV5r2dWIFL5ft0iemdwj+Zt+Q13OA=";
   };
 
   installPhase = ''

pkgs/by-name/el/elvis/package.nix

@@ -36,7 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ ncurses ];
 
-  configureFlags = [ "--ioctl=termios" ];
+  configureFlags = [
+    "--ioctl=termios"
+    "--libs=-lncurses"
+  ];
 
   strictDeps = false;
 
@@ -46,6 +49,11 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'if [ -f /usr/include/sys/wait.h ]' 'if true'
   '';
 
+  postConfigure = ''
+    echo >>config.h '#undef NEED_MEMMOVE'
+    echo >>config.h '#define NEED_IOCTL_H'
+  '';
+
   installPhase = ''
     runHook preInstall
 

pkgs/by-name/ez/eza/package.nix

@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "eza";
-  version = "0.21.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-edBFMqY+61kFumLTcVFgnmhE4d+bMVz+udR5h02kDk0=";
+    hash = "sha256-HtukMHiTWWejbq+cpeyF4QmTaBP4yvvyVb/xaacHKwI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-VqwgsYyoZM+88IkMJxDtIi5WtPDRg0Izk7WenTNuLAI=";
+  cargoHash = "sha256-T/ryAhBM0ECttDx3vMesLfTXfnHecM/0gpOCcg/o2kI=";
 
   nativeBuildInputs = [
     cmake

pkgs/by-name/fc/fceux/package.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   SDL2,
   cmake,
   fetchFromGitHub,
@@ -12,7 +13,6 @@
   pkg-config,
   qt5,
   qt6,
-  stdenv,
   x264,
   # Configurable options
   ___qtVersion ? "5",
@@ -31,13 +31,13 @@ assert lib.elem ___qtVersion [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "fceux";
-  version = "2.6.6-unstable-2024-06-09";
+  version = "2.6.6-unstable-2025-01-20";
 
   src = fetchFromGitHub {
     owner = "TASEmulators";
     repo = "fceux";
-    rev = "f980ec2bc7dc962f6cd76b9ae3131f2eb902c9e7";
-    hash = "sha256-baAjrTzRp61Lw1p5axKJ97PuFiuBNQewXrlN0s8o7us=";
+    rev = "2b8f6e76271341616920bb7e0c54ee48570783d3";
+    hash = "sha256-2QDiAk2HO9oQ1gNvc7QFZSCbWkCDYW5OJWT8f4bmXyg=";
   };
 
   nativeBuildInputs = [
@@ -60,15 +60,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  postInstall = ''
+    substituteInPlace $out/share/applications/fceux.desktop \
+      --replace-fail "/usr/bin/" "" \
+      --replace-fail "/usr/share/pixmaps/" ""
+  '';
+
   meta = {
-    homepage = "http://www.fceux.com/";
+    homepage = "http://www.fceux.com";
     description = "Nintendo Entertainment System (NES) Emulator";
-    changelog = "https://github.com/TASEmulators/blob/fceux/${finalAttrs.src.rev}/changelog.txt";
+    changelog = "https://github.com/TASEmulators/fceux/blob/${finalAttrs.src.rev}/changelog.txt";
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "fceux";
-    maintainers = with lib.maintainers; [
-      sbruder
-    ];
+    maintainers = with lib.maintainers; [ sbruder ];
     platforms = lib.platforms.linux;
   };
 })

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

@@ -1,58 +1,57 @@
 {
   lib,
   stdenv,
-  libXcomposite,
-  libgnome-keyring,
-  makeWrapper,
-  udev,
-  curlWithGnuTls,
-  alsa-lib,
-  libXfixes,
-  atk,
-  gtk3,
-  libXrender,
-  pango,
-  adwaita-icon-theme,
-  cairo,
-  freetype,
-  fontconfig,
-  libX11,
-  libXi,
-  libxcb,
-  libXext,
-  libXcursor,
-  glib,
-  libXScrnSaver,
-  libxkbfile,
-  libXtst,
-  nss,
-  nspr,
-  cups,
-  fetchzip,
-  expat,
-  gdk-pixbuf,
-  libXdamage,
-  libXrandr,
-  dbus,
-  makeDesktopItem,
-  openssl,
-  wrapGAppsHook3,
   buildPackages,
+  copyDesktopItems,
+  fetchzip,
+  makeDesktopItem,
+  makeWrapper,
+  adwaita-icon-theme,
+  alsa-lib,
   at-spi2-atk,
   at-spi2-core,
-  libuuid,
+  atk,
+  cacert,
+  cairo,
+  cups,
+  curlWithGnuTls,
+  dbus,
   e2fsprogs,
+  expat,
+  fontconfig,
+  freetype,
+  gdk-pixbuf,
+  git,
+  glib,
+  gtk3,
   krb5,
+  libGL,
+  libX11,
+  libXScrnSaver,
+  libXcomposite,
+  libXcursor,
+  libXdamage,
+  libXext,
+  libXfixes,
+  libXi,
+  libXrandr,
+  libXrender,
+  libXtst,
   libdrm,
   libgbm,
-  unzip,
-  copyDesktopItems,
-  libxshmfence,
+  libgnome-keyring,
+  libuuid,
+  libxcb,
   libxkbcommon,
-  git,
-  libGL,
+  libxkbfile,
+  libxshmfence,
+  nspr,
+  nss,
+  openssl,
+  pango,
+  udev,
+  unzip,
   zlib,
-  cacert,
 }:
 
 let
@@ -80,25 +79,28 @@ let
 
   src = srcs.${stdenv.hostPlatform.system} or throwSystem;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.gitkraken.com/git-client";
     description = "Simplifying Git for any OS";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
+    license = lib.licenses.unfree;
     platforms = builtins.attrNames srcs;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       nicolas-goudry
       Rishik-Y
     ];
     mainProgram = "gitkraken";
   };
 
+  passthru.updateScript = ./update.sh;
+
   linux = stdenv.mkDerivation rec {
     inherit
       pname
       version
       src
       meta
+      passthru
       ;
 
     dontBuild = true;
@@ -228,6 +230,7 @@ let
       version
       src
       meta
+      passthru
       ;
 
     nativeBuildInputs = [

pkgs/by-name/gi/gitkraken/update.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts curl jq
+
+set -euo pipefail
+
+scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
+nixpkgs=$(realpath "$scriptDir"/../../../..)
+
+# All architectures are released together, therefore we get the latest version from the linux release
+# NOTE: for some reason, the darwin RELEASES (ie. /darwin/RELEASES) file returns a frozen version...
+echo >&2 "=== Obtaining version data from release.axocdn.com..."
+version=$(curl -fsSL https://release.axocdn.com/linux/RELEASES | jq -r '.name')
+
+# Hardcoded URLs to compute hashes
+declare -A tarballs=(
+  ["x86_64-linux"]="https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"
+  ["x86_64-darwin"]="https://release.axocdn.com/darwin/GitKraken-v${version}.zip"
+  ["aarch64-darwin"]="https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"
+)
+
+for arch in "${!tarballs[@]}"; do
+  # We precalculate the hash before calling update-source-version because it attempts to calculate each architecture's
+  # package's hash by running `nix-build --system <architecture> -A gitkraken.src` which causes cross compiling headaches
+  echo >&2 "=== Downloading ${arch} package and computing its hash..."
+  hash=$(nix-hash --sri --type sha256 "$(nix-prefetch-url --print-path --unpack "${tarballs[${arch}]}" | tail -n1)")
+  echo >&2 "=== Updating package.nix for ${arch}..."
+  # update-source-version expects to be at the root of nixpkgs
+  (cd "${nixpkgs}" && update-source-version gitkraken "${version}" "${hash}" --system="${arch}" --version-key="srcs.${arch}")
+done
+
+echo >&2 "=== Done!"

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

@@ -1,15 +1,12 @@
 {
   lib,
   writeScript,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  pythonOlder,
-  setuptools,
-  requests,
   cacert,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gogdl";
   version = "1.1.2";
   format = "pyproject";
@@ -21,9 +18,9 @@ buildPythonApplication rec {
     hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0=";
   };
 
-  disabled = pythonOlder "3.8";
+  disabled = python3Packages.pythonOlder "3.8";
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     setuptools
     requests
   ];

pkgs/by-name/he/heroic-unwrapped/package.nix

@@ -7,7 +7,8 @@
   nodejs,
   python3,
   makeWrapper,
-  electron,
+  # Upstream uses EOL Electron 31.  Use next oldest version.
+  electron_33,
   vulkan-helper,
   gogdl,
   legendary-heroic,
@@ -15,6 +16,9 @@
   comet-gog,
 }:
 
+let
+  electron = electron_33;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
   version = "2.16.1";

pkgs/by-name/ho/home-manager/package.nix

@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-04-09";
+  version = "0-unstable-2025-04-19";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "79461936709b12e17adb9c91dd02d1c66d577f09";
-    hash = "sha256-reYpe0J1J+wH34JFs7KKp0G5nP7+XSQ5z0ZLFJcfJr8=";
+    rev = "9676e8a52a177d80c8a42f66566362a6d74ecf78";
+    hash = "sha256-bvcatss0xodcdxXm0LUSLPd2jjrhqO3yFSu3stOfQXg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/il/ilmbase/package.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics";
+    description = "Library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics";
     homepage = "https://www.openexr.com/";
     license = licenses.bsd3;
     platforms = platforms.all;

pkgs/by-name/ja/jamin/package.nix

@@ -13,19 +13,20 @@
   perlPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "0.95.0";
   pname = "jamin";
 
   src = fetchurl {
-    url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz";
-    sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
+    url = "mirror://sourceforge/jamin/jamin-${finalAttrs.version}.tar.gz";
+    hash = "sha256-di/uiGgvJ4iORt+wE6mrXnmFM7m2dkP/HXdgUBk5uzw=";
   };
 
   nativeBuildInputs = [
     pkg-config
     makeWrapper
   ];
+
   buildInputs =
     [
       fftwFloat
@@ -44,17 +45,19 @@ stdenv.mkDerivation rec {
   # gcc-10. Otherwise build fails as:
   #     ld: jamin-preferences.o:/build/jamin-0.95.0/src/hdeq.h:64: multiple definition of
   #       `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
+  # `incompatible-pointer-types` fixes build on GCC 14, otherwise fails with:
+  #   error: passing argument 4 of 'lo_server_thread_add_method' from incompatible pointer type
+  env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-error=incompatible-pointer-types";
 
   postInstall = ''
     wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://jamin.sourceforge.net";
     description = "JACK Audio Mastering interface";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.nico202 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.nico202 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/lm/lmstudio/package.nix

@@ -2,13 +2,18 @@
   lib,
   stdenv,
   callPackage,
-  version ? "0.3.14",
-  rev ? "3",
   ...
 }@args:
 let
   pname = "lmstudio";
-  packageVersion = "${version}-${rev}"; # Combine version and rev
+
+  version_aarch64-darwin = "0.3.14-5";
+  hash_aarch64-darwin = "sha256-8OTfjEZ27ubRFvRQ84em2Gz3mS9w3oev41Qg6MMNjNU=";
+  version_x86_64-linux = "0.3.14-5";
+  hash_x86_64-linux = "sha256-WrO95ez81/A0U1Tt1Oi2PyUp6nvsmQMzK0VUVH1TYbg=";
+
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
     homepage = "https://lmstudio.ai/";
@@ -26,18 +31,18 @@ in
 if stdenv.hostPlatform.isDarwin then
   callPackage ./darwin.nix {
     inherit pname meta;
-    version = packageVersion;
+    version = version_aarch64-darwin;
     url =
       args.url
-        or "https://installers.lmstudio.ai/darwin/arm64/${version}-${rev}/LM-Studio-${version}-${rev}-arm64.dmg";
-    hash = args.hash or "sha256-doAhCbWFwDWlBQ+4YfJz6p7I4NZJxIOtdLYTr3mOGds=";
+        or "https://installers.lmstudio.ai/darwin/arm64/${version_aarch64-darwin}/LM-Studio-${version_aarch64-darwin}-arm64.dmg";
+    hash = args.hash or hash_aarch64-darwin;
   }
 else
   callPackage ./linux.nix {
     inherit pname meta;
-    version = packageVersion;
+    version = version_x86_64-linux;
     url =
       args.url
-        or "https://installers.lmstudio.ai/linux/x64/${version}-${rev}/LM-Studio-${version}-${rev}-x64.AppImage";
-    hash = args.hash or "sha256-IIJMk0cfLQdrx0nTSbpsbqOvD+f/qrH+rGdYN4mygaw=";
+        or "https://installers.lmstudio.ai/linux/x64/${version_x86_64-linux}/LM-Studio-${version_x86_64-linux}-x64.AppImage";
+    hash = args.hash or hash_x86_64-linux;
   }

pkgs/by-name/lm/lmstudio/update.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts
+
+set -euo pipefail
+
+packages="$(curl -s -L "https://lmstudio.ai/" | grep -oE 'https://installers.lmstudio.ai[^"\]*' | sort -u | grep -v \\.exe)"
+for system in "aarch64-darwin darwin/arm64" "x86_64-linux linux/x64"; do
+  set -- ${system}
+
+  arch="${1}"
+  url=$(echo "${packages}" | grep "${2}")
+  version="$(echo "${url}" | cut -d/ -f6)"
+  hash=$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")")
+
+  update-source-version lmstudio "${version}" "${hash}" --system="${arch}" --version-key="version_${arch}"
+done

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

@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "neocmakelsp";
-  version = "0.8.21";
+  version = "0.8.22";
 
   src = fetchFromGitHub {
     owner = "Decodetalkers";
     repo = "neocmakelsp";
     rev = "v${version}";
-    hash = "sha256-iVetPUg/eX8o2BB1y9dlijbhZUyDNMHaLrqcqTbvpQk=";
+    hash = "sha256-AFnGMKcPAn1rFfFDZWvg/iIhKHGKgCLA3bueP5k9oY4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Mswh/wuowrWORj16Mvg4kIueW72bEFw3Ax2RBMtATqY=";
+  cargoHash = "sha256-XsRtkQpNfXCZxEbgkQo11lQM78E6+8PJWc+5FBXM2Ro=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/ni/nile/package.nix

@@ -1,22 +1,14 @@
 {
   lib,
   gitUpdater,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  pythonOlder,
-  setuptools,
-  requests,
-  protobuf,
-  pycryptodome,
-  zstandard,
-  json5,
-  platformdirs,
 }:
 
 let
   version = "1.1.2";
 in
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "nile";
   inherit version;
   format = "pyproject";
@@ -28,9 +20,9 @@ buildPythonApplication {
     hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI=";
   };
 
-  disabled = pythonOlder "3.8";
+  disabled = python3Packages.pythonOlder "3.8";
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     setuptools
     requests
     protobuf

pkgs/by-name/pb/pbpctrl/package.nix

@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pbpctrl";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "qzed";
     repo = "pbpctrl";
     rev = "v${version}";
-    hash = "sha256-u5I3Hs00JDPRBwThYTEmNiZj/zPVfHyyrt4E68d13do=";
+    hash = "sha256-XSRJytPrRKKWhFTBQd3Kd1R3amdecGNTmJS4PmFL6kg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0kh9bwiTVWuDviDw6IY5EGj+2k2WsyCCeo+r7CdBftE=";
+  cargoHash = "sha256-eDR/Z4v8G7/XPzWjJdZ5Fg2qULdn/SuNmvE/GVqSVJ8=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/pl/ploticus/fix-zlib-file-type.patch

@@ -0,0 +1,28 @@
+Index: src/svg.c
+===================================================================
+--- a/src/svg.c
++++ b/src/svg.c
+@@ -676,9 +676,9 @@
+ double x1, y1, x2, y2;
+ {
+ char *buf;
+ #ifdef WZ
+-  FILE *outfp;
++  gzFile outfp;
+ #endif
+ 
+ if (svg_style_in_prog) fprintf( svg_fp, "</g>");
+ fprintf( svg_fp, "</g>\n" );   /* close default style */
+@@ -731,10 +731,10 @@
+ 	svg_fp = fopen( svg_tmpfilename, "r" );
+ 	if( svg_fp == NULL ) return( Eerr( 2487, "cannot reopen temp file", svg_tmpfilename ) );
+ #ifdef WZ
+ 	if( svg_compress ) {
+-		if( svg_stdout ) outfp = (FILE *) gzdopen( 1, svg_compressmode );  /* stdout = 1 */
+-		else outfp = (FILE *) gzopen( svg_filename, svg_compressmode );
++		if( svg_stdout ) outfp = gzdopen( 1, svg_compressmode );  /* stdout = 1 */
++		else outfp = gzopen( svg_filename, svg_compressmode );
+ 		if( outfp == NULL ) return( Eerr( 2488, "cannot open output file", svg_filename ) );
+ 		} 
+ #endif
+ 	buf = svg_style; /* reuse */

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

@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
     url = "mirror://sourceforge/ploticus/ploticus/${finalAttrs.version}/ploticus${
       lib.replaceStrings [ "." ] [ "" ] finalAttrs.version
     }_src.tar.gz";
-    sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA=";
+    hash = "sha256-PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA=";
   };
 
   patches = [
@@ -33,6 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
     # This is required for non-ASCII fonts to work:
     # https://ploticus.sourceforge.net/doc/fonts.html
     ./use-gd-package.patch
+
+    # svg.c:752:26: error: passing argument 1 of 'gzclose' from incompatible pointer type []
+    #  752 |                 gzclose( outfp );
+    # note: expected 'gzFile' {aka 'struct gzFile_s *'} but argument is of type 'FILE *'
+    ./fix-zlib-file-type.patch
   ];
 
   buildInputs = [
@@ -56,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "CC:=$(CC)" ];
 
+  enableParallelBuilding = true;
+
   preInstall = ''
     mkdir -p "$out/bin"
   '';
@@ -84,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
         '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Non-interactive software package for producing plots and charts";
     longDescription = ''
       Ploticus is a free, GPL'd, non-interactive
@@ -94,9 +101,9 @@ stdenv.mkDerivation (finalAttrs: {
       statistical capabilities.  It allows significant user control
       over colors, styles, options and details.
     '';
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ pSub ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ pSub ];
     homepage = "https://ploticus.sourceforge.net/";
-    platforms = with platforms; linux ++ darwin;
+    platforms = with lib.platforms; linux ++ darwin;
   };
 })

pkgs/by-name/po/pocket-id/package.nix

@@ -10,20 +10,22 @@
   nix-update-script,
 }:
 
-let
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pocket-id";
   version = "0.48.0";
+
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ax5E3e3GUrQLVsQREUhjmORjXQgKrEBVa9ySJr5ZLUY=";
   };
 
   backend = buildGoModule {
     pname = "pocket-id-backend";
-    inherit version src;
+    inherit (finalAttrs) version src;
 
-    sourceRoot = "${src.name}/backend";
+    sourceRoot = "${finalAttrs.src.name}/backend";
 
     vendorHash = "sha256-0LAlltXd7YNQu7ymdjUSy75hMBz6MpvmUtgct43BU7M=";
 
@@ -32,11 +34,11 @@ let
     '';
   };
 
-  frontend = buildNpmPackage (finalAttrs: {
+  frontend = buildNpmPackage {
     pname = "pocket-id-frontend";
-    inherit version src;
+    inherit (finalAttrs) version src;
 
-    sourceRoot = "${src.name}/frontend";
+    sourceRoot = "${finalAttrs.src.name}/frontend";
 
     npmDepsHash = "sha256-CKxa0uL7pBQJiA2LPDA/HQvRk8sjphZ9nur8jb7BnU8=";
     npmFlags = [ "--legacy-peer-deps" ];
@@ -66,17 +68,7 @@ let
 
       runHook postInstall
     '';
-  });
-
-in
-stdenvNoCC.mkDerivation {
-  pname = "pocket-id";
-  inherit
-    version
-    src
-    backend
-    frontend
-    ;
+  };
 
   dontUnpack = true;
 
@@ -84,8 +76,8 @@ stdenvNoCC.mkDerivation {
     runHook preInstall
 
     mkdir -p $out/bin
-    ln -s ${backend}/bin/pocket-id-backend $out/bin/pocket-id-backend
-    ln -s ${frontend}/bin/pocket-id-frontend $out/bin/pocket-id-frontend
+    ln -s ${finalAttrs.backend}/bin/pocket-id-backend $out/bin/pocket-id-backend
+    ln -s ${finalAttrs.frontend}/bin/pocket-id-frontend $out/bin/pocket-id-frontend
 
     runHook postInstall
   '';
@@ -107,7 +99,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "OIDC provider with passkeys support";
     homepage = "https://pocket-id.org";
-    changelog = "https://github.com/pocket-id/pocket-id/releases/tag/v${version}";
+    changelog = "https://github.com/pocket-id/pocket-id/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [
       gepbird
@@ -116,4 +108,4 @@ stdenvNoCC.mkDerivation {
     ];
     platforms = lib.platforms.unix;
   };
-}
+})

pkgs/by-name/po/posting/package.nix

@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "posting";
-  version = "2.5.4";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "darrenburns";
     repo = "posting";
     tag = version;
-    hash = "sha256-6nFQSGCdmR4qZuleiY0xh76WgBIjs9OZtfpc16b4iws=";
+    hash = "sha256-CEfApa1TfBovmGMSxqtHZC9aSSEGYTyVXGpRGxLI7Vo=";
   };
 
   pythonRelaxDeps = true;
@@ -23,7 +23,9 @@ python3Packages.buildPythonApplication rec {
   ];
 
   # Required for x resources themes
-  buildInputs = [ xorg.xrdb ];
+  buildInputs = [
+    xorg.xrdb
+  ];
 
   dependencies =
     with python3Packages;
@@ -41,6 +43,8 @@ python3Packages.buildPythonApplication rec {
       textual-autocomplete
       textual
       openapi-pydantic
+      tree-sitter-json
+      tree-sitter-html
     ]
     ++ httpx.optional-dependencies.brotli
     ++ textual.optional-dependencies.syntax;

pkgs/by-name/pr/primus/package.nix

@@ -5,19 +5,20 @@
 # Other distributions do the same.
 {
   stdenv,
-  stdenv_i686,
+  pkgsi686Linux,
   lib,
   primusLib,
   writeScriptBin,
   runtimeShell,
-  primusLib_i686 ? null,
+  primusLib_i686 ?
+    if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null,
   useNvidia ? true,
 }:
 
 let
   # We override stdenv in case we need different ABI for libGL
   primusLib_ = primusLib.override { inherit stdenv; };
-  primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; };
+  primusLib_i686_ = primusLib_i686.override { stdenv = pkgsi686Linux.stdenv; };
 
   primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; };
   primus_i686 =

pkgs/by-name/pr/primusLib/package.nix

@@ -5,7 +5,8 @@
   fetchpatch,
   libX11,
   libGL,
-  nvidia_x11 ? null,
+  linuxPackages,
+  nvidia_x11 ? linuxPackages.nvidia_x11.override { libsOnly = true; },
   libglvnd,
 }:
 
@@ -55,14 +56,14 @@ stdenv.mkDerivation {
 
   passthru.glvnd = if nvidia_x11 != null && nvidia_x11.useGLVND then nvidia_x11 else null;
 
-  meta = with lib; {
+  meta = {
     description = "Low-overhead client-side GPU offloading";
     homepage = "https://github.com/amonakov/primus";
     platforms = [
       "i686-linux"
       "x86_64-linux"
     ];
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ abbradar ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ abbradar ];
   };
 }

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

@@ -8,6 +8,7 @@
   gtk3,
   gst_all_1,
   gtksourceview,
+  writableTmpDirAsHomeHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -25,6 +26,7 @@ python3Packages.buildPythonApplication rec {
     pkg-config
     gobject-introspection
     wrapGAppsHook3
+    writableTmpDirAsHomeHook
   ];
 
   buildInputs = [
@@ -50,7 +52,6 @@ python3Packages.buildPythonApplication rec {
   '';
 
   preBuild = ''
-    export HOME=$(mktemp -d)
     export PYTHONPATH=./lib:$PYTHONPATH
     python pgn2ecodb.py
     python create_theme_preview.py

pkgs/by-name/ru/rust-streamdeck/package.nix

@@ -0,0 +1,49 @@
+{
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  lib,
+  udev,
+  nix-update-script,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "rust-streamdeck";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "ryankurte";
+    repo = "rust-streamdeck";
+    tag = "v${version}";
+    hash = "sha256-9FuTnRQHKYJzMqhhgyTVq2R+drn4HAr3GDNjQgc3r+w=";
+  };
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ udev ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${builtins.placeholder "out"}/bin/${meta.mainProgram}";
+
+  postInstall = ''
+    install -Dm444 40-streamdeck.rules -t $out/lib/udev/rules.d/
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "ibusb based driver for Elgato StreamDeck devices";
+    homepage = "https://github.com/ryankurte/rust-streamdeck";
+    license = lib.licenses.mpl20;
+    maintainers = [ lib.maintainers.gdifolco ];
+    mainProgram = "streamdeck-cli";
+  };
+}

pkgs/by-name/sm/smeagol/package.nix

@@ -0,0 +1,41 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "smeagol";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "AustinWise";
+    repo = "smeagol";
+    tag = finalAttrs.version;
+    hash = "sha256-ILZ4TRL5yRGZuyyNPIpMgnlBGQAwbtTFlTaN3UYb5ls=";
+  };
+
+  cargoHash = "sha256-5OSrxm+NpuimE8Jwl5/VScKjuYNROX50KNiyBMZqCOw=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/smeagol-wiki";
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Locally hosted wiki";
+    homepage = "https://smeagol.dev/";
+    changelog = "https://github.com/AustinWise/smeagol/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      kachick
+    ];
+    mainProgram = "smeagol-wiki";
+  };
+})

pkgs/by-name/ta/tailscale/package.nix

@@ -24,7 +24,7 @@
 }:
 
 let
-  version = "1.82.0";
+  version = "1.82.5";
 in
 buildGoModule {
   pname = "tailscale";
@@ -39,7 +39,7 @@ buildGoModule {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    hash = "sha256-/8MJE1Io0MRSUXiFirYDn6FH2qkWQHE7Fl3nJLjieDw=";
+    hash = "sha256-BFitj8A+TfNKTyXBB1YhsEs5NvLUfgJ2IbjB2ipf4xU=";
   };
 
   vendorHash = "sha256-SiUkN6BQK1IQmLfkfPetzvYqRu9ENK6+6txtGxegF5Y=";

pkgs/by-name/tp/tpm2-pkcs11-esapi/package.nix

@@ -0,0 +1,12 @@
+{
+  tpm2-pkcs11,
+  ...
+}@args:
+
+tpm2-pkcs11.override (
+  args
+  // {
+    fapiSupport = false;
+    extraDescription = "Disables FAPI support, as if TPM2_PKCS11_BACKEND were always set to 'esysdb'.";
+  }
+)

pkgs/by-name/tp/tpm2-pkcs11-fapi/package.nix

@@ -0,0 +1,13 @@
+{
+  tpm2-pkcs11,
+  ...
+}@args:
+
+tpm2-pkcs11.override (
+  args
+  // {
+    fapiSupport = true;
+    defaultToFapi = true;
+    extraDescription = "Enables fapi by default, as if TPM2_PKCS11_BACKEND defaulted to 'fapi'.";
+  }
+)

pkgs/by-name/tp/tpm2-pkcs11/default-to-fapi.patch

@@ -0,0 +1,33 @@
+From 648f0d08953152185e13feaca4feda02f8665341 Mon Sep 17 00:00:00 2001
+From: Morgan Jones <me@numin.it>
+Date: Wed, 9 Apr 2025 00:12:47 -0700
+Subject: [PATCH] backend: default to fapi
+
+---
+ src/lib/backend.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/backend.c b/src/lib/backend.c
+index 128f58b..8404afe 100644
+--- a/src/lib/backend.c
++++ b/src/lib/backend.c
+@@ -15,12 +15,12 @@ static enum backend get_backend(void) {
+ 
+     const char *env = getenv("TPM2_PKCS11_BACKEND");
+ 
+-    if (!env || !strcasecmp(env, "esysdb")) {
+-        return backend_esysdb;
++    if (!env || !strcasecmp(env, "fapi")) {
++        return backend_fapi;
+     }
+ 
+-    if (!strcasecmp(env, "fapi")) {
+-        return backend_fapi;
++    if (!strcasecmp(env, "esysdb")) {
++        return backend_esysdb;
+     }
+ 
+     return backend_error;
+-- 
+2.47.0
+

pkgs/by-name/tp/tpm2-pkcs11/package.nix

@@ -26,14 +26,18 @@
   swtpm,
   tpm2-abrmd,
   tpm2-openssl,
-  tpm2-pkcs11, # for passthru abrmd tests
+  tpm2-pkcs11, # for passthru tests
+  tpm2-pkcs11-esapi,
+  tpm2-pkcs11-fapi,
   tpm2-tools,
   tpm2-tss,
   which,
   xxd,
   abrmdSupport ? false,
   fapiSupport ? true,
+  defaultToFapi ? false,
   enableFuzzing ? false,
+  extraDescription ? null,
 }:
 
 let
@@ -51,7 +55,9 @@ chosenStdenv.mkDerivation (finalAttrs: {
   };
 
   # Disable Java‐based tests because of missing dependencies
-  patches = [ ./disable-java-integration.patch ];
+  patches =
+    lib.singleton ./disable-java-integration.patch
+    ++ lib.optional defaultToFapi ./default-to-fapi.patch;
 
   postPatch = ''
     echo ${lib.escapeShellArg finalAttrs.version} >VERSION
@@ -80,12 +86,14 @@ chosenStdenv.mkDerivation (finalAttrs: {
     [
       (lib.enableFeature finalAttrs.doCheck "unit")
       (lib.enableFeature finalAttrs.doCheck "integration")
+
+      # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag.
+      "--with-fapi=${if fapiSupport then "yes" else "no"}"
     ]
     ++ lib.optionals enableFuzzing [
       "--enable-fuzzing"
       "--disable-hardening"
-    ]
-    ++ lib.optional fapiSupport "--with-fapi";
+    ];
 
   strictDeps = true;
 
@@ -178,6 +186,10 @@ chosenStdenv.mkDerivation (finalAttrs: {
 
       # Enable tests to load TPM2 OpenSSL module
       export OPENSSL_MODULES="${openssl-modules}/lib/ossl-modules"
+    ''
+    + lib.optionalString defaultToFapi ''
+      # Need to change the default since the tests expect the other way.
+      export TPM2_PKCS11_BACKEND=esysdb
     '';
 
   postInstall = ''
@@ -211,13 +223,24 @@ chosenStdenv.mkDerivation (finalAttrs: {
     '';
 
   passthru = {
-    tests.tpm2-pkcs11-abrmd = tpm2-pkcs11.override {
-      abrmdSupport = true;
+    tests = {
+      inherit tpm2-pkcs11-esapi tpm2-pkcs11-fapi;
+      tpm2-pkcs11-abrmd = tpm2-pkcs11.override {
+        abrmdSupport = true;
+      };
+      tpm2-pkcs11-esapi-abrmd = tpm2-pkcs11-esapi.override {
+        abrmdSupport = true;
+      };
+      tpm2-pkcs11-fapi-abrmd = tpm2-pkcs11-fapi.override {
+        abrmdSupport = true;
+      };
     };
   };
 
   meta = {
-    description = "PKCS#11 interface for TPM2 hardware";
+    description =
+      "PKCS#11 interface for TPM2 hardware."
+      + lib.optionalString (extraDescription != null) " ${extraDescription}";
     homepage = "https://github.com/tpm2-software/tpm2-pkcs11";
     license = lib.licenses.bsd2;
     platforms = lib.platforms.linux;

pkgs/by-name/wo/workout-tracker/package.nix

@@ -9,13 +9,13 @@
 }:
 let
   pname = "workout-tracker";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "jovandeginste";
     repo = "workout-tracker";
     tag = "v${version}";
-    hash = "sha256-m/mQRFBIlffw+o0exBCejU3F5nSQhGEu3PGrw/M9l7M=";
+    hash = "sha256-TSRHsVpl/qfu4Dwttj1pYhD+4zzxCt48y9FF4zP1drY=";
   };
 
   assets = buildNpmPackage {

pkgs/by-name/xd/xdvdfs-cli/package.nix

@@ -0,0 +1,40 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "xdvdfs-cli";
+  version = "0.8.3";
+
+  src = fetchFromGitHub {
+    owner = "antangelo";
+    repo = "xdvdfs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-58f9eznPKeUVnUvslcm0CQPC+1xU3Zto+R56IXPBKT4=";
+  };
+
+  cargoHash = "sha256-vNCqfXsPjb3mph28YuYKpWTs9VHbIcXs6GVn4XgQKtQ=";
+
+  cargoBuildFlags = [ "--package xdvdfs-cli" ];
+  cargoTestFlags = [ "--package xdvdfs-cli" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/xdvdfs";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    mainProgram = "xdvdfs";
+    description = "Original Xbox DVD Filesystem library and management tool";
+    homepage = "https://github.com/antangelo/xdvdfs";
+    changelog = "https://github.com/antangelo/xdvdfs/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ federicoschonborn ];
+  };
+})

pkgs/development/compilers/go/1.23.nix

@@ -28,6 +28,7 @@ let
       "armv6l" = "arm";
       "armv7l" = "arm";
       "i686" = "386";
+      "loongarch64" = "loong64";
       "mips" = "mips";
       "mips64el" = "mips64le";
       "mipsel" = "mipsle";

pkgs/development/compilers/go/1.24.nix

@@ -28,6 +28,7 @@ let
       "armv6l" = "arm";
       "armv7l" = "arm";
       "i686" = "386";
+      "loongarch64" = "loong64";
       "mips" = "mips";
       "mips64el" = "mips64le";
       "mipsel" = "mipsle";

pkgs/development/compilers/go/binary.nix

@@ -18,6 +18,7 @@ let
       "armv7l" = "armv6l";
       "powerpc64le" = "ppc64le";
       "riscv64" = "riscv64";
+      "loongarch64" = "loong64";
     }
     .${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}");
 

pkgs/development/libraries/openvdb/default.nix

@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "openvdb";
-  version = "12.0.0";
+  version = "12.0.1";
 
   outputs = [
     "out"
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openvdb";
-    rev = "v${version}";
-    sha256 = "sha256-S2uvzDCrTxAmvUMJr5PChcYTqhIHvRZbOfQLtUvzypI=";
+    tag = "v${version}";
+    hash = "sha256-ofVhwULBDzjA+bfhkW12tgTMnFB/Mku2P2jDm74rutY=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/development/libraries/science/astronomy/indilib/default.nix

@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "indilib";
-  version = "2.1.2.1";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "indilib";
     repo = "indi";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EaLmwPyoQfdTUURKb6bBhg9kz7wSEzRdH3QQkayJDjA=";
+    hash = "sha256-Y2JmlboNU7e2Whvv6snd8Qgotr+AAkUkAd9qCORZoI0=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix

@@ -45,7 +45,7 @@ let
     owner = "indilib";
     repo = "indi-3rdparty";
     rev = "v${indilib.version}";
-    hash = "sha256-WYvinfAbMxgF5Q9iB/itQTMsVmG83lY45JriUo3kzFg=";
+    hash = "sha256-REmeIP0Cl5FfwUnL40u0dqZaJugBlLGT/Bts5j1bvgw=";
   };
 
   buildIndi3rdParty =
@@ -121,29 +121,6 @@ let
       }
     );
 
-  libahp-gt = buildIndi3rdParty {
-    pname = "libahp-gt";
-    meta = with lib; {
-      license = licenses.unfreeRedistributable;
-      platforms = with platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
-    };
-  };
-
-  # broken: needs libdfu
-  libahp-xc = buildIndi3rdParty {
-    pname = "libahp-xc";
-    buildInputs = [
-      libusb-compat-0_1
-      urjtag
-      libftdi1
-    ];
-    meta = with lib; {
-      license = licenses.unfreeRedistributable;
-      broken = true;
-      platforms = [ ];
-    };
-  };
-
   libaltaircam = buildIndi3rdParty {
     pname = "libaltaircam";
     meta = with lib; {
@@ -505,13 +482,12 @@ in
     buildInputs = [
       cfitsio
       indilib
-      libahp-xc
       libnova
       zlib
     ];
     meta = {
-      platforms = libahp-xc.meta.platforms;
-      # libahc-xc needs libdfu, which is not packaged
+      platforms = [ ];
+      # libahc-xc not packaged
       broken = true;
     };
   };
@@ -677,11 +653,9 @@ in
       indilib
       gsl
       gtest
-      libahp-gt
       libnova
       zlib
     ];
-    meta.platforms = libahp-gt.meta.platforms;
   };
 
   indi-ffmv = buildIndi3rdParty {

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

@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   replaceVars,
   ruff,
@@ -19,16 +18,14 @@
 
 buildPythonPackage rec {
   pname = "xsdata";
-  version = "24.12";
+  version = "25.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "tefra";
     repo = "xsdata";
     tag = "v${version}";
-    hash = "sha256-ARq7QNwEtnXo0Q04CNWf3bAwyjl92YnFUp/Y51sgsLU=";
+    hash = "sha256-2sHHDFv2p+O5ru9ajnmbk6ULm40h0hMyYiIAFh3PC8I=";
   };
 
   patches = [

pkgs/development/python-modules/xsdata/paths.patch

@@ -1,5 +1,5 @@
 diff --git a/xsdata/formats/dataclass/generator.py b/xsdata/formats/dataclass/generator.py
-index 1c155836..43506818 100644
+index f30196b1..b7934b3d 100644
 --- a/xsdata/formats/dataclass/generator.py
 +++ b/xsdata/formats/dataclass/generator.py
 @@ -240,14 +240,14 @@ class DataclassGenerator(AbstractGenerator):
@@ -9,13 +9,13 @@ index 1c155836..43506818 100644
 -                "ruff",
 +                "@ruff@",
                  "format",
-                 "--line-length",
-                 str(self.config.output.max_line_length),
+                 "--config",
+                 f"line-length={self.config.output.max_line_length}",
                  *file_paths,
              ],
              [
 -                "ruff",
 +                "@ruff@",
                  "check",
-                 "--line-length",
-                 str(self.config.output.max_line_length),
+                 "--config",
+                 f"line-length={self.config.output.max_line_length}",

pkgs/misc/barebox/default.nix

@@ -1,105 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  bison,
-  dtc,
-  flex,
-  libusb1,
-  lzop,
-  openssl,
-  pkg-config,
-  buildPackages,
-}:
-
-let
-  buildBarebox =
-    {
-      filesToInstall,
-      installDir ? "$out",
-      defconfig,
-      extraMeta ? { },
-      ...
-    }@args:
-    stdenv.mkDerivation rec {
-      pname = "barebox-${defconfig}";
-
-      version = "2020.12.0";
-
-      src = fetchurl {
-        url = "https://www.barebox.org/download/barebox-${version}.tar.bz2";
-        sha256 = "06vsd95ihaa2nywpqy6k0c7xwk2pzws4yvbp328yd2pfiigachrv";
-      };
-
-      postPatch = ''
-        patchShebangs scripts
-      '';
-
-      nativeBuildInputs = [
-        bison
-        dtc
-        flex
-        openssl
-        libusb1
-        lzop
-        pkg-config
-      ];
-      depsBuildBuild = [ buildPackages.stdenv.cc ];
-
-      hardeningDisable = [ "all" ];
-
-      makeFlags = [
-        "DTC=dtc"
-        "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-      ];
-
-      configurePhase = ''
-        runHook preConfigure
-
-        make ${defconfig}
-
-        runHook postConfigure
-      '';
-
-      installPhase = ''
-        runHook preInstall
-
-        mkdir -p ${installDir}
-        cp ${lib.concatStringsSep " " filesToInstall} ${installDir}
-
-        runHook postInstall
-      '';
-
-      enableParallelBuilding = true;
-
-      dontStrip = true;
-
-      meta =
-        with lib;
-        {
-          homepage = "https://www.barebox.org";
-          description = "Swiss Army Knive for bare metal";
-          license = licenses.gpl2Only;
-          maintainers = with maintainers; [ emantor ];
-        }
-        // extraMeta;
-    }
-    // removeAttrs args [ "extraMeta" ];
-
-in
-{
-  inherit buildBarebox;
-
-  bareboxTools = buildBarebox {
-    defconfig = "hosttools_defconfig";
-    installDir = "$out/bin";
-    extraMeta.platforms = lib.platforms.linux;
-    filesToInstall = [
-      "scripts/bareboximd"
-      "scripts/imx/imx-usb-loader"
-      "scripts/omap4_usbboot"
-      "scripts/omap3-usb-loader"
-      "scripts/kwboot"
-    ];
-  };
-}

pkgs/tools/admin/drawterm/default.nix

@@ -1,94 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFrom9Front,
-  unstableGitUpdater,
-  installShellFiles,
-  makeWrapper,
-  xorg,
-  pkg-config,
-  wayland-scanner,
-  pipewire,
-  wayland,
-  wayland-protocols,
-  libxkbcommon,
-  wlr-protocols,
-  pulseaudio,
-  config,
-  nixosTests,
-}:
-
-stdenv.mkDerivation {
-  pname = "drawterm";
-  version = "0-unstable-2025-03-18";
-
-  src = fetchFrom9Front {
-    owner = "plan9front";
-    repo = "drawterm";
-    rev = "0b43ac046ca81d78e9eca535ab1e92971d30405a";
-    hash = "sha256-L0a81zwzIKwnRK/Mu/kW1oHoJCroa+VDNGj7CI90WMQ=";
-  };
-
-  enableParallelBuilding = true;
-  strictDeps = true;
-  nativeBuildInputs =
-    [ installShellFiles ]
-    ++ {
-      linux = [
-        pkg-config
-        wayland-scanner
-      ];
-      unix = [ makeWrapper ];
-    }
-    ."${config}" or (throw "unsupported CONF");
-
-  buildInputs =
-    {
-      linux = [
-        pipewire
-        wayland
-        wayland-protocols
-        libxkbcommon
-        wlr-protocols
-      ];
-      unix = [
-        xorg.libX11
-        xorg.libXt
-      ];
-    }
-    ."${config}" or (throw "unsupported CONF");
-
-  # TODO: macos
-  makeFlags = [ "CONF=${config}" ];
-
-  installPhase =
-    {
-      linux = ''
-        install -Dm755 -t $out/bin/ drawterm
-      '';
-      unix = ''
-        # wrapping the oss output with pulse seems to be the easiest
-        mv drawterm drawterm.bin
-        install -Dm755 -t $out/bin/ drawterm.bin
-        makeWrapper ${pulseaudio}/bin/padsp $out/bin/drawterm --add-flags $out/bin/drawterm.bin
-      '';
-    }
-    ."${config}" or (throw "unsupported CONF")
-    + ''
-      installManPage drawterm.1
-    '';
-
-  passthru = {
-    updateScript = unstableGitUpdater { shallowClone = false; };
-    tests = nixosTests.drawterm;
-  };
-
-  meta = with lib; {
-    description = "Connect to Plan 9 CPU servers from other operating systems";
-    homepage = "https://drawterm.9front.org/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ moody ];
-    platforms = platforms.linux;
-    mainProgram = "drawterm";
-  };
-}

pkgs/top-level/aliases.nix

@@ -290,6 +290,7 @@ mapAliases {
   apacheKafka_3_6 = throw "apacheKafka_2_8 through _3_6 have been removed from nixpkgs as outdated"; # Added 2024-11-27
   antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
   apacheAnt = ant; # Added 2024-11-28
+  appimagekit = throw "'appimagekit' has been removed as it was broken in nixpkgs and archived upstream"; # Added 2025-04-19
   apple-sdk_10_12 = throw "apple-sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27
   apple-sdk_10_13 = throw "apple-sdk_10_13 was removed as Nixpkgs no longer supports macOS 10.13; see the 25.05 release notes"; # Added 2024-10-27
   apple-sdk_10_14 = throw "apple-sdk_10_14 was removed as Nixpkgs no longer supprots macOS 10.14; see the 25.05 release notes"; # Added 2024-10-27
@@ -325,6 +326,7 @@ mapAliases {
   baget = throw "'baget' has been removed due to being unmaintained";
   bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17
   bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
+  bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
   beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
   beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
@@ -358,6 +360,7 @@ mapAliases {
 
   budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
   budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
+  buildBarebox = throw "buildBarebox has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   buildGo122Module = throw "Go 1.22 is end-of-life, and 'buildGo122Module' has been removed. Please use a newer builder version."; # Added 2025-03-28
   buildGoPackage = throw "`buildGoPackage` has been deprecated and removed, see the Go section in the nixpkgs manual for details"; # Added 2024-11-18
 

pkgs/top-level/all-packages.nix

@@ -13282,12 +13282,6 @@ with pkgs;
     ubootWandboard
     ;
 
-  # Upstream Barebox:
-  inherit (callPackage ../misc/barebox { })
-    buildBarebox
-    bareboxTools
-    ;
-
   eudev = callPackage ../by-name/eu/eudev/package.nix {
     util-linux = util-linuxMinimal;
   };
@@ -14043,8 +14037,7 @@ with pkgs;
     buildServerGui = false;
   };
 
-  drawterm = callPackage ../tools/admin/drawterm { config = "unix"; };
-  drawterm-wayland = callPackage ../tools/admin/drawterm { config = "linux"; };
+  drawterm-wayland = callPackage ../by-name/dr/drawterm/package.nix { withWayland = true; };
 
   droopy = python3Packages.callPackage ../applications/networking/droopy { };
 
@@ -16539,16 +16532,6 @@ with pkgs;
       if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.virtualglLib else null;
   };
 
-  primusLib = callPackage ../tools/X11/primus/lib.nix {
-    nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
-  };
-
-  primus = callPackage ../tools/X11/primus {
-    stdenv_i686 = pkgsi686Linux.stdenv;
-    primusLib_i686 =
-      if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null;
-  };
-
   vlc-bin-universal = vlc-bin.override { variant = "universal"; };
 
   libvlc = vlc.override {
@@ -17030,13 +17013,6 @@ with pkgs;
     fteqcc
     ;
 
-  heroic-unwrapped = callPackage ../games/heroic {
-    # Upstream uses EOL Electron 31.  Use next oldest version.
-    electron = electron_33;
-  };
-
-  heroic = callPackage ../games/heroic/fhsenv.nix { };
-
   pmars-x11 = pmars.override { enableXwinGraphics = true; };
 
   vanillatd = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillatd"; };
@@ -17287,8 +17263,6 @@ with pkgs;
     libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
   };
 
-  gogdl = python3Packages.callPackage ../games/gogdl { };
-
   gscrabble = python3Packages.callPackage ../games/gscrabble { };
 
   gshogi = callPackage ../games/gshogi { };
@@ -17398,8 +17372,6 @@ with pkgs;
 
   nethack-x11 = callPackage ../games/nethack { x11Mode = true; };
 
-  nile = python3Packages.callPackage ../games/nile { };
-
   npush = callPackage ../games/npush { };
   run-npush = callPackage ../games/npush/run.nix { };