Merge staging-next into staging

doc/hooks/index.md

@@ -22,6 +22,7 @@ haredo.section.md
 installShellFiles.section.md
 julec.section.md
 just.section.md
+libglycin.section.md
 libiconv.section.md
 libxml2.section.md
 meson.section.md

doc/hooks/libglycin.section.md

@@ -0,0 +1,47 @@
+# libglycin {#libglycin-hooks}
+
+[Glycin](https://gitlab.gnome.org/GNOME/glycin) is a library for sandboxed and extendable image loading.
+
+[]{#libglycin-setup-hook} For most applications using it, individual image formats are loaded through binaries provided by `glycin-loaders`. The paths of these loaders must be injected into the environment, e.g. using [`wrapGAppsHook`](#ssec-gnome-hooks). `libglycin.setupHook` will do that.
+
+[]{#libglycin-patch-vendor-hook} Additionally, for Rust projects `glycin` Rust crate itself requires a patch to become self-contained. `libglycin.patchVendorHook` will do that. This is not needed for projects using the ELF library from `libglycin` package.
+
+## Example code snippet {#libglycin-hooks-example-code-snippet}
+
+```nix
+{
+  lib,
+  rustPlatform,
+  libglycin,
+  glycin-loaders,
+  wrapGAppsHook4,
+}:
+
+rustPlatform.buildRustPackage {
+  # ...
+
+  cargoHash = "...";
+
+  nativeBuildInputs = [
+    wrapGAppsHook4
+    libglycin.patchVendorHook
+  ];
+
+  buildInputs = [
+    libglycin.setupHook
+    glycin-loaders
+  ];
+
+  # ...
+}
+```
+
+## Variables controlling glycin-loaders {#libglycin-hook-variables-controlling}
+
+### `glycinCargoDepsPath` {#glycin-cargo-deps-path}
+
+Path to a directory containing the `glycin` crate to patch. Defaults to the crate directory created by `cargoSetupHook`, or `./vendor/`.
+
+### `dontWrapGlycinLoaders` {#glycin-dont-wrap}
+
+Disable adding the Glycin loaders path `XDG_DATA_DIRS` with `wrapGAppsHook`.

doc/languages-frameworks/gnome.section.md

@@ -129,6 +129,8 @@ The hooks do the following:
 
 - []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGApps*` hook.
 
+- []{#ssec-gnome-hooks-libglycin} `libglycin`'s [setup hook](#libglycin-setup-hook) will populate `XDG_DATA_DIRS` with the path to the loaders.
+
 You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook:
 
 ```nix

doc/redirects.json

@@ -2473,6 +2473,27 @@
   "setup-hook-gdk-pixbuf": [
     "index.html#setup-hook-gdk-pixbuf"
   ],
+  "libglycin-hooks": [
+    "index.html#libglycin-hooks"
+  ],
+  "libglycin-setup-hook": [
+    "index.html#libglycin-setup-hook"
+  ],
+  "libglycin-patch-vendor-hook": [
+    "index.html#libglycin-patch-vendor-hook"
+  ],
+  "libglycin-hooks-example-code-snippet": [
+    "index.html#libglycin-hooks-example-code-snippet"
+  ],
+  "libglycin-hook-variables-controlling": [
+    "index.html#libglycin-hook-variables-controlling"
+  ],
+  "glycin-cargo-deps-path": [
+    "index.html#glycin-cargo-deps-path"
+  ],
+  "glycin-dont-wrap": [
+    "index.html#glycin-dont-wrap"
+  ],
   "ghc": [
     "index.html#ghc"
   ],
@@ -3173,6 +3194,9 @@
   "ssec-gnome-hooks-gst-grl-plugins": [
     "index.html#ssec-gnome-hooks-gst-grl-plugins"
   ],
+  "ssec-gnome-hooks-libglycin": [
+    "index.html#ssec-gnome-hooks-libglycin"
+  ],
   "ssec-gnome-updating": [
     "index.html#ssec-gnome-updating"
   ],

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

@@ -89,7 +89,7 @@
 
 - `iroh` has been removed and split up into `iroh-dns-server` and `iroh-relay`.
 
-- the `xorg` package set has been deprecated and will be removed, packages have moved to the top level.
+- the `xorg` package set has been deprecated, packages have moved to the top level.
 
 - `python3Packages.pygame` has been been renamed to `python3Packages.pygame-original`, the attribute `python3Packages.pygame` will from python 3.14 default to the more actively maintained `python3Packages.pygame-ce`
 

lib/systems/platforms.nix

@@ -22,6 +22,10 @@ rec {
     linux-kernel.autoModules = false;
   };
 
+  ##
+  ## POWER
+  ##
+
   powernv = {
     linux-kernel = {
       name = "PowerNV";
@@ -29,16 +33,16 @@ rec {
       baseConfig = "powernv_defconfig";
       target = "vmlinux";
       autoModules = true;
-      # avoid driver/FS trouble arising from unusual page size
-      extraConfig = ''
-        PPC_64K_PAGES n
-        PPC_4K_PAGES y
-        IPV6 y
+    };
+  };
 
-        ATA_BMDMA y
-        ATA_SFF y
-        VIRTIO_MENU y
-      '';
+  ppc64 = {
+    linux-kernel = {
+      name = "powerpc64";
+
+      baseConfig = "ppc64_defconfig";
+      target = "vmlinux";
+      autoModules = true;
     };
   };
 
@@ -625,8 +629,8 @@ rec {
     else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then
       (import ./examples.nix { inherit lib; }).mipsel-linux-gnu
 
-    else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then
-      powernv
+    else if platform.isPower64 then
+      if platform.isLittleEndian then powernv else ppc64
 
     else if platform.isLoongArch64 then
       loongarch64-multiplatform

maintainers/maintainer-list.nix

@@ -18091,6 +18091,12 @@
     githubId = 220262;
     name = "Ion Mudreac";
   };
+  mulatta = {
+    email = "seungwon@mulatta.io";
+    github = "mulatta";
+    githubId = 67085791;
+    name = "Seungwon Lee";
+  };
   MulliganSecurity = {
     email = "mulligansecurity@riseup.net";
     github = "MulliganSecurity";

nixos/modules/system/boot/systemd.nix

@@ -164,9 +164,10 @@ let
     "systemd-creds@.service"
     "systemd-creds.socket"
   ]
-  ++ lib.optional cfg.package.withTpm2Units [
+  ++ lib.optionals cfg.package.withTpm2Units [
     "systemd-pcrlock@.service"
     "systemd-pcrlock.socket"
+    "systemd-tpm2-clear.service"
   ]
   ++ [
 
@@ -218,7 +219,6 @@ let
     "factory-reset.target"
     "systemd-factory-reset-request.service"
     "systemd-factory-reset-reboot.service"
-    "systemd-tpm2-clear.service"
   ]
   ++ cfg.additionalUpstreamSystemUnits;
 

pkgs/README.md

@@ -305,10 +305,6 @@ For example, the `libxml2` package builds both a library and some tools; but it
 
   - `servers/http` (e.g. `apache-httpd`)
 
-- **If it’s an implementation of the X Windowing System:**
-
-  - `servers/x11` (e.g. `xorg` — this includes the client libraries and programs)
-
 - **Else:**
 
   - `servers/misc`

pkgs/applications/editors/jetbrains/builder/darwin.nix

@@ -1,57 +1,58 @@
 # Darwin-specific base builder.
-# TODO:
-#   This actually just ignores a lot of options passed to it... (e.g. buildInputs)
-#   - not entirely sure how this hasn't caused big problems yet.
 
 {
   lib,
   stdenvNoCC,
   undmg,
+
+  excludeDrvArgNames,
   ...
 }:
 
-{
-  meta,
-  pname,
-  product,
-  productShort,
-  src,
-  version,
-  passthru,
+lib.extendMkDerivation {
+  inherit excludeDrvArgNames;
 
-  plugins ? [ ],
-  ...
-}:
+  constructDrv = stdenvNoCC.mkDerivation;
 
-let
-  loname = lib.toLower productShort;
-in
-stdenvNoCC.mkDerivation {
-  inherit
-    pname
-    src
-    version
-    plugins
-    passthru
-    ;
-  meta = meta // {
-    mainProgram = loname;
-  };
-  desktopName = product;
-  dontFixup = true;
-  installPhase = ''
-    runHook preInstall
-    APP_DIR="$out/Applications/${product}.app"
-    mkdir -p "$APP_DIR"
-    cp -Tr *.app "$APP_DIR"
-    mkdir -p "$out/bin"
-    cat << EOF > "$out/bin/${loname}"
-    #!${stdenvNoCC.shell}
-    open -na '$APP_DIR' --args "\$@"
-    EOF
-    chmod +x "$out/bin/${loname}"
-    runHook postInstall
-  '';
-  nativeBuildInputs = [ undmg ];
-  sourceRoot = ".";
+  extendDrvArgs =
+    finalAttrs:
+    {
+      product,
+      productShort ? product,
+
+      nativeBuildInputs ? [ ],
+      meta ? { },
+      ...
+    }:
+
+    let
+      loname = lib.toLower productShort;
+    in
+    {
+      desktopName = product;
+
+      dontFixup = true;
+
+      installPhase = ''
+        runHook preInstall
+        APP_DIR="$out/Applications/${product}.app"
+        mkdir -p "$APP_DIR"
+        cp -Tr *.app "$APP_DIR"
+        mkdir -p "$out/bin"
+        cat << EOF > "$out/bin/${loname}"
+        #!${stdenvNoCC.shell}
+        open -na '$APP_DIR' --args "\$@"
+        EOF
+        chmod +x "$out/bin/${loname}"
+        runHook postInstall
+      '';
+
+      nativeBuildInputs = nativeBuildInputs ++ [ undmg ];
+
+      sourceRoot = ".";
+
+      meta = meta // {
+        mainProgram = loname;
+      };
+    };
 }

pkgs/applications/editors/jetbrains/builder/default.nix

@@ -6,82 +6,64 @@
   callPackage,
 
   jdk,
-  fontconfig,
-  libGL,
-  libX11,
 
   vmopts ? null,
   forceWayland ? false,
 }:
 let
   baseBuilder = if stdenv.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix;
-  mkJetBrainsProductCore = callPackage baseBuilder { inherit vmopts; };
 in
 # Makes a JetBrains IDE
-{
-  pname,
-  src,
-  version,
-  buildNumber,
-  wmClass,
-  product,
-  productShort ? product,
-  meta,
-
-  libdbm,
-  fsnotifier,
-
-  extraWrapperArgs ? [ ],
-  extraLdPath ? [ ],
-  buildInputs ? [ ],
-  passthru ? { },
-}:
-mkJetBrainsProductCore {
-  inherit
-    pname
-    extraLdPath
-    jdk
-    src
-    version
-    buildNumber
-    wmClass
-    product
-    productShort
-    libdbm
-    fsnotifier
-    ;
-
-  buildInputs =
-    buildInputs
-    ++ [ stdenv.cc.cc ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      fontconfig
-      libGL
-      libX11
+lib.extendMkDerivation {
+  constructDrv = callPackage baseBuilder {
+    inherit vmopts jdk forceWayland;
+    # Args to not pass to mkDerivation in the base builders. Since both get the same args
+    # passed in, both have the same list of args to ignore, even if they don't both use
+    # all of them.
+    excludeDrvArgNames = [
+      "product"
+      "productShort"
+      "buildNumber"
+      "wmClass"
+      "libdbm"
+      "fsnotifier"
+      "extraLdPath"
+      "extraWrapperArgs"
     ];
+  };
 
-  extraWrapperArgs =
-    extraWrapperArgs
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && forceWayland) [
-      ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"''
-    ];
+  extendDrvArgs =
+    # NOTE: See linux.nix and darwin.nix for additional specific arguments
+    finalAttrs:
+    {
+      buildNumber,
+      product,
 
-  passthru = lib.recursiveUpdate passthru {
-    inherit
-      buildNumber
-      product
-      libdbm
-      fsnotifier
-      ;
+      libdbm,
+      fsnotifier,
 
-    updateScript = ../updater/main.py;
+      meta ? { },
+      passthru ? { },
+      ...
+    }:
+    {
+      passthru = passthru // {
+        inherit
+          buildNumber
+          product
+          libdbm
+          fsnotifier
+          ;
 
-    tests = {
-      plugins = callPackage ../plugins/tests.nix { ideName = pname; };
+        updateScript = ../updater/main.py;
+
+        tests = {
+          plugins = callPackage ../plugins/tests.nix { ide = finalAttrs.finalPackage; };
+        };
+      };
+
+      meta = meta // {
+        teams = [ lib.teams.jetbrains ];
+      };
     };
-  };
-
-  meta = meta // {
-    teams = [ lib.teams.jetbrains ];
-  };
 }

pkgs/applications/editors/jetbrains/builder/linux.nix

@@ -18,163 +18,179 @@
   e2fsprogs,
   python3,
   autoPatchelfHook,
-  vmopts ? null,
   glibcLocales,
+  fontconfig,
+  libGL,
+  libX11,
+
+  jdk,
+  vmopts ? null,
+  forceWayland ? null,
+  excludeDrvArgNames,
 }:
 
-{
-  pname,
-  product,
-  productShort,
-  version,
-  src,
-  wmClass,
-  jdk,
-  meta,
-  passthru,
+lib.extendMkDerivation {
+  inherit excludeDrvArgNames;
 
-  libdbm,
-  fsnotifier,
+  constructDrv = stdenv.mkDerivation;
 
-  extraLdPath ? [ ],
-  extraWrapperArgs ? [ ],
-  buildInputs ? [ ],
-  ...
-}@args:
+  extendDrvArgs =
+    finalAttrs:
+    {
+      pname,
+      product,
+      productShort ? product,
+      wmClass,
 
-let
-  loName = lib.toLower productShort;
-  hiName = lib.toUpper productShort;
-  vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions";
-in
+      libdbm,
+      fsnotifier,
 
-with stdenv;
-lib.makeOverridable mkDerivation (
-  rec {
-    inherit
-      pname
-      version
-      src
-      buildInputs
-      passthru
-      ;
-    meta = args.meta // {
-      mainProgram = pname;
-    };
+      extraLdPath ? [ ],
+      extraWrapperArgs ? [ ],
+      buildInputs ? [ ],
+      nativeBuildInputs ? [ ],
+      meta ? { },
+      postPatch ? "",
+      ...
+    }:
 
-    desktopItem = makeDesktopItem {
-      name = pname;
-      exec = pname;
-      comment = lib.trim (lib.replaceString "\n" " " meta.longDescription);
-      desktopName = product;
-      genericName = meta.description;
-      categories = [ "Development" ];
-      icon = pname;
-      startupWMClass = wmClass;
-    };
+    let
+      loName = lib.toLower productShort;
+      hiName = lib.toUpper productShort;
+      vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions";
+      finalExtraWrapperArgs =
+        extraWrapperArgs
+        ++ lib.optionals forceWayland [
+          ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"''
+        ];
 
-    vmoptsIDE = if hiName == "WEBSTORM" then "WEBIDE" else hiName;
-    vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts);
+      desktopItem = makeDesktopItem {
+        name = finalAttrs.pname;
+        exec = finalAttrs.meta.mainProgram;
+        comment = lib.trim (lib.replaceString "\n" " " finalAttrs.meta.longDescription);
+        desktopName = product;
+        genericName = finalAttrs.meta.description;
+        categories = [ "Development" ];
+        icon = pname;
+        startupWMClass = wmClass;
+      };
 
-    nativeBuildInputs = [
-      makeWrapper
-      patchelf
-      unzip
-      autoPatchelfHook
-    ];
+      vmoptsIDE = if hiName == "WEBSTORM" then "WEBIDE" else hiName;
+      vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts);
+    in
+    {
+      inherit desktopItem vmoptsIDE vmoptsFile;
 
-    postPatch = ''
-      rm -rf jbr
-      # When using the IDE as a remote backend using gateway, it expects the jbr directory to contain the jdk
-      ln -s ${jdk.home} jbr
+      buildInputs = buildInputs ++ [
+        stdenv.cc.cc
+        fontconfig
+        libGL
+        libX11
+      ];
 
-      if [ -d "plugins/remote-dev-server" ]; then
-        patch -F3 -p1 < ${../patches/jetbrains-remote-dev.patch}
-      fi
+      nativeBuildInputs = nativeBuildInputs ++ [
+        makeWrapper
+        patchelf
+        unzip
+        autoPatchelfHook
+      ];
 
-      vmopts_file=bin/linux/${vmoptsName}
-      if [[ ! -f $vmopts_file ]]; then
-        vmopts_file=bin/${vmoptsName}
-        if [[ ! -f $vmopts_file ]]; then
-          echo "ERROR: $vmopts_file not found"
-          exit 1
+      postPatch = ''
+        rm -rf jbr
+        # When using the IDE as a remote backend using gateway, it expects the jbr directory to contain the jdk
+        ln -s ${jdk.home} jbr
+
+        if [ -d "plugins/remote-dev-server" ]; then
+          patch -F3 -p1 < ${../patches/jetbrains-remote-dev.patch}
         fi
-      fi
-      echo -Djna.library.path=${
-        lib.makeLibraryPath [
-          libsecret
-          e2fsprogs
-          libnotify
-          # Required for Help -> Collect Logs
-          # in at least rider and goland
-          udev
-        ]
-      } >> $vmopts_file
-    '';
 
-    installPhase = ''
-      runHook preInstall
+        vmopts_file=bin/linux/${vmoptsName}
+        if [[ ! -f $vmopts_file ]]; then
+          vmopts_file=bin/${vmoptsName}
+          if [[ ! -f $vmopts_file ]]; then
+            echo "ERROR: $vmopts_file not found"
+            exit 1
+          fi
+        fi
+        echo -Djna.library.path=${
+          lib.makeLibraryPath [
+            libsecret
+            e2fsprogs
+            libnotify
+            # Required for Help -> Collect Logs
+            # in at least rider and goland
+            udev
+          ]
+        } >> $vmopts_file
+      ''
+      + postPatch;
 
-      mkdir -p $out/{bin,$pname,share/pixmaps,share/icons/hicolor/scalable/apps}
-      cp -a . $out/$pname
-      [[ -f $out/$pname/bin/${loName}.png ]] && ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png
-      [[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg \
-        && ln -s $out/$pname/bin/${loName}.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg
-      cp ${libdbm}/lib/libdbm.so $out/$pname/bin/libdbm.so
-      cp ${fsnotifier}/bin/fsnotifier $out/$pname/bin/fsnotifier
+      installPhase = ''
+        runHook preInstall
 
-      jdk=${jdk.home}
-      item=${desktopItem}
+        mkdir -p $out/{bin,$pname,share/pixmaps,share/icons/hicolor/scalable/apps}
+        cp -a . $out/$pname
+        [[ -f $out/$pname/bin/${loName}.png ]] && ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png
+        [[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg \
+          && ln -s $out/$pname/bin/${loName}.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg
+        cp ${libdbm}/lib/libdbm.so $out/$pname/bin/libdbm.so
+        cp ${fsnotifier}/bin/fsnotifier $out/$pname/bin/fsnotifier
 
-      needsWrapping=()
+        jdk=${jdk.home}
+        item=${desktopItem}
 
-      if [ -f "$out/$pname/bin/${loName}" ]; then
-        needsWrapping+=("$out/$pname/bin/${loName}")
-      fi
-      if [ -f "$out/$pname/bin/${loName}.sh" ]; then
-        needsWrapping+=("$out/$pname/bin/${loName}.sh")
-      fi
+        needsWrapping=()
 
-      for launcher in "''${needsWrapping[@]}"
-      do
-        wrapProgram  "$launcher" \
-          --prefix PATH : "${
-            lib.makeBinPath [
-              jdk
-              coreutils
-              gnugrep
-              which
-              git
-            ]
-          }" \
-          --suffix PATH : "${lib.makeBinPath [ python3 ]}" \
-          --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \
-          ${lib.concatStringsSep " " extraWrapperArgs} \
-          --set-default JDK_HOME "$jdk" \
-          --set-default ANDROID_JAVA_HOME "$jdk" \
-          --set-default JAVA_HOME "$jdk" \
-          --set-default JETBRAINS_CLIENT_JDK "$jdk" \
-          --set-default ${hiName}_JDK "$jdk" \
-          --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
-          --set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile}
-      done
+        if [ -f "$out/$pname/bin/${loName}" ]; then
+          needsWrapping+=("$out/$pname/bin/${loName}")
+        fi
+        if [ -f "$out/$pname/bin/${loName}.sh" ]; then
+          needsWrapping+=("$out/$pname/bin/${loName}.sh")
+        fi
 
-      launcher="$out/$pname/bin/${loName}"
-      if [ ! -e "$launcher" ]; then
-        launcher+=.sh
-      fi
+        for launcher in "''${needsWrapping[@]}"
+        do
+          wrapProgram  "$launcher" \
+            --prefix PATH : "${
+              lib.makeBinPath [
+                jdk
+                coreutils
+                gnugrep
+                which
+                git
+              ]
+            }" \
+            --suffix PATH : "${lib.makeBinPath [ python3 ]}" \
+            --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \
+            ${lib.concatStringsSep " " finalExtraWrapperArgs} \
+            --set-default JDK_HOME "$jdk" \
+            --set-default ANDROID_JAVA_HOME "$jdk" \
+            --set-default JAVA_HOME "$jdk" \
+            --set-default JETBRAINS_CLIENT_JDK "$jdk" \
+            --set-default ${hiName}_JDK "$jdk" \
+            --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
+            --set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile}
+        done
 
-      ln -s "$launcher" $out/bin/$pname
-      rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/
-      echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh
-      chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh
-      ln -s "$out/$pname/bin/remote-dev-server-wrapped.sh" $out/bin/$pname-remote-dev-server
-      ln -s "$item/share/applications" $out/share
+        launcher="$out/$pname/bin/${loName}"
+        if [ ! -e "$launcher" ]; then
+          launcher+=.sh
+        fi
 
-      runHook postInstall
-    '';
-  }
-  // lib.optionalAttrs (!(meta.license.free or true)) {
-    preferLocalBuild = true;
-  }
-)
+        ln -s "$launcher" $out/bin/$pname
+        rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/
+        echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh
+        chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh
+        ln -s "$out/$pname/bin/remote-dev-server-wrapped.sh" $out/bin/$pname-remote-dev-server
+        ln -s "$item/share/applications" $out/share
+
+        runHook postInstall
+      '';
+
+      preferLocalBuild = !(finalAttrs.meta.license.free or true);
+
+      meta = meta // {
+        mainProgram = pname;
+      };
+    };
+}

pkgs/applications/editors/jetbrains/ides/dataspell.nix

@@ -47,7 +47,9 @@ mkJetBrainsProduct {
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
 
-  buildInputs = [
+  # NOTE: This `lib.optionals` is only here because the old Darwin builder ignored `buildInputs`.
+  #       DataSpell may need these, even on Darwin!
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libgcc
     (runCommand "libR" { } ''
       mkdir -p $out/lib

pkgs/applications/editors/jetbrains/plugins/tests.nix

@@ -6,12 +6,12 @@
   fetchzip,
   fetchurl,
   # If not set, all IDEs are tested.
-  ideName ? null,
+  ide ? null,
 }:
 
 let
   ides =
-    if ideName == null then
+    if ide == null then
       with jetbrains;
       [
         clion
@@ -31,7 +31,7 @@ let
         webstorm
       ]
     else
-      [ (jetbrains.${ideName}) ];
+      [ ide ];
 in
 {
   # Check to see if the process for adding plugins is breaking anything, instead of the plugins themselves

pkgs/applications/editors/jetbrains/readme.md

@@ -56,9 +56,6 @@ Any comments or other manual changes between these markers will be removed when
  - Add it to `default.nix`
 
 ### TODO:
- - Switch `mkJetbrainsProduct` to use `lib.extendMkDerivation`, see also:
-   - https://github.com/NixOS/nixpkgs/pull/475183#discussion_r2655305961
-   - https://github.com/NixOS/nixpkgs/pull/475183#discussion_r2655348886
  - move PyCharm overrides to a common place outside of `default.nix`
  - package `patchSharedLibs` from `default.nix` as a hook
  - cleanup this TODO list, especially the following points, which have been here since 2023

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

@@ -6,13 +6,13 @@
 }:
 vimUtils.buildVimPlugin {
   pname = "zig.vim";
-  version = "0-unstable-2026-01-16";
+  version = "0-unstable-2026-01-24";
 
   src = fetchFromCodeberg {
     owner = "ziglang";
     repo = "zig.vim";
-    rev = "fc01f73ce0636723a03b784b63a7a89f2f9a84ae";
-    hash = "sha256-bWvwb6k9jyoAqtp07UfYkyUsGo2N8Yvv7H6zq1eiwP8=";
+    rev = "2f53c35bee0d64a1d417d47c894a3cbb6663dff4";
+    hash = "sha256-vrtcUAp/YWpZtf6lyg2l0GR62YdHprAb8sAHzZ89F48=";
   };
 
   passthru.updateScript = nix-update-script {

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

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2026-01-25";
+  version = "0-unstable-2026-02-01";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "38c84798aac5239a06d75e85469225a2ad9c4707";
-    hash = "sha256-3N2/v9yv44GdSEoPjC2yne43f4WqLTlWr8dYRrb+GxY=";
+    rev = "77f067eed8e0ea2ad9e86fbc690922f1f1671fc4";
+    hash = "sha256-mIeTBcx3XK4V2+t4MGc8klhDODuDDACFlI/758zDLPc=";
   };
 
   hardeningDisable = [ "format" ];

pkgs/applications/emulators/mame/default.nix

@@ -37,14 +37,14 @@
 
 stdenv.mkDerivation rec {
   pname = "mame";
-  version = "0.284";
+  version = "0.285";
   srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
 
   src = fetchFromGitHub {
     owner = "mamedev";
     repo = "mame";
     rev = "mame${srcVersion}";
-    hash = "sha256-e/Ztoy+X9glMmV6Og5eAMiXB+EQLKlsHa/8KyahHmDw=";
+    hash = "sha256-vuGQ1VOjIAEopV4X+qP1k+bgH7lJJLZ9RtYevUxgIQg=";
   };
 
   outputs = [

pkgs/applications/graphics/inkscape/default.nix

@@ -19,8 +19,9 @@
   gspell,
   gtk-mac-integration,
   gtkmm3,
+  gtksourceview4,
   gdk-pixbuf,
-  imagemagick,
+  graphicsmagick,
   lcms,
   lib2geom,
   libcdr,
@@ -34,6 +35,7 @@
   libXft,
   libxml2,
   libxslt,
+  readline,
   ninja,
   perlPackages,
   pkg-config,
@@ -146,7 +148,8 @@ stdenv.mkDerivation (finalAttrs: {
     glibmm
     gsl
     gtkmm3
-    imagemagick
+    gtksourceview4
+    graphicsmagick
     lcms
     lib2geom
     libcdr
@@ -160,6 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXft
     libxml2
     libxslt
+    readline
     perlPackages.perl
     poppler
     popt

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -670,13 +670,13 @@
     "vendorHash": "sha256-4XCCzB5Va1jtTn5vgIVKjQq4g8sKe0SIw3ynZExz/Vg="
   },
   "hashicorp_tls": {
-    "hash": "sha256-t/nUt0deyckP8opNiPZc5rbC1SleZwkrFXuQFw47sqA=",
+    "hash": "sha256-r7nthgw7MycME+edQ4jHQQ33mmpNv3t/LDbD5IkXDYA=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tls",
     "owner": "hashicorp",
     "repo": "terraform-provider-tls",
-    "rev": "v4.1.0",
+    "rev": "v4.2.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-tYvQURTrFtr+rgSMGq2zi/5p5jJVGIse7+hj95gz68U="
+    "vendorHash": "sha256-OvotUEh+P2b3ngaD/8lVbemnM3lrtwqduPXPjF/bqVA="
   },
   "hashicorp_vault": {
     "hash": "sha256-7vcggk2Sh4z/6CCyeL8XAzk82K5jaFjiDGBEG+5ftEg=",

pkgs/applications/networking/mailreaders/evolution/evolution/default.nix

@@ -47,9 +47,9 @@
   xz,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "evolution";
-  version = "3.58.2";
+  version = "3.58.3";
 
   outputs = [
     "out"
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-uhvDtXKKMbjJ6qDaHuiulG7dzFRO6CQtzMIJ2W3KozA=";
+    url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor finalAttrs.version}/evolution-${finalAttrs.version}.tar.xz";
+    hash = "sha256-XQG3mlvr3y06mHG2E1CTnPJQH26gPCQVQ/dEqShtTXk=";
   };
 
   nativeBuildInputs = [
@@ -157,4 +157,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/as/asymptote/package.nix

@@ -33,7 +33,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "3.05";
+  version = "3.06";
   pname = "asymptote";
 
   outputs = [
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
-    hash = "sha256-NcFtCjvdhppW5O//Rjj4HDqIsva2ZNGWRxAV2/TGmoc=";
+    hash = "sha256-XMhhlo/oEC/FVktgddsoN91WmGcmiLO/txQGwNoPjO8=";
   };
 
   # override with TeX Live containers to avoid building sty, docs from source

pkgs/by-name/au/authenticator/package.nix

@@ -21,7 +21,6 @@
   sqlite,
   wayland,
   zbar,
-  glycin-loaders,
   nix-update-script,
 }:
 
@@ -78,8 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
     gappsWrapperArgs+=(
       # vp8enc preset
       --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
-      # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
     )
   '';
 

pkgs/by-name/ba/bazaar/package.nix

@@ -9,7 +9,6 @@
   pkg-config,
   wrapGAppsHook4,
   appstream,
-  bubblewrap,
   flatpak,
   glib-networking,
   glycin-loaders,
@@ -18,6 +17,7 @@
   libadwaita,
   libdex,
   libglycin,
+  libglycin-gtk4,
   libsoup_3,
   libxmlb,
   libyaml,
@@ -56,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
     libadwaita
     libdex
     libglycin
+    libglycin-gtk4
+    glycin-loaders
     libsoup_3
     libxmlb
     libyaml
@@ -64,15 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsecret
   ];
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PATH : "$out/bin:${lib.makeBinPath [ bubblewrap ]}"
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
-    )
-  '';
-
   passthru = {
-    inherit (libglycin) glycinPathsPatch;
     updateScript = nix-update-script { };
   };
 

pkgs/by-name/bl/blast/package.nix

@@ -12,7 +12,6 @@
   curl,
   sqlite,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "blast";
   version = "2.17.0";
@@ -132,6 +131,9 @@ stdenv.mkDerivation (finalAttrs: {
     # Version 2.10.0 fails on Darwin
     # See https://github.com/NixOS/nixpkgs/pull/61430
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ luispedro ];
+    maintainers = with lib.maintainers; [
+      luispedro
+      mulatta
+    ];
   };
 })

pkgs/by-name/ce/centrifugo/package.nix

@@ -16,16 +16,16 @@ let
 in
 buildGoModule rec {
   pname = "centrifugo";
-  version = "6.5.1";
+  version = "6.6.0";
 
   src = fetchFromGitHub {
     owner = "centrifugal";
     repo = "centrifugo";
     rev = "v${version}";
-    hash = "sha256-CuH8P28WMKBMHHXFZ1zyFX483zNlcomDGVP2CWtF4TM=";
+    hash = "sha256-v6uMnycHncQZUB3d7eMdSBH4ISNZM5OcipAz5ohHZTE=";
   };
 
-  vendorHash = "sha256-ug6P0xYN3bhmbDWu9MOL2OtDkm2IWjBZDrCOKjPXX3A=";
+  vendorHash = "sha256-I0VvHbPDIwuEONcZnxqh/lg4OP9quPZyT8f3Zev9TRc=";
 
   ldflags = [
     "-s"

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

@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "cocoon";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "haileyok";
     repo = "cocoon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pQHltHAU5UAOtG7AvxQMI9tFeXApY4+C7+ipk4vG8zs=";
+    hash = "sha256-lyRTLnh+kxuvGfKML1g92+K3pR6okbVVnkCJMkBypRU=";
   };
 
   ldflags = [

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

@@ -11,6 +11,7 @@
   desktop-file-utils,
   libadwaita,
   libglycin,
+  libglycin-gtk4,
   libva-utils,
   ffmpeg,
   gst-thumbnailers,
@@ -42,6 +43,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
   buildInputs = [
     libadwaita
     libglycin
+    libglycin-gtk4
+    glycin-loaders
   ];
 
   dependencies = [
@@ -60,7 +63,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
   preFixup = ''
     makeWrapperArgs+=(
       ''${gappsWrapperArgs[@]}
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
       --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}
     )
   '';

pkgs/by-name/ev/evolution-data-server/package.nix

@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "evolution-data-server";
-  version = "3.58.2";
+  version = "3.58.3";
 
   outputs = [
     "out"
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz";
-    hash = "sha256-aULs/Dnrs2sLQ2Ot/wB3HBwt+jT1ToDsksO6o/6wIPs=";
+    hash = "sha256-2hNtEZDZ6LCUmUUvYFjiTu5rd/RBqMdp90pSRRvzefE=";
   };
 
   patches = [

pkgs/by-name/fr/fractal/package.nix

@@ -23,10 +23,10 @@
   libshumate,
   wrapGAppsHook4,
   blueprint-compiler,
-  bubblewrap,
   sqlite,
   xdg-desktop-portal,
   libseccomp,
+  libglycin,
   glycin-loaders,
   libwebp,
 }:
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     grass-sass
     gtk4
+    libglycin.patchVendorHook
     meson
     ninja
     pkg-config
@@ -79,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     glib
+    libglycin.setupHook
+    glycin-loaders
     gtk4
     gtksourceview5
     lcms2
@@ -99,13 +102,6 @@ stdenv.mkDerivation (finalAttrs: {
     gst-plugins-rs
   ]);
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
-      --prefix PATH : "${lib.makeBinPath [ bubblewrap ]}"
-    )
-  '';
-
   env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
 
   passthru = {

pkgs/by-name/gi/git-spice/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-spice";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+k+uwOobHDMIqsFRLIMx64YV+64qh8qDAqGOpig1VXY=";
+    hash = "sha256-p0XKjQhw0c40+m6QevMnHLaknKYc8Qf6WhTKLkPORP0=";
   };
 
-  vendorHash = "sha256-fd4G6xBeso0jbHSZmyPR7zblSpbqvcPlMMy4RBIzTwU=";
+  vendorHash = "sha256-tlAex6SFTprJtpMexMjAUNanamqraHYJuwtABx52rWQ=";
 
   subPackages = [ "." ];
 

pkgs/by-name/gl/glycin-loaders/package.nix

@@ -1,13 +1,12 @@
 {
   stdenv,
   lib,
-  fetchurl,
   cairo,
   cargo,
   gettext,
-  git,
-  gnome,
+  glib,
   gtk4,
+  libglycin,
   lcms2,
   libheif,
   libjxl,
@@ -17,43 +16,34 @@
   meson,
   ninja,
   pkg-config,
+  python3,
+  shared-mime-info,
   rustc,
   rustPlatform,
-  common-updater-scripts,
-  _experimental-update-script-combinators,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glycin-loaders";
-  version = "2.0.7";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
-    hash = "sha256-xBasKbbT7NxnuQwVU3uhKTzrevlvoQHK5nt9HTflCrA=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    name = "glycin-loaders-deps-${finalAttrs.version}";
-    hash = "sha256-UVVVjMt4vWkLob0H/MxIaW6rkBSFImu+5dezaCnc3Q8=";
-    dontConfigure = true;
-  };
+  inherit (libglycin) version src cargoDeps;
 
   nativeBuildInputs = [
     cargo
     gettext # for msgfmt
-    git
     meson
     ninja
     pkg-config
     rustc
     rustPlatform.cargoSetupHook
+  ]
+  ++ lib.optionals finalAttrs.finalPackage.doCheck [
+    python3
+    # Tests use Rust glycin library.
+    libglycin.patchVendorHook
   ];
 
   buildInputs = [
-    gtk4 # for GdkTexture
     cairo
-    lcms2
     libheif
     libxml2 # for librsvg crate
     librsvg
@@ -61,12 +51,20 @@ stdenv.mkDerivation (finalAttrs: {
     libjxl
   ];
 
+  # Tests in passthru.tests to avoid dependency cycles.
+  checkInputs = [
+    glib
+    gtk4
+    lcms2
+  ];
+
   mesonFlags = [
     "-Dglycin-loaders=true"
     "-Dglycin-thumbnailer=false"
     "-Dlibglycin=false"
     "-Dlibglycin-gtk4=false"
     "-Dvapi=false"
+    (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck)
   ];
 
   strictDeps = true;
@@ -74,38 +72,30 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace glycin-loaders/meson.build \
       --replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader,"
+  ''
+  + lib.optionalString finalAttrs.finalPackage.doCheck ''
+    chmod +x build-aux/setup-integration-test.py
+
+    patchShebangs \
+      build-aux/setup-integration-test.py
+  '';
+
+  preCheck = lib.optionalString finalAttrs.finalPackage.doCheck ''
+    # Fix test files being considered application/octet-stream
+    export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS
+
+    # fonts test will not be able to create cache without this
+    export XDG_CACHE_HOME=$(mktemp -d)
   '';
 
   env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
 
   passthru = {
-    updateScript =
-      let
-        updateSource = gnome.updateScript {
-          attrPath = "glycin-loaders";
-          packageName = "glycin";
-        };
-        updateLockfile = {
-          command = [
-            "sh"
-            "-c"
-            ''
-              PATH=${
-                lib.makeBinPath [
-                  common-updater-scripts
-                ]
-              }
-              update-source-version glycin-loaders --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null
-            ''
-          ];
-          # Experimental feature: do not copy!
-          supportedFeatures = [ "silent" ];
-        };
-      in
-      _experimental-update-script-combinators.sequence [
-        updateSource
-        updateLockfile
-      ];
+    tests = {
+      withTests = finalAttrs.finalPackage.overrideAttrs {
+        doCheck = true;
+      };
+    };
   };
 
   meta = {

pkgs/by-name/gn/gnome-maps/package.nix

@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-maps";
-  version = "49.3";
+  version = "49.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
-    hash = "sha256-v8jpNxGOWWNnC8Pvkcdmn6wV7b1r9rIU+K2IFxkovd8=";
+    hash = "sha256-hvqvWNQNauDy9fN8nA3TEsPuKqTlElsfSjHv5Kn4BLA=";
   };
 
   doCheck = !stdenv.hostPlatform.isDarwin;

pkgs/by-name/gn/gnome-sudoku/package.nix

@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-sudoku";
-  version = "49.3";
+  version = "49.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major finalAttrs.version}/gnome-sudoku-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ybVGyN/pcWHfXVD1U4GCp0FTYmy8NoBbB4FSjvM7xZU=";
+    hash = "sha256-nIzQZ6RSOHiq/zBHovvYb4izGYQkPw1CorHk8+ZFH1A=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/gn/gnome-user-docs/package.nix

@@ -9,13 +9,13 @@
   yelp-tools,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-user-docs";
-  version = "49.1";
+  version = "49.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-DlC4u0/OqpEoNnzTRY5e24YclieMGqmnOm7AQCt7xhc=";
+    url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major finalAttrs.version}/gnome-user-docs-${finalAttrs.version}.tar.xz";
+    hash = "sha256-BkRI6t1cHxW8j+tQQYpjRxFO+BXcjRXQCiDcX0iuioA=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnome-user-docs";
     };
   };
 
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
     teams = [ lib.teams.gnome ];
     platforms = lib.platforms.all;
   };
-}
+})

pkgs/by-name/gs/gst-thumbnailers/package.nix

@@ -49,14 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
     gst_all_1.gst-plugins-ugly
     fontconfig
     libglycin
+    glycin-loaders
   ];
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
-    )
-  '';
-
   meta = {
     description = "Generate thumbnailer for video and audio files";
     homepage = "https://gitlab.gnome.org/GNOME/gst-thumbnailers";

pkgs/by-name/gv/gvfs/package.nix

@@ -49,11 +49,11 @@
 assert googleSupport -> gnomeSupport;
 stdenv.mkDerivation (finalAttrs: {
   pname = "gvfs";
-  version = "1.58.0";
+  version = "1.58.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3ZvjaHPQ/LMJ64mo0nR3DOV2KHYoos8RG9OH4cNPGC8=";
+    hash = "sha256-/FN9a7qx/6dpct99ShgZsMD+GevR3+gkIdHzLhS13Ds=";
   };
 
   patches = [

pkgs/by-name/hi/highscore-unwrapped/package.nix

@@ -17,6 +17,7 @@
   libadwaita,
   libarchive,
   libglycin,
+  libglycin-gtk4,
   libhighscore,
   libmanette,
   sqlite,
@@ -92,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     libadwaita
     libarchive
     libglycin
+    libglycin-gtk4
     libhighscore
     libmanette-1-alpha
     sqlite

pkgs/by-name/ju/jumppad/package.nix

@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "jumppad";
-  version = "0.21.0";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "jumppad-labs";
     repo = "jumppad";
     rev = version;
-    hash = "sha256-7bc3OmWNLvi+T8xNEwp2aIg/lQ28XrWW4LTcYhEO2xs=";
+    hash = "sha256-OH06qQ+gkPv9McHr+YiMRiqTvdvhW9UqcEJK2NZxGQo=";
   };
-  vendorHash = "sha256-mr7Rnqp2rPIeW9oqNMbxc0SR+l8pPhKm6jk6EEycpRQ=";
+  vendorHash = "sha256-m2aMRQ/K8etAKgGEcMbOrx2cYxp3ncdLe70Q3zYdj4I=";
 
   subPackages = [ "." ];
 

pkgs/by-name/li/libglycin-gtk4/package.nix

@@ -0,0 +1,102 @@
+{
+  lib,
+  stdenv,
+  cargo,
+  fontconfig,
+  gi-docgen,
+  glib,
+  gobject-introspection,
+  gtk4,
+  lcms2,
+  libglycin,
+  libseccomp,
+  meson,
+  ninja,
+  pkg-config,
+  python3,
+  rustPlatform,
+  rustc,
+  vala,
+  buildPackages,
+  withIntrospection ?
+    lib.meta.availableOn stdenv.hostPlatform gobject-introspection
+    && stdenv.hostPlatform.emulatorAvailable buildPackages,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libglycin-gtk4";
+
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  inherit (libglycin) version src cargoDeps;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    rustc
+    cargo
+    python3
+    rustPlatform.cargoSetupHook
+  ]
+  ++ lib.optionals withIntrospection [
+    vala
+    gi-docgen
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    fontconfig
+    glib
+    libseccomp
+    lcms2
+    gtk4
+  ];
+
+  propagatedBuildInputs = [
+    libglycin
+    gtk4
+    # TODO: these should not be required by .pc file
+    fontconfig
+    libseccomp
+    lcms2
+  ];
+
+  mesonFlags = [
+    (lib.mesonBool "glycin-loaders" false)
+    (lib.mesonBool "glycin-thumbnailer" false)
+    (lib.mesonBool "libglycin" false)
+    (lib.mesonBool "libglycin-gtk4" true)
+    (lib.mesonBool "introspection" withIntrospection)
+    (lib.mesonBool "vapi" withIntrospection)
+    (lib.mesonBool "capi_docs" withIntrospection)
+  ];
+
+  postPatch = ''
+    patchShebangs \
+      build-aux/crates-version.py
+  '';
+
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput "share/doc" "$devdoc"
+  '';
+
+  meta = {
+    description = "C-Bindings to convert glycin frames to GDK Textures";
+    homepage = "https://gitlab.gnome.org/GNOME/glycin";
+    license = with lib.licenses; [
+      mpl20 # or
+      lgpl21Plus
+    ];
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
+    pkgConfigModules = [
+      "glycin-gtk4-1"
+    ];
+  };
+})

pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch

@@ -1,13 +0,0 @@
-diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs
-index 90cd5f6..17a6469 100644
---- a/vendor/glycin/src/sandbox.rs
-+++ b/vendor/glycin/src/sandbox.rs
-@@ -251,7 +251,7 @@ impl Sandbox {
-     }
- 
-     async fn bwrap_command(&self, seccomp_memfd: &Memfd) -> Result<Command, Error> {
--        let mut command = Command::new("bwrap");
-+        let mut command = Command::new("@bwrap@");
- 
-         command.args([
-             "--unshare-all",

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

@@ -1,7 +1,8 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
+  fetchurl,
+  makeSetupHook,
   meson,
   ninja,
   pkg-config,
@@ -11,13 +12,18 @@
   rustPlatform,
   vala,
   gi-docgen,
+  glib,
   gobject-introspection,
+  glycin-loaders,
+  libglycin-gtk4,
+  fontconfig,
   libseccomp,
   lcms2,
-  gtk4,
   gnome,
   replaceVars,
   bubblewrap,
+  jq,
+  moreutils,
   common-updater-scripts,
   _experimental-update-script-combinators,
   buildPackages,
@@ -29,12 +35,22 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "libglycin";
   version = "2.0.7";
 
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "glycin";
-    tag = finalAttrs.version;
-    hash = "sha256-17ebdiLMuDJuuw8TBYWamyyDM4aZgtWRWEQhWGb/2mw=";
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  setupHook = ./path-hook.sh;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
+    hash = "sha256-xBasKbbT7NxnuQwVU3uhKTzrevlvoQHK5nt9HTflCrA=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-UVVVjMt4vWkLob0H/MxIaW6rkBSFImu+5dezaCnc3Q8=";
   };
 
   nativeBuildInputs = [
@@ -45,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     cargo
     python3
     rustPlatform.cargoSetupHook
+    finalAttrs.passthru.patchVendorHook
   ]
   ++ lib.optionals withIntrospection [
     vala
@@ -52,18 +69,16 @@ stdenv.mkDerivation (finalAttrs: {
     gobject-introspection
   ];
 
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) pname version src;
-    hash = "sha256-7x4Ts0wRFoxZ2u3AHVEey8g6+XWDpxM/hFZeomkojKU=";
-  };
-
   buildInputs = [
+    fontconfig
     libseccomp
     lcms2
-    gtk4
   ];
 
   propagatedBuildInputs = [
+    glib
+    # TODO: these should not be required by .pc file
+    fontconfig
     libseccomp
     lcms2
   ];
@@ -72,18 +87,22 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonBool "glycin-loaders" false)
     (lib.mesonBool "glycin-thumbnailer" false)
     (lib.mesonBool "libglycin" true)
+    (lib.mesonBool "libglycin-gtk4" false)
     (lib.mesonBool "introspection" withIntrospection)
     (lib.mesonBool "vapi" withIntrospection)
     (lib.mesonBool "capi_docs" withIntrospection)
   ];
 
   postPatch = ''
-    patch -p2 < ${finalAttrs.passthru.glycin3PathsPatch}
-
     patchShebangs \
       build-aux/crates-version.py
   '';
 
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput "share/doc" "$devdoc"
+  '';
+
   passthru = {
     updateScript =
       let
@@ -113,12 +132,24 @@ stdenv.mkDerivation (finalAttrs: {
         updateLockfile
       ];
 
-    glycinPathsPatch = replaceVars ./fix-glycin-paths.patch {
-      bwrap = "${bubblewrap}/bin/bwrap";
-    };
+    patchVendorHook =
+      makeSetupHook
+        {
+          name = "glycinPatchVendorHook";
+        }
+        (
+          replaceVars ./patch-vendor-hook.sh {
+            bwrap = "${bubblewrap}/bin/bwrap";
+            jq = "${jq}/bin/jq";
+            sponge = "${moreutils}/bin/sponge";
+          }
+        );
 
-    glycin3PathsPatch = replaceVars ./fix-glycin-3-paths.patch {
-      bwrap = "${bubblewrap}/bin/bwrap";
+    tests = {
+      inherit
+        glycin-loaders
+        libglycin-gtk4
+        ;
     };
   };
 
@@ -135,7 +166,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     pkgConfigModules = [
       "glycin-1"
-      "glycin-gtk4-1"
     ];
   };
 })

pkgs/by-name/li/libglycin/patch-vendor-hook.sh

@@ -0,0 +1,43 @@
+libglycinPatchVendorHook() {
+  echo "executing libglycinPatchVendorHook"
+
+  local glycinPath
+
+  if [[ -z ${glycinCargoDepsPath:-} ]]; then
+    # When cargoSetupHook is used, `cargoDepsCopy` would be set and preferred.
+    # Otherwise, fallback to vendor/
+    local cargoDepsPath=${cargoDepsCopy:-vendor}
+  fi
+
+  while read -r path; do
+    # Ensure the paths we're patching exist (and that this crate probably isn't something like glycin-utils)
+    if [[ -f $path/src/sandbox.rs ]]; then
+      glycinPath="$path"
+      break
+    fi
+  done < <(find "$cargoDepsPath" -type d -name 'glycin*')
+
+  if [[ -z ${glycinPath:-} ]]; then
+    echo >&2 "error: glycin was not found within the cargo dependencies at '$cargoDepsPath'."
+    echo >&2 "are you sure libglycin.patchVendorHook is still required?"
+    exit 1
+  fi
+  echo "patching glycin crate at '$glycinPath'"
+
+  # Allow use in non-FHS environments like tests in Nix build sandbox.
+  substituteInPlace "$glycinPath/src/sandbox.rs" \
+    --replace-fail '"--ro-bind",
+            "/usr",' '"--ro-bind-try", "/usr",'
+
+  substituteInPlace "$glycinPath/src/sandbox.rs" \
+    --replace-fail '"bwrap"' '"@bwrap@"'
+
+  # Replace hash of file we patch in vendored glycin.
+  @jq@ \
+    --arg hash "$(sha256sum "$glycinPath/src/sandbox.rs" | cut -d' ' -f 1)" \
+    '.files."src/sandbox.rs" = $hash' \
+    "$glycinPath/.cargo-checksum.json" |
+    @sponge@ "$glycinPath/.cargo-checksum.json"
+}
+
+prePatchHooks+=(libglycinPatchVendorHook)

pkgs/by-name/li/libglycin/path-hook.sh

@@ -0,0 +1,18 @@
+find_glycin_loader_paths() {
+  if [ -d "$1/share/glycin-loaders" ]; then
+    addToSearchPath NIX_GLYCIN_LOADER_PATHS $1/share
+  fi
+}
+
+addEnvHooks "$hostOffset" find_glycin_loader_paths
+
+glycinLoadersWrapperArgsHook() {
+  echo "executing glycinLoadersWrapperArgsHook"
+  if [[ -n "$NIX_GLYCIN_LOADER_PATHS" ]]; then
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$NIX_GLYCIN_LOADER_PATHS")
+  fi
+}
+
+if [[ -z ${dontWrapGlycinLoaders:-} ]]; then
+  preFixupPhases+=(glycinLoadersWrapperArgsHook)
+fi

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

@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libshumate";
-  version = "1.5.2";
+  version = "1.5.3";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ppVlwetd2ezTkmi78UNeqlGlsCjtDGUqC2uTZ+BMk4Y=";
+    hash = "sha256-NfATslORhW4bXD1ECaXEpkDGzLX1KW/5gux77Tn1bUw=";
   };
 
   patches = [

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

@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libspelling";
-  version = "0.4.9";
+  version = "0.4.10";
 
   outputs = [
     "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libspelling/${lib.versions.majorMinor finalAttrs.version}/libspelling-${finalAttrs.version}.tar.xz";
-    hash = "sha256-0JP9Na4PHJj7WIdlBSh/wKiF5H2p0kEdbXzVlfNNTr8=";
+    hash = "sha256-VuPwGjoYtXW+6kw0NJ+ZzaujFuH3wnGxIx97z12a9zs=";
   };
 
   nativeBuildInputs = [

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

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtsm";
-  version = "4.4.1";
+  version = "4.4.2";
 
   src = fetchFromGitHub {
     owner = "kmscon";
     repo = "libtsm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8db/amwcV1a5Ho0dymQxKtOFsTN6nLUnwSobuAowSwk=";
+    hash = "sha256-DWy7kgBbXUEt2Htcugo8PaVoHE23Nu22EIrB5f6/P30=";
   };
 
   buildInputs = [ libxkbcommon ];

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

@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libwacom";
-  version = "2.17.0";
+  version = "2.18.0";
 
   outputs = [
     "bin"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "linuxwacom";
     repo = "libwacom";
     rev = "libwacom-${finalAttrs.version}";
-    hash = "sha256-2JbO3B/PqsLKnaCeQcn1x9Z2pQL4kScuS39F1JlpDpc=";
+    hash = "sha256-habbSnrOr9H6e/eRSQHugJaLRa252GXjZ8wHThpIydU=";
   };
 
   postPatch = ''

pkgs/by-name/lo/loupe/package.nix

@@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     cargo
     desktop-file-utils
     itstool
+    libglycin.patchVendorHook
     meson
     ninja
     pkg-config
@@ -57,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    libglycin.setupHook
+    glycin-loaders
     gtk4
     lcms2
     libadwaita
@@ -64,22 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
     libseccomp
   ];
 
-  preConfigure = ''
-    # Dirty approach to add patches after cargoSetupPostUnpackHook
-    # We should eventually use a cargo vendor patch hook instead
-    pushd ../$(stripHash $cargoDeps)/glycin-3.*
-      patch -p3 < ${libglycin.passthru.glycin3PathsPatch}
-    popd
-  '';
-
-  preFixup = ''
-    # Needed for the glycin crate to find loaders.
-    # https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
-    )
-  '';
-
   # For https://gitlab.gnome.org/GNOME/loupe/-/blob/0e6ddb0227ac4f1c55907f8b43eaef4bb1d3ce70/src/meson.build#L34-35
   env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
 

pkgs/by-name/lx/lxmenu-data/package.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxmenu-data";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxmenu-data";
     tag = finalAttrs.version;
-    hash = "sha256-5QdQ+7nzj7wDrfdt4GT8VW4+sHgZdE7h3cReY2pmcak=";
+    hash = "sha256-JwyJkZIJye8Mtx8yOcpxzOO1Gw0K5ZT00DGgXNqziJQ=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/me/meld/package.nix

@@ -61,6 +61,12 @@ python3.pkgs.buildPythonApplication rec {
     patchShebangs meson_shebang_normalisation.py
   '';
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "meld";

pkgs/by-name/me/meteo-qt/package.nix

@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "meteo-qt";
-  version = "4.2";
+  version = "4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dglent";
     repo = "meteo-qt";
     tag = "v${version}";
-    hash = "sha256-s02A5WwJffjbB497sXyugkIolqyK3OpEY7aBgnOBdbM=";
+    hash = "sha256-ksG5cnVV/4QOCzK+UWwe7LjPncIeFElAuTK60KaHgrY=";
   };
 
   postPatch = ''

pkgs/by-name/n9/n98-magerun2/package.nix

@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "n98-magerun2";
-  version = "9.2.1";
+  version = "9.3.0";
 
   src = fetchFromGitHub {
     owner = "netz98";
     repo = "n98-magerun2";
     tag = finalAttrs.version;
-    hash = "sha256-00VbleO94noopyqy9XOyHTi5M2ECEhWaT/byXgNEed0=";
+    hash = "sha256-GKRsX3R7bcGRN3jIHj+x3hz/lVMB3IKI/c8b9od/R2w=";
   };
 
-  vendorHash = "sha256-g9O83bq3OoXM3kP2qmvuYaXywfkDc/GQxjkLBU9XmOc=";
+  vendorHash = "sha256-vawCeh3oegiPrnBiAG7tthUsWXs2I+sen7XWTfsKf6w=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

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

@@ -20,16 +20,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextflow";
-  # 24.08.0-edge is compatible with Java 21. The current (as of 2024-09-19)
-  # nextflow release (24.04.4) does not yet support java21, but java19. The
-  # latter is not in nixpkgs(-unstable) anymore.
-  version = "24.08.0-edge";
+  version = "25.10.2";
 
   src = fetchFromGitHub {
     owner = "nextflow-io";
     repo = "nextflow";
-    rev = "6e866ae81ff3bf8a9729e9dbaa9dd89afcb81a4b";
-    hash = "sha256-SA27cuP3iO5kD6u0uTeEaydyqbyJzOkVtPrb++m3Tv0=";
+    rev = "c03082c9b816774c799660d22c2b56d72218fddc";
+    hash = "sha256-k8B393GOsU1gs+ZS5x3VZUmz+n8lH8/cmXkpzU301lY=";
   };
 
   nativeBuildInputs = [
@@ -44,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     # to be reverted for this specific use case.
     substituteInPlace modules/nextflow/src/main/groovy/nextflow/executor/BashWrapperBuilder.groovy \
       --replace-fail "['/bin/bash'," "['${bash}/bin/bash'," \
+      --replace-fail '? "/bin/bash"' '? "'${bash}'/bin/bash"' \
       --replace-fail "if( containerBuilder ) {" "if( containerBuilder ) {
                 launcher = launcher.replaceFirst(\"/nix/store/.*/bin/bash\", \"/bin/bash\")"
   '';
@@ -113,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       Etjean
+      mulatta
     ];
     mainProgram = "nextflow";
     platforms = lib.platforms.unix;

pkgs/by-name/oi/oidc-agent/package.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "oidc-agent";
-  version = "5.3.3";
+  version = "5.3.4";
 
   src = fetchFromGitHub {
     owner = "indigo-dc";
     repo = "oidc-agent";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-PV1aswfvEMtsgHWKfdtIo/BV+MHKKdul2vjFdyoT2Ic=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hM5Q1xrjFOCIL5BLRvhVMmPiip1bwRo0ikeQXu/Oouk=";
   };
 
   nativeBuildInputs = [

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

@@ -7,7 +7,7 @@
   qt6Packages,
 }:
 python3Packages.buildPythonApplication rec {
-  name = "openfreebuds";
+  pname = "openfreebuds";
   version = "0.17.1";
 
   src = fetchFromGitHub {

pkgs/by-name/pa/paretosecurity/package.nix

@@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.3.11";
+  version = "0.3.13";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = finalAttrs.version;
-    hash = "sha256-BYSbLeWW0DSVNAgBvWKRLgwDg47QjTbvloGfyCDYIOU=";
+    hash = "sha256-ETKKcEeTLK+srVmIDRC2hYGOKWxNzc18DPn03hc86Bs=";
   };
 
-  vendorHash = "sha256-hH+4rYvFuDsCa90C1uNM2WaQSYK9n0PpVv6P+o54RoU=";
+  vendorHash = "sha256-jAcUf4VjtKB/Q2wHOVnCgcmPp5XNMqV8Ei9kpWoGO4Q=";
   proxyVendor = true;
 
   # Skip building the Windows installer

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

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phpstan";
-  version = "2.1.37";
+  version = "2.1.38";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan";
     tag = finalAttrs.version;
-    hash = "sha256-Ov4wCIKHuVtVKCTLBR9d2W2yNw49U2gGZkygEPhXTRA=";
+    hash = "sha256-yN/pnY0kVTHSb7Pi8LQGsLWvc/f3gfVgIwf7n1ty/UI=";
   };
 
   nativeBuildInputs = [

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

@@ -7,7 +7,7 @@
   rainfrog,
 }:
 let
-  version = "0.3.13";
+  version = "0.3.14";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-0+zlEBjyQLauaLyojdo1mIaauHNyRW9x32yPrpgb4qE=";
+    hash = "sha256-DeLcn+0L3e1SXG5oIwUzbsNHtQeyF8o+OMbGcFJX2KY=";
   };
 
-  cargoHash = "sha256-EJWhs9oVMBT5qRPAbiaW5sG52cSLXDmbntWpBKVORyM=";
+  cargoHash = "sha256-0IV3OyREYPFsgGuG+RIr5dPPhha2RktjiUHSFpRofx8=";
 
   passthru = {
     tests.version = testers.testVersion {

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

@@ -3,12 +3,12 @@
   stdenv,
   appstream-glib,
   blueprint-compiler,
+  bubblewrap,
   cargo,
   dbus,
   desktop-file-utils,
   fetchFromCodeberg,
   glib,
-  libglycin,
   glycin-loaders,
   gst_all_1,
   gtk4,
@@ -21,12 +21,19 @@
   ninja,
   nix-update-script,
   pkg-config,
+  replaceVars,
   rustPlatform,
   rustc,
   sqlite,
   wrapGAppsHook4,
 }:
 
+let
+  glycinPathsPatch = replaceVars ./fix-glycin-paths.patch {
+    bwrap = "${bubblewrap}/bin/bwrap";
+  };
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "recordbox";
   version = "0.10.4";
@@ -90,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Dirty approach to add patches after cargoSetupPostUnpackHook
     # We should eventually use a cargo vendor patch hook instead
     pushd ../$(stripHash $cargoDeps)/glycin-2.*
-      patch -p3 < ${libglycin.passthru.glycinPathsPatch}
+      patch -p3 < ${glycinPathsPatch}
     popd
   '';
   preFixup = ''

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

@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "responder";
-  version = "3.2.1.0";
+  version = "3.2.2.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "lgandx";
     repo = "Responder";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ajVG4ZUw1GB4dgOztnOfZJ+9wpsrupZuHh8FLRZVZ24=";
+    hash = "sha256-vzn+7w7RgAsCt1pOz53cvBE1F1U+NFE4c1MehwLoFeQ=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ru/ruff/package.nix

@@ -16,18 +16,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.14.14";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-h6XYWK6NxelLCfqG0geiAj3XbcqzbeFKeFMMDsy8fm8=";
+    hash = "sha256-Q3xujVNv5i3mgdsjnvgTiPoKmK9aeSgz+2IoVrNur4k=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-H5ZaBDV0YTdExu42Dt1Bq379vJ3FtddKtdLkMW+qC78=";
+  cargoHash = "sha256-JMMDOANg+nqrCoxiuIXTcdqm7UZ61pIJwUTJB20TjUM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/ru/rundeck/package.nix

@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck";
-  version = "5.18.0-20251216";
+  version = "5.19.0-20260202";
 
   src = fetchurl {
     url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-VCxOD54gMgMSDhEgkDI1FDaK8RDGxKwtUwXrfK4JmpM=";
+    hash = "sha256-KUITEp0aq1fg531VUwBnCdY8o9wMUe3daAVfNYzuPVI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/by-name/sk/skim/package.nix

@@ -11,7 +11,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "skim";
-  version = "2.0.1";
+  version = "2.0.2";
 
   outputs = [
     "out"
@@ -23,14 +23,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "skim-rs";
     repo = "skim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MQV7Fcbna6x4t3NFFn8m/EHvOM1CrPpfdwUJGQz09LU=";
+    hash = "sha256-V6ZIGPeGWTeNzOA9FDhARx63L3CVpUUpCILwIGg8NOY=";
   };
 
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
   '';
 
-  cargoHash = "sha256-BlY1idYk6LpVI40dLdH0Sn49ZChbecp6KhwWORgKP3k=";
+  cargoHash = "sha256-xtrqY8jBB43Dpj4nOr2b0FziRvPjtRpWevAM8FeHqwc=";
 
   nativeBuildInputs = [ installShellFiles ];
   nativeCheckInputs = [ tmux ];

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

@@ -6,9 +6,7 @@
   glycin-loaders,
   cargo,
   desktop-file-utils,
-  jq,
   meson,
-  moreutils,
   ninja,
   pkg-config,
   rustc,
@@ -34,19 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-NVj2+ODTiylQtrrZue7COCSb7f7c5w+1iijK1pRebOk=";
   };
 
-  patches = [
-    # Fix paths in glycin library
-    libglycin.passthru.glycin3PathsPatch
-  ];
-
   cargoVendorDir = "vendor";
 
   nativeBuildInputs = [
     cargo
     desktop-file-utils
-    jq
+    libglycin.patchVendorHook
     meson
-    moreutils # sponge is used in postPatch
     ninja
     pkg-config
     rustc
@@ -56,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     glib
+    libglycin.setupHook
+    glycin-loaders
     gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
@@ -70,13 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    # Replace hash of file we patch in vendored glycin.
-    jq \
-      --arg hash "$(sha256sum vendor/glycin/src/sandbox.rs | cut -d' ' -f 1)" \
-      '.files."src/sandbox.rs" = $hash' \
-      vendor/glycin/.cargo-checksum.json \
-      | sponge vendor/glycin/.cargo-checksum.json
-
     substituteInPlace src/meson.build --replace-fail \
       "'src' / rust_target / meson.project_name()" \
       "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
@@ -86,8 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
     gappsWrapperArgs+=(
       # vp8enc preset
       --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
-      # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
     )
   '';
 

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

@@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
     ./time-1.9-fix-sighandler-prototype-for-c23.patch
   ];
 
+  outputs = [
+    "out"
+    "info"
+  ];
+
   meta = {
     description = "Tool that runs programs and summarizes the system resources they use";
     longDescription = ''

pkgs/by-name/tu/turntable/package.nix

@@ -13,6 +13,7 @@
   json-glib,
   libsecret,
   libglycin,
+  libglycin-gtk4,
   glib-networking,
   glycin-loaders,
 
@@ -47,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     json-glib
     libsecret
     libglycin
+    libglycin-gtk4
+    glycin-loaders
     glib-networking
   ];
 
@@ -57,12 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
-    )
-  '';
-
   meta = {
     description = "Scrobbles your music to multiple services with playback controls for MPRIS players";
     longDescription = ''

pkgs/by-name/uv/uv/package.nix

@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.9.28";
+  version = "0.9.29";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-39vawkM7V9imTENBcIiCRoIk+EmWNeGZn7pXJoHBK4Q=";
+    hash = "sha256-HsMZzn7D2C19Uu9xmz4NRaK+cGcoiyJYaAq1Z9f5nwY=";
   };
 
-  cargoHash = "sha256-ey4cahnMak0L1M4M/B06FalRhKeOvbZQI1YYHwADjnM=";
+  cargoHash = "sha256-q+LeKIasQwhgAdq0N43cPK/dHkS45tV73tCCvrjnFfA=";
 
   buildInputs = [
     rust-jemalloc-sys

pkgs/by-name/va/valent/package.nix

@@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     json-glib
     libadwaita
     libglycin
+    glycin-loaders
     libpeas2
     libphonenumber
     libportal-gtk4
@@ -69,12 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
     tinysparql
   ];
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
-    )
-  '';
-
   passthru.updateScript = nix-update-script { };
 
   meta = {

pkgs/by-name/vi/vipsdisp/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vipsdisp";
-  version = "4.1.2";
+  version = "4.1.3";
 
   src = fetchFromGitHub {
     owner = "jcupitt";
     repo = "vipsdisp";
     tag = "v${version}";
-    hash = "sha256-9L8l/afD6phq8T3ReYqQQgD1CztW5gw0MME23Ut/lEE=";
+    hash = "sha256-xTvs52k+OHDaKXu83kKc17lpx0/SmdOI6BaUmBQ/WoY=";
   };
 
   postPatch = ''

pkgs/by-name/wh/whosthere/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "whosthere";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "ramonvermeulen";
     repo = "whosthere";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-7NzQTwl+3FqihMB8nsgzoFoxvnxraZHgG66kPa77ulY=";
+    hash = "sha256-EuEq3HG7j5kz0GomJELcVy+POtbA+NtIM/Y/G3kGZn4=";
   };
 
   vendorHash = "sha256-YVPsWpIXC5SLm+T2jEGqF4MBcKOAAk0Vpc7zCIFkNw8=";

pkgs/by-name/z3/z3/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   python3Packages,
   fixDarwinDylibNames,
   nix-update-script,
@@ -39,6 +40,25 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = lib.optionals useCmakeBuild [
     ./fix-pkg-config-paths.patch
+    # fix Segmentation fault. See https://github.com/Z3Prover/z3/pull/8264 and
+    # https://github.com/NixOS/nixpkgs/issues/486491
+    (fetchpatch2 {
+      name = "preserve-the-initial-state-of-the-solver.patch";
+      url = "https://github.com/Z3Prover/z3/commit/850a3236adab92f9f6f569ac66ffbb69be179f4c.patch?full_index=1";
+      hash = "sha256-C6p+dj3i3DpOnd2wr+R8ZwClHoMFfk5i5/+JRhTDNcs=";
+    })
+    # needs to include a cosmetic change to apply patch for memory corruption
+    (fetchpatch2 {
+      name = "cosmetic-changes-to-i.patch";
+      url = "https://github.com/Z3Prover/z3/commit/243694379475d983605f87578452a330f3e3b28f.patch?full_index=1";
+      includes = [ "src/api/api_polynomial.cpp" ];
+      hash = "sha256-huo5S73WrFrEEUcaP+1LDQwGwo+n2iYT4x/OjK5rmqQ=";
+    })
+    (fetchpatch2 {
+      name = "fix-memory-corruption.patch";
+      url = "https://github.com/Z3Prover/z3/commit/e7b6f3f33bcc6c88a0f2ace47ff2f09b59239433.patch?full_index=1";
+      hash = "sha256-kEEeod4s8i9SI2e2TFD2U4yd1qEPoGnJOfE0y+1Cq6M=";
+    })
   ];
 
   strictDeps = true;

pkgs/by-name/zo/zoom/package.nix

@@ -13,8 +13,6 @@
   libice,
 }:
 
-# !!! assert freetype == xorg.freetype
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "zoom";
   version = "1.1.5";

pkgs/data/misc/nixos-artwork/wallpapers.nix

@@ -7,7 +7,8 @@
 let
   mkNixBackground =
     {
-      name,
+      pname,
+      version,
       src,
       description,
       license ? lib.licenses.free,
@@ -15,7 +16,11 @@ let
 
     let
       pkg = stdenv.mkDerivation {
-        inherit name src;
+        inherit
+          pname
+          version
+          src
+          ;
 
         dontUnpack = true;
 
@@ -27,12 +32,12 @@ let
                   ln -s $src $out/share/backgrounds/nixos/${src.name}
 
                   mkdir -p $out/share/gnome-background-properties/
-                  cat <<EOF > $out/share/gnome-background-properties/${name}.xml
+                  cat <<EOF > $out/share/gnome-background-properties/${pname}.xml
           <?xml version="1.0" encoding="UTF-8"?>
           <!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
           <wallpapers>
             <wallpaper deleted="false">
-              <name>${name}</name>
+              <name>${pname}</name>
               <filename>${src}</filename>
               <options>zoom</options>
               <shade_type>solid</shade_type>
@@ -47,12 +52,12 @@ let
                   ln -s $src $out/share/artwork/gnome/${src.name}
 
                   # KDE
-                  mkdir -p $out/share/wallpapers/${name}/contents/images
-                  ln -s $src $out/share/wallpapers/${name}/contents/images/${src.name}
-                  cat >>$out/share/wallpapers/${name}/metadata.desktop <<_EOF
+                  mkdir -p $out/share/wallpapers/${pname}/contents/images
+                  ln -s $src $out/share/wallpapers/${pname}/contents/images/${src.name}
+                  cat >>$out/share/wallpapers/${pname}/metadata.desktop <<_EOF
           [Desktop Entry]
-          Name=${name}
-          X-KDE-PluginInfo-Name=${name}
+          Name=${pname}
+          X-KDE-PluginInfo-Name=${pname}
           _EOF
 
                   runHook postInstall
@@ -60,7 +65,7 @@ let
 
         passthru = {
           gnomeFilePath = "${pkg}/share/backgrounds/nixos/${src.name}";
-          kdeFilePath = "${pkg}/share/wallpapers/${name}/contents/images/${src.name}";
+          kdeFilePath = "${pkg}/share/wallpapers/${pname}/contents/images/${src.name}";
         };
 
         meta = {
@@ -77,7 +82,8 @@ in
 rec {
 
   binary-black = mkNixBackground {
-    name = "binary-black-2024-02-15";
+    pname = "binary-black";
+    version = "2024-02-15";
     description = "Black binary wallpaper for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/8957e93c95867faafec7f9988cedddd6837859fa/wallpapers/nix-wallpaper-binary-black.png";
@@ -87,7 +93,8 @@ rec {
   };
 
   binary-blue = mkNixBackground {
-    name = "binary-blue-2024-02-15";
+    pname = "binary-blue";
+    version = "2024-02-15";
     description = "Blue binary wallpaper for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/8957e93c95867faafec7f9988cedddd6837859fa/wallpapers/nix-wallpaper-binary-blue.png";
@@ -97,7 +104,8 @@ rec {
   };
 
   binary-red = mkNixBackground {
-    name = "binary-red-2024-02-15";
+    pname = "binary-red";
+    version = "2024-02-15";
     description = "Red binary wallpaper for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/8957e93c95867faafec7f9988cedddd6837859fa/wallpapers/nix-wallpaper-binary-red.png";
@@ -107,7 +115,8 @@ rec {
   };
 
   binary-white = mkNixBackground {
-    name = "binary-white-2024-02-15";
+    pname = "binary-white";
+    version = "2024-02-15";
     description = "White binary wallpaper for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/8957e93c95867faafec7f9988cedddd6837859fa/wallpapers/nix-wallpaper-binary-white.png";
@@ -117,7 +126,8 @@ rec {
   };
 
   catppuccin-frappe = mkNixBackground {
-    name = "catppuccin-frappe-2024-02-15";
+    pname = "catppuccin-frappe";
+    version = "2024-02-15";
     description = "Catppuccin Frappé colorscheme wallpaper for NixOS";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/97444e18b7fe97705e8caedd29ae05e62cb5d4b7/wallpapers/nixos-wallpaper-catppuccin-frappe.png";
@@ -127,7 +137,8 @@ rec {
   };
 
   catppuccin-latte = mkNixBackground {
-    name = "catppuccin-latte-2024-02-15";
+    pname = "catppuccin-latte";
+    version = "2024-02-15";
     description = "Catppuccin Latte colorscheme wallpaper for NixOS";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/97444e18b7fe97705e8caedd29ae05e62cb5d4b7/wallpapers/nixos-wallpaper-catppuccin-latte.png";
@@ -137,7 +148,8 @@ rec {
   };
 
   catppuccin-macchiato = mkNixBackground {
-    name = "catppuccin-macchiato-2024-02-15";
+    pname = "catppuccin-macchiato";
+    version = "2024-02-15";
     description = "Catppuccin Macchiato colorscheme wallpaper for NixOS";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/97444e18b7fe97705e8caedd29ae05e62cb5d4b7/wallpapers/nixos-wallpaper-catppuccin-macchiato.png";
@@ -147,7 +159,8 @@ rec {
   };
 
   catppuccin-mocha = mkNixBackground {
-    name = "catppuccin-mocha-2024-02-15";
+    pname = "catppuccin-mocha";
+    version = "2024-02-15";
     description = "Catppuccin Mochacolorscheme wallpaper for NixOS";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/97444e18b7fe97705e8caedd29ae05e62cb5d4b7/wallpapers/nixos-wallpaper-catppuccin-mocha.png";
@@ -157,7 +170,8 @@ rec {
   };
 
   dracula = mkNixBackground {
-    name = "dracula-2020-07-02";
+    pname = "dracula";
+    version = "2020-07-02";
     description = "Nix background based on the Dracula color palette";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/03c6c20be96c38827037d2238357f2c777ec4aa5/wallpapers/nix-wallpaper-dracula.png";
@@ -167,7 +181,8 @@ rec {
   };
 
   gear = mkNixBackground {
-    name = "gear-2022-04-19";
+    pname = "gear";
+    version = "2022-04-19";
     description = "3D wallpaper for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-gear.png";
@@ -179,7 +194,8 @@ rec {
   gnome-dark = simple-dark-gray-bottom;
 
   gradient-grey = mkNixBackground {
-    name = "gradient-grey-2018-10-20";
+    pname = "gradient-grey";
+    version = "2018-10-20";
     description = "Simple grey gradient background for NixOS";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/3f7695afe75239720a32d6c38df7c9888b5ed581/wallpapers/NixOS-Gradient-grey.png";
@@ -189,7 +205,8 @@ rec {
   };
 
   moonscape = mkNixBackground {
-    name = "moonscape-2022-04-19";
+    pname = "moonscape";
+    version = "2022-04-19";
     description = "3D wallpaper for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-moonscape.png";
@@ -199,7 +216,8 @@ rec {
   };
 
   mosaic-blue = mkNixBackground {
-    name = "mosaic-blue-2016-02-19";
+    pname = "mosaic-blue";
+    version = "2016-02-19";
     description = "Mosaic blue background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png";
@@ -209,7 +227,8 @@ rec {
   };
 
   nineish = mkNixBackground {
-    name = "nineish-2019-12-04";
+    pname = "nineish";
+    version = "2019-12-04";
     description = "Nix background inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/da01f68d21ddfdc9f1c6e520c2170871c81f1cf5/wallpapers/nix-wallpaper-nineish.png";
@@ -219,7 +238,8 @@ rec {
   };
 
   nineish-dark-gray = mkNixBackground {
-    name = "nineish-dark-gray-2020-07-02";
+    pname = "nineish-dark-gray";
+    version = "2020-07-02";
     description = "Dark gray Nix background inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/f07707cecfd89bc1459d5dad76a3a4c5315efba1/wallpapers/nix-wallpaper-nineish-dark-gray.png";
@@ -229,7 +249,8 @@ rec {
   };
 
   nineish-solarized-dark = mkNixBackground {
-    name = "nineish-dark-gray-2021-07-20";
+    pname = "nineish-solarized-dark";
+    version = "2021-07-20";
     description = "Solarized dark Nix background inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/f99638d8d1a11d97a99ff7e0e1e7df58c28643ff/wallpapers/nix-wallpaper-nineish-solarized-dark.png";
@@ -239,7 +260,8 @@ rec {
   };
 
   nineish-solarized-light = mkNixBackground {
-    name = "nineish-dark-light-2021-07-20";
+    pname = "nineish-dark-light";
+    version = "2021-07-20";
     description = "Solarized light Nix background inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/f99638d8d1a11d97a99ff7e0e1e7df58c28643ff/wallpapers/nix-wallpaper-nineish-solarized-light.png";
@@ -249,7 +271,8 @@ rec {
   };
 
   nineish-catppuccin-frappe-alt = mkNixBackground {
-    name = "nineish-catppuccin-frappe-alt-2025-01-27";
+    pname = "nineish-catppuccin-frappe-alt";
+    version = "2025-01-27";
     description = "Alternative Catppuccin Frappe wallpaper for Nix inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/33856d7837cb8ba76c4fc9e26f91a659066ee31f/wallpapers/nix-wallpaper-nineish-catppuccin-frappe-alt.png";
@@ -259,7 +282,8 @@ rec {
   };
 
   nineish-catppuccin-frappe = mkNixBackground {
-    name = "nineish-catppuccin-frappe-2025-01-27";
+    pname = "nineish-catppuccin-frappe";
+    version = "2025-01-27";
     description = "Catppuccin Frappe wallpaper for Nix inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/33856d7837cb8ba76c4fc9e26f91a659066ee31f/wallpapers/nix-wallpaper-nineish-catppuccin-frappe.png";
@@ -269,7 +293,8 @@ rec {
   };
 
   nineish-catppuccin-latte-alt = mkNixBackground {
-    name = "nineish-catppuccin-latte-alt-2025-01-27";
+    pname = "nineish-catppuccin-latte-alt";
+    version = "2025-01-27";
     description = "Alternative Catppuccin Latte wallpaper for Nix inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/33856d7837cb8ba76c4fc9e26f91a659066ee31f/wallpapers/nix-wallpaper-nineish-catppuccin-latte-alt.png";
@@ -279,7 +304,8 @@ rec {
   };
 
   nineish-catppuccin-latte = mkNixBackground {
-    name = "nineish-catppuccin-latte-2025-01-27";
+    pname = "nineish-catppuccin-latte";
+    version = "2025-01-27";
     description = "Catppuccin Latte wallpaper for Nix inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/33856d7837cb8ba76c4fc9e26f91a659066ee31f/wallpapers/nix-wallpaper-nineish-catppuccin-latte.png";
@@ -289,7 +315,8 @@ rec {
   };
 
   nineish-catppuccin-macchiato-alt = mkNixBackground {
-    name = "nineish-catppuccin-macchiato-alt-2025-01-27";
+    pname = "nineish-catppuccin-macchiato-alt";
+    version = "2025-01-27";
     description = "Alternative Catppuccin Macchiato wallpaper for Nix inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/33856d7837cb8ba76c4fc9e26f91a659066ee31f/wallpapers/nix-wallpaper-nineish-catppuccin-macchiato-alt.png";
@@ -299,7 +326,8 @@ rec {
   };
 
   nineish-catppuccin-macchiato = mkNixBackground {
-    name = "nineish-catppuccin-macchiato-2025-01-27";
+    pname = "nineish-catppuccin-macchiato";
+    version = "2025-01-27";
     description = "Catppuccin Macchiato wallpaper for Nix inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/33856d7837cb8ba76c4fc9e26f91a659066ee31f/wallpapers/nix-wallpaper-nineish-catppuccin-macchiato.png";
@@ -309,7 +337,8 @@ rec {
   };
 
   nineish-catppuccin-mocha-alt = mkNixBackground {
-    name = "nineish-catppuccin-mocha-alt-2025-01-27";
+    pname = "nineish-catppuccin-mocha-alt";
+    version = "2025-01-27";
     description = "Alternative Catppuccin Mocha wallpaper for Nix inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/33856d7837cb8ba76c4fc9e26f91a659066ee31f/wallpapers/nix-wallpaper-nineish-catppuccin-mocha-alt.png";
@@ -319,7 +348,8 @@ rec {
   };
 
   nineish-catppuccin-mocha = mkNixBackground {
-    name = "nineish-catppuccin-mocha-2025-01-27";
+    pname = "nineish-catppuccin-mocha";
+    version = "2025-01-27";
     description = "Catppuccin Mocha wallpaper for Nix inspired by simpler times";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/33856d7837cb8ba76c4fc9e26f91a659066ee31f/wallpapers/nix-wallpaper-nineish-catppuccin-mocha.png";
@@ -329,7 +359,8 @@ rec {
   };
 
   recursive = mkNixBackground {
-    name = "recursive-2022-04-19";
+    pname = "recursive";
+    version = "2022-04-19";
     description = "3D wallpaper for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-recursive.png";
@@ -339,7 +370,8 @@ rec {
   };
 
   simple-blue = mkNixBackground {
-    name = "simple-blue-2016-02-19";
+    pname = "simple-blue";
+    version = "2016-02-19";
     description = "Simple blue background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png";
@@ -349,7 +381,8 @@ rec {
   };
 
   simple-dark-gray = mkNixBackground {
-    name = "simple-dark-gray-2016-02-19";
+    pname = "simple-dark-gray";
+    version = "2016-02-19";
     description = "Simple dark gray background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png";
@@ -359,7 +392,8 @@ rec {
   };
 
   simple-dark-gray-bootloader = mkNixBackground {
-    name = "simple-dark-gray-bootloader-2018-08-28";
+    pname = "simple-dark-gray-bootloader";
+    version = "2018-08-28";
     description = "Simple dark gray background for NixOS, specifically bootloaders";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/9d1f11f652ed5ffe460b6c602fbfe2e7e9a08dff/bootloader/nix-wallpaper-simple-dark-gray_bootloader.png";
@@ -369,7 +403,8 @@ rec {
   };
 
   simple-dark-gray-bottom = mkNixBackground {
-    name = "simple-dark-gray-2018-08-28";
+    pname = "simple-dark-gray";
+    version = "2018-08-28";
     description = "Simple dark gray background for NixOS, specifically bootloaders and graphical login";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/783c38b22de09f6ee33aacc817470a4513392d83/wallpapers/nix-wallpaper-simple-dark-gray_bottom.png";
@@ -379,7 +414,8 @@ rec {
   };
 
   simple-light-gray = mkNixBackground {
-    name = "simple-light-gray-2016-02-19";
+    pname = "simple-light-gray";
+    version = "2016-02-19";
     description = "Simple light gray background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png";
@@ -389,7 +425,8 @@ rec {
   };
 
   simple-red = mkNixBackground {
-    name = "simple-red-2016-02-19";
+    pname = "simple-red";
+    version = "2016-02-19";
     description = "Simple red background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png";
@@ -399,7 +436,8 @@ rec {
   };
 
   stripes-logo = mkNixBackground {
-    name = "stripes-logo-2016-02-19";
+    pname = "stripes-logo";
+    version = "2016-02-19";
     description = "Stripes logo background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png";
@@ -409,7 +447,8 @@ rec {
   };
 
   stripes = mkNixBackground {
-    name = "stripes-2016-02-19";
+    pname = "stripes";
+    version = "2016-02-19";
     description = "Stripes background for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png";
@@ -419,7 +458,8 @@ rec {
   };
 
   waterfall = mkNixBackground {
-    name = "waterfall-2022-04-19";
+    pname = "waterfall";
+    version = "2022-04-19";
     description = "3D wallpaper for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-waterfall.png";
@@ -429,7 +469,8 @@ rec {
   };
 
   watersplash = mkNixBackground {
-    name = "watersplash-2022-04-19";
+    pname = "watersplash";
+    version = "2022-04-19";
     description = "3D wallpaper for Nix";
     src = fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-watersplash.png";

pkgs/development/haskell-modules/make-package-set.nix

@@ -161,7 +161,7 @@ let
           inherit (scope) ghc buildHaskellPackages;
         };
     in
-    ps // ps.xorg // ps.gnome2 // { inherit stdenv; } // scopeSpliced;
+    ps // ps.gnome2 // { inherit stdenv; } // scopeSpliced;
   defaultScope = mkScope self;
   callPackage = drv: args: callPackageWithScope defaultScope drv args;
 

pkgs/development/mobile/androidenv/test-suite.nix

@@ -17,7 +17,7 @@ let
     // (examples-shell-with-emulator.passthru.tests // examples-shell-without-emulator.passthru.tests);
 in
 stdenv.mkDerivation {
-  name = "androidenv-test-suite";
+  pname = "androidenv-test-suite";
   version = (lib.importJSON ./repo.json).latest.fingerprint or "0000000000000000";
   buildInputs = lib.attrValues all-tests;
 

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

@@ -12,7 +12,6 @@
     "out"
     "devdoc"
   ],
-  src ? null,
 
   # enabling or disabling does nothing for perl packages so set it explicitly
   # to false to not change hashes when enableParallelBuildingByDefault is enabled
@@ -64,7 +63,6 @@ lib.throwIf (attrs ? name)
 
           inherit
             outputs
-            src
             doCheck
             checkTarget
             enableParallelBuilding

pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "apify-fingerprint-datapoints";
+  version = "0.10.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "apify_fingerprint_datapoints";
+    inherit (finalAttrs) version;
+    hash = "sha256-FObB0yFu/t1RtnCYyDuzIzgm4mHu8mC+cATzciGd2VA=";
+  };
+
+  build-system = [ hatchling ];
+
+  pythonImportsCheck = [ "apify_fingerprint_datapoints" ];
+
+  # Module has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Browser fingerprint datapoints collected by Apify";
+    homepage = "https://pypi.org/project/apify-fingerprint-datapoints/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+})

pkgs/development/python-modules/boto3-stubs/default.nix

@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.42.39";
+  version = "1.42.41";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-9BMx4YMO0i5lJPpuP5WJfpmw33kO+2N5iz1DGA85haE=";
+    hash = "sha256-z6erIbmTyD6Ncsbfe6huQaawMOoiuVViIFymSM1iRCY=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/botocore-stubs/default.nix

@@ -9,13 +9,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "botocore-stubs";
-  version = "1.42.39";
+  version = "1.42.41";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-enUmXNWfuT/qSmoCrF6Qy7RNFPGCYnrVjbFCVpC8iD0=";
+    hash = "sha256-2+rC90Tfa4FM6D7D83d7KZoBXL6lei78QcM7jDgmWCU=";
   };
 
   build-system = [ setuptools ];

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

@@ -1,34 +1,33 @@
 {
   lib,
   aiofiles,
+  apify-fingerprint-datapoints,
   buildPythonPackage,
   click,
   fetchFromGitHub,
   httpx,
   orjson,
   poetry-core,
-  pythonOlder,
   rich,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "browserforge";
-  version = "1.2.3";
+  version = "1.2.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "daijro";
     repo = "browserforge";
-    tag = "v${version}";
-    hash = "sha256-D5GlUZ4KT6kqPQVcpli8T++xoXl1YUVGZu8rePJQ44A=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8mh1Wok96rwUNAdnaoI1VYkyNr50JX/K7o04n/epuMo=";
   };
 
   build-system = [ poetry-core ];
 
   dependencies = [
     aiofiles
+    apify-fingerprint-datapoints
     click
     httpx
     orjson
@@ -46,4 +45,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

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

@@ -26,14 +26,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cvxpy";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cvxpy";
     repo = "cvxpy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RBRosw7mNQNdVxXU5aW0ehwM0OV2krPqP+ULBGGhrxM=";
+    hash = "sha256-7bLvVvOthbEe+Ry/NQCxP5El9K8qITIGwJzypooT2mw=";
   };
 
   postPatch =

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

@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cyvest";
-  version = "5.1.4";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PakitoSec";
     repo = "cyvest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OvAnhasc4iZtfi8olQ4rLaokcaC/b5rYdPPMn2pVYTA=";
+    hash = "sha256-AfTeZj7GFLoaLRImGbiFqbaw4AxjHUZSBDwGFY9sA1s=";
   };
 
   pythonRelaxDeps = [ "pydantic" ];
@@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Cybersecurity Investigation Model";
     homepage = "https://github.com/PakitoSec/cyvest";
-    changelog = "https://github.com/PakitoSec/cyvest/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/PakitoSec/cyvest/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };

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

@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202602021";
+  version = "0.1.202602031";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-310x0g6TBy64Svj8aO5vvmCFWaL4txA6rZLXxSrxL2g=";
+    hash = "sha256-4d3HrcLBTxGX+GsEzhUa7Z8sCIRvpG3lckxzBYzQFrA=";
   };
 
   __darwinAllowLocalNetworking = true;

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

@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildPythonPackage,
   fetchPypi,
@@ -6,6 +7,7 @@
   libX11,
   setuptools,
   glcontext,
+  pkgs,
 }:
 
 buildPythonPackage rec {
@@ -18,7 +20,7 @@ buildPythonPackage rec {
     hash = "sha256-UpNqmMyy8uHW48sYUospGfaDHn4/kk54i1hzutzlEps=";
   };
 
-  postPatch = ''
+  postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) ''
     substituteInPlace _moderngl.py \
       --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \
       --replace-fail '"libEGL.so"' '"${libGL}/lib/libEGL.so"'
@@ -26,7 +28,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  buildInputs = [
+  buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [
     libGL
     libX11
   ];
@@ -44,7 +46,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/moderngl/moderngl/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ c0deaddict ];
-    # should be mesa.meta.platforms, darwin build breaks.
-    platforms = lib.platforms.linux;
+    inherit (pkgs.mesa.meta) platforms;
   };
 }

pkgs/development/python-modules/mypy-boto3/default.nix

@@ -163,8 +163,8 @@ in
       "sha256-uKbD5VkYnYO2PKd1Lp9PAg9+5p8X+LisT+N6TsqhZRY=";
 
   mypy-boto3-batch =
-    buildMypyBoto3Package "batch" "1.42.3"
-      "sha256-8vWX/eJxWKoe4c3aTUrQf11UDeMMJ4BDYwFYwDpEyzY=";
+    buildMypyBoto3Package "batch" "1.42.41"
+      "sha256-IDtmHGtBihawUVZVLgf4+8uB3Jm8OqmLlRrge8zZvFY=";
 
   mypy-boto3-billingconductor =
     buildMypyBoto3Package "billingconductor" "1.42.7"
@@ -227,8 +227,8 @@ in
       "sha256-O9OEm8iaNx1MNoaRU1syAkS6AFec3dY7tYtz8o1w5RA=";
 
   mypy-boto3-cloudfront =
-    buildMypyBoto3Package "cloudfront" "1.42.25"
-      "sha256-xfXJFIEv8Hd+V0oKEw44pwpYyfRPCGO6jKCcXaq8viQ=";
+    buildMypyBoto3Package "cloudfront" "1.42.40"
+      "sha256-5xhiNDkHCtL2AmL2asOOZbwbxL5etj5anUOnKja5+Ic=";
 
   mypy-boto3-cloudhsm =
     buildMypyBoto3Package "cloudhsm" "1.42.3"
@@ -431,8 +431,8 @@ in
       "sha256-VLjmuBf9xHv0qwv2F3l/14KptFqXVE0OmwPF/WC06NI=";
 
   mypy-boto3-dynamodb =
-    buildMypyBoto3Package "dynamodb" "1.42.33"
-      "sha256-qd1IxJJDVvcvJQCApfvv6sgR3zWBdDLbnqRGc2eI2oY=";
+    buildMypyBoto3Package "dynamodb" "1.42.41"
+      "sha256-YQLF7PJbHvSFJ0ypxq9563b2YgDNB1UV7dK5ZWX5iS0=";
 
   mypy-boto3-dynamodbstreams =
     buildMypyBoto3Package "dynamodbstreams" "1.42.3"
@@ -726,8 +726,8 @@ in
       "sha256-isLoakoBigys+KBGRoFryEqtKT2g+Wv2D/+ttlxOlfk=";
 
   mypy-boto3-kinesis =
-    buildMypyBoto3Package "kinesis" "1.42.3"
-      "sha256-MeAbdKqcMS5z8sMjjKfnw00DY7UdaEMf6pV1tzZQUlo=";
+    buildMypyBoto3Package "kinesis" "1.42.41"
+      "sha256-3xWp1Dg6ZC3t0dUNqD+iYJaKAxN5ILv8Sq1QLx7IXvo=";
 
   mypy-boto3-kinesis-video-archived-media =
     buildMypyBoto3Package "kinesis-video-archived-media" "1.42.3"
@@ -842,8 +842,8 @@ in
       "sha256-kiKP12WkHvskEVNPRAUTRJqksrz6I5y31snfFpcz8HQ=";
 
   mypy-boto3-marketplace-catalog =
-    buildMypyBoto3Package "marketplace-catalog" "1.42.3"
-      "sha256-+7BvckGEN74BosIfQguWMCE0chJlp4bOVSXpIqqnR4w=";
+    buildMypyBoto3Package "marketplace-catalog" "1.42.41"
+      "sha256-lyq6RaR12pc3LKJokhd+S5wSppt4hWdsHoVsQe34GMY=";
 
   mypy-boto3-marketplace-entitlement =
     buildMypyBoto3Package "marketplace-entitlement" "1.42.3"
@@ -982,8 +982,8 @@ in
       "sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk=";
 
   mypy-boto3-organizations =
-    buildMypyBoto3Package "organizations" "1.42.8"
-      "sha256-bopH6sCfrIERc/DcPkGFd5ss8PWYyycfwuh/SPFr3ic=";
+    buildMypyBoto3Package "organizations" "1.42.41"
+      "sha256-yx4CFlVDJ7LYV7ShLyNZPYLiSUXLMf2xT3FZBFTV7Xo=";
 
   mypy-boto3-osis =
     buildMypyBoto3Package "osis" "1.42.3"
@@ -1310,8 +1310,8 @@ in
       "sha256-eLm650XMxikqnBzOWD6aZo8dYVmVkl3Mk0+SqZcON8c=";
 
   mypy-boto3-sso-admin =
-    buildMypyBoto3Package "sso-admin" "1.42.3"
-      "sha256-asz4/PUoDt62nlH2G1RdTIlH0ll/cOBPB5NxuYBCApc=";
+    buildMypyBoto3Package "sso-admin" "1.42.41"
+      "sha256-AbfHjc5UxxCdT5w7WS2EYMmWZU2xGpIeIe3ZZzhidL0=";
 
   mypy-boto3-sso-oidc =
     buildMypyBoto3Package "sso-oidc" "1.42.3"

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

@@ -27,23 +27,18 @@
   zeroconf,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyatv";
-  version = "0.16.1";
+  version = "0.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "postlund";
     repo = "pyatv";
-    tag = "v${version}";
-    hash = "sha256-b5u9u5CD/1W422rCxHvoyBqT5CuBAh68/EUBzNDcXoE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wsLqG1yJf5A3BMgpbQMrXn6NzpcF4BU1TD+0NJ6Nt7c=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "pytest-runner" ""
-  '';
-
   pythonRelaxDeps = [
     "aiohttp"
     "async_timeout"
@@ -109,8 +104,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python client library for the Apple TV";
     homepage = "https://github.com/postlund/pyatv";
-    changelog = "https://github.com/postlund/pyatv/blob/${src.tag}/CHANGES.md";
+    changelog = "https://github.com/postlund/pyatv/blob/${finalAttrs.src.tag}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix

@@ -962,9 +962,9 @@
   };
 
   sparql = {
-    version = "0-unstable-2024-06-26";
-    url = "github:GordianDziwis/tree-sitter-sparql/d853661ca680d8ff7f8d800182d5782b61d0dd58";
-    hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=";
+    version = "0.1.0-unstable-2025-10-15";
+    url = "github:GordianDziwis/tree-sitter-sparql/1ef52d35a73a2a5f2e433ecfd1c751c1360a923b";
+    hash = "sha256-9DaV12dkcwF7/jWc4QaTQaHcKu5zO5evWlXGNZMdRqc=";
     meta = {
       license = lib.licenses.mit;
     };

pkgs/os-specific/linux/kernel/build.nix

@@ -504,6 +504,12 @@ lib.makeOverridable (
         export HOME=${installkernel}
       '';
 
+    preFixup = ''
+      if [ -z "''${dontStrip-}" -a -e $out/vmlinux ]; then
+        strip -v -S -p $out/vmlinux
+      fi
+    '';
+
     requiredSystemFeatures = [ "big-parallel" ];
 
     passthru = rec {

pkgs/os-specific/linux/kernel/common-config.nix

@@ -565,6 +565,10 @@ let
         # Enable CEC over DisplayPort
         DRM_DP_CEC = whenOlder "6.10" yes;
         DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes;
+
+        # Do not enable Nova drivers, which are still WIP. This is the Kconfig default.
+        NOVA_CORE = whenAtLeast "6.15" no;
+        DRM_NOVA = whenAtLeast "6.16" no;
       }
       //
         lib.optionalAttrs
@@ -988,6 +992,9 @@ let
       XEN_PVHVM = option yes;
       XEN_SAVE_RESTORE = option yes;
 
+      # Disabled by default on POWER
+      VIRTIO_MENU = yes;
+
       # Enable device detection on virtio-mmio hypervisors
       VIRTIO_MMIO_CMDLINE_DEVICES = yes;
 
@@ -1435,6 +1442,10 @@ let
         # Enable coreboot firmware drivers.
         # While these are called CONFIG_GOOGLE_*, they apply to coreboot systems in general.
         GOOGLE_FIRMWARE = yes;
+
+        # Disabled by default on POWER
+        ATA_BMDMA = yes;
+        ATA_SFF = yes;
       }
       //
         lib.optionalAttrs
@@ -1550,6 +1561,20 @@ let
 
         # Enable Intel Turbo Boost Max 3.0
         INTEL_TURBO_MAX_3 = yes;
+      }
+      // lib.optionalAttrs (stdenv.hostPlatform.isPower64) {
+        # avoid driver/FS trouble arising from unusual page size
+        PPC_64K_PAGES = no;
+        PPC_4K_PAGES = yes;
+
+        # Does not get auto-loaded on relevant systems, makes fans stuck at max speed.
+        # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713943 (2014 :<)
+        # > This module ought to be auto-loaded where it's needed, but somehow that
+        # > has broken.  I asked Benjamin Herrenschmidt (upstream powerpc maintainer
+        # > and the last person to touch it) and he was aware of this but hadn't got
+        # > round to working out why.  The workaround is to build it in[…].
+        # > (It won't do any harm on non-Mac systems.)
+        I2C_POWERMAC = yes;
       };
 
     accel = {

pkgs/servers/x11/xorg/.gitignore

@@ -1 +0,0 @@
-download-cache/

pkgs/servers/x11/xorg/default.nix

@@ -1,465 +0,0 @@
-{
-  lib,
-  config,
-  # keep-sorted start case=no numeric=no block=yes
-  appres,
-  automake,
-  bdftopcf,
-  bitmap,
-  ed,
-  editres,
-  font-adobe-100dpi,
-  font-adobe-75dpi,
-  font-adobe-utopia-100dpi,
-  font-adobe-utopia-75dpi,
-  font-adobe-utopia-type1,
-  font-alias,
-  font-arabic-misc,
-  font-bh-100dpi,
-  font-bh-75dpi,
-  font-bh-lucidatypewriter-100dpi,
-  font-bh-lucidatypewriter-75dpi,
-  font-bh-ttf,
-  font-bh-type1,
-  font-bitstream-100dpi,
-  font-bitstream-75dpi,
-  font-bitstream-type1,
-  font-cronyx-cyrillic,
-  font-cursor-misc,
-  font-daewoo-misc,
-  font-dec-misc,
-  font-encodings,
-  font-ibm-type1,
-  font-isas-misc,
-  font-jis-misc,
-  font-micro-misc,
-  font-misc-cyrillic,
-  font-misc-ethiopic,
-  font-misc-meltho,
-  font-misc-misc,
-  font-mutt-misc,
-  font-schumacher-misc,
-  font-screen-cyrillic,
-  font-sony-misc,
-  font-sun-misc,
-  font-util,
-  font-winitzki-cyrillic,
-  font-xfree86-type1,
-  fonttosfnt,
-  gccmakedep,
-  iceauth,
-  ico,
-  imake,
-  libapplewm,
-  libdmx,
-  libfontenc,
-  libfs,
-  libice,
-  libpciaccess,
-  libpthread-stubs,
-  libsm,
-  libwindowswm,
-  libx11,
-  libxau,
-  libxaw,
-  libxcb,
-  libxcb-cursor,
-  libxcb-errors,
-  libxcb-image,
-  libxcb-keysyms,
-  libxcb-render-util,
-  libxcb-util,
-  libxcb-wm,
-  libxcomposite,
-  libxcursor,
-  libxcvt,
-  libxdamage,
-  libxdmcp,
-  libxext,
-  libxfixes,
-  libxfont_1,
-  libxfont_2,
-  libxft,
-  libxi,
-  libxinerama,
-  libxkbfile,
-  libxmu,
-  libxp,
-  libxpm,
-  libxpresent,
-  libxrandr,
-  libxrender,
-  libxres,
-  libxscrnsaver,
-  libxshmfence,
-  libxt,
-  libxtst,
-  libxv,
-  libxvmc,
-  libxxf86dga,
-  libxxf86misc,
-  libxxf86vm,
-  listres,
-  lndir,
-  luit,
-  makedepend,
-  mkfontscale,
-  oclock,
-  pixman,
-  sessreg,
-  setxkbmap,
-  smproxy,
-  tab-window-manager,
-  transset,
-  util-macros,
-  viewres,
-  wrapWithXFileSearchPathHook,
-  x11perf,
-  xauth,
-  xbacklight,
-  xbitmaps,
-  xcalc,
-  xcb-proto,
-  xclock,
-  xcmsdb,
-  xcompmgr,
-  xconsole,
-  xcursor-themes,
-  xcursorgen,
-  xdm,
-  xdpyinfo,
-  xdriinfo,
-  xev,
-  xeyes,
-  xf86-input-evdev,
-  xf86-input-joystick,
-  xf86-input-keyboard,
-  xf86-input-libinput,
-  xf86-input-mouse,
-  xf86-input-synaptics,
-  xf86-input-vmmouse,
-  xf86-input-void,
-  xf86-video-amdgpu,
-  xf86-video-apm,
-  xf86-video-ark,
-  xf86-video-ast,
-  xf86-video-ati,
-  xf86-video-chips,
-  xf86-video-cirrus,
-  xf86-video-dummy,
-  xf86-video-fbdev,
-  xf86-video-geode,
-  xf86-video-i128,
-  xf86-video-i740,
-  xf86-video-intel,
-  xf86-video-mga,
-  xf86-video-neomagic,
-  xf86-video-nouveau,
-  xf86-video-nv,
-  xf86-video-omap,
-  xf86-video-openchrome,
-  xf86-video-qxl,
-  xf86-video-r128,
-  xf86-video-s3virge,
-  xf86-video-savage,
-  xf86-video-siliconmotion,
-  xf86-video-sis,
-  xf86-video-sisusb,
-  xf86-video-suncg6,
-  xf86-video-sunffb,
-  xf86-video-sunleo,
-  xf86-video-tdfx,
-  xf86-video-trident,
-  xf86-video-v4l,
-  xf86-video-vbox,
-  xf86-video-vesa,
-  xf86-video-vmware,
-  xf86-video-voodoo,
-  xfd,
-  xfontsel,
-  xfs,
-  xfsinfo,
-  xgamma,
-  xgc,
-  xhost,
-  xinit,
-  xinput,
-  xkbcomp,
-  xkbevd,
-  xkbprint,
-  xkbutils,
-  xkeyboard-config,
-  xkeyboard-config_custom,
-  xkill,
-  xload,
-  xlsatoms,
-  xlsclients,
-  xlsfonts,
-  xmag,
-  xmessage,
-  xmodmap,
-  xmore,
-  xorg-cf-files,
-  xorg-docs,
-  xorg-server,
-  xorg-sgml-doctools,
-  xorgproto,
-  xpr,
-  xprop,
-  xrandr,
-  xrdb,
-  xrefresh,
-  xset,
-  xsetroot,
-  xsm,
-  xstdcmap,
-  xtrans,
-  xvfb,
-  xvinfo,
-  xwd,
-  xwininfo,
-  xwud,
-  # keep-sorted end
-}:
-_:
-{
-  inherit
-    # keep-sorted start case=no numeric=no block=yes
-    appres
-    bdftopcf
-    bitmap
-    editres
-    fonttosfnt
-    gccmakedep
-    iceauth
-    ico
-    imake
-    libdmx
-    libfontenc
-    libpciaccess
-    libxcb
-    libxcvt
-    libxkbfile
-    libxshmfence
-    listres
-    lndir
-    luit
-    makedepend
-    mkfontscale
-    oclock
-    pixman
-    sessreg
-    setxkbmap
-    smproxy
-    transset
-    viewres
-    wrapWithXFileSearchPathHook
-    x11perf
-    xauth
-    xbacklight
-    xbitmaps
-    xcalc
-    xclock
-    xcmsdb
-    xcompmgr
-    xconsole
-    xcursorgen
-    xdm
-    xdpyinfo
-    xdriinfo
-    xev
-    xeyes
-    xfd
-    xfontsel
-    xfs
-    xfsinfo
-    xgamma
-    xgc
-    xhost
-    xinit
-    xinput
-    xkbcomp
-    xkbevd
-    xkbprint
-    xkbutils
-    xkill
-    xload
-    xlsatoms
-    xlsclients
-    xlsfonts
-    xmag
-    xmessage
-    xmodmap
-    xmore
-    xorgproto
-    xpr
-    xprop
-    xrandr
-    xrdb
-    xrefresh
-    xset
-    xsetroot
-    xsm
-    xstdcmap
-    xtrans
-    xvfb
-    xvinfo
-    xwd
-    xwininfo
-    xwud
-    # keep-sorted end
-    ;
-
-  # keep-sorted start case=no numeric=no block=yes
-  encodings = font-encodings;
-  fontadobe100dpi = font-adobe-100dpi;
-  fontadobe75dpi = font-adobe-75dpi;
-  fontadobeutopia100dpi = font-adobe-utopia-100dpi;
-  fontadobeutopia75dpi = font-adobe-utopia-75dpi;
-  fontadobeutopiatype1 = font-adobe-utopia-type1;
-  fontalias = font-alias;
-  fontarabicmisc = font-arabic-misc;
-  fontbh100dpi = font-bh-100dpi;
-  fontbh75dpi = font-bh-75dpi;
-  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
-  fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;
-  fontbhttf = font-bh-ttf;
-  fontbhtype1 = font-bh-type1;
-  fontbitstream100dpi = font-bitstream-100dpi;
-  fontbitstream75dpi = font-bitstream-75dpi;
-  fontbitstreamtype1 = font-bitstream-type1;
-  fontcronyxcyrillic = font-cronyx-cyrillic;
-  fontcursormisc = font-cursor-misc;
-  fontdaewoomisc = font-daewoo-misc;
-  fontdecmisc = font-dec-misc;
-  fontibmtype1 = font-ibm-type1;
-  fontisasmisc = font-isas-misc;
-  fontjismisc = font-jis-misc;
-  fontmicromisc = font-micro-misc;
-  fontmisccyrillic = font-misc-cyrillic;
-  fontmiscethiopic = font-misc-ethiopic;
-  fontmiscmeltho = font-misc-meltho;
-  fontmiscmisc = font-misc-misc;
-  fontmuttmisc = font-mutt-misc;
-  fontschumachermisc = font-schumacher-misc;
-  fontscreencyrillic = font-screen-cyrillic;
-  fontsonymisc = font-sony-misc;
-  fontsunmisc = font-sun-misc;
-  fontutil = font-util;
-  fontwinitzkicyrillic = font-winitzki-cyrillic;
-  fontxfree86type1 = font-xfree86-type1;
-  libAppleWM = libapplewm;
-  libFS = libfs;
-  libICE = libice;
-  libpthreadstubs = libpthread-stubs;
-  libSM = libsm;
-  libWindowsWM = libwindowswm;
-  libX11 = libx11;
-  libXau = libxau;
-  libXaw = libxaw;
-  libXcomposite = libxcomposite;
-  libXcursor = libxcursor;
-  libXdamage = libxdamage;
-  libXdmcp = libxdmcp;
-  libXext = libxext;
-  libXfixes = libxfixes;
-  libXfont = libxfont_1;
-  libXfont2 = libxfont_2;
-  libXft = libxft;
-  libXi = libxi;
-  libXinerama = libxinerama;
-  libXmu = libxmu;
-  libXp = libxp;
-  libXpm = libxpm;
-  libXpresent = libxpresent;
-  libXrandr = libxrandr;
-  libXrender = libxrender;
-  libXres = libxres;
-  libXScrnSaver = libxscrnsaver;
-  libXt = libxt;
-  libXtst = libxtst;
-  libXv = libxv;
-  libXvMC = libxvmc;
-  libXxf86dga = libxxf86dga;
-  libXxf86misc = libxxf86misc;
-  libXxf86vm = libxxf86vm;
-  mkfontdir = mkfontscale;
-  twm = tab-window-manager;
-  utilmacros = util-macros;
-  xcbproto = xcb-proto;
-  xcbutil = libxcb-util;
-  xcbutilcursor = libxcb-cursor;
-  xcbutilerrors = libxcb-errors;
-  xcbutilimage = libxcb-image;
-  xcbutilkeysyms = libxcb-keysyms;
-  xcbutilrenderutil = libxcb-render-util;
-  xcbutilwm = libxcb-wm;
-  xcursorthemes = xcursor-themes;
-  xf86inputevdev = xf86-input-evdev;
-  xf86inputjoystick = xf86-input-joystick;
-  xf86inputkeyboard = xf86-input-keyboard;
-  xf86inputlibinput = xf86-input-libinput;
-  xf86inputmouse = xf86-input-mouse;
-  xf86inputsynaptics = xf86-input-synaptics;
-  xf86inputvmmouse = xf86-input-vmmouse;
-  xf86inputvoid = xf86-input-void;
-  xf86videoamdgpu = xf86-video-amdgpu;
-  xf86videoapm = xf86-video-apm;
-  xf86videoark = xf86-video-ark;
-  xf86videoast = xf86-video-ast;
-  xf86videoati = xf86-video-ati;
-  xf86videochips = xf86-video-chips;
-  xf86videocirrus = xf86-video-cirrus;
-  xf86videodummy = xf86-video-dummy;
-  xf86videofbdev = xf86-video-fbdev;
-  xf86videogeode = xf86-video-geode;
-  xf86videoi128 = xf86-video-i128;
-  xf86videoi740 = xf86-video-i740;
-  xf86videointel = xf86-video-intel;
-  xf86videomga = xf86-video-mga;
-  xf86videoneomagic = xf86-video-neomagic;
-  xf86videonouveau = xf86-video-nouveau;
-  xf86videonv = xf86-video-nv;
-  xf86videoomap = xf86-video-omap;
-  xf86videoopenchrome = xf86-video-openchrome;
-  xf86videoqxl = xf86-video-qxl;
-  xf86videor128 = xf86-video-r128;
-  xf86videos3virge = xf86-video-s3virge;
-  xf86videosavage = xf86-video-savage;
-  xf86videosiliconmotion = xf86-video-siliconmotion;
-  xf86videosis = xf86-video-sis;
-  xf86videosisusb = xf86-video-sisusb;
-  xf86videosuncg6 = xf86-video-suncg6;
-  xf86videosunffb = xf86-video-sunffb;
-  xf86videosunleo = xf86-video-sunleo;
-  xf86videotdfx = xf86-video-tdfx;
-  xf86videotrident = xf86-video-trident;
-  xf86videov4l = xf86-video-v4l;
-  xf86videovboxvideo = xf86-video-vbox;
-  xf86videovesa = xf86-video-vesa;
-  xf86videovmware = xf86-video-vmware;
-  xf86videovoodoo = xf86-video-voodoo;
-  xkeyboardconfig = xkeyboard-config;
-  xkeyboardconfig_custom = xkeyboard-config_custom;
-  xorgcffiles = xorg-cf-files;
-  xorgdocs = xorg-docs;
-  xorgserver = xorg-server;
-  xorgsgmldoctools = xorg-sgml-doctools;
-  # keep-sorted end
-}
-
-# deprecate some packages
-// lib.optionalAttrs config.allowAliases {
-  # keep-sorted start case=no numeric=no block=yes
-  fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24
-  libXtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13
-  xf86videoglide = throw "The Xorg Glide video driver has been archived upstream due to being obsolete"; # added 2025-12-13
-  xf86videoglint = throw ''
-    The Xorg GLINT/Permedia video driver has been broken since xorg 21.
-    see https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1''; # added 2025-12-13
-  xf86videonewport = throw "The Xorg Newport video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
-  xf86videotga = throw "The Xorg TGA (aka DEC 21030) video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
-  xf86videowsfb = throw "The Xorg BSD wsdisplay framebuffer video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
-  xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13
-  # keep-sorted end
-}

pkgs/top-level/aliases.nix

@@ -1959,6 +1959,263 @@ mapAliases {
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
   xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28
   xonsh-unwrapped = throw "'xonsh-unwrapped' has been renamed to/replaced by 'python3Packages.xonsh'"; # Converted to throw 2025-10-27
+  xorg = # Added 2026-01-29
+    lib.mapAttrs
+      (
+        name: value:
+        warnAlias "The xorg package set has been deprecated, 'xorg.${name}' has been renamed to '${name}'" value
+      )
+      {
+        inherit
+          # keep-sorted start case=no numeric=no block=yes
+          appres
+          bdftopcf
+          bitmap
+          editres
+          fonttosfnt
+          gccmakedep
+          iceauth
+          ico
+          imake
+          libdmx
+          libfontenc
+          libpciaccess
+          libxcb
+          libxcvt
+          libxkbfile
+          libxshmfence
+          listres
+          lndir
+          luit
+          makedepend
+          mkfontscale
+          oclock
+          pixman
+          sessreg
+          setxkbmap
+          smproxy
+          transset
+          viewres
+          wrapWithXFileSearchPathHook
+          x11perf
+          xauth
+          xbacklight
+          xbitmaps
+          xcalc
+          xclock
+          xcmsdb
+          xcompmgr
+          xconsole
+          xcursorgen
+          xdm
+          xdpyinfo
+          xdriinfo
+          xev
+          xeyes
+          xfd
+          xfontsel
+          xfs
+          xfsinfo
+          xgamma
+          xgc
+          xhost
+          xinit
+          xinput
+          xkbcomp
+          xkbevd
+          xkbprint
+          xkbutils
+          xkill
+          xload
+          xlsatoms
+          xlsclients
+          xlsfonts
+          xmag
+          xmessage
+          xmodmap
+          xmore
+          xorgproto
+          xpr
+          xprop
+          xrandr
+          xrdb
+          xrefresh
+          xset
+          xsetroot
+          xsm
+          xstdcmap
+          xtrans
+          xvfb
+          xvinfo
+          xwd
+          xwininfo
+          xwud
+          # keep-sorted end
+          ;
+      }
+    //
+      lib.mapAttrs
+        (
+          name: value:
+          warnAlias "The xorg package set has been deprecated, 'xorg.${name}' has been renamed to '${value}'"
+            self.${value}
+        )
+        {
+          # keep-sorted start case=no numeric=no block=yes
+          encodings = "font-encodings";
+          fontadobe100dpi = "font-adobe-100dpi";
+          fontadobe75dpi = "font-adobe-75dpi";
+          fontadobeutopia100dpi = "font-adobe-utopia-100dpi";
+          fontadobeutopia75dpi = "font-adobe-utopia-75dpi";
+          fontadobeutopiatype1 = "font-adobe-utopia-type1";
+          fontalias = "font-alias";
+          fontarabicmisc = "font-arabic-misc";
+          fontbh100dpi = "font-bh-100dpi";
+          fontbh75dpi = "font-bh-75dpi";
+          fontbhlucidatypewriter100dpi = "font-bh-lucidatypewriter-100dpi";
+          fontbhlucidatypewriter75dpi = "font-bh-lucidatypewriter-75dpi";
+          fontbhttf = "font-bh-ttf";
+          fontbhtype1 = "font-bh-type1";
+          fontbitstream100dpi = "font-bitstream-100dpi";
+          fontbitstream75dpi = "font-bitstream-75dpi";
+          fontbitstreamtype1 = "font-bitstream-type1";
+          fontcronyxcyrillic = "font-cronyx-cyrillic";
+          fontcursormisc = "font-cursor-misc";
+          fontdaewoomisc = "font-daewoo-misc";
+          fontdecmisc = "font-dec-misc";
+          fontibmtype1 = "font-ibm-type1";
+          fontisasmisc = "font-isas-misc";
+          fontjismisc = "font-jis-misc";
+          fontmicromisc = "font-micro-misc";
+          fontmisccyrillic = "font-misc-cyrillic";
+          fontmiscethiopic = "font-misc-ethiopic";
+          fontmiscmeltho = "font-misc-meltho";
+          fontmiscmisc = "font-misc-misc";
+          fontmuttmisc = "font-mutt-misc";
+          fontschumachermisc = "font-schumacher-misc";
+          fontscreencyrillic = "font-screen-cyrillic";
+          fontsonymisc = "font-sony-misc";
+          fontsunmisc = "font-sun-misc";
+          fontutil = "font-util";
+          fontwinitzkicyrillic = "font-winitzki-cyrillic";
+          fontxfree86type1 = "font-xfree86-type1";
+          libAppleWM = "libapplewm";
+          libFS = "libfs";
+          libICE = "libice";
+          libpthreadstubs = "libpthread-stubs";
+          libSM = "libsm";
+          libWindowsWM = "libwindowswm";
+          libX11 = "libx11";
+          libXau = "libxau";
+          libXaw = "libxaw";
+          libXcomposite = "libxcomposite";
+          libXcursor = "libxcursor";
+          libXdamage = "libxdamage";
+          libXdmcp = "libxdmcp";
+          libXext = "libxext";
+          libXfixes = "libxfixes";
+          libXfont = "libxfont_1";
+          libXfont2 = "libxfont_2";
+          libXft = "libxft";
+          libXi = "libxi";
+          libXinerama = "libxinerama";
+          libXmu = "libxmu";
+          libXp = "libxp";
+          libXpm = "libxpm";
+          libXpresent = "libxpresent";
+          libXrandr = "libxrandr";
+          libXrender = "libxrender";
+          libXres = "libxres";
+          libXScrnSaver = "libxscrnsaver";
+          libXt = "libxt";
+          libXtst = "libxtst";
+          libXv = "libxv";
+          libXvMC = "libxvmc";
+          libXxf86dga = "libxxf86dga";
+          libXxf86misc = "libxxf86misc";
+          libXxf86vm = "libxxf86vm";
+          mkfontdir = "mkfontscale";
+          twm = "tab-window-manager";
+          utilmacros = "util-macros";
+          xcbproto = "xcb-proto";
+          xcbutil = "libxcb-util";
+          xcbutilcursor = "libxcb-cursor";
+          xcbutilerrors = "libxcb-errors";
+          xcbutilimage = "libxcb-image";
+          xcbutilkeysyms = "libxcb-keysyms";
+          xcbutilrenderutil = "libxcb-render-util";
+          xcbutilwm = "libxcb-wm";
+          xcursorthemes = "xcursor-themes";
+          xf86inputevdev = "xf86-input-evdev";
+          xf86inputjoystick = "xf86-input-joystick";
+          xf86inputkeyboard = "xf86-input-keyboard";
+          xf86inputlibinput = "xf86-input-libinput";
+          xf86inputmouse = "xf86-input-mouse";
+          xf86inputsynaptics = "xf86-input-synaptics";
+          xf86inputvmmouse = "xf86-input-vmmouse";
+          xf86inputvoid = "xf86-input-void";
+          xf86videoamdgpu = "xf86-video-amdgpu";
+          xf86videoapm = "xf86-video-apm";
+          xf86videoark = "xf86-video-ark";
+          xf86videoast = "xf86-video-ast";
+          xf86videoati = "xf86-video-ati";
+          xf86videochips = "xf86-video-chips";
+          xf86videocirrus = "xf86-video-cirrus";
+          xf86videodummy = "xf86-video-dummy";
+          xf86videofbdev = "xf86-video-fbdev";
+          xf86videogeode = "xf86-video-geode";
+          xf86videoi128 = "xf86-video-i128";
+          xf86videoi740 = "xf86-video-i740";
+          xf86videointel = "xf86-video-intel";
+          xf86videomga = "xf86-video-mga";
+          xf86videoneomagic = "xf86-video-neomagic";
+          xf86videonouveau = "xf86-video-nouveau";
+          xf86videonv = "xf86-video-nv";
+          xf86videoomap = "xf86-video-omap";
+          xf86videoopenchrome = "xf86-video-openchrome";
+          xf86videoqxl = "xf86-video-qxl";
+          xf86videor128 = "xf86-video-r128";
+          xf86videos3virge = "xf86-video-s3virge";
+          xf86videosavage = "xf86-video-savage";
+          xf86videosiliconmotion = "xf86-video-siliconmotion";
+          xf86videosis = "xf86-video-sis";
+          xf86videosisusb = "xf86-video-sisusb";
+          xf86videosuncg6 = "xf86-video-suncg6";
+          xf86videosunffb = "xf86-video-sunffb";
+          xf86videosunleo = "xf86-video-sunleo";
+          xf86videotdfx = "xf86-video-tdfx";
+          xf86videotrident = "xf86-video-trident";
+          xf86videov4l = "xf86-video-v4l";
+          xf86videovboxvideo = "xf86-video-vbox";
+          xf86videovesa = "xf86-video-vesa";
+          xf86videovmware = "xf86-video-vmware";
+          xf86videovoodoo = "xf86-video-voodoo";
+          xkeyboardconfig = "xkeyboard-config";
+          xkeyboardconfig_custom = "xkeyboard-config_custom";
+          xorgcffiles = "xorg-cf-files";
+          xorgdocs = "xorg-docs";
+          xorgserver = "xorg-server";
+          xorgsgmldoctools = "xorg-sgml-doctools";
+          # keep-sorted end
+        }
+    // {
+      # keep-sorted start case=no numeric=no block=yes
+      callPackage = throw "The xorg package set has been moved to the top level."; # Added 2026-01-29
+      fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24
+      libXtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13
+      newScope = throw "The xorg package set has been moved to the top level."; # Added 2026-01-29
+      overrideScope = throw "The xorg package set has been moved to the top level."; # Added 2026-01-29
+      packages = throw "The xorg package set has been moved to the top level."; # Added 2026-01-29
+      xf86videoglide = throw "The Xorg Glide video driver has been archived upstream due to being obsolete"; # added 2025-12-13
+      xf86videoglint = throw ''
+        The Xorg GLINT/Permedia video driver has been broken since xorg 21.
+        see https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1''; # added 2025-12-13
+      xf86videonewport = throw "The Xorg Newport video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
+      xf86videotga = throw "The Xorg TGA (aka DEC 21030) video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
+      xf86videowsfb = throw "The Xorg BSD wsdisplay framebuffer video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
+      xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13
+      # keep-sorted end
+    };
   xorg-autoconf = util-macros; # Added 2025-08-18
   xorgdocs = xorg-docs; # Added 2026-01-19
   xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19

pkgs/top-level/all-packages.nix

@@ -8830,71 +8830,61 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  xorg = recurseIntoAttrs (makeScopeWithSplicing' {
-    otherSplices = generateSplicesForMkScope "xorg";
-    # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage`
-    # so as not to have the newly bound xorg items already in scope,  which would
-    # have created a cycle.
-    f = lib.callPackageWith __splicedPackages ../servers/x11/xorg { };
-  });
-
-  inherit (xorg)
-    fontadobe100dpi
-    fontadobeutopia100dpi
-    fontbh100dpi
-    fontbhlucidatypewriter100dpi
-    fontbitstream100dpi
-    fontutil
-    libAppleWM
-    libFS
-    libICE
-    libSM
-    libX11
-    libXScrnSaver
-    libXau
-    libXaw
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXdmcp
-    libXext
-    libXfixes
-    libXfont2
-    libXft
-    libXi
-    libXinerama
-    libXmu
-    libXp
-    libXpm
-    libXpresent
-    libXrandr
-    libXrender
-    libXres
-    libXt
-    libXtst
-    libXv
-    libXvMC
-    libXxf86dga
-    libXxf86misc
-    libXxf86vm
-    libpthreadstubs
-    mkfontdir
-    utilmacros
-    xcbproto
-    xcbutil
-    xcbutilcursor
-    xcbutilerrors
-    xcbutilimage
-    xcbutilkeysyms
-    xcbutilrenderutil
-    xcbutilwm
-    xf86inputevdev
-    xf86inputlibinput
-    xf86videonouveau
-    xkeyboardconfig
-    xorgcffiles
-    xorgserver
-    ;
+  fontadobe100dpi = font-adobe-100dpi;
+  fontadobeutopia100dpi = font-adobe-utopia-100dpi;
+  fontbh100dpi = font-bh-100dpi;
+  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
+  fontbitstream100dpi = font-bitstream-100dpi;
+  fontutil = font-util;
+  libAppleWM = libapplewm;
+  libFS = libfs;
+  libICE = libice;
+  libpthreadstubs = libpthread-stubs;
+  libSM = libsm;
+  libX11 = libx11;
+  libXau = libxau;
+  libXaw = libxaw;
+  libXcomposite = libxcomposite;
+  libXcursor = libxcursor;
+  libXdamage = libxdamage;
+  libXdmcp = libxdmcp;
+  libXext = libxext;
+  libXfixes = libxfixes;
+  libXfont2 = libxfont_2;
+  libXft = libxft;
+  libXi = libxi;
+  libXinerama = libxinerama;
+  libXmu = libxmu;
+  libXp = libxp;
+  libXpm = libxpm;
+  libXpresent = libxpresent;
+  libXrandr = libxrandr;
+  libXrender = libxrender;
+  libXres = libxres;
+  libXScrnSaver = libxscrnsaver;
+  libXt = libxt;
+  libXtst = libxtst;
+  libXv = libxv;
+  libXvMC = libxvmc;
+  libXxf86dga = libxxf86dga;
+  libXxf86misc = libxxf86misc;
+  libXxf86vm = libxxf86vm;
+  mkfontdir = mkfontscale;
+  utilmacros = util-macros;
+  xcbproto = xcb-proto;
+  xcbutil = libxcb-util;
+  xcbutilcursor = libxcb-cursor;
+  xcbutilerrors = libxcb-errors;
+  xcbutilimage = libxcb-image;
+  xcbutilkeysyms = libxcb-keysyms;
+  xcbutilrenderutil = libxcb-render-util;
+  xcbutilwm = libxcb-wm;
+  xf86inputevdev = xf86-input-evdev;
+  xf86inputlibinput = xf86-input-libinput;
+  xf86videonouveau = xf86-video-nouveau;
+  xkeyboardconfig = xkeyboard-config;
+  xorgcffiles = xorg-cf-files;
+  xorgserver = xorg-server;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};

pkgs/top-level/pkg-config/pkg-config-data.json

@@ -817,20 +817,17 @@
     },
     "x11": {
       "attrPath": [
-        "xorg",
-        "libX11"
+        "libx11"
       ]
     },
     "xau": {
       "attrPath": [
-        "xorg",
-        "libXau"
+        "libxau"
       ]
     },
     "xcursor": {
       "attrPath": [
-        "xorg",
-        "libXcursor"
+        "libxcursor"
       ]
     },
     "xerces-c": {
@@ -840,26 +837,22 @@
     },
     "xext": {
       "attrPath": [
-        "xorg",
-        "libXext"
+        "libxext"
       ]
     },
     "xft": {
       "attrPath": [
-        "xorg",
-        "libXft"
+        "libxft"
       ]
     },
     "xi": {
       "attrPath": [
-        "xorg",
-        "libXi"
+        "libxi"
       ]
     },
     "xinerama": {
       "attrPath": [
-        "xorg",
-        "libXinerama"
+        "libxinerama"
       ]
     },
     "xkbcommon": {
@@ -869,38 +862,32 @@
     },
     "xpm": {
       "attrPath": [
-        "xorg",
-        "libXpm"
+        "libxpm"
       ]
     },
     "xrandr": {
       "attrPath": [
-        "xorg",
-        "libXrandr"
+        "libxrandr"
       ]
     },
     "xrender": {
       "attrPath": [
-        "xorg",
-        "libXrender"
+        "libxrender"
       ]
     },
     "xscrnsaver": {
       "attrPath": [
-        "xorg",
-        "libXScrnSaver"
+        "libxscrnsaver"
       ]
     },
     "xtst": {
       "attrPath": [
-        "xorg",
-        "libXtst"
+        "libxtst"
       ]
     },
     "xxf86vm": {
       "attrPath": [
-        "xorg",
-        "libXxf86vm"
+        "libxxf86vm"
       ]
     },
     "yaml-0.1": {

pkgs/top-level/python-packages.nix

@@ -816,6 +816,10 @@ self: super: with self; {
 
   apiflask = callPackage ../development/python-modules/apiflask { };
 
+  apify-fingerprint-datapoints =
+    callPackage ../development/python-modules/apify-fingerprint-datapoints
+      { };
+
   apipkg = callPackage ../development/python-modules/apipkg { };
 
   apischema = callPackage ../development/python-modules/apischema { };

pkgs/top-level/splice.nix

@@ -114,8 +114,8 @@ in
   inherit splicePackages;
 
   # We use `callPackage' to be able to omit function arguments that can be
-  # obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use
-  # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
+  # obtained from `pkgs` or `buildPackages`.
+  # Use `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
   callPackage = pkgs.newScope { };
 
   callPackages = lib.callPackagesWith pkgsForCall;