Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -1092,6 +1092,12 @@
     githubId = 45104896;
     name = "Alexandru Nechita";
   };
+  alexandrutocar = {
+    email = "at@myquiet.place";
+    github = "alexandrutocar";
+    githubId = 65486851;
+    name = "Alexandru Tocar";
+  };
   alexarice = {
     email = "alexrice999@hotmail.co.uk";
     github = "alexarice";

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

@@ -627,6 +627,8 @@
 
 - `services.soft-serve` now restarts upon config change.
 
+- `services.keycloak` now provides a `realmFiles` option that allows to import realms during startup. See https://www.keycloak.org/server/importExport
+
 - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
 
 - [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option.

nixos/lib/test-driver/src/test_driver/machine.py

@@ -1,6 +1,7 @@
 import base64
 import io
 import os
+import platform
 import queue
 import re
 import select
@@ -199,7 +200,13 @@ class StartCommand:
         allow_reboot: bool = False,
     ) -> str:
         display_opts = ""
+
         display_available = any(x in os.environ for x in ["DISPLAY", "WAYLAND_DISPLAY"])
+        if platform.system() == "Darwin":
+            # We have no DISPLAY variables on macOS and seemingly no better way
+            # to find out
+            display_available = "TERM_PROGRAM" in os.environ
+
         if not display_available:
             display_opts += " -nographic"
 

nixos/modules/services/misc/snapper.nix

@@ -55,10 +55,15 @@ let
     };
 
     FSTYPE = lib.mkOption {
-      type = lib.types.enum [ "btrfs" ];
+      type = lib.types.enum [
+        "btrfs"
+        "bcachefs"
+      ];
       default = "btrfs";
       description = ''
         Filesystem type. Only btrfs is stable and tested.
+
+        bcachefs support is experimental.
       '';
     };
 

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

