Merge master into staging-next

doc/build-helpers/testers.chapter.md

@@ -118,7 +118,7 @@ It has two modes:
 
 ## `shellcheck` {#tester-shellcheck}
 
-Runs files through `shellcheck`, a static analysis tool for shell scripts.
+Run files through `shellcheck`, a static analysis tool for shell scripts, failing if there are any issues.
 
 :::{.example #ex-shellcheck}
 # Run `testers.shellcheck`
@@ -127,7 +127,7 @@ A single script
 
 ```nix
 testers.shellcheck {
-  name = "shellcheck";
+  name = "script";
   src = ./script.sh;
 }
 ```
@@ -139,7 +139,7 @@ let
   inherit (lib) fileset;
 in
 testers.shellcheck {
-  name = "shellcheck";
+  name = "nixbsd-activate";
   src = fileset.toSource {
     root = ./.;
     fileset = fileset.unions [
@@ -154,15 +154,20 @@ testers.shellcheck {
 
 ### Inputs {#tester-shellcheck-inputs}
 
-[`src` (path or string)]{#tester-shellcheck-param-src}
+`name` (string, optional)
+: The name of the test.
+  `name` will be required at a future point because it massively improves traceability of test failures, but is kept optional for now to avoid breaking existing usages.
+  Defaults to `run-shellcheck`.
+  The name of the derivation produced by the tester is `shellcheck-${name}` when `name` is supplied.
 
+`src` (path-like)
 : The path to the shell script(s) to check.
   This can be a single file or a directory containing shell files.
   All files in `src` will be checked, so you may want to provide `fileset`-based source instead of a whole directory.
 
 ### Return value {#tester-shellcheck-return}
 
-A derivation that runs `shellcheck` on the given script(s).
+A derivation that runs `shellcheck` on the given script(s), producing an empty output if no issues are found.
 The build will fail if `shellcheck` finds any issues.
 
 ## `shfmt` {#tester-shfmt}

doc/redirects.json

@@ -1557,9 +1557,6 @@
   "tester-shellcheck-inputs": [
     "index.html#tester-shellcheck-inputs"
   ],
-  "tester-shellcheck-param-src": [
-    "index.html#tester-shellcheck-param-src"
-  ],
   "tester-shellcheck-return": [
     "index.html#tester-shellcheck-return"
   ],

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

@@ -18,6 +18,9 @@
 - The hand written `perlPackages.SearchXapian` bindings have been dropped in favor of the (mostly compatible)
   `perlPackages.Xapian`.
 
+- [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided.
+  The `name` argument will become mandatory in a future release.
+
 - The `nixLog*` family of functions made available through the standard environment have been rewritten to prefix messages with both the debug level and the function name of the caller.
   The `nixLog` function, which logs unconditionally, was also re-introduced and modified to prefix messages with the function name of the caller.
   For more information, [see this PR](https://github.com/NixOS/nixpkgs/pull/370742).

maintainers/maintainer-list.nix

@@ -7412,6 +7412,12 @@
     githubId = 32963606;
     email = "cptevris@gmail.com";
   };
+  evythedemon = {
+    name = "Evy Garden";
+    github = "EvysGarden";
+    githubId = 92547295;
+    email = "evysgarden@protonmail.com";
+  };
   ewok = {
     email = "ewok@ewok.ru";
     github = "ewok-old";

nixos/modules/config/nix-channel/test.nix

@@ -5,6 +5,7 @@ let
   inherit (lib) fileset;
 
   runShellcheck = testers.shellcheck {
+    name = "activation-check";
     src = fileset.toSource {
       root = ./.;
       fileset = fileset.unions [

nixos/modules/system/activation/lib/test.nix

@@ -31,6 +31,7 @@ let
   };
 
   runShellcheck = testers.shellcheck {
+    name = "activation-lib";
     src = runTests.src;
   };
 

pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix

@@ -12,19 +12,19 @@
   pkgs,
 }:
 let
-  version = "0.0.21";
+  version = "0.0.22";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
     tag = "v${version}";
-    hash = "sha256-XAI+kPUCcWrnHN0SHt6wrQ6gS/F24WGUS9PrtDGyU6A=";
+    hash = "sha256-m33yNoGnSYKfjTuabxx/QsMptiUxAcP8NVe/su+JfkE=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";
     inherit version src;
 
     useFetchCargoVendor = true;
-    cargoHash = "sha256-/S3zjjNOE53efalzMaFxtUsR24W3F6QwrovFIB8WrSU=";
+    cargoHash = "sha256-pmnMoNdaIR0i+4kwW3cf01vDQo39QakTCEG9AXA86ck=";
 
     nativeBuildInputs = [
       pkg-config

pkgs/build-support/testers/shellcheck/tester.nix

@@ -1,39 +1,35 @@
 # Dependencies (callPackage)
 {
   lib,
-  stdenv,
-  runCommand,
+  stdenvNoCC,
   shellcheck,
 }:
 
 # testers.shellcheck function
 # Docs: doc/build-helpers/testers.chapter.md
 # Tests: ./tests.nix
-{ src }:
-let
-  inherit (lib) pathType isPath;
-in
-stdenv.mkDerivation {
-  name = "run-shellcheck";
-  src =
-    if
-      isPath src && pathType src == "regular" # note that for strings this would have been IFD, which we prefer to avoid
-    then
-      runCommand "testers-shellcheck-src" { } ''
-        mkdir $out
-        cp ${src} $out
-      ''
+{
+  name ? null,
+  src,
+}:
+stdenvNoCC.mkDerivation {
+  __structuredAttrs = true;
+  strictDeps = true;
+  name =
+    if name == null then
+      lib.warn "testers.shellcheck: name will be required in a future release, defaulting to run-shellcheck" "run-shellcheck"
     else
-      src;
+      "shellcheck-${name}";
+  inherit src;
+  dontUnpack = true; # Unpack phase tries to extract an archive, which we don't want to do with source trees
   nativeBuildInputs = [ shellcheck ];
   doCheck = true;
   dontConfigure = true;
   dontBuild = true;
   checkPhase = ''
-    find . -type f -print0 \
-      | xargs -0 shellcheck
+    find "$src" -type f -print0 | xargs -0 shellcheck
   '';
   installPhase = ''
-    touch $out
+    touch "$out"
   '';
 }

pkgs/build-support/testers/shellcheck/tests.nix

@@ -4,39 +4,33 @@
 {
   lib,
   testers,
-  runCommand,
 }:
 lib.recurseIntoAttrs {
-
-  example-dir =
-    runCommand "test-testers-shellcheck-example-dir"
-      {
-        failure = testers.testBuildFailure (
-          testers.shellcheck {
-            src = ./src;
-          }
-        );
-      }
+  example-dir = testers.testBuildFailure' {
+    drv = testers.shellcheck {
+      name = "example-dir";
+      src = ./src;
+    };
+    expectedBuilderExitCode = 123;
+    expectedBuilderLogEntries = [
       ''
-        log="$failure/testBuildFailure.log"
-        echo "Checking $log"
-        grep SC2068 "$log"
-        touch $out
-      '';
-
-  example-file =
-    runCommand "test-testers-shellcheck-example-file"
-      {
-        failure = testers.testBuildFailure (
-          testers.shellcheck {
-            src = ./src/example.sh;
-          }
-        );
-      }
+        echo $@
+             ^-- SC2068 (error): Double quote array expansions to avoid re-splitting elements.
       ''
-        log="$failure/testBuildFailure.log"
-        echo "Checking $log"
-        grep SC2068 "$log"
-        touch $out
-      '';
+    ];
+  };
+
+  example-file = testers.testBuildFailure' {
+    drv = testers.shellcheck {
+      name = "example-file";
+      src = ./src/example.sh;
+    };
+    expectedBuilderExitCode = 123;
+    expectedBuilderLogEntries = [
+      ''
+        echo $@
+             ^-- SC2068 (error): Double quote array expansions to avoid re-splitting elements.
+      ''
+    ];
+  };
 }

pkgs/by-name/ce/certinfo-go/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "certinfo-go";
-  version = "0.1.40";
+  version = "0.1.42";
 
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "certinfo";
     tag = "v${version}";
-    hash = "sha256-YPylhWHPr2Sxi5i0A32cgIWEh1VpAoDEmOHu/Cs/uDg=";
+    hash = "sha256-XnHQTMohpuMnV2trSqZ9PlKWmuOyHGDj+6ljKfUD40A=";
   };
 
-  vendorHash = "sha256-e+FUVFiW46lQ6Ha1cl6D+MRnpRh8rzeRiacItVh5MGE=";
+  vendorHash = "sha256-Bbj+8TAJJWhkOxib9cz/Znj5bHAXcgrDONRpGDK+los=";
 
   ldflags = [
     "-s"

pkgs/by-name/io/iodine/package.nix

@@ -20,8 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ zlib ];
 
-  patchPhase = ''sed -i "s,/sbin/route,${nettools}/bin/route," src/tun.c'';
-
   env.NIX_CFLAGS_COMPILE = ''-DIFCONFIGPATH="${nettools}/bin/" -DROUTEPATH="${nettools}/bin/"'';
 
   installFlags = [ "prefix=\${out}" ];
@@ -31,9 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    homepage = "http://code.kryo.se/iodine/";
+    homepage = "https://code.kryo.se/iodine/";
     description = "Tool to tunnel IPv4 data through a DNS server";
     license = lib.licenses.isc;
     platforms = lib.platforms.unix;
+    maintainers = [ ];
   };
 })

pkgs/by-name/ma/mangayomi/package.nix

@@ -1,8 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  flutter324,
-  pkg-config,
+  flutter327,
   webkitgtk_4_1,
   mpv,
   rustPlatform,
@@ -11,27 +10,42 @@
   makeDesktopItem,
   replaceVars,
 }:
+
 let
   pname = "mangayomi";
-  version = "0.3.8";
+  version = "0.5.2";
+
   src = fetchFromGitHub {
     owner = "kodjodevf";
     repo = "mangayomi";
     tag = "v${version}";
-    hash = "sha256-TOCDGmJ5tlpcGS8NeVdIdx946rM1/ItQVY9OnDS6uZ0=";
+    hash = "sha256-xF3qvmEGctYXE7HWka89G4W6ytMTVGw75o26h/Ql0Aw=";
   };
+
+  metaCommon = {
+    changelog = "https://github.com/kodjodevf/mangayomi/releases/tag/v${version}";
+    description = "Reading manga, novels, and watching animes";
+    homepage = "https://github.com/kodjodevf/mangayomi";
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
+  };
+
   rustDep = rustPlatform.buildRustPackage {
     inherit pname version src;
 
     sourceRoot = "${src.name}/rust";
 
     useFetchCargoVendor = true;
-    cargoHash = "sha256-Qzq1FyWtUy1533/S1KS8XEou5nAnq0O0Vxxlt+Iv8OQ=";
+
+    cargoHash = "sha256-WkWNgjTA50cOztuF9ZN6v8l38kldarqUOMXNFJDI0Ds=";
 
     passthru.libraryPath = "lib/librust_lib_mangayomi.so";
+
+    meta = metaCommon;
   };
 in
-flutter324.buildFlutterApplication {
+flutter327.buildFlutterApplication {
   inherit pname version src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -60,18 +74,20 @@ flutter324.buildFlutterApplication {
       };
   };
 
-  gitHashes = {
-    desktop_webview_window = "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA=";
-    flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A=";
-    media_kit_libs_windows_video = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk=";
-    media_kit_native_event_loop = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk=";
-    media_kit_video = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk=";
-  };
+  gitHashes =
+    let
+      media_kit-hash = "sha256-bRwDrK6YdQGuXnxyIaNtvRoubl3i42ksaDsggAwgB80=";
+    in
+    {
+      desktop_webview_window = "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA=";
+      flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A=";
+      media_kit_libs_windows_video = media_kit-hash;
+      media_kit_video = media_kit-hash;
+      media_kit = media_kit-hash;
+      flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw=";
+    };
 
-  nativeBuildInputs = [
-    pkg-config
-    copyDesktopItems
-  ];
+  nativeBuildInputs = [ copyDesktopItems ];
 
   buildInputs = [
     webkitgtk_4_1
@@ -101,16 +117,15 @@ flutter324.buildFlutterApplication {
   '';
 
   extraWrapProgramArgs = ''
-    --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
+    --prefix LD_LIBRARY_PATH : $out/app/mangayomi/lib
   '';
 
-  meta = {
-    changelog = "https://github.com/kodjodevf/mangayomi/releases/tag/v${version}";
-    description = "Read manga and stream anime from a variety of sources including BitTorrent";
-    homepage = "https://github.com/kodjodevf/mangayomi";
+  passthru = {
+    inherit rustDep;
+    updateScript = ./update.sh;
+  };
+
+  meta = metaCommon // {
     mainProgram = "mangayomi";
-    license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ ];
-    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/ma/mangayomi/update.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
+
+set -eou pipefail
+
+ROOT="$(dirname "$(readlink -f "$0")")"
+
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/kodjodevf/mangayomi/releases/latest | jq --raw-output .tag_name)
+latestVersion=$(echo "$latestTag" | sed 's/^v//')
+
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; mangayomi.version or (lib.getVersion mangayomi)" | tr -d '"')
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+    echo "package is up-to-date: $currentVersion"
+    exit 0
+fi
+
+nix-update --subpackage rustDep mangayomi
+
+curl https://raw.githubusercontent.com/kodjodevf/mangayomi/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json

pkgs/by-name/mi/microsoft-edge/package.nix

@@ -168,11 +168,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "133.0.3065.69";
+  version = "134.0.3124.51";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-IrMCmqigNzlKWaHiawmL+rJaArMMYOc9kt6CyTcdfRc=";
+    hash = "sha256-i7C6Q4uCBZnIyd2LA+Kws5/WxHZaoz/UxgN9AtZCtuo=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

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

@@ -78,6 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace python/CMakeLists.txt \
       --replace-fail ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}' \
                      ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH}'
+
+    substituteInPlace ng/ng.tcl ng/onetcl.cpp \
+      --replace-fail "libnggui" "$out/lib/libnggui"
   '';
 
   nativeBuildInputs = [
@@ -121,11 +124,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doInstallCheck)
   ];
 
-  # Tcl script used by netgen need to be aware of environment NETGENDIR
-  postInstall = ''
-    wrapProgram "$out/bin/netgen" --set NETGENDIR "$out/bin"
-  '';
-
   # mesh generation differs on x86_64 and aarch64 platform
   # tests will fail on aarch64 platform
   doInstallCheck = stdenv.hostPlatform.isx86_64;

pkgs/by-name/op/opnborg/package.nix

@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "opnborg";
-  version = "0.1.64";
+  version = "0.1.66";
 
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "opnborg";
     rev = "v${version}";
-    hash = "sha256-v1+hN77l3Y7IyxoZWJqN96odpzKGQ0fiXfLRFgqy+IQ=";
+    hash = "sha256-7WYDkAHhCrVghNd+77XfwF1WwYJ8azt0Twn4d/rDjU8=";
   };
 
-  vendorHash = "sha256-J4CKwjOkjBb2v/H3x+TTatW7dL7gZYYV8yAvz2pvjTE=";
+  vendorHash = "sha256-i9MDtaR5uTrIhpliCyK/WMZqT69TyPVLQI9AGHCWavU=";
 
   ldflags = [
     "-s"

pkgs/by-name/pn/pnetcdf/package.nix

@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gfortran,
+  autoreconfHook,
+  perl,
+  mpi,
+  mpiCheckPhaseHook,
+  gitUpdater,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pnetcdf";
+  version = "1.14.0";
+
+  src = fetchFromGitHub {
+    owner = "Parallel-NetCDF";
+    repo = "PnetCDF";
+    tag = "checkpoint.${finalAttrs.version}";
+    hash = "sha256-Zyhzyvdh9Pf5GkcJW3duGgI6m3Dy0RR5B9YtA83Hpr4=";
+  };
+
+  nativeBuildInputs = [
+    perl
+    autoreconfHook
+    gfortran
+  ];
+
+  buildInputs = [ mpi ];
+
+  postPatch = ''
+    patchShebangs src/binding/f77/buildiface
+  '';
+
+  doCheck = true;
+
+  nativeCheckInputs = [ mpiCheckPhaseHook ];
+
+  checkTarget = lib.concatStringsSep " " [
+    # build all test programs (build only, no run)
+    "tests"
+    # run sequential test programs
+    "check"
+    # run parallel test programs on 3,4,6,8 MPI processes
+    "ptests"
+  ];
+
+  # cannot do parallel check otherwise failed
+  enableParallelChecking = false;
+
+  enableParallelBuilding = true;
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "checkpoint.";
+  };
+
+  meta = {
+    homepage = "https://parallel-netcdf.github.io/";
+    license = with lib.licenses; [
+      # Files: *
+      # Copyright: (c) 2003 Northwestern University and Argonne National Laboratory
+      bsd3
+
+      # Files: src/drivers/common/utf8proc.c
+      # Copyright: (c) 2006-2007 Jan Behrens, FlexiGuided GmbH, Berlin
+      mit
+
+      # Files: src/drivers/common/utf8proc_data.c
+      # Copyright: 1991-2007 Unicode, Inc.
+      unicode-30
+    ];
+    description = "Parallel I/O Library for NetCDF File Access";
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ qbisi ];
+  };
+})

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

@@ -12,17 +12,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "3.21.0";
+  version = "3.22.0";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-Y5kyf/F1Icf1GVkPY1pYTaMvh5IE07CgTuwy9KHQQjM=";
+    hash = "sha256-WzdLMKL0Bg8z1qlhg4sbzRuGreqgyydqLEkwl8lbngY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-a+b49uaqKvmdbV0XHT+qYy9weO3vhs2Jkaht5a74qGU=";
+  cargoHash = "sha256-TVuA8Xo7v+NSGMnttLu1iCwFpi7ue7s/z3i1H4ofaXs=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/re/refine/package.nix

@@ -34,7 +34,7 @@ in
 
 python3Packages.buildPythonApplication rec {
   pname = "refine";
-  version = "0.4.4";
+  version = "0.5.2";
   pyproject = false; # uses meson
 
   src = fetchFromGitLab {
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
     owner = "TheEvilSkeleton";
     repo = "Refine";
     tag = version;
-    hash = "sha256-39fbUJpNON0aALT/pb18/m9hStue4TxkrAsHymEpy5I=";
+    hash = "sha256-G1G9uuch7kdqWvSfCSOgb9o67da7spNKnnka47k4/rY=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/sd/sdl2-compat/package.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl2-compat";
-  version = "2.30.52";
+  version = "2.32.52";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl2-compat";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-pdY+yrLWIjMTjmKdYvX4DjzXy2cKaw6P90BPu8K163k";
+    hash = "sha256-adtFcBFclfub//KGpxqObuTIZbh9r4k/jdJEnP1Hzpw=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/sd/sdl3-image/package.nix

@@ -0,0 +1,67 @@
+{
+  lib,
+  sdl3,
+  darwin,
+  libavif,
+  libtiff,
+  libwebp,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  validatePkgConfig,
+  # Boolean flags
+  enableTests ? true,
+  enableImageIO ? stdenv.hostPlatform.isDarwin,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sdl3-image";
+  version = "3.2.4";
+
+  outputs = [
+    "lib"
+    "dev"
+    "out"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "libsdl-org";
+    repo = "SDL_image";
+    tag = "release-${finalAttrs.version}";
+    hash = "sha256-/orQ+YfH0CV8DOqXFMF9fOT4YaVpC1t55xM3j520Png=";
+  };
+
+  strictDeps = true;
+  doCheck = true;
+
+  nativeBuildInputs = [
+    cmake
+    validatePkgConfig
+  ];
+
+  buildInputs = [
+    sdl3
+    libtiff
+    libwebp
+    libavif
+  ] ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation);
+
+  cmakeFlags = [
+    # fail when a dependency could not be found
+    (lib.cmakeBool "SDLIMAGE_STRICT" true)
+    # disable shared dependencies as they're opened at runtime using SDL_LoadObject otherwise.
+    (lib.cmakeBool "SDLIMAGE_DEPS_SHARED" false)
+    # enable imageio backend
+    (lib.cmakeBool "SDLIMAGE_BACKEND_IMAGEIO" enableImageIO)
+    # enable tests
+    (lib.cmakeBool "SDLIMAGE_TESTS" enableTests)
+  ];
+
+  meta = {
+    description = "SDL image library";
+    homepage = "https://github.com/libsdl-org/SDL_image";
+    license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ evythedemon ];
+    inherit (sdl3.meta) platforms;
+  };
+})

pkgs/by-name/sy/syncterm/package.nix

@@ -14,22 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "syncterm";
-  version = "1.1";
+  version = "1.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}-src.tgz";
-    sha256 = "19m76bisipp1h3bc8mbq83b851rx3lbysxb0azpbr5nbqr2f8xyi";
+    url = "mirror://sourceforge/syncterm/syncterm-${version}-src.tgz";
+    hash = "sha256-eeOuQ9OfmKWSJo/0AJQJTaYqpYe1uSXmt0WdZqXRHUk=";
   };
 
-  patches = [
-    # Cherry-picks from the upstream Synchronet tree, removing calls to `pthread_yield`.
-    # See upstream issue: https://gitlab.synchro.net/main/sbbs/-/issues/299
-    (fetchpatch {
-      url = "https://gitlab.synchro.net/main/sbbs/-/commit/851627df99f48d8eaad33d3a98ef309b4371f359.patch";
-      hash = "sha256-DbFAeJnrwFyfEpZgZFN8etqX6vQ3ca2TJwaqp0aHeo4=";
-    })
-    ./0001-use-sched-yield-53264f2b.patch
-  ];
   # We can't use sourceRoot, as the cherry-picked patches apply to files outside of it.
   postPatch = ''cd src/syncterm'';
 
@@ -44,6 +35,7 @@ stdenv.mkDerivation rec {
     ++ (lib.optionals stdenv.hostPlatform.isLinux [
       "-DUSE_ALSA_SOUND" # Don't use OSS for beeps.
     ]);
+
   makeFlags = [
     "PREFIX=$(out)"
     "RELEASE=1"
@@ -66,15 +58,15 @@ stdenv.mkDerivation rec {
     SDL2
   ]; # Both of these are dlopen()'ed at runtime.
 
-  meta = with lib; {
+  meta = {
     # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin'
     broken =
       (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin;
     homepage = "https://syncterm.bbsdev.net/";
     description = "BBS terminal emulator";
     mainProgram = "syncterm";
-    maintainers = with maintainers; [ embr ];
-    platforms = platforms.unix;
-    license = licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ embr ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
   };
 }

pkgs/by-name/td/tdlib/package.nix

@@ -36,7 +36,7 @@ in
 
 stdenv.mkDerivation {
   pname = "tdlib";
-  version = "1.8.45";
+  version = "1.8.46";
 
   src = fetchFromGitHub {
     owner = "tdlib";
@@ -45,8 +45,8 @@ stdenv.mkDerivation {
     # The tdlib authors do not set tags for minor versions, but
     # external programs depending on tdlib constrain the minor
     # version, hence we set a specific commit with a known version.
-    rev = "8e29c4d7d21db3ab2c7a88c384626e95ef789f61";
-    hash = "sha256-R/OkKj65PEDrFOTvybv3tQ/cyqBZDzusnd5RJgrgspo=";
+    rev = "207f3be7b58b2a2b9f0a066b5b6ef18782b8b517";
+    hash = "sha256-+cqdRp+J/W1Cyh+TqbglaerN4w3AVGp5NC5JLVK5e3k=";
   };
 
   buildInputs = [

pkgs/by-name/tl/tlsinfo/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "tlsinfo";
-  version = "0.1.43";
+  version = "0.1.45";
 
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "tlsinfo";
     tag = "v${version}";
-    hash = "sha256-3H/1UlktRVnCd95OFkOqPp6gciGZCOBpj0UFfO+tyJg=";
+    hash = "sha256-gVKB03Tv00c+vO9IgwESWCU1Vqh3iwkVuQLk3BEHlUk=";
   };
 
-  vendorHash = "sha256-yFb4Z8i3b6lPQ4NOszEI2k5s5dmE7Z7YGSFZuExXZ4I=";
+  vendorHash = "sha256-FFefmnXPCyTEOUkM8A0UCz0nZ0Ors8scxZIwVPnSiac=";
 
   ldflags = [
     "-s"

pkgs/by-name/wa/warp-terminal/versions.json

@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-s8SBoSCRgmgWB0P0YngHegqVvwVOPcYwQHpdTfzDGlE=",
-    "version": "0.2025.02.26.08.02.stable_02"
+    "hash": "sha256-Reni9yNh4Z2aXrl3Z1jJrkLk6BkEfiFIayr58/K5H0k=",
+    "version": "0.2025.03.05.08.02.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-kwlX0UpKcY+YrYe46bkDz8BT/dtmezA95hONAzyqatE=",
-    "version": "0.2025.02.26.08.02.stable_02"
+    "hash": "sha256-8z2FZVi4xLTDMSTgNE/Yxy/wZRRxRdjRrI/5dXcUdRA=",
+    "version": "0.2025.03.05.08.02.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-skIH8OBy5rtM193T3yUPTCEQ/etnQYqo6yaT+IJBX9U=",
-    "version": "0.2025.02.26.08.02.stable_02"
+    "hash": "sha256-7rwfxhrE4cROHfU3Z/VIoMbqn3EZJcEeTTPzmCbXdbw=",
+    "version": "0.2025.03.05.08.02.stable_02"
   }
 }

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

@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "evohome-async";
-  version = "1.0.2";
+  version = "1.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "zxdavb";
     repo = "evohome-async";
     tag = version;
-    hash = "sha256-CpN0QAlUqCDy6hNkuNvbjQUee40BA0UqAleR+Omm9bA=";
+    hash = "sha256-VjUndmthuKGlvFX6sTWWxeGWFWDwN+UEtS9J/8nKQ9s=";
   };
 
   build-system = [ hatchling ];

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

@@ -4,23 +4,20 @@
   aiounittest,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pytestCheckHook,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pyfronius";
-  version = "0.7.6";
+  version = "0.7.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "nielstron";
     repo = "pyfronius";
     tag = version;
-    hash = "sha256-zyRcMueKZbk2QWhF3d500NUpvljikO8fsDnePy6Tq90=";
+    hash = "sha256-ewU1NubcL9LAWIH3fO/joHJKb7mAw+4u+BWGcq3GAnQ=";
   };
 
   build-system = [ setuptools ];

pkgs/servers/monitoring/prometheus/alertmanager.nix

@@ -9,17 +9,17 @@
 
 buildGoModule rec {
   pname = "alertmanager";
-  version = "0.28.0";
+  version = "0.28.1";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    hash = "sha256-m8UbC9aSzUmoyfCxBNNSCeUQvnQqMlXrcOU0ygH9byE=";
+    hash = "sha256-2HHQ7S1J/X4PVFnPbi8Oapsqf1MyNnsqfMMBJRItWf0=";
   };
 
-  vendorHash = "sha256-oIQ7sXBoYC/KSYk8Er8XEg6nf0vJ3kF80hysmInmdIc=";
+  vendorHash = "sha256-4XWHe32UZ+1HOQzQdZX4leoPD6pfJZwyjDQV3dv164s=";
 
   subPackages = [
     "cmd/alertmanager"

pkgs/top-level/python-packages.nix

@@ -9401,7 +9401,7 @@ self: super: with self; {
 
   netdisco = callPackage ../development/python-modules/netdisco { };
 
-  netgen = toPythonModule (pkgs.netgen.override { python3Packages = self; });
+  netgen-mesher = toPythonModule (pkgs.netgen.override { python3Packages = self; });
 
   nethsm = callPackage ../development/python-modules/nethsm { };