@@ -128,10 +128,29 @@ let
 
   siteOpts = { options, config, lib, name, ... }:
     {
+      # TODO: Remove in time for 25.11 and/or simplify once https://github.com/NixOS/nixpkgs/issues/96006 is fixed
+      imports = [
+        ({config, options, ... }: let
+          removalNote = "The option has had no effect for 3+ years. There is no replacement available.";
+          optPath = lib.options.showOption [ "services" "dokuwiki" "sites" name "enable" ];
+        in {
+          options.enable = mkOption {
+            visible = false;
+            apply = x: throw "The option `${optPath}' can no longer be used since it's been removed. ${removalNote}";
+          };
+          config.assertions = [
+            {
+              assertion = !options.enable.isDefined;
+              message = ''
+                The option definition `${optPath}' in ${showFiles options.enable.files} no longer has any effect; please remove it.
+              ${removalNote}
+              '';
+            }
+          ];
+        })
+      ];
 
       options = {
-        enable = mkEnableOption "DokuWiki web application";
-
         package = mkPackageOption pkgs "dokuwiki" { };
 
         stateDir = mkOption {
@@ -342,6 +361,13 @@ let
           '';
         };
 
+        # TODO: Remove when no submodule-level assertions are needed anymore
+        assertions = mkOption {
+          type = types.listOf types.unspecified;
+          default = [ ];
+          visible = false;
+          internal = true;
+        };
     };
   };
 in
@@ -374,6 +400,8 @@ in
 
   # implementation
   config = mkIf (eachSite != {}) (mkMerge [{
+    # TODO: Remove when no submodule-level assertions are needed anymore
+    assertions = flatten (mapAttrsToList (_: cfg: cfg.assertions) eachSite);
 
     services.phpfpm.pools = mapAttrs' (hostName: cfg: (
       nameValuePair "dokuwiki-${hostName}" {

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

@@ -102,24 +102,12 @@ in
         phpPackage = cfg.phpPackage.buildEnv {
           extensions =
             { all, enabled }:
-            with all;
+            enabled
-            [
+            ++ (with all; [
               apcu
-              ctype
-              curl
-              dom
-              exif
-              filter
-              gd
-              mbstring
-              opcache
-              openssl
-              session
-              simplexml
               xml
               yaml
-              zip
+            ]);
-            ];
 
           extraConfig = generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault { } " = "; } {
             output_buffering = "0";

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

@@ -90,6 +90,7 @@ in
         enum
         package
         port
+        listOf
         ;
 
       assertStringPath =
@@ -288,6 +289,25 @@ in
         '';
       };
 
+      realmFiles = mkOption {
+        type = listOf path;
+        example = lib.literalExpression ''
+          [
+            ./some/realm.json
+            ./another/realm.json
+          ]
+        '';
+        default = [ ];
+        description = ''
+          Realm files that the server is going to import during startup.
+          If a realm already exists in the server, the import operation is
+          skipped. Importing the master realm is not supported. All files are
+          expected to be in `json` format. See the
+          [documentation](https://www.keycloak.org/server/importExport) for
+          further information.
+        '';
+      };
+
       settings = mkOption {
         type = lib.types.submodule {
           freeformType = attrsOf (
@@ -644,6 +664,24 @@ in
         '';
       };
 
+      systemd.tmpfiles.settings."10-keycloak" =
+        let
+          mkTarget =
+            file:
+            let
+              baseName = builtins.baseNameOf file;
+              name = if lib.hasSuffix ".json" baseName then baseName else "${baseName}.json";
+            in
+            "/run/keycloak/data/import/${name}";
+          settingsList = map (f: {
+            name = mkTarget f;
+            value = {
+              "L+".argument = "${f}";
+            };
+          }) cfg.realmFiles;
+        in
+        builtins.listToAttrs settingsList;
+
       systemd.services.keycloak =
         let
           databaseServices =
@@ -725,7 +763,7 @@ in
               cp $CREDENTIALS_DIRECTORY/ssl_{cert,key} /run/keycloak/ssl/
             ''
             + ''
-              kc.sh --verbose start --optimized
+              kc.sh --verbose start --optimized ${lib.optionalString (cfg.realmFiles != [ ]) "--import-realm"}
             '';
         };
 

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

@@ -277,7 +277,7 @@ def get_profiles() -> list[str]:
 def install_bootloader(args: argparse.Namespace) -> None:
     try:
         with open("/etc/machine-id") as machine_file:
-            machine_id = machine_file.readlines()[0]
+            machine_id = machine_file.readlines()[0].strip()
     except IOError as e:
         if e.errno != errno.ENOENT:
             raise

pkgs/applications/editors/vim/plugins/generated.nix

@@ -12141,6 +12141,19 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
+  rainbow_csv = buildVimPlugin {
+    pname = "rainbow_csv";
+    version = "2024-07-05";
+    src = fetchFromGitHub {
+      owner = "mechatroner";
+      repo = "rainbow_csv";
+      rev = "3dbbfd7d17536aebfb80f571255548495574c32b";
+      sha256 = "0zdhk1fhjdqsi9zlmhdnasg2kxik3lh3kpq7w1hmyf5z3dsmbzv5";
+    };
+    meta.homepage = "https://github.com/mechatroner/rainbow_csv/";
+    meta.hydraPlatforms = [ ];
+  };
+
   rainbow_parentheses-vim = buildVimPlugin {
     pname = "rainbow_parentheses.vim";
     version = "2013-03-05";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -931,6 +931,7 @@ https://github.com/stefandtw/quickfix-reflector.vim/,,
 https://github.com/dannyob/quickfixstatus/,,
 https://github.com/jbyuki/quickmath.nvim/,HEAD,
 https://github.com/luochen1990/rainbow/,,
+https://github.com/mechatroner/rainbow_csv/,HEAD,
 https://github.com/kien/rainbow_parentheses.vim/,,
 https://github.com/vim-scripts/random.vim/,,
 https://github.com/winston0410/range-highlight.nvim/,,

pkgs/applications/emulators/libretro/cores/beetle-psx.nix

@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-psx" + lib.optionalString withHw "-hw";
-  version = "0-unstable-2025-01-10";
+  version = "0-unstable-2025-03-16";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-psx-libretro";
-    rev = "60cf49e94e65d4023d93718161dc03b9e24da47a";
+    rev = "d4a2ce15eea2e93ba984d1800fe7151b14df0de4";
-    hash = "sha256-EFiLF/5zcoPFnzozEqkXWOEjx3KCgRoixYXqN9ai7qc=";
+    hash = "sha256-Xq3NOH6rsuZQnifE0brX98okchKrLG7fB8eAgt+aK9A=";
   };
 
   extraBuildInputs = lib.optionals withHw [

pkgs/applications/emulators/libretro/cores/dosbox-pure.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2025-01-12";
+  version = "0-unstable-2025-03-13";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "e69a36a83c09f6660f7683d64eb8077a2da9a487";
+    rev = "8af2dee6d8efb406067c5120d7fb175eddfefcb9";
-    hash = "sha256-QiwkWP6fHiGASN1SpLY+pSJVsu3TsENj7oAM4pCXnsk=";
+    hash = "sha256-mBSm25ABAvjc0s4YTAViGtzgGSpq0EXYt5q+7agHc6M=";
   };
 
   hardeningDisable = [ "format" ];

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

@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2025-01-11";
+  version = "0-unstable-2025-03-10";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "b35ef5663b809a449a4c89f6e9808fd0a63e7e49";
+    rev = "b15a49e31172f05dfdb1b1a15ea71e8a870c27ae";
-    hash = "sha256-P3R8gV4LxorfW0qo8HVOZunK58+/SO5pvlmij/HlnKw=";
+    hash = "sha256-+jNdMeW11w8Bg4TZD8fYOFGOPxcHHu+apR+w2QZCIXw=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/am/amnezia-vpn/package.nix

@@ -56,13 +56,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amnezia-vpn";
-  version = "4.8.4.4";
+  version = "4.8.5.0";
 
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amnezia-client";
     tag = finalAttrs.version;
-    hash = "sha256-uWO38eK4pJ7pkViyBh3QSVWPIMXn1tcMSS4Bt1M1bpk=";
+    hash = "sha256-k0BroQYrmJzM0+rSZMf20wHba5NbOK/xm5lbUFBNEHI=";
     fetchSubmodules = true;
   };
 

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

@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  python3Packages,
+  nix-update-script,
+}:
+
+let
+  opencv4WithGtk = python3Packages.opencv4.override {
+    enableGtk2 = true; # For GTK2 support
+    enableGtk3 = true; # For GTK3 support
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "apriltags";
+  version = "3.4.3";
+
+  src = fetchFromGitHub {
+    owner = "AprilRobotics";
+    repo = "AprilTags";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1XbsyyadUvBZSpIc9KPGiTcp+3G7YqHepWoORob01Ss=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [ opencv4WithGtk ];
+
+  cmakeFlags = [ (lib.cmakeBool "BUILD_EXAMPLES" true) ];
+
+  doCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Visual fiducial system popular for robotics research";
+    homepage = "https://april.eecs.umich.edu/software/apriltag";
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ phodina ];
+  };
+})

pkgs/by-name/ca/cargo-tauri/package.nix

@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tauri";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${version}";
-    hash = "sha256-EQ/df2fPhB4j6HcBjnwwSES8l65QU0VUjkMJfDBh5MA=";
+    hash = "sha256-koNbtmNC/F5t10z/joP/+J0VAlu336E6t4N7tfnu8+8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-d+d2QFZfGZ9n3wefxWaQC3ePmokAV5J5743jLYjfI2s=";
+  cargoHash = "sha256-Os/9VArYsPGAkjqsCjpR0+m9wds4l/HTFKdacacLU1I=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/ca/cargo-tauri/test-app.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       ;
 
-    hash = "sha256-qomBrnpJeFuDr3Vz173uYrMxTvVgu/qJvMAOYII4smI=";
+    hash = "sha256-U/wYt+cEDGqEIg/Q9nC0Xo4wyW0ljfd77929+b8iSnE=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/co/cosmic-applibrary/package.nix

@@ -7,14 +7,15 @@
   just,
   nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
-    tag = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-hJOM5dZdLq6uYfhfspZzpbHgUOK/FWuIXuFPoisS8DU=";
   };
 
@@ -62,4 +63,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.linux;
     mainProgram = "cosmic-app-library";
   };
-}
+})

pkgs/by-name/co/cosmic-edit/package.nix

@@ -18,14 +18,14 @@
   vulkan-loader,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
-    rev = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-mKVZI/x8+LrwFHGnJOzOq/vFkGev7sM9xJQOTA7uZGA=";
   };
 
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   # COSMIC applications now uses vergen for the About page
   # Update the COMMIT_DATE to match when the commit was made
   env.VERGEN_GIT_COMMIT_DATE = "2025-02-20";
-  env.VERGEN_GIT_SHA = src.rev;
+  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
 
   postPatch = ''
     substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
@@ -95,4 +95,4 @@ rustPlatform.buildRustPackage rec {
     ];
     platforms = platforms.linux;
   };
-}
+})

pkgs/by-name/co/cosmic-idle/package.nix

@@ -12,14 +12,15 @@
   bash,
   nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-idle";
-    tag = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-hORU+iMvWA4XMSWmzir9EwjpLK5vOLR8BgMZz+aIZ4U=";
   };
 
@@ -65,4 +66,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.linux;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
   };
-}
+})

pkgs/by-name/co/cosmic-notifications/package.nix

@@ -14,14 +14,14 @@
   intltool,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-notifications";
-    rev = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-d6bAiRSO2opKSZfadyQYrU9oIrXwPNzO/g2E2RY6q04=";
   };
 
@@ -70,4 +70,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [ nyabinary ];
     platforms = platforms.linux;
   };
-}
+})

pkgs/by-name/co/cosmic-osd/package.nix

@@ -8,14 +8,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-osd";
-    tag = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-ezOeRgqI/GOWFknUVZI7ZLEy1GYaBI+/An83HWKL6ho=";
   };
 
@@ -51,4 +51,4 @@ rustPlatform.buildRustPackage rec {
     ];
     platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/co/cosmic-player/package.nix

@@ -15,14 +15,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-player";
-    tag = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-Ebjj+C+yLCRomZy2W8mYDig1pv7aQcD3A9V2M53RM5U=";
   };
 
@@ -91,4 +91,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.linux;
     mainProgram = "cosmic-player";
   };
-}
+})

pkgs/by-name/co/cosmic-screenshot/package.nix

@@ -7,14 +7,14 @@
   pkg-config,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-screenshot";
-    rev = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-/sGYF+XWmPraNGlBVUcN/nokDB9JwWViEAL9gVH3ZaI=";
   };
 
@@ -45,4 +45,4 @@ rustPlatform.buildRustPackage rec {
     platforms = platforms.linux;
     mainProgram = "cosmic-screenshot";
   };
-}
+})

pkgs/by-name/co/cosmic-settings-daemon/package.nix

@@ -9,14 +9,14 @@
   udev,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
-    rev = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-DtwW6RxHnNh87Xu0NCULfUsHNzYU9tHtFKE9HO3rvME=";
   };
 
@@ -46,4 +46,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [ nyabinary ];
     platforms = platforms.linux;
   };
-}
+})

pkgs/by-name/co/cosmic-store/package.nix

@@ -12,14 +12,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
   version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
-    tag = "epoch-${version}";
+    tag = "epoch-${finalAttrs.version}";
     hash = "sha256-ce7PaHBhRFUoujAS6j10XWbD2PxzK6XXIk/ENclT1iY=";
   };
 
@@ -72,4 +72,4 @@ rustPlatform.buildRustPackage rec {
     ];
     platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/cr/creek/build.zig.zon.nix

@@ -0,0 +1,110 @@
+# generated by zon2nix (https://github.com/Cloudef/zig2nix)
+{
+  lib,
+  linkFarm,
+  fetchurl,
+  fetchgit,
+  runCommandLocal,
+  zig,
+  name ? "zig-packages",
+}:
+let
+  unpackZigArtifact =
+    {
+      name,
+      artifact,
+    }:
+    runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
+      hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
+      mv "$TMPDIR/p/$hash" "$out"
+      chmod 755 "$out"
+    '';
+
+  fetchZig =
+    {
+      name,
+      url,
+      hash,
+    }:
+    let
+      artifact = fetchurl { inherit url hash; };
+    in
+    unpackZigArtifact { inherit name artifact; };
+
+  fetchGitZig =
+    {
+      name,
+      url,
+      hash,
+    }:
+    let
+      parts = lib.splitString "#" url;
+      url_base = builtins.elemAt parts 0;
+      url_without_query = builtins.elemAt (lib.splitString "?" url_base) 0;
+      rev_base = builtins.elemAt parts 1;
+      rev =
+        if builtins.match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
+    in
+    fetchgit {
+      inherit name rev hash;
+      url = url_without_query;
+      deepClone = false;
+    };
+
+  fetchZigArtifact =
+    {
+      name,
+      url,
+      hash,
+    }:
+    let
+      parts = lib.splitString "://" url;
+      proto = builtins.elemAt parts 0;
+      path = builtins.elemAt parts 1;
+      fetcher = {
+        "git+http" = fetchGitZig {
+          inherit name hash;
+          url = "http://${path}";
+        };
+        "git+https" = fetchGitZig {
+          inherit name hash;
+          url = "https://${path}";
+        };
+        http = fetchZig {
+          inherit name hash;
+          url = "http://${path}";
+        };
+        https = fetchZig {
+          inherit name hash;
+          url = "https://${path}";
+        };
+      };
+    in
+    fetcher.${proto};
+in
+linkFarm name [
+  {
+    name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56";
+    path = fetchZigArtifact {
+      name = "zig-pixman";
+      url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz";
+      hash = "sha256-CYgFIOR9H5q8UUpFglaixOocCMT6FGpcKQQBUVWpDKQ=";
+    };
+  }
+  {
+    name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
+    path = fetchZigArtifact {
+      name = "zig-wayland";
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
+      hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA=";
+    };
+  }
+  {
+    name = "1220a4029ee3ee70d3175c69878e2b70dccd000c4324bc74ba800d8a143b7250fb38";
+    path = fetchZigArtifact {
+      name = "zig-fcft";
+      url = "https://git.sr.ht/~novakane/zig-fcft/archive/1.1.0.tar.gz";
+      hash = "sha256-osL/zsXqa8tC/Qvzf0/wXeNCzw02F2viCo+d8Gh2S7U=";
+    };
+  }
+]

pkgs/by-name/cr/creek/package.nix

@@ -0,0 +1,58 @@
+{
+  callPackage,
+  lib,
+  zig_0_13,
+  stdenv,
+  fetchFromGitHub,
+  fcft,
+  pixman,
+  pkg-config,
+  wayland,
+  wayland-scanner,
+  wayland-protocols,
+}:
+let
+  zig = zig_0_13;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "creek";
+  version = "0.4.2";
+
+  src = fetchFromGitHub {
+    owner = "nmeum";
+    repo = "creek";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3Q690DEMgPqURTHKzJwH5iVyTLvgYqNpxuwAEV+/Lyw=";
+  };
+
+  nativeBuildInputs = [
+    zig.hook
+    pkg-config
+    wayland
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    fcft
+    pixman
+    wayland-protocols
+  ];
+
+  deps = callPackage ./build.zig.zon.nix {
+    inherit zig;
+  };
+
+  zigBuildFlags = [
+    "--system"
+    "${finalAttrs.deps}"
+  ];
+
+  meta = {
+    homepage = "https://git.8pit.net/creek";
+    description = "Malleable and minimalist status bar for the River compositor";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ alexandrutocar ];
+    mainProgram = "creek";
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/by-name/do/docker-color-output/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "docker-color-output";
-  version = "2.5.1";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "devemio";
     repo = "docker-color-output";
     tag = version;
-    hash = "sha256-rnCZ+6t6iOiLBynp1EPshO+/otAdtu8yy1FqFkYB07w=";
+    hash = "sha256-r11HNRXnmTC1CJR871sX7xW9ts9KAu1+azwIwXH09qg=";
   };
 
   vendorHash = null;

pkgs/by-name/fa/faustPhysicalModeling/package.nix

@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "faustPhysicalModeling";
-  version = "2.77.3";
+  version = "2.79.3";
 
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
     rev = version;
-    sha256 = "sha256-CADiJXyB4FivQjbh1nhpAVgCkTi1pW/vtXKXfL7o7xU=";
+    sha256 = "sha256-j5ADlKZriwLARpEJ/4xgvyAhF5ld9Hl2gXZS3NPJJj8=";
   };
 
   nativeBuildInputs = [

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

@@ -9,7 +9,7 @@
   unibilium,
 }:
 let
-  version = "0.4.3";
+  version = "0.4.5";
 in
 stdenv.mkDerivation {
   pname = "libtickit";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     owner = "leonerd";
     repo = "libtickit";
     rev = "v${version}";
-    hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc=";
+    hash = "sha256-q8JMNFxmnyOiUso4nXLZjJIBFYR/EF6g45lxVeY0f1s=";
   };
 
   patches = [

pkgs/by-name/sb/sbom4python/package.nix

@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sbom4python";
-  version = "0.12.2";
+  version = "0.12.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthonyharrison";
     repo = "sbom4python";
     tag = "v${version}";
-    hash = "sha256-F2rEyHvosP0/FJHFN/kPdM1e18bWdbC1V5L4de3aAZc=";
+    hash = "sha256-H96M/X6WKSrA3zs0uLUHqY2zmsXLNZ8OtekC1MDfF1s=";
   };
 
   build-system = with python3Packages; [

pkgs/by-name/se/sequoia-sq/package.nix

@@ -10,22 +10,23 @@
   capnproto,
   installShellFiles,
   openssl,
+  cacert,
   sqlite,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sequoia-sq";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sq";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
-    hash = "sha256-m6uUqTXswzdtIabNgijdU54VGQSk0SkSqdh+7m1Q7RU=";
+    hash = "sha256-1jssSlyjbrGgkxGC1gieZooVVI42Qvz0q+pIfcZRIj0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-a+3oKORX88SfMw4/QA6+Ls12koZIw0iadTulCzGlr6U=";
+  cargoHash = "sha256-tATxGaoF/+cUDywvlnW1N2sKo/FbKhJM7yUb74mxB5s=";
 
   nativeBuildInputs = [
     pkg-config
@@ -48,14 +49,11 @@ rustPlatform.buildRustPackage rec {
       ]
     );
 
-  checkFlags = [
-    # https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/297
-    "--skip=sq_autocrypt_import"
-  ];
-
   # Needed for tests to be able to create a ~/.local/share/sequoia directory
+  # Needed for avoiding "OpenSSL error" since 1.2.0
   preCheck = ''
     export HOME=$(mktemp -d)
+    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
   '';
 
   env.ASSET_OUT_DIR = "/tmp/";
@@ -74,10 +72,10 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Cool new OpenPGP implementation";
+    description = "Command line application exposing a useful set of OpenPGP functionality for common tasks";
     homepage = "https://sequoia-pgp.org/";
-    changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${version}/NEWS";
+    changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${finalAttrs.version}/NEWS";
-    license = lib.licenses.gpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [
       minijackson
       doronbehar
@@ -85,4 +83,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "sq";
   };
-}
+})

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

@@ -8,29 +8,33 @@
 
 stdenv.mkDerivation {
   pname = "simplenes";
-  version = "unstable-2019-03-13";
+  version = "0-unstable-2025-01-05";
 
   src = fetchFromGitHub {
     owner = "amhndu";
     repo = "SimpleNES";
-    rev = "4edb7117970c21a33b3bfe11a6606764fffc5173";
+    rev = "154a2fd4f2f2611a27197aa8d802bbcdfd1a0ea3";
-    sha256 = "1nmwj431iwqzzcykxd4xinqmg0rm14mx7zsjyhcc5skz7pihz86g";
+    hash = "sha256-4Nb42tb/pJaVOOhj7hH9cQLDKCz8GUXWz8KAHPOd9nE=";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ sfml ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin
     cp ./SimpleNES $out/bin
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/amhndu/SimpleNES";
     description = "NES emulator written in C++";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "SimpleNES";
   };
 }

pkgs/by-name/te/tectonic-unwrapped/package.nix

@@ -52,9 +52,9 @@ buildRustPackage rec {
   cargoPatches = [
     (fetchpatch2 {
       # cherry-picked from https://github.com/tectonic-typesetting/tectonic/pull/1202
-      name = "1202-fix-build-with-rust-1_80";
+      name = "1202-fix-build-with-rust-1_80-and-icu-75";
-      url = "https://github.com/tectonic-typesetting/tectonic/commit/6b49ca8db40aaca29cb375ce75add3e575558375.patch";
+      url = "https://github.com/tectonic-typesetting/tectonic/compare/19654bf152d602995da970f6164713953cffc2e6...6b49ca8db40aaca29cb375ce75add3e575558375.patch?full_index=1";
-      hash = "sha256-i1L3XaSuBbsmgOSXIWVqr6EHlHGs8A+6v06kJ3C50sk=";
+      hash = "sha256-CgQBCFvfYKKXELnR9fMDqmdq97n514CzGJ7EBGpghJc=";
     })
   ];
 

pkgs/by-name/ur/url-parser/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "url-parser";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "url-parser";
     tag = "v${version}";
-    hash = "sha256-eAfe23aATve9d9Nhxi49ZatpbfzeZLnfPZN+ZV/tD1I=";
+    hash = "sha256-GIJj4t6xDXfXMWfSpUR1iI1Ju/W/2REedgtyEFgbylE=";
   };
 
-  vendorHash = "sha256-Znt8C7B+tSZnzq+3DaycEu0VtkltKhODG9sB5aO99rc=";
+  vendorHash = "sha256-gYkuSBgkDdAaJArsvTyZXkvYCKXkhic5XzLqPbbGVOw=";
 
   ldflags = [
     "-s"

pkgs/by-name/ve/vencord/package.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.11.6";
+  version = "1.11.7";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8KAt7yFGT/DBlg2VJ7ejsOJ67Sp5cuuaKEWK3+VpL4E=";
+    hash = "sha256-WzmRz0wf/Ss90FmXXp6gaylC0k/k/QkFaFddlnLo+Xk=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

pkgs/by-name/we/weston/package.nix

@@ -31,7 +31,7 @@
   pipewireSupport ? true,
   pipewire,
   rdpSupport ? true,
-  freerdp,
+  freerdp3,
   remotingSupport ? true,
   gst_all_1,
   vaapiSupport ? true,
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional lcmsSupport lcms2
     ++ lib.optional pangoSupport pango
     ++ lib.optional pipewireSupport pipewire
-    ++ lib.optional rdpSupport freerdp
+    ++ lib.optional rdpSupport freerdp3
     ++ lib.optionals remotingSupport [
       gst_all_1.gstreamer
       gst_all_1.gst-plugins-base

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

@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "approvaltests";
-  version = "14.3.0";
+  version = "14.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "approvals";
     repo = "ApprovalTests.Python";
     tag = "v${version}";
-    hash = "sha256-HcF4SjAdAPxINB0+kI1RWtKQ3VBhMNpFk6BECup7E+w=";
+    hash = "sha256-cFxa+QNfMk8+5jC4cxhbUs09/0tHjOgdsaE8XfxG6yk=";
   };
 
   build-system = [ setuptools ];
@@ -56,6 +56,7 @@ buildPythonPackage rec {
 
   disabledTests = [
     "test_preceding_whitespace"
+    "test_command_line_verify"
     # Tests expect paths below ApprovalTests.Python directory
     "test_received_filename"
     "test_pytest_namer"

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

@@ -2,18 +2,19 @@
   lib,
   stdenv,
   aiohttp,
+  audioop-lts,
   buildPythonPackage,
   fetchFromGitHub,
+  ffmpeg,
   libopus,
   pynacl,
-  withVoice ? true,
-  ffmpeg,
   setuptools,
+  withVoice ? true,
 }:
 
 let
   pname = "discord.py";
-  version = "2.4.0";
+  version = "2.5.2";
 in
 buildPythonPackage {
   inherit pname version;
@@ -23,12 +24,15 @@ buildPythonPackage {
     owner = "Rapptz";
     repo = "discord.py";
     tag = "v${version}";
-    hash = "sha256-GIwXx7bRCH2+G3zlilJ/Tb8el50SDbxGGX2/1bqL3+U=";
+    hash = "sha256-xaZeOkfOhm1CL5ceu9g/Vlas4jpYoQDlGMEtACFY7PE=";
   };
 
   build-system = [ setuptools ];
 
-  dependencies = [ aiohttp ] ++ lib.optionals withVoice [ pynacl ];
+  dependencies = [
+    aiohttp
+    audioop-lts
+  ] ++ lib.optionals withVoice [ pynacl ];
 
   patchPhase = lib.optionalString withVoice ''
     substituteInPlace "discord/opus.py" \

pkgs/development/python-modules/django-admin-datta/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "django-admin-datta";
-  version = "1.0.16";
+  version = "1.0.17";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ef7SwKRbzuUWuwf24p5hxLXllEdCwqixoMEFy33f3Tc=";
+    hash = "sha256-1POh1ii6sITt2rqn+2S2B/kK1tsKsSlgxc1fEnCvSCM=";
   };
 
   propagatedBuildInputs = [ django ];

pkgs/development/python-modules/django-allauth/default.nix

@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  version = "65.4.1";
+  version = "65.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "pennersr";
     repo = "django-allauth";
     tag = version;
-    hash = "sha256-z5vaNopIk1CAV+TpH/V3Y6lXf7ztU4QeHZ9OTSPCgc0=";
+    hash = "sha256-VHMt3iX8q+tgXQ86xDhGOmlQLvmBZJN5N3w+C96J8cA=";
   };
 
   nativeBuildInputs = [ gettext ];

pkgs/development/python-modules/django-appconf/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "django-appconf";
-  version = "1.0.6";
+  version = "1.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "django-compressor";
     repo = "django-appconf";
     tag = "v${version}";
-    hash = "sha256-H9MwX5LtHkYN6TshP7rRKlX/iOJZHbQVsZeki95yks4=";
+    hash = "sha256-raK3Q+6cDSOiK5vrgZG65qDUiFOrRhDKxsPOQv/lz8w=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/django-htmx/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "django-htmx";
-  version = "1.21.0";
+  version = "1.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "adamchainz";
     repo = "django-htmx";
     rev = version;
-    hash = "sha256-2zmCJ+oHvw21lvCgAFja2LRPA6LNWep4uRor0z1Ft6g=";
+    hash = "sha256-IgVkHgTk4hC0lL6LVM16QoT2xtPWxKNu+NrcyxZ5oVY=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/django-mfa3/default.nix

@@ -8,31 +8,20 @@
   fido2,
   qrcode,
   python,
-  fetchpatch,
 }:
 
 buildPythonPackage rec {
   pname = "django-mfa3";
-  version = "0.13.0";
+  version = "0.15.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xi";
     repo = "django-mfa3";
     tag = version;
-    hash = "sha256-O8po7VevqyHlP2isnNnLbpgfs1p4sFezxIZKMTgnwuY=";
+    hash = "sha256-HcurgGSzPnKVRpL9NVq0vkCmYDvj/HoWYVbnIrK5pSI=";
   };
 
-  patches = [
-    # Fix for tests.tests.FIDO2Test.test_origin_https
-    # https://github.com/xi/django-mfa3/issues/24
-    (fetchpatch {
-      url = "https://github.com/xi/django-mfa3/commit/49003746783e32cd60e55c4593bef5d7e709c4bd.patch";
-      hash = "sha256-D3fPURAB+RC16fSd2COpCIcmjZW/1h92GOOhRczSVec=";
-      name = "test_origin_https_fix.patch";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [

pkgs/development/python-modules/django-modeltranslation/default.nix

@@ -1,34 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  django,
   django-stubs,
-  pytestCheckHook,
+  django,
+  fetchFromGitHub,
+  parameterized,
   pytest-cov-stub,
   pytest-django,
-  parameterized,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
 }:
-let
+
-  # 0.18.12 was yanked from PyPI, it refers to this issue:
+buildPythonPackage rec {
-  # https://github.com/deschler/django-modeltranslation/issues/701
-  version = "0.19.12";
-in
-buildPythonPackage {
   pname = "django-modeltranslation";
-  inherit version;
+  version = "0.19.13";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "deschler";
     repo = "django-modeltranslation";
     tag = "v${version}";
-    hash = "sha256-j5IKAjGes1EUNX9XE1RAPkGJGviABa4VFl789Mj2dyc=";
+    hash = "sha256-mn3dGSJbujULPT/PBAVvd1hlCukMItC4Z8dIZ+MWZ2w=";
   };
 
-  disabled = pythonOlder "3.6";
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ django ];
+  dependencies = [ django ];
 
   nativeCheckInputs = [
     django-stubs
@@ -38,9 +38,12 @@ buildPythonPackage {
     parameterized
   ];
 
+  pythonImportsCheck = [ "modeltranslation" ];
+
   meta = with lib; {
     description = "Translates Django models using a registration approach";
     homepage = "https://github.com/deschler/django-modeltranslation";
+    changelog = "https://github.com/deschler/django-modeltranslation/blob/v${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ augustebaum ];
   };

pkgs/development/python-modules/django-picklefield/default.nix

@@ -4,22 +4,24 @@
   fetchFromGitHub,
   django,
   python,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "django-picklefield";
-  version = "3.2.0";
+  version = "3.3.0";
-  format = "setuptools";
+  pyproject = true;
 
-  # The PyPi source doesn't contain tests
   src = fetchFromGitHub {
     owner = "gintas";
-    repo = pname;
+    repo = "django-picklefield";
-    rev = "v${version}";
+    tag = "v${version}";
-    sha256 = "sha256-UMMbJoSHWcdumZOFPhKNUjThGzU/8nhP2J8YsDjgbHo=";
+    hash = "sha256-/H6spsf2fmJdg5RphD8a4YADggr+5d+twuLoFMfyEac=";
   };
 
-  propagatedBuildInputs = [ django ];
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
 
   checkPhase = ''
     runHook preCheck
@@ -27,9 +29,12 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
+  pythonImportsCheck = [ "picklefield" ];
+
   meta = with lib; {
     description = "Pickled object field for Django";
     homepage = "https://github.com/gintas/django-picklefield";
+    changelog = "https://github.com/gintas/django-picklefield/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = [ ];
   };

pkgs/development/python-modules/django-q2/default.nix

@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "django-q2";
-  version = "1.7.4";
+  version = "1.7.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-q2";
     repo = "django-q2";
     tag = "v${version}";
-    hash = "sha256-mp/IZkfT64xW42B1TEO6lSHxvLQbeH4td8vqZH7wUxM=";
+    hash = "sha256-L2IrLKszo2UCpeioAwI8c636KwQgNCEJjHUDY2Ctv4A=";
   };
 
   postPatch = ''

pkgs/development/python-modules/django-silk/default.nix

@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "django-silk";
-  version = "5.3.1";
+  version = "5.3.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "jazzband";
     repo = "django-silk";
     tag = version;
-    hash = "sha256-Rm3iyEFphhDYGC7fQy+RUrbAOQQSOSiu+bOcp7TozN0=";
+    hash = "sha256-+JOUpjKR0rx+4+hU/5gSov5nW2aj7HR+HYr5FPbUkSA=";
   };
 
   # "test_time_taken" tests aren't suitable for reproducible execution, but Django's

pkgs/development/python-modules/django-soft-delete/default.nix

@@ -3,29 +3,33 @@
   buildPythonPackage,
   fetchPypi,
   django,
-  setuptools,
+  hatchling,
 }:
 
 buildPythonPackage rec {
   pname = "django-soft-delete";
-  version = "1.0.16";
+  version = "1.0.18";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "django_soft_delete";
-    hash = "sha256-zEA5jM2GnHWm1rp/Um4WxK/isMCBHCE6MY2Wu0xYp4c=";
+    inherit version;
+    hash = "sha256-0vnbRJpPAI6XhvgvpLr75AdfegsyhIRHNQB+mIsqTfY=";
   };
 
+  build-system = [ hatchling ];
+
   dependencies = [ django ];
 
-  build-system = [ setuptools ];
-
   # No tests
   doCheck = false;
 
+  pythonImportsCheck = [ "django_softdelete" ];
+
   meta = {
     description = "Soft delete models, managers, queryset for Django";
     homepage = "https://github.com/san4ezy/django_softdelete";
     license = lib.licenses.mit;
+    maintainers = [ ];
   };
 }

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

@@ -1,35 +1,35 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
   exceptiongroup,
+  fetchPypi,
   poetry-core,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "generic";
-  version = "1.1.3";
+  version = "1.1.4";
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
-  format = "pyproject";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d4+CRv1uecIdS4t23cAI34s/PdIFYNQXfABuRWjzCUQ=";
+    hash = "sha256-3QcFbbWgCJcL37MwiK1Sv7LG6N60zsw93CupD4Xzp/w=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ exceptiongroup ];
+  dependencies = [ exceptiongroup ];
 
   pythonImportsCheck = [ "generic" ];
 
   meta = with lib; {
     description = "Generic programming (Multiple dispatch) library for Python";
-    maintainers = [ ];
     homepage = "https://github.com/gaphor/generic";
     changelog = "https://github.com/gaphor/generic/releases/tag/${version}";
     license = licenses.bsd3;
+    maintainers = [ ];
   };
 }

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

@@ -1,38 +1,34 @@
 {
-  buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
   lib,
-
+  buildPythonPackage,
-  # pythonPackages
-  hatchling,
   dnspython,
   expiringdict,
+  fetchPypi,
+  hatchling,
   html2text,
-  mail-parser,
   imapclient,
+  mail-parser,
   publicsuffix2,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "mailsuite";
-  version = "1.9.18";
+  version = "1.9.20";
-  format = "pyproject";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3rK5PgcAOKVvZbFT7PaZX9lhU8yKpPQozvh2F8mTkfA=";
+    hash = "sha256-1DS0TzEejvviF3BPBiiCVJLOOi8RQuGoDIpKRm+CNHo=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  pythonRelaxDeps = [ "mail-parser" ];
 
-  pythonRelaxDeps = [
+  build-system = [ hatchling ];
-    "mail-parser"
-  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dnspython
     expiringdict
     html2text
@@ -43,12 +39,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mailsuite" ];
 
+  # Module has no tests
   doCheck = false;
 
   meta = {
     description = "Python package to simplify receiving, parsing, and sending email";
     homepage = "https://seanthegeek.github.io/mailsuite/";
-    maintainers = with lib.maintainers; [ talyz ];
+    changelog = "https://github.com/seanthegeek/mailsuite/blob/master/CHANGELOG.md";
     license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ talyz ];
   };
 }

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

@@ -3,6 +3,9 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+  jinja2,
+  poetry-core,
+  pytest,
   pythonOlder,
   requests,
   setuptools,
@@ -10,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "meraki";
-  version = "1.54.0";
+  version = "1.56.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,16 +22,22 @@ buildPythonPackage rec {
     owner = "meraki";
     repo = "dashboard-api-python";
     tag = version;
-    hash = "sha256-eRGVC0M8PtK3UUuECXUXrD5rGnAK04f+3/xVl+2rjAM=";
+    hash = "sha256-OMoi4t7lMQF/fMV/lWg+GwSmKg5cXwiVSROfpZRtXJM=";
   };
 
-  build-system = [
+  pythonRelaxDeps = [
-    setuptools
+    "pytest"
+    "setuptools"
   ];
 
+  build-system = [ poetry-core ];
+
   dependencies = [
     aiohttp
+    jinja2
+    pytest
     requests
+    setuptools
   ];
 
   # All tests require an API key

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

@@ -50,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "nicegui";
-  version = "2.12.1";
+  version = "2.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui";
     tag = "v${version}";
-    hash = "sha256-te2YMKOnvmo2FCdIB1lvqcVsHBD4k5KK10E2Bol6uEg=";
+    hash = "sha256-CawBLQstWLZ7AOmoOxsU7W7bZnnqvMmZacBC9CI/h+M=";
   };
 
   build-system = [

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

@@ -2,30 +2,32 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   pycryptodome,
+  python-kasa,
+  pythonOlder,
   requests,
   rtp,
-  urllib3,
   setuptools,
+  urllib3,
 }:
 
 buildPythonPackage rec {
   pname = "pytapo";
-  version = "3.3.38";
+  version = "3.3.42";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-o3onR27lKg2QAa1Tgdidv6iOzqb/XlkJPq+vkkIhnAY=";
+    hash = "sha256-wToCKRmFyhsrRxDLcOtWagVVEPn4mYzfWxz3qwTnP2I=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     pycryptodome
+    python-kasa
     requests
     rtp
     urllib3

pkgs/development/python-modules/routeros-api/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "routeros-api";
-  version = "0.18.1";
+  version = "0.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "socialwifi";
     repo = "routeros-api";
     tag = version;
-    hash = "sha256-6IpoByG3YhHh2dPS18ufaoI1vzTZBsZa9WNHS/fImrg=";
+    hash = "sha256-1g37fDB+/6bVwgtgE1YzGnUpDaLEfwDpQWoqjHgeeqk=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/sphinxext-rediraffe/default.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  sphinx,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "sphinxext-rediraffe";
+  version = "0.2.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "wpilibsuite";
+    repo = "sphinxext-rediraffe";
+    tag = "v${version}";
+    hash = "sha256-g+GD1ApD26g6PwPOH/ir7aaEgH+n1QQYSr9QizYrmug=";
+  };
+
+  postPatch = ''
+    # Fixes "packaging.version.InvalidVersion: Invalid version: 'main'"
+    substituteInPlace setup.py \
+      --replace-fail 'version = "main"' 'version = "${version}"'
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    sphinx
+  ];
+
+  # tests require seleniumbase which is not currently in nixpkgs
+  doCheck = false;
+
+  pythonImportsCheck = [ "sphinxext.rediraffe" ];
+
+  pythonNamespaces = [ "sphinxext" ];
+
+  meta = {
+    description = "Sphinx extension to redirect files";
+    homepage = "https://github.com/wpilibsuite/sphinxext-rediraffe";
+    changelog = "https://github.com/wpilibsuite/sphinxext-rediraffe/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.newam ];
+  };
+}

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

@@ -12,21 +12,21 @@
 
 buildPythonPackage rec {
   pname = "yamllint";
-  version = "1.35.1";
+  version = "1.37.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "adrienverge";
     repo = "yamllint";
     tag = "v${version}";
-    hash = "sha256-+7Q2cPl4XElI2IfLAkteifFVTrGkj2IjZk7nPuc6eYM=";
+    hash = "sha256-874VqcJyHMVIvrR3qzL2H7/Hz7qRb7GDWI56SAdCz00=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     pyyaml
     pathspec
   ];
@@ -37,6 +37,8 @@ buildPythonPackage rec {
     [
       # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373
       "test_find_files_recursively"
+      # Issue wih fixture
+      "test_codec_built_in_equivalent"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307
@@ -49,12 +51,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Linter for YAML files";
-    mainProgram = "yamllint";
     homepage = "https://github.com/adrienverge/yamllint";
     changelog = "https://github.com/adrienverge/yamllint/blob/v${version}/CHANGELOG.rst";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    maintainers = with maintainers; [ mikefaille ];
-      mikefaille
+    mainProgram = "yamllint";
-    ];
   };
 }

pkgs/development/tools/build-managers/scala-cli/sources.json

@@ -1,21 +1,21 @@
 {
-  "version": "1.6.2",
+  "version": "1.7.1",
   "assets": {
     "aarch64-darwin": {
       "asset": "scala-cli-aarch64-apple-darwin.gz",
-      "sha256": "039cprk224i1vszk86vhxg6rz637smrrnfbz449sy7pk6qlzq7xi"
+      "sha256": "0nmqcd8a7qhj8msdwjng0x33024gxwnfby6nw3p2fnm8gjs8y99b"
     },
     "aarch64-linux": {
       "asset": "scala-cli-aarch64-pc-linux.gz",
-      "sha256": "1p0vf33m0nrb8s6hhm4c931ialp20v37w2v7m3f46w11s4hmk6qj"
+      "sha256": "1ilnahpwrlknh41b7swq3vf4f5wnnpm1snfpi7g6cw9m7sq575m4"
     },
     "x86_64-darwin": {
       "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "1y9x84s7k8lcnb074q0pljjcgr8in2ll7lqxfwh5yrapxzjm7jh8"
+      "sha256": "17krx8wqizgcac98scihgh34n7y9cd9prpfd6wr09n7xmhrw334b"
     },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
-      "sha256": "15xx7ijj7cahhkzn5knnx3kcc2rrycshhqfk24l73lf0j2b5gzhf"
+      "sha256": "0ck252q0wn6q4lv10ydz7w2fj0h33a8a1cf677qwy26d0ciy3ii2"
     }
   }
 }

pkgs/servers/monitoring/prometheus/redis-exporter.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "redis_exporter";
-  version = "1.68.0";
+  version = "1.69.0";
 
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
     rev = "v${version}";
-    sha256 = "sha256-rdJPrGRXNZq00U3ZX0AqaDPUtLBcPRZhqHPVuUV/Tm4=";
+    sha256 = "sha256-KIbrJJ2QNghj/dehcDXJqWJU2pD6mt8Gw9RPLK3RTk0=";
   };
 
   vendorHash = "sha256-8N/gY6YvhrGGwziLUPC12vhoxZ8QnCxgv9jxFnG6/XQ=";

pkgs/servers/nextcloud/packages/29.json

@@ -249,6 +249,16 @@
       "agpl"
     ]
   },
+  "oidc_login": {
+    "hash": "sha256-RLYquOE83xquzv+s38bahOixQ+y4UI6OxP9HfO26faI=",
+    "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.2.2/oidc_login.tar.gz",
+    "version": "3.2.2",
+    "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication",
+    "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "onlyoffice": {
     "hash": "sha256-Bh0CGw0qdJI+NzJ/dmzoqSZdVYzcFbqSJa70gvZhDGs=",
     "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.7.0/onlyoffice.tar.gz",

pkgs/servers/nextcloud/packages/30.json

@@ -249,6 +249,16 @@
       "agpl"
     ]
   },
+  "oidc_login": {
+    "hash": "sha256-RLYquOE83xquzv+s38bahOixQ+y4UI6OxP9HfO26faI=",
+    "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.2.2/oidc_login.tar.gz",
+    "version": "3.2.2",
+    "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication",
+    "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "onlyoffice": {
     "hash": "sha256-Bh0CGw0qdJI+NzJ/dmzoqSZdVYzcFbqSJa70gvZhDGs=",
     "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.7.0/onlyoffice.tar.gz",

pkgs/servers/nextcloud/packages/31.json

@@ -239,6 +239,16 @@
       "agpl"
     ]
   },
+  "oidc_login": {
+    "hash": "sha256-RLYquOE83xquzv+s38bahOixQ+y4UI6OxP9HfO26faI=",
+    "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.2.2/oidc_login.tar.gz",
+    "version": "3.2.2",
+    "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication",
+    "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "onlyoffice": {
     "hash": "sha256-Bh0CGw0qdJI+NzJ/dmzoqSZdVYzcFbqSJa70gvZhDGs=",
     "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.7.0/onlyoffice.tar.gz",

pkgs/servers/nextcloud/packages/README.md

@@ -1,4 +1,16 @@
-= Adding apps =
+## Updating apps
+
+To regenerate the nixpkgs nextcloudPackages set, run:
+
+```
+./generate.sh
+```
+
+After that you can commit and submit the changes in a pull request.
+
+## Adding apps
+
+**Before adding an app and making a pull request to nixpkgs, please first update as described above in a separate commit.**
 
 To extend the nextcloudPackages set, add a new line to the corresponding json
 file with the id of the app:
@@ -11,27 +23,29 @@ https://apps.nextcloud.com. The id corresponds to the last part in the app url,
 for example `breezedark` for the app with the url
 `https://apps.nextcloud.com/apps/breezedark`.
 
-To regenerate the nixpkgs nextcloudPackages set, run:
+Then regenerate the nixpkgs nextcloudPackages set by running:
 
 ```
 ./generate.sh
 ```
 
-After that you can commit and submit the changes.
+**Make sure that in this update, only the app added to `nextcloud-apps.json` gets updated.**
 
-= Usage with the Nextcloud module =
+After that you can commit and submit the changes in a pull request.
 
-The apps will be available in the namespace `nextcloud25Packages.apps`.
+## Usage with the Nextcloud module
+
+The apps will be available in the namespace `nextcloud31Packages.apps` (and for older versions of Nextcloud similarly).
 Using it together with the Nextcloud module could look like this:
 
-```nix
+```
 {
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud25;
+    package = pkgs.nextcloud31;
     hostName = "localhost";
     config.adminpassFile = "${pkgs.writeText "adminpass" "hunter2"}";
-    extraApps = with pkgs.nextcloud25Packages.apps; {
+    extraApps = with pkgs.nextcloud31Packages.apps; {
       inherit mail calendar contact;
     };
     extraAppsEnable = true;

pkgs/servers/nextcloud/packages/nextcloud-apps.json

@@ -26,6 +26,7 @@
 , "music": "agpl3Plus"
 , "news": "agpl3Plus"
 , "notes": "agpl3Plus"
+, "oidc_login": "agpl3Only"
 , "onlyoffice": "asl20"
 , "phonetrack": "agpl3Plus"
 , "polls": "agpl3Plus"

pkgs/test/texlive/default.nix

@@ -438,6 +438,9 @@ rec {
     let
       # TODO known broken binaries
       broken = [
+        # do not know how to test without a valid build.lua
+        "ppmcheckpdf"
+
         # *.inc files in source container rather than run
         "texaccents"
 
@@ -660,6 +663,8 @@ rec {
         "allcm"
         "allec"
         "chkweb"
+        "explcheck"
+        "extractbb"
         "fontinst"
         "ht*"
         "installfont-tl"

pkgs/tools/admin/ansible/later.nix

@@ -17,7 +17,10 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-4ZHCnLeG5gr0UtKQLU+6xnTxUbxnLcmDd51Psnaa42I=";
   };
 
-  pythonRelaxDeps = [ "python-json-logger" ];
+  pythonRelaxDeps = [
+    "python-json-logger"
+    "yamllint"
+  ];
 
   build-system = with python3Packages; [
     poetry-core

pkgs/tools/package-management/nix/vendor/2_26/packaging/everything.nix

@@ -154,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
       devPaths = lib.mapAttrsToList (_k: lib.getDev) finalAttrs.finalPackage.libs;
     in
     ''
-      mkdir -p $out $dev/nix-support $doc $man
+      mkdir -p $out $dev/nix-support
 
       # Custom files
       echo $libs >> $dev/nix-support/propagated-build-inputs
@@ -168,8 +168,8 @@ stdenv.mkDerivation (finalAttrs: {
       done
 
       # Forwarded outputs
-      ln -s ${nix-manual} $doc
+      ln -sT ${nix-manual} $doc
-      ln -s ${nix-manual.man} $man
+      ln -sT ${nix-manual.man} $man
     '';
 
   passthru = {

pkgs/tools/system/osquery/default.nix

@@ -105,6 +105,7 @@ stdenvNoCC.mkDerivation rec {
       znewman01
       lewo
       squalus
+      lesuisse
     ];
   };
 }

pkgs/tools/system/osquery/info.json

@@ -5,9 +5,9 @@
     },
     "osquery": {
         "fetchSubmodules": true,
-        "hash": "sha256-ZEFdsdXf7a+lj79QtfjpfOKPt01C40lcdK5TAocjVmE=",
+        "hash": "sha256-Q5KiPqkyciuC5vlgBuY9ObRnDhM7Xhq6Oe5GbtatH/s=",
         "owner": "osquery",
         "repo": "osquery",
-        "rev": "5.15.0"
+        "rev": "5.16.0"
     }
 }

pkgs/tools/typesetting/tex/texlive/bin.nix

@@ -251,6 +251,16 @@ rec {
 
     inherit (common) binToOutput src prePatch;
 
+    patches = [
+      (fetchpatch {
+        # do not create extractbb -> xdvipdfmx link
+        name = "extractbb-separate-package.patch";
+        url = "https://github.com/TeX-Live/texlive-source/commit/e48aafd2889281e5e9082cf2e4815a906b9a68ec.patch";
+        hash = "sha256-Rh0PJeUgKUfmgZ+WXnTteM5A0vXPEajKzZBU7AoE7Vs";
+        excludes = [ "texk/dvipdfm-x/ChangeLog" ];
+      })
+    ];
+
     outputs = [
       "out"
       "dev"
@@ -694,11 +704,14 @@ rec {
       # so that top level updates do not break texlive
       src = fetchurl {
         url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
-        hash = "sha256-nZtcb6fg+848HlT+sl4tUdKMT+d5jyTHbNyugpGo6mY=";
+        hash = "sha256-egUACsP2vwYx2uvSCZ8H/jLU9f17Siz8gFWwCNSXsIQ=";
       };
 
       texContainer = texlive.pkgs.asymptote.tex;
       texdocContainer = texlive.pkgs.asymptote.texdoc;
+
+      # build issue with asymptote 2.95 has been fixed
+      postConfigure = "";
     }
   );
 

pkgs/tools/typesetting/tex/texlive/default.nix

@@ -5,7 +5,7 @@
 { lib
 #, stdenv
 , gcc12Stdenv
-, fetchurl, runCommand, writeShellScript, writeText, buildEnv
+, fetchpatch, fetchurl, runCommand, writeShellScript, writeText, buildEnv
 , callPackage, ghostscript_headless, harfbuzz
 , makeWrapper, installShellFiles
 , python3, ruby, perl, tk, jdk, bash, snobol4
@@ -34,7 +34,7 @@ let
   overriddenTlpdb = let
     overrides = import ./tlpdb-overrides.nix {
       inherit
-        stdenv lib bin tlpdb tlpdbxz tl
+        stdenv lib fetchpatch bin tlpdb tlpdbxz tl
         installShellFiles
         coreutils findutils gawk getopt ghostscript_headless gnugrep
         gnumake gnupg gnused gzip html-tidy ncurses perl python3 ruby zip;
@@ -44,12 +44,12 @@ let
   version = {
     # day of the snapshot being taken
     year = "2024";
-    month = "10";
+    month = "03";
-    day = "27";
+    day = "09";
     # TeX Live version
     texliveYear = 2024;
     # final (historic) release or snapshot
-    final = false;
+    final = true;
   };
 
   # The tarballs on CTAN mirrors for the current release are constantly
@@ -80,7 +80,7 @@ let
         # use last mirror for daily snapshots as texlive.tlpdb.xz changes every day
         # TODO make this less hacky
         (if version.final then mirrors else [ (lib.last mirrors) ]);
-    hash = "sha256-jB9FXLpmqYluxdxGl67C50cx9dfN2S8LQwOow4OezcQ=";
+    hash = "sha256-YLn4+Ik9WR0iDS9Pjdo/aGyqFl7+eKoMzI3sgNSHmao=";
   };
 
   tlpdbNix = runCommand "tlpdb.nix" {
@@ -159,15 +159,15 @@ let
   # these license lists should be the sorted union of the licenses of the packages the schemes contain.
   # The correctness of this collation is tested by tests.texlive.licenses
   licenses = with lib.licenses; {
-    scheme-basic = [ free gfl gpl1Only gpl2Only gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ];
+    scheme-basic = [ cc-by-sa-40 free gfl gpl1Only gpl2Only gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ];
-    scheme-bookpub = [ artistic2 asl20 bsd3 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus knuth lgpl21 lppl1 lppl12 lppl13c mit ofl publicDomain ];
+    scheme-bookpub = [ artistic2 asl20 bsd3 cc-by-sa-40 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus knuth lgpl21 lppl1 lppl12 lppl13c mit ofl publicDomain ];
     scheme-context = [ bsd2 bsd3 cc-by-sa-40 eupl12 free gfl gfsl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl13c mit ofl publicDomain x11 ];
     scheme-full = [ artistic1-cl8 artistic2 asl20 bsd2 bsd3 bsdOriginal cc-by-10 cc-by-20 cc-by-30 cc-by-40 cc-by-sa-10 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gfsl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ];
-    scheme-gust = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gfsl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ];
+    scheme-gust = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gfsl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13c mit ofl publicDomain x11 ];
     scheme-infraonly = [ gpl2Plus lgpl21 ];
     scheme-medium = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ];
-    scheme-minimal = [ free gpl1Only gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ];
+    scheme-minimal = [ cc-by-sa-40 free gpl1Only gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ];
-    scheme-small = [ asl20 cc-by-40 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ];
+    scheme-small = [ asl20 cc-by-40 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13c mit ofl publicDomain x11 ];
     scheme-tetex = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-30 cc-by-40 cc-by-sa-10 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 eupl12 fdl13Only free gfl gpl1Only gpl2Only gpl2Plus gpl3Only gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ];
   };
 

pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix

@@ -1,5 +1,6 @@
 {
   stdenv,
+  fetchpatch,
   lib,
   tlpdb,
   bin,
@@ -77,6 +78,13 @@ lib.recursiveUpdate orig rec {
   texlogsieve.extraBuildInputs = [ bin.luatex ];
 
   #### perl packages
+  bundledoc.extraBuildInputs = [
+    (perl.withPackages (
+      ps: with ps; [
+        StringShellQuote
+      ]
+    ))
+  ];
   crossrefware.extraBuildInputs = [
     (perl.withPackages (
       ps: with ps; [
@@ -248,6 +256,12 @@ lib.recursiveUpdate orig rec {
     texmfstart = tl.context-legacy.tex + "/scripts/context/ruby/texmfstart.rb";
   };
 
+  dvipdfmx.binlinks = {
+    # even though 'ebb' was removed from the Makefile, this symlink is still
+    # part of the binary container of dvipdfmx
+    ebb = "xdvipdfmx";
+  };
+
   epstopdf.binlinks.repstopdf = "epstopdf";
   pdfcrop.binlinks.rpdfcrop = "pdfcrop";
 
@@ -417,6 +431,22 @@ lib.recursiveUpdate orig rec {
     sed -Ei 's/import sre/import re/; s/file\(/open(/g; s/\t/        /g; s/print +(.*)$/print(\1)/g' "$out"/bin/ebong
   '';
 
+  # readd functions moved to 'tools.pm' not shipped to CTAN
+  eolang.postUnpack =
+    let
+      patch = fetchpatch {
+        name = "eolang-without-tools-pm.patch";
+        url = "https://github.com/objectionary/eolang.sty/commit/2c3bf97dd85e1748b2028ffa056a75c0d9432f88.patch";
+        includes = [ "eolang.pl" ];
+        hash = "sha256-ZQtGjqzfhX5foRWuiWQaomN8nOOEj394HdCDrb2sdzA=";
+      };
+    in
+    ''
+      if [[ -d "$out"/scripts/eolang ]] ; then
+        patch -d "$out/scripts/eolang" -i "${patch}"
+      fi
+    '';
+
   # find files in script directory, not binary directory
   # add runtime dependencies to PATH
   epspdf.postFixup = ''
@@ -424,6 +454,17 @@ lib.recursiveUpdate orig rec {
     substituteInPlace "$out"/bin/epspdftk --replace-fail '[info script]' "\"$scriptsFolder/epspdftk.tcl\""
   '';
 
+  # use correct path to xdvipdfmx
+  extractbb.extraBuildInputs = [ bin.core.dvipdfmx ];
+  extractbb.postUnpack = ''
+    if [[ -f "$out"/scripts/extractbb/extractbb-wrapper.lua ]] ; then
+      sed -i 's!local target_path = interpreter_dir .. "/" .. TARGET_PATH_NAME .. target_ext!local target_path = os.getenv("NIX_TEXLIVE_XDVIPDFMX")!' "$out"/scripts/extractbb/extractbb-wrapper.lua
+    fi
+  '';
+  extractbb.postFixup = ''
+    sed -i "2ios.setenv('NIX_TEXLIVE_XDVIPDFMX','$(PATH="$HOST_PATH" command -v xdvipdfmx)')" "$out"/bin/extractbb
+  '';
+
   # find files in script directory, not in binary directory
   latexindent.postFixup = ''
     substituteInPlace "$out"/bin/latexindent --replace-fail 'use FindBin;' "BEGIN { \$0 = '$scriptsFolder' . '/latexindent.pl'; }; use FindBin;"
@@ -498,9 +539,6 @@ lib.recursiveUpdate orig rec {
     !(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) && !stdenv.hostPlatform.isRiscV
   ) orig.luajittex.binfiles;
 
-  # osda is unfree. Hence, we can't include it by default
-  collection-publishers.deps = builtins.filter (dep: dep != "osda") orig.collection-publishers.deps;
-
   texdoc = {
     extraRevision = "-tlpdb${toString tlpdbVersion.revision}";
     extraVersion = "-tlpdb-${toString tlpdbVersion.revision}";
@@ -528,11 +566,6 @@ lib.recursiveUpdate orig rec {
     postFixup = ''
       TEXMFCNF="${tl.kpathsea.tex}"/web2c TEXMF="$scriptsFolder/../.." \
         texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc
-      substituteInPlace "$TMPDIR"/_texdoc \
-        --replace-fail 'compdef __texdoc texdoc' '#compdef texdoc' \
-        --replace-fail '$(kpsewhich -var-value TEXMFROOT)/tlpkg/texlive.tlpdb' '$(kpsewhich Data.tlpdb.lua)' \
-        --replace-fail '/^name[^.]*$/ {print $2}' '/^  \["[^"]*"\] = {$/ { print substr($1,3,length($1)-4) }'
-      echo '__texdoc' >> "$TMPDIR"/_texdoc
       installShellCompletion --zsh "$TMPDIR"/_texdoc
     '';
   };

pkgs/top-level/packages-config.nix

@@ -26,7 +26,6 @@
         sourceHanPackages
         zabbix50
         zabbix60
-        zeroadPackages
         ;
 
       # Make sure haskell.compiler is included, so alternative GHC versions show up,

pkgs/top-level/python-packages.nix

@@ -15862,6 +15862,8 @@ self: super: with self; {
 
   sphinxext-opengraph = callPackage ../development/python-modules/sphinxext-opengraph { };
 
+  sphinxext-rediraffe = callPackage ../development/python-modules/sphinxext-rediraffe { };
+
   spidev = callPackage ../development/python-modules/spidev { };
 
   splinter = callPackage ../development/python-modules/splinter { };