Revert "Revert "xorg-server: re-enable strictflexarrays1 on darwin""

.github/labeler.yml

@@ -43,6 +43,14 @@
               - .github/**/*
               - ci/**/*.*
 
+"6.topic: coq":
+  - any:
+      - changed-files:
+          - any-glob-to-any-file:
+              - pkgs/applications/science/logic/coq/**/*
+              - pkgs/development/coq-modules/**/*
+              - pkgs/top-level/coq-packages.nix
+
 "6.topic: COSMIC":
   - any:
       - changed-files:
@@ -458,18 +466,6 @@
           - any-glob-to-any-file:
               - pkgs/development/rocm-modules/**/*
 
-"6.topic: rocq":
-  - any:
-      - changed-files:
-          - any-glob-to-any-file:
-              - pkgs/applications/science/logic/coq/**/*
-              - pkgs/applications/science/logic/rocq-core/**/*
-              - pkgs/build-support/coq/**/*
-              - pkgs/build-support/rocq/**/*
-              - pkgs/development/rocq-modules/**/*
-              - pkgs/top-level/coq-packages.nix
-              - pkgs/top-level/rocq-packages.nix
-
 "6.topic: ruby":
   - any:
       - changed-files:

doc/languages-frameworks/ocaml.section.md

@@ -59,9 +59,6 @@ Here is a simple package example.
 - The library will be installed using the `angstrom.install` file that dune
   generates.
 
-- It also accepts an optional `dunePackages` argument, if there is more than one
-  dune package that needs to be built (see `zipperposition`)
-
 ```nix
 {
   lib,

doc/languages-frameworks/rocq.section.md

@@ -3,12 +3,11 @@
 Note that "The Rocq Prover" (Rocq for short) is the new name of the
 proof assistant formerly known as Coq. The `coq` and `coqPackages`
 derivations currently remain for both older versions of Coq, but also
-as compatibility aliases for some versions of Rocq. In both cases, the
-`coq` and `rocq-core` attributes exist. In the case of Coq (< 9),
-`rocq-core` is just an alias for `coq`, while in the case of Rocq (>= 9),
-`rocq-core` is the main Rocq derivation, while `coq` provides
-compatibility binaries (`coqc`, `coqtop`, etc.) for packages that still
-depend on them.
+some versions of Rocq during the renaming transition. In the latter
+case, the `coq` derivation encompasses the compatibility binaries
+(`coqtop`, `coqc`, etc.) in addition to the `rocq` binary. The packages
+only in `coqPackages` are the ones which currently still depend on these
+compatibility binaries.
 
 ## Rocq derivation: `rocq-core` {#rocq-derivation-rocq}
 
@@ -18,18 +17,18 @@ The Rocq derivation is overridable through the `rocq-core.override overrides`, w
 * `customOCamlPackages` (optional, defaults to `null`, which lets Rocq choose a version automatically), which can be set to any of the ocaml packages attribute of `ocaml-ng` (such as `ocaml-ng.ocamlPackages_4_14` which is the default for Rocq 9.1 for example).
 * `rocq-version` (optional, defaults to the short version e.g. "9.1"), is a version number of the form "x.y" that indicates which Rocq's version build behavior to mimic when using a source which is not a release. E.g. `rocq-core.override { version = "40be8435e132aab2231a79091f011ebc3e64a753"; rocq-version = "9.1"; }`.
 
-## Creating custom Coq environments with `rocq-core.withPackages` {#coq-withPackages}
+## Creating custom Coq environments with `coq.withPackages` {#coq-withPackages}
 
-The `rocq-core.withPackages` function provides a convenient way to create a Rocq environment that includes additional Rocq packages. This is similar to how `python.withPackages` works for Python environments.
+The `coq.withPackages` function provides a convenient way to create a Coq environment that includes additional Coq packages. This is similar to how `python.withPackages` works for Python environments.
 
-The function takes a function that receives the Rocq package set and returns a list of packages. It returns a wrapped Rocq environment where the Rocq binaries (`rocq`, etc.) are configured with the appropriate environment variables to find the packages.
+The function takes a function that receives the Coq package set and returns a list of packages. It returns a wrapped Coq environment where all Coq binaries (`coqtop`, `coqc`, `coqdep`, `coqchk`, `coqide`, etc.) are configured with the appropriate environment variables to find the packages.
 
 ### Usage {#coq-withPackages-usage}
 
-Here is an example of creating a Rocq environment with specific packages.
+Here is an example of creating a Coq environment with specific packages.
 
 ```nix
-rocq-core.withPackages (
+coq.withPackages (
   ps: with ps; [
     mathcomp
     bignums
@@ -37,9 +36,7 @@ rocq-core.withPackages (
 )
 ```
 
-If you install the `vsrocq-language-server` or `rocq-lsp` server, make sure to list them as part of the above `rocq-core.withPackages` expression instead of installing them separately if you want them to find your Rocq packages.
-
-For versions prior to Rocq 9.0, a similar `coq.withPackages` function is available.
+If you install the `vsrocq-language-server` or `rocq-lsp` server, make sure to list them as part of the above `coq.withPackages` expression instead of installing them separately if you want them to find your Coq/Rocq packages.
 
 ## Rocq packages attribute sets: `rocqPackages` {#rocq-packages-attribute-sets-rocqpackages}
 
@@ -133,7 +130,7 @@ mkRocqDerivation {
     mathcomp.boot
     mathcomp.algebra
     mathcomp-finmap
-    mathcomp.finite-group
+    mathcomp.fingroup
     mathcomp-bigenough
   ];
 

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

@@ -82,8 +82,6 @@
 
 - `nix-serve-ng` (and `haskellPackages.nix-serve-ng`) is now built against Lix instead of CppNix, following upstream which has switched to Lix as its supported Nix implementation.
 
-- `buildPythonPackage` and `buildPythonApplication` now set `__structuredAttrs = true` by default. You can explicitly set `__structuredAttrs = false` in packages broken by this change.
-
 - Linux kernel configuration has been moved out of the `linux-kernel` field of the platform structure into the kernel builders:
   - `linux-kernel.name` has been removed.
   - `linux-kernel.target` is available as the `target` parameter and passthru attribute on the kernel builders.
@@ -140,8 +138,6 @@
   [pnpm `fetcherVersion` section](#javascript-pnpm-fetcherVersion) of the manual
   for details.
 
-- `makeSetupHook` now uses structured attributes and only makes substitutions based on the values of the `substitutions` argument - other derivation attributes are no longer considered.
-
 - `rebuilderd` has been updated to 0.27.0 introducing breaking changes. See upstream changelog for details: [0.26.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0), [0.27.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0)
 
 - Starting with v14, `flameshot` will primarily utilise xdg-desktop-portal calls for screenshotting. This will directly affect users on X11 window managers due to the lack of a compatible portal with Screenshot feature. See [upstream changelog](https://github.com/flameshot-org/flameshot/releases/tag/v14.0.0) or [NixOS Flameshot](https://wiki.nixos.org/wiki/Flameshot) wiki page for workarounds.

lib/licenses/licenses.nix

@@ -203,11 +203,6 @@ lib.mapAttrs mkLicense (
       fullName = " BitTorrent Open Source License v1.1";
     };
 
-    blessing = {
-      spdxId = "blessing";
-      fullName = "SQLite Blessing";
-    };
-
     boehmGC = {
       spdxId = "Boehm-GC";
       fullName = "Boehm-Demers-Weiser GC License";

maintainers/maintainer-list.nix

@@ -18949,12 +18949,6 @@
     githubId = 54669781;
     keys = [ { fingerprint = "293B 93D8 A471 059F 85D7  16A6 5BA9 2099 D9BE 2DAA"; } ];
   };
-  mishushakov = {
-    email = "mish@e2b.dev";
-    github = "mishushakov";
-    githubId = 10400064;
-    name = "Mish Ushakov";
-  };
   misilelab = {
     name = "misilelab";
     email = "misileminecord@gmail.com";
@@ -21889,12 +21883,6 @@
     githubId = 4908217;
     name = "Paho Lurie-Gregg";
   };
-  paige = {
-    email = "paigely@tuta.io";
-    github = "ssalggnikool";
-    githubId = 235818692;
-    name = "paige";
-  };
   pakhfn = {
     email = "pakhfn@gmail.com";
     github = "pakhfn";

nixos/modules/programs/gamemode.nix

@@ -92,11 +92,6 @@ in
           ]
         );
 
-        restartTriggers = [
-          cfg.package
-          config.environment.etc."gamemode.ini".source
-        ];
-
         serviceConfig.ExecStart = lib.mkIf cfg.enableRenice [
           "" # Tell systemd to clear the existing ExecStart list, to prevent appending to it.
           "${config.security.wrapperDir}/gamemoded"

nixos/modules/services/audio/mympd.nix

@@ -108,7 +108,7 @@ in
         DynamicUser = true;
         ExecStart = lib.getExe cfg.package;
         LockPersonality = true;
-        MemoryDenyWriteExecute = false; # pcre2 jit
+        MemoryDenyWriteExecute = true;
         PrivateDevices = true;
         ProtectClock = true;
         ProtectControlGroups = true;

nixos/modules/services/databases/mysql.nix

@@ -752,7 +752,7 @@ in
             "AF_INET6"
           ];
           LockPersonality = true;
-          MemoryDenyWriteExecute = false; # pcre2 jit
+          MemoryDenyWriteExecute = true;
           RestrictRealtime = true;
           RestrictSUIDSGID = true;
           PrivateMounts = true;

nixos/modules/services/home-automation/wyoming/faster-whisper.nix

@@ -329,9 +329,7 @@ in
           finalPackage = cfg.package.overridePythonAttrs (oldAttrs: {
             dependencies =
               oldAttrs.dependencies
-              ++ optionals (any (
-                arg: hasInfix "--hass" arg
-              ) options.extraArgs) oldAttrs.optional-dependencies.hass
+              ++ optionals (any (arg: hasInfix "--hass" arg) cfg.extraArgs) oldAttrs.optional-dependencies.hass
               ++ optionals options.zeroconf.enable oldAttrs.optional-dependencies.zeroconf
               ++ optionals (
                 options.sttLibrary == "onnx-asr" || options.sttLibrary == "auto" && options.language == "ru"

nixos/modules/services/mail/cyrus-imap.nix

@@ -355,7 +355,7 @@ in
         PrivateDevices = true;
         ProtectSystem = "full";
         CapabilityBoundingSet = [ "~CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE" ];
-        MemoryDenyWriteExecute = false; # pcre2 jit
+        MemoryDenyWriteExecute = true;
         ProtectKernelModules = true;
         ProtectKernelTunables = true;
         ProtectControlGroups = true;

nixos/modules/services/mail/dovecot.nix

@@ -1061,7 +1061,7 @@ in
           "CAP_SYS_RESOURCE"
         ];
         LockPersonality = true;
-        MemoryDenyWriteExecute = false; # pcre2 jit
+        MemoryDenyWriteExecute = true;
         NoNewPrivileges = false; # e.g for sendmail
         OOMPolicy = "continue";
         PrivateTmp = true;

nixos/modules/services/mail/postfix.nix

@@ -1011,7 +1011,7 @@ in
             PrivateDevices = true;
             ProtectSystem = "full";
             CapabilityBoundingSet = [ "~CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE" ];
-            MemoryDenyWriteExecute = false; # pcre2 jit
+            MemoryDenyWriteExecute = true;
             ProtectKernelModules = true;
             ProtectKernelTunables = true;
             ProtectControlGroups = true;

nixos/modules/services/misc/forgejo.nix

@@ -777,7 +777,7 @@ in
         ];
         RestrictNamespaces = true;
         LockPersonality = true;
-        MemoryDenyWriteExecute = false; # pcre2 jit
+        MemoryDenyWriteExecute = true;
         RestrictRealtime = true;
         RestrictSUIDSGID = true;
         RemoveIPC = true;

nixos/modules/services/misc/gitea.nix

@@ -953,7 +953,7 @@ in
         ++ lib.optional (useSendmail && config.services.postfix.enable) "AF_NETLINK";
         RestrictNamespaces = true;
         LockPersonality = true;
-        MemoryDenyWriteExecute = false; # pcre2 jit
+        MemoryDenyWriteExecute = true;
         RestrictRealtime = true;
         RestrictSUIDSGID = true;
         RemoveIPC = true;

nixos/modules/services/networking/avahi-daemon.nix

@@ -436,15 +436,6 @@ in
           "@system-service"
           "~@privileged"
           "@chown setgroups setresuid"
-        ]
-        ++ lib.optionals pkgs.stdenv.hostPlatform.is32bit [
-          # glibc's setresuid()/setgroups() invoke the kernel's 32-bit compat
-          # syscalls (setresuid32/setgroups32) on 32-bit architectures --
-          # distinct syscalls from the ones already allowlisted above, so
-          # without these 2, avahi-daemon is killed with SIGSYS as soon as it
-          # tries to drop privileges.
-          "setgroups32"
-          "setresuid32"
         ];
         UMask = "0077";
       };

nixos/modules/services/networking/suricata/default.nix

@@ -273,7 +273,7 @@ in
               ProtectSystem = "strict";
               DevicePolicy = "closed";
               LockPersonality = true;
-              MemoryDenyWriteExecute = false; # pcre2 jit
+              MemoryDenyWriteExecute = true;
               ProtectHostname = true;
               ProtectProc = true;
               ProtectKernelLogs = true;

nixos/modules/services/ttys/kmscon.nix

@@ -35,7 +35,7 @@ let
     enableAutologin:
     "${gettyCfg.loginProgram} ${baseLoginOptions}${lib.optionalString enableAutologin " -f -- ${gettyCfg.autologinUser}"}";
 
-  loginScript = pkgs.writers.writeBash "kmscon-login" (
+  loginScript = pkgs.writers.writeDash "kmscon-login" (
     lib.optionalString (gettyCfg.autologinUser != null && gettyCfg.autologinOnce) ''
       kms_tty=
       active_tty_file=/sys/class/tty/tty0/active

nixos/modules/services/web-servers/nginx/default.nix

@@ -1614,7 +1614,11 @@ in
           ];
           RestrictNamespaces = true;
           LockPersonality = true;
-          MemoryDenyWriteExecute = false; # for pcre2 & several plugins
+          MemoryDenyWriteExecute =
+            !(
+              (builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules)
+              || (lib.getName cfg.package == "openresty")
+            );
           RestrictRealtime = true;
           RestrictSUIDSGID = true;
           RemoveIPC = true;

nixos/modules/services/web-servers/unit/default.nix

@@ -139,7 +139,7 @@ in
           "AF_INET6"
         ];
         LockPersonality = true;
-        MemoryDenyWriteExecute = false; # pcre2 jit
+        MemoryDenyWriteExecute = true;
         RestrictRealtime = true;
         RestrictSUIDSGID = true;
         PrivateMounts = true;

pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix

@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-8SakE2rooV1s7+vDSNFKGErsnGEpxFMuds2Zit1b9cw=";
+          hash = "sha256-IboTqMAH/w3x43M7WXXCVQx8eL1Bw7syG8On18GU/xc=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-gGli7mBulBHvEzUMY8IpAAyFYoVCT/oCE7pzLONf1Yg=";
+          hash = "sha256-k+CkNkRoM2EB/8i/WFyRVv8COmHvN2WO0WbWkpfGvLg=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-4exme1H0ax6kGs06ob2FdHowsMxCSMldn+niKeQHcIU=";
+          hash = "sha256-YV5ZGPmZ7ovL6u0rnufzyOGsbJrt9BbXENBRVB7GS3I=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.234";
+      version = "2.1.233";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

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

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2026-08-14";
+  version = "0-unstable-2026-07-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "6a7c009273dba8d0607d60ac90634dea11d45343";
-    hash = "sha256-tkEl+APyBw6mIlyzaOAsHSEg0xABl0cW/1lkgUocKJQ=";
+    rev = "96174369b3c30d9fc57c926fa3379c273dc6a9a5";
+    hash = "sha256-DEXyycFfQMK3RksP+4YxBIPYqmCFH4fM39MKxw6VOBU=";
   };
 
   meta = {

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

@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "swanstation";
-  version = "0-unstable-2026-08-11";
+  version = "0-unstable-2026-07-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "swanstation";
-    rev = "7f69c199ed88d5723f71dd3a6e9c1b7a45b535a6";
-    hash = "sha256-16ZdvG/N31vCC/kI8INH1PkmdfzHhQ2pnrUrzblCayg=";
+    rev = "5430a4a53b89fa5827c97b84ada29d23317245bc";
+    hash = "sha256-sE9jJjdt25nz0+B0oSonRubYWurE20o/FDdUTj//qOI=";
   };
 
   extraNativeBuildInputs = [ cmake ];

pkgs/applications/science/logic/coq/default.nix

@@ -100,7 +100,6 @@ let
   version = fetched.version;
   coq-version =
     args.coq-version or (if version != "dev" then lib.versions.majorMinor version else "dev");
-  rocq-version = coq-version;
   coqAtLeast = v: coq-version == "dev" || lib.versionAtLeast coq-version v;
   buildIde = args.buildIde or (coqAtLeast "8.10" && !coqAtLeast "8.14");
   csdpPatch = lib.optionalString (csdp != null) ''
@@ -162,7 +161,6 @@ let
 
     passthru = {
       inherit coq-version;
-      inherit rocq-version;
       inherit ocamlPackages ocamlNativeBuildInputs;
       inherit ocamlPropagatedBuildInputs;
       # For compatibility

pkgs/applications/science/logic/coq/with-packages.nix

@@ -11,8 +11,7 @@ packages:
 let
   # At version 9.0, Coq underwent a name change to Rocq.
   # A couple paths and environment variables need to change at this point.
-  isRocq = coq ? rocq-version && lib.versionAtLeast coq.rocq-version "9.0";
-  rocq-version = if isRocq then coq.rocq-version else coq.coq-version;
+  isRocq = lib.versionAtLeast coq.coq-version "9.0";
 
   collectPropagated =
     pkg:
@@ -22,9 +21,9 @@ let
 
   allPackages = lib.unique (lib.concatMap collectPropagated packages);
 
-  coqPath = lib.makeSearchPath "/lib/coq/${rocq-version}/user-contrib" allPackages;
+  coqPath = lib.makeSearchPath "/lib/coq/${coq.coq-version}/user-contrib" allPackages;
 
-  ocamlPath = lib.makeSearchPath "/lib/ocaml/${coq.ocamlPackages.ocaml.version}/site-lib" (
+  ocamlPath = lib.makeSearchPath "/lib/ocaml/${coq.ocaml.version}/site-lib" (
     [ coq.ocamlPackages.findlib ] ++ allPackages
   );
 

pkgs/build-support/bintools-wrapper/default.nix

@@ -478,8 +478,6 @@ stdenvNoCC.mkDerivation {
       apple-sdk.__spliced.buildTarget or apple-sdk;
   };
 
-  __structuredAttrs = true;
-
   meta =
     let
       bintools_ = optionalAttrs (bintools != null) bintools;

pkgs/build-support/ocaml/dune.nix

@@ -18,7 +18,6 @@ lib.extendMkDerivation {
     {
       pname,
       version,
-      dunePackages ? [ pname ],
       nativeBuildInputs ? [ ],
       enableParallelBuilding ? true,
       ...
@@ -59,14 +58,14 @@ lib.extendMkDerivation {
         buildPhase =
           args.buildPhase or ''
             runHook preBuild
-            dune build -p ${lib.concatStringsSep "," dunePackages} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+            dune build -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
             runHook postBuild
           '';
 
         installPhase =
           args.installPhase or ''
             runHook preInstall
-            dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${lib.concatStringsSep " " dunePackages} \
+            dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \
              ${
                if lib.versionAtLeast Dune.version "2.9" then
                  "--docdir $out/share/doc --mandir $out/share/man"
@@ -79,7 +78,7 @@ lib.extendMkDerivation {
         checkPhase =
           args.checkPhase or ''
             runHook preCheck
-            dune runtest -p ${lib.concatStringsSep "," dunePackages} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+            dune runtest -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
             runHook postCheck
           '';
 

pkgs/build-support/rocq/default.nix

@@ -213,12 +213,6 @@ stdenv.mkDerivation (
         }
         // (args.env or { });
 
-      preBuild =
-        optionalString (useCoq && useDune && lib.versionAtLeast rocq-core.rocq-version "9.0") ''
-          export COQPATH="$ROCQPATH"
-        ''
-        + (args.preBuild or "");
-
       meta =
         (
           {

pkgs/build-support/trivial-builders/default.nix

@@ -735,6 +735,7 @@ rec {
       meta ? { },
       passthru ? { },
       substitutions ? { },
+      __structuredAttrs ? false,
     }@args:
     script:
     runCommand name
@@ -744,6 +745,10 @@ rec {
           # Make the position of the derivation accurate.
           # Since not having `name` is deprecated, this should be fairly accurate.
           pos = lib.unsafeGetAttrPos "name" args;
+          # TODO(@Artturin:) substitutions should be inside the env attrset
+          # but users are likely passing non-substitution arguments through substitutions
+          # turn off __structuredAttrs to unbreak substituteAll
+          inherit __structuredAttrs;
           pname = name;
           version = "26.05pre-git";
           inherit meta;
@@ -751,7 +756,6 @@ rec {
           inherit propagatedBuildInputs;
           inherit propagatedNativeBuildInputs;
           strictDeps = true;
-          __structuredAttrs = true;
           # TODO 2023-01, no backport: simplify to inherit passthru;
           passthru =
             passthru
@@ -767,9 +771,7 @@ rec {
           recordPropagatedDependencies
         ''
         + lib.optionalString (substitutions != { }) ''
-          substitute ${script} $out/nix-support/setup-hook ${
-            lib.concatMapAttrsStringSep " " (name: _: "--subst-var ${name}") substitutions
-          }
+          substituteAll ${script} $out/nix-support/setup-hook
         ''
       );
 

pkgs/by-name/_2/_2ship2harkinian/package.nix

@@ -19,7 +19,6 @@
   libpulseaudio,
   libzip,
   nlohmann_json,
-  stb,
   SDL2,
   spdlog,
   tinyxml-2,
@@ -90,6 +89,12 @@ let
     '';
   };
 
+  stb' = fetchurl {
+    name = "stb_image.h";
+    url = "https://raw.githubusercontent.com/nothings/stb/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h";
+    hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw=";
+  };
+
   stormlib' = applyPatches {
     src = fetchFromGitHub {
       owner = "ladislav-zezula";
@@ -215,7 +220,7 @@ stdenv.mkDerivation (finalAttrs: {
   preConfigure = ''
     # mirror 2ship's stb
     mkdir stb
-    cp ${stb}/include/stb/stb_image.h ./stb/stb_image.h
+    cp ${stb'} ./stb/${stb'.name}
     cp ${stb_impl} ./stb/${stb_impl.name}
     substituteInPlace libultraship/cmake/dependencies/common.cmake \
       --replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)"

pkgs/by-name/ab/abseil-cpp_202505/package.nix

@@ -45,8 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Open-source collection of C++ code designed to augment the C++ standard library";
     homepage = "https://abseil.io/";

pkgs/by-name/ab/abseil-cpp_202508/package.nix

@@ -50,8 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Open-source collection of C++ code designed to augment the C++ standard library";
     homepage = "https://abseil.io/";

pkgs/by-name/ab/abseil-cpp_202601/package.nix

@@ -39,8 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ gtest ];
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Open-source collection of C++ code designed to augment the C++ standard library";
     homepage = "https://abseil.io/";

pkgs/by-name/ad/ada/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ada";
-  version = "4.0.0";
+  version = "3.4.4";
 
   src = fetchFromGitHub {
     owner = "ada-url";
     repo = "ada";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TvjoLUKO2+YgS1mlyglLb+rBLTO/SWSBVA2S34Z6kMI=";
+    hash = "sha256-kfUbsqQ+CsqnySKgeL1GFJLcDe1Irivp4CoZG93BZYg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ag/agari/package.nix

@@ -1,43 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  python3,
-  versionCheckHook,
-  nix-update-script,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "agari";
-  version = "0.24.0";
-  __structuredAttrs = true;
-
-  src = fetchFromGitHub {
-    owner = "agari-industries";
-    repo = "agari";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-okJ1AJ0hVAkK9E9DXm6s+LO5moPiRdswhpDt2tDxego=";
-  };
-
-  cargoHash = "sha256-52zuMizvGVMleFHXu3rKaq+7B6PbsrJtQoPPvDUBcv8=";
-
-  nativeBuildInputs = [ python3 ];
-
-  cargoBuildFlags = [
-    "--package=agari"
-  ];
-
-  doInstallCheck = true;
-  nativeInstallCheckInputs = [ versionCheckHook ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Comprehensive Riichi Mahjong scoring engine";
-    homepage = "https://github.com/agari-industries/agari";
-    changelog = "https://github.com/agari-industries/agari/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ Br1ght0ne ];
-    mainProgram = "agari";
-  };
-})

pkgs/by-name/ar/argp-standalone/package.nix

@@ -22,12 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  strictDeps = true;
-
   doCheck = true;
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://github.com/argp-standalone/argp-standalone";
     description = "Standalone version of arguments parsing functions from Glibc";

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

@@ -151,7 +151,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   src = fetchFromGitHub {
     owner = "asciidoc-py";
     repo = "asciidoc-py";
-    tag = finalAttrs.version;
+    rev = finalAttrs.version;
     hash = "sha256-td3C7xTWfSzdo9Bbz0dHW2oPaCQYmUE9H2sUFfg5HH0=";
   };
 
@@ -320,8 +320,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     runHook postCheck
   '';
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Text-based document generation system";
     longDescription = ''

pkgs/by-name/at/atheme/package.nix

@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "atheme";
-  version = "7.2.12-unstable-2026-08-18";
+  version = "7.2.12-unstable-2026-07-30";
 
   src = fetchFromGitHub {
     owner = "atheme";
     repo = "atheme";
-    rev = "88de242f4755394746444c7bd28da15127d976d2";
-    hash = "sha256-fX86+8I96FiysiCNJNCFK682GM0T5UJHpA7FjqKNbnE=";
+    rev = "bb8b8733b4ab04375b33269fab0d29677eed0922";
+    hash = "sha256-emjAsCPl+4/6JDwO4Cd1kDg9deaKonROQpeVHDVim8Y=";
     # for modules and pinned libmowgli
     fetchSubmodules = true;
     # configure checks for git tree

pkgs/by-name/au/auto-patchelf/package.nix

@@ -15,8 +15,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ pythonEnv ];
 
-  strictDeps = true;
-
   src = ./source;
 
   buildPhase = ''
@@ -35,8 +33,6 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Automatically patch ELF binaries using patchelf";
     mainProgram = "auto-patchelf";

pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py

@@ -240,35 +240,6 @@ def find_first_matching_rpath_with_origin(binary: Path, lib_dir: Path, rpaths: l
             return Path(rpath)
     return None
 
-
-def relativize_rpath_to_origin(*, binary_path: Path, rpath_entries: list[Path], containing_path: Path) -> list[Path]:
-    """
-    Rewrite absolute RPATH entries to use $ORIGIN when the entry sits
-    under containing_path (the --paths entry the binary was found
-    under).
-
-    The resulting RPATH is relocatable: as long as the directory layout
-    within containing_path is preserved, the whole tree can be moved
-    and the binary will still find its dependencies.
-
-    Entries that already contain $ORIGIN are left untouched.
-    Entries outside containing_path are also left absolute.
-    """
-    containing_norm: Path = Path(os.path.normpath(containing_path))
-    new_rpath_entries: list[Path] = []
-    for entry in rpath_entries:
-        if "$ORIGIN" in entry.as_posix():
-            new_rpath_entries.append(entry)
-            continue
-        entry_norm: Path = Path(os.path.normpath(entry))
-        if not entry_norm.is_relative_to(containing_norm):
-            new_rpath_entries.append(entry)
-            continue
-        rel = os.path.relpath(entry_norm, binary_path.parent)
-        new_rpath_entries.append(Path("$ORIGIN") / rel)
-    return new_rpath_entries
-
-
 class Event(Protocol):
     """Protocol for loggable events that occur during the auto-patchelf process."""
     def to_human_readable_str(self) -> str: ...
@@ -346,18 +317,7 @@ class Logger:
 
 
 
-def auto_patchelf_file(
-    *,
-    logger: Logger,
-    runtime_deps: list[Path],
-    append_rpaths: list[Path] = [],
-    keep_libc: bool = False,
-    preserve_origin: bool = False,
-    relativize_rpath: bool = False,
-    extra_args: list[str] = [],
-    path: Path,
-    containing_path: Path
-) -> list[Dependency]:
+def auto_patchelf_file(logger: Logger, path: Path, runtime_deps: list[Path], append_rpaths: list[Path] = [], keep_libc: bool = False, preserve_origin: bool = False, extra_args: list[str] = []) -> list[Dependency]:
     try:
         with open_elf(path) as elf:
 
@@ -476,9 +436,6 @@ def auto_patchelf_file(
             if "$ORIGIN" in existing_rpath:
                 rpath.append(Path(existing_rpath))
 
-    if relativize_rpath:
-        rpath = relativize_rpath_to_origin(binary_path=path, rpath_entries=rpath, containing_path=containing_path)
-
     # Dedup the rpath
     rpath_str = ":".join(dict.fromkeys(map(Path.as_posix, rpath)))
 
@@ -501,7 +458,6 @@ def auto_patchelf(
         append_rpaths: list[Path] = [],
         keep_libc: bool = False,
         preserve_origin: bool = False,
-        relativize_rpath: bool = False,
         add_existing: bool = True,
         extra_args: list[str] = []) -> None:
 
@@ -516,20 +472,9 @@ def auto_patchelf(
     populate_cache(lib_dirs)
 
     dependencies = []
-    for containing_path in paths_to_patch:
-        for path in glob(containing_path, '*', recursive):
-            if not path.is_symlink() and path.is_file():
-                dependencies += auto_patchelf_file(
-                    logger=logger,
-                    runtime_deps=runtime_deps,
-                    append_rpaths=append_rpaths,
-                    keep_libc=keep_libc,
-                    preserve_origin=preserve_origin,
-                    relativize_rpath=relativize_rpath,
-                    extra_args=extra_args,
-                    path=path,
-                    containing_path=containing_path
-                )
+    for path in chain.from_iterable(glob(p, '*', recursive) for p in paths_to_patch):
+        if not path.is_symlink() and path.is_file():
+            dependencies += auto_patchelf_file(logger, path, runtime_deps, append_rpaths, keep_libc, preserve_origin, extra_args)
 
     missing = [dep for dep in dependencies if not dep.found]
 
@@ -615,12 +560,6 @@ def main() -> None:
         action="store_true",
         help="When possible, replace absolute RPATH entries with original $ORIGIN entries that resolve to the same directory.",
     )
-    parser.add_argument(
-        "--relativize-rpath",
-        dest="relativize_rpath",
-        action="store_true",
-        help="Rewrite absolute RPATH entries to use $ORIGIN when the binary and the entry live under the same --paths root, so the patched tree is relocatable.",
-    )
     parser.add_argument(
         "--ignore-existing",
         dest="add_existing",
@@ -658,7 +597,6 @@ def main() -> None:
         append_rpaths=args.append_rpaths,
         keep_libc=args.keep_libc,
         preserve_origin=args.preserve_origin,
-        relativize_rpath=args.relativize_rpath,
         add_existing=args.add_existing,
         extra_args=args.extra_args)
 

pkgs/by-name/au/autoconf-archive/package.nix

@@ -28,8 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ xz ];
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Archive of autoconf m4 macros";
     homepage = "https://www.gnu.org/software/autoconf-archive/";

pkgs/by-name/az/azurehound/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "azurehound";
-  version = "3.1.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WtT56qFwpAVTyWKH8Bun9irr0DHbzLDcvV3VPXEw8BE=";
+    hash = "sha256-4uc4XSjvuMUSeCsJl9uHBFIaeG1KZ1xDaACXnXkp7v0=";
   };
 
   vendorHash = "sha256-WF46wXaNU/Em0KpF6hkuuJ+7K1IKLGqpNS/HxpxX5WY=";

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

@@ -4,7 +4,6 @@
   fetchFromGitHub,
   python3Packages,
   testers,
-  fetchpatch2,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
@@ -19,20 +18,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     hash = "sha256-i6wKe3djZL2tHjq3UrC+edU6Gz8EYSXSUry61BaI0v4=";
   };
 
-  patches = [
-    # TODO: remove on version > 0.0.19
-    (fetchpatch2 {
-      name = "Adapt-tests-for-rsainvalid-check-for-latest-Python-c.patch";
-      url = "https://github.com/badkeys/badkeys/commit/0bdcc68378bf389aebcc714b8c24de1c8a88a4e9.patch?full_index=1";
-      hash = "sha256-K0AsRNxfDQ/qC7abt0rr8tKNP9cfvWJ75DscdyoxF08=";
-    })
-    (fetchpatch2 {
-      name = "Add-test-for-Diffie-Hellman-DH-key.patch";
-      url = "https://github.com/badkeys/badkeys/commit/4e16c47dc79dd98865f4e3ec4b981306630a57a3.patch?full_index=1";
-      hash = "sha256-6F4lfUOmSkCF4XuiPwnJGD2RrxT5/jsillAyW9vzXMw=";
-    })
-  ];
-
   build-system = with python3Packages; [
     setuptools
     setuptools-scm

pkgs/by-name/bi/bicgl/package.nix

@@ -9,20 +9,19 @@
   libglut,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "bicgl";
-  version = "1.3.60-unstable-2018-04-06";
+  version = "unstable-2018-04-06";
+
+  owner = "BIC-MNI";
 
   src = fetchFromGitHub {
-    owner = "BIC-MNI";
+    inherit owner;
     repo = "bicgl";
     rev = "61a035751c9244fcca1edf94d6566fa2a709ce90";
     sha256 = "0lzirdi1mf4yl8srq7vjn746sbydz7h0wjh7wy8gycy6hq04qrg4";
   };
 
-  __structuredAttrs = true;
-  strictDeps = true;
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libminc
@@ -42,7 +41,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/BIC-MNI/bicgl";
+    homepage = "https://github.com/${owner}/bicgl";
     description = "Brain Imaging Centre graphics library";
     maintainers = with lib.maintainers; [ bcdarwin ];
     platforms = lib.platforms.unix;

pkgs/by-name/bi/bison/package.nix

@@ -28,7 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
     "host"
   ];
 
-  strictDeps = true;
+  # there's a /bin/sh shebang in bin/yacc which when no strictDeps is patched with the build stdenv shell
+  # however when cross-compiling it would still be patched with the build stdenv shell which would be wrong
+  # cannot add bash to buildInputs due to infinite recursion
+  strictDeps = stdenv.hostPlatform != stdenv.buildPlatform;
 
   nativeBuildInputs = [
     m4
@@ -37,13 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional stdenv.hostPlatform.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];
 
-  # there's a /bin/sh shebang in bin/yacc which when no strictDeps is patched with the build stdenv shell
-  # however when cross-compiling it would still be patched with the build stdenv shell which would be wrong
-  # cannot add bash to buildInputs due to infinite recursion
-  postFixup = lib.optionalString (lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) ''
-    patchShebangs --build $out/bin/yacc
-  '';
-
   enableParallelBuilding = true;
   # tests are flaky / timing sensitive on FreeBSD
   enableParallelChecking = !stdenv.hostPlatform.isFreeBSD;
@@ -54,8 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
   # TODO: enable doInstallCheck unconditionally when fixed upstream.
   doInstallCheck = !stdenv.cc.isClang;
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://www.gnu.org/software/bison/";
     description = "Yacc-compatible parser generator";

pkgs/by-name/bo/bomber-go/package.nix

@@ -2,39 +2,36 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "bomber-go";
-  version = "0.5.1";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "devops-kung-fu";
     repo = "bomber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D3xs8lVhrRKVVQYzHN7CQNw5NTC+AxgsWvJxnV0lwGY=";
+    hash = "sha256-q3x3duXc2++BvVul2a5fBTcPHWrOHpPOGHBUXL08syg=";
   };
 
-  vendorHash = "sha256-mhGnuNuvMvX4WsqnS7QkWcrPfWEyaQsSKDUOpg9YrO8=";
+  vendorHash = "sha256-jVdrvc48/Vt240EYk5PtZCjNGipX7M1qF8OJdpu/qI4=";
 
-  ldflags = [ "-s" ];
-
-  nativeInstallCheckInputs = [ versionCheckHook ];
-
-  checkFlags = [
-    # Requires network access
-    "-skip=TestEnrich|TestScanner_enrichVulnerabilities"
+  ldflags = [
+    "-w"
+    "-s"
   ];
 
-  doInstallCheck = true;
+  checkFlags = [
+    "-skip=TestEnrich" # Requires network access
+  ];
 
   meta = {
     description = "Tool to scans Software Bill of Materials (SBOMs) for vulnerabilities";
     homepage = "https://github.com/devops-kung-fu/bomber";
-    changelog = "https://github.com/devops-kung-fu/bomber/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/devops-kung-fu/bomber/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "bomber";
+    maintainers = with lib.maintainers; [ fab ];
   };
 })

pkgs/by-name/bo/boost-build/package.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     useBoost.src or (fetchFromGitHub {
       owner = "boostorg";
       repo = "build";
-      tag = defaultVersion;
+      rev = defaultVersion;
       sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54";
     });
 
@@ -58,8 +58,6 @@ stdenv.mkDerivation {
     bison
   ];
 
-  strictDeps = true;
-
   buildPhase = ''
     runHook preBuild
     ./bootstrap.sh
@@ -78,8 +76,6 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://www.boost.org/build/";
     license = lib.licenses.boost;

pkgs/by-name/br/brotli/package.nix

@@ -32,8 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  strictDeps = true;
-
   cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";
 
   outputs = [
@@ -62,8 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://github.com/google/brotli";
     changelog = "https://github.com/google/brotli/blob/${finalAttrs.src.tag}/CHANGELOG.md";

pkgs/by-name/ca/cacert/package.nix

@@ -70,8 +70,6 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ buildcatrust ];
 
-  strictDeps = true;
-
   buildPhase = ''
     mkdir unbundled hashed
     buildcatrust \
@@ -249,7 +247,5 @@ stdenv.mkDerivation {
       };
   };
 
-  __structuredAttrs = true;
-
   inherit meta;
 }

pkgs/by-name/ca/catch2/package.nix

@@ -12,18 +12,14 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-XnT2ziES94Y4uzWmaxSw7nWegJFQjAqFUG8PkwK5nLU=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-XnT2ziES94Y4uzWmaxSw7nWegJFQjAqFUG8PkwK5nLU=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  strictDeps = true;
-
   cmakeFlags = [ "-H.." ];
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
     homepage = "http://catch-lib.net";

pkgs/by-name/ce/ceph/src.nix

@@ -6,11 +6,11 @@
 
 applyPatches (final: {
   pname = "ceph-src";
-  version = "20.2.3";
+  version = "20.2.2";
 
   src = fetchurl {
     url = "https://download.ceph.com/tarballs/ceph-${final.version}.tar.gz";
-    hash = "sha256-y3bZm2lkHiebXYNbZA7jN4VXCLaDEElYvpyuglLISi0=";
+    hash = "sha256-G76ZcCdadt4KP7Ry0yzqPrbi1ydZlrcZb2IhGd2Fd1M=";
   };
 
   patches = [

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

@@ -6,6 +6,8 @@
 makeSetupHook {
   name = "check-phase-thread-limit-hook";
 
+  __structuredAttrs = true;
+
   meta = {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ grimmauld ];

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

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   fetchurl,
   cmake,
   ninja,
@@ -16,15 +17,23 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chromaprint";
-  version = "1.6.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "acoustid";
     repo = "chromaprint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Es903zeZ++9/Xb/npUU3rB0V87DVqwT9uTMbQdSzfJI=";
+    hash = "sha256-G3HIMgbjaAXsC+8nt7mkj58xA62qwA8FC+PfTGblhNg=";
   };
 
+  patches = [
+    # fix generated pkg-config files
+    (fetchpatch {
+      url = "https://github.com/acoustid/chromaprint/commit/782ef6bb5f6498e35f8e275f76998fbd5ffa36d6.patch";
+      hash = "sha256-drUfAMzTrqqB5UbzOnfPq6XD3HI+3sxyJJSTCa0BmD8=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja

pkgs/by-name/cl/claude-agent-acp/package.nix

@@ -8,16 +8,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "claude-agent-acp";
-  version = "0.69.0";
+  version = "0.66.0";
 
   src = fetchFromGitHub {
     owner = "agentclientprotocol";
     repo = "claude-agent-acp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x0k+5EhGx3y6Xd2rswTWMfYb0ZAYf5D+DaACr14uNMM=";
+    hash = "sha256-B6oB0xrDHFm46YfgTc/VlxPjHhCdSNlriq1zGe6XyU4=";
   };
 
-  npmDepsHash = "sha256-Zr9aKUoIVheaFBMBmpZovsP0hWt0tqnxk/PMEjgP9HY=";
+  npmDepsHash = "sha256-7c9+Q+HkoUeL38EzEbu+KePA/aN+If9tGr7C/lWluhU=";
 
   nativeBuildInputs = [ makeWrapper ];
 

pkgs/by-name/cl/claude-code/manifest.json

@@ -1,51 +1,52 @@
 {
-  "version": "2.1.234",
-  "commit": "7215ba60b06dff03b3e75825084c7038a013d0b0",
-  "buildDate": "2026-08-17T01:50:17Z",
+  "version": "2.1.233",
+  "commit": "f8d57569aaf350fe25dc4dfa10cad59db8ea4d45",
+  "buildDate": "2026-08-14T17:37:41Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "08d8700313697cbe730a25420c908a299ce52d56f0eb2cf4fac94cab5109bc57",
-      "size": 310740672
+      "checksum": "bc466b6cde63edafc773f471a1fb98787fabb31f52240c8616ce7e1f587b212d",
+      "size": 306981408
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "1a7b2e8948609f1f732a6498cd17b805b5c5187d74a99adc61ebaa5a29efc34c",
-      "size": 319452208
+      "checksum": "8b3ae18df411098ce55705c4bb151e9c97e34df55fe379c7b6b3122a69f0ea74",
+      "size": 315654448
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "24adda673591cd8345b03ec8245915bb151a259a1ebc3ef23649b57ba944aaa2",
-      "size": 325507304
+      "checksum": "42df1841f74e9b2ac13f2c1a2a820ef6b9ac5b2efb8646bb25c9a92b8bd69194",
+      "size": 321771752
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "3473601ea695d5bf769c5b202844d4cb4fbf723ae995450fcb6973204775c84a",
-      "size": 328358192
+      "checksum": "55d281096f57d411ebbdd94dbf5e9ff3accb7c05713e37348c2c11d4b83bf9d9",
+      "size": 324598064
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "3d458e3709a4373fb62f799c1d421e8fd2dd1cfcbf3d608157c15cddd11715fb",
-      "size": 318652008
+      "checksum": "1669931403b9fea920aea1c2db398f70eae08836ca78896f3e5e85b04e9a2d97",
+      "size": 314916456
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "408a059131b70cf51e01e2d19fbc340eafcbcfe1c99b49a08e6f8bd375326e71",
-      "size": 322486056
+      "checksum": "55f95b1ed2f8c52b429a5334c7101dd6171a78368677e0f5b89905c570dc56de",
+      "size": 318721832
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "3f877e78543e2cb4daad61d18f06cc11028f9dffc1afd41ccf1f8f84cf02eb1b",
-      "size": 324028576
+      "checksum": "8ae35d41252b02a7b747097ececf368b6872fab93ca104832b99a8ec5942fabd",
+      "size": 320400544
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "ed6cc3d0218e4b27f3691e3832837d814a5274b02755c34aedeb74e3db65e8d4",
-      "size": 311927456
+      "checksum": "c3852bb4a2d8418493ba75531913b03d00373974753c6d4a018ae419a0a106a1",
+      "size": 308298912
     }
   },
   "sdkCompat": {
     "testedWrapperVersions": [
+      "0.3.195",
       "0.3.196",
       "0.3.197",
       "0.3.198",

pkgs/by-name/cn/cni-plugin-flannel/package.nix

@@ -12,7 +12,7 @@ buildGoModule rec {
     owner = "flannel-io";
     repo = "cni-plugin";
     rev = "v${version}";
-    sha256 = "sha256-lYn9qDmUn8g3nnD4wQqyzKjd/lPXqoER5nZuY0sVK0s=";
+    sha256 = "sha256-MPR8Nu+EZ/P+xSeEig6EmQVG0qaGt6g6/Fe3jIz1fqU=";
   };
 
   vendorHash = "sha256-JTy9MsTyWvnqtRH0hzezYwgB23mfG7KtI9OmynpcESM=";
@@ -44,9 +44,6 @@ buildGoModule rec {
     homepage = "https://github.com/flannel-io/cni-plugin/";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [
-      abbe
-      antoineco
-    ];
+    maintainers = with lib.maintainers; [ abbe ];
   };
 }

pkgs/by-name/co/codex-acp/package.nix

@@ -69,11 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/zed-industries/codex-acp";
     changelog = "https://github.com/zed-industries/codex-acp/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-      "aarch64-darwin"
-    ];
+    platforms = lib.platforms.unix;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
     mainProgram = "codex-acp";
   };

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

@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     # sandbox does not allow setgid
     sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh
     substituteInPlace ./tests/install/install-C.sh \
-      --replace-fail 'mode3=2755' 'mode3=1755'
+      --replace 'mode3=2755' 'mode3=1755'
 
     # Fails on systems with a rootfs. Looks like a bug in the test, see
     # https://lists.gnu.org/archive/html/bug-coreutils/2019-12/msg00000.html
@@ -162,8 +162,6 @@ stdenv.mkDerivation (finalAttrs: {
     # TODO(@Ericson2314): Investigate whether Darwin could benefit too
     ++ optional (isCross && stdenv.hostPlatform.libc != "glibc") libiconv;
 
-  strictDeps = true;
-
   hardeningDisable = [ "trivialautovarinit" ];
 
   configureFlags = [
@@ -273,8 +271,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://www.gnu.org/software/coreutils/";
     description = "GNU Core Utilities";

pkgs/by-name/cp/cpio/package.nix

@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   autoreconfHook,
-  texinfo,
 
   # for passthru.tests
   git,
@@ -22,29 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-k3YQuXwymh7JJoVT+3gAN7z/8Nz/6XJevE/ZwaqQdds=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2026-66484.patch";
-      url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=e2b9cbdd3354d2b1569b7390d1bc15c1930559ad";
-      hash = "sha256-WjphVpMaI/ePg8MTZx+vvilKzpRAAzhAFwCwrbsPLRE=";
-    })
-    (fetchpatch {
-      name = "CVE-2026-66485.patch";
-      url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=3cd514031371d8aeeaf2048aa10103e02831aaa9";
-      hash = "sha256-YDlROEYYlZERNzzlx1cQD29gV5IrU01aVcZ/sKpWrRo=";
-    })
-    (fetchpatch {
-      name = "CVE-2026-66486.patch";
-      url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=2ff9600c9ef32e88759843cdbde74c8db5ae9b30";
-      excludes = [ "NEWS" ];
-      hash = "sha256-qi9/9xhKnIyPpji63RgzbnnHZsJgwRnQVMaMiLxQipk=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    texinfo # for makeinfo
-  ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   separateDebugInfo = true;
 

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

@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cryptsetup";
-  version = "2.8.7";
+  version = "2.8.6";
 
   outputs = [
     "bin"
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     url =
       "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor finalAttrs.version}/"
       + "cryptsetup-${finalAttrs.version}.tar.xz";
-    hash = "sha256-53bw04HobKYQQsRXBpSR/o4KwoZ4DHw7Hk+ZIavJYdo=";
+    hash = "sha256-gAQmX9mTiF0I97Yz2+BWhR3hohAwdhOk693HQ/zO/lo=";
   };
 
   patches = [

pkgs/by-name/cu/cunit/package.nix

@@ -19,15 +19,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [ libtool ];
 
-  strictDeps = true;
-
   src = fetchurl {
     url = "mirror://sourceforge/cunit/CUnit/${finalAttrs.version}/CUnit-${finalAttrs.version}.tar.bz2";
     sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm";
   };
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Unit Testing Framework for C";
 

pkgs/by-name/cu/cups/package.nix

@@ -14,6 +14,7 @@
   systemdLibs,
   acl,
   gmp,
+  darwin,
   libusb1 ? null,
   gnutls ? null,
   avahi ? null,
@@ -39,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     "lib"
     "dev"
     "man"
-    "doc"
   ];
 
   postPatch = ''

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

@@ -63,8 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "http://gondor.apana.org.au/~herbert/dash/";
     description = "POSIX-compliant implementation of /bin/sh that aims to be as small as possible";

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

@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   outputs = [
     "out"
     "denort"
-    "libdenort"
   ];
 
   src = fetchFromGitHub {
@@ -241,15 +240,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   preInstall = ''
     # Delete generated shared libraries that aren't needed in the final package
     find ./target \
-      \( -name "libswc_common${stdenv.hostPlatform.extensions.sharedLibrary}" -o \
+      -name "libswc_common${stdenv.hostPlatform.extensions.sharedLibrary}" -o \
       -name "libtest_ffi${stdenv.hostPlatform.extensions.sharedLibrary}" -o \
-      -name "libtest_napi${stdenv.hostPlatform.extensions.sharedLibrary}" \) \
+      -name "libtest_napi${stdenv.hostPlatform.extensions.sharedLibrary}" \
       -delete
   '';
 
   postInstall = ''
     moveToOutput "bin/denort" "$denort"
-    moveToOutput "lib/libdenort${stdenv.hostPlatform.extensions.sharedLibrary}" "$libdenort"
 
     # Remove non-essential binaries like test_server
     find $out/bin/* -not -name "deno" -delete

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

@@ -33,7 +33,7 @@ let
 in
 buildPythonApplication (finalAttrs: {
   pname = "devede";
-  version = "4.22.1";
+  version = "4.21.3.1";
   pyproject = true;
   namePrefix = "";
 
@@ -41,7 +41,7 @@ buildPythonApplication (finalAttrs: {
     owner = "rastersoft";
     repo = "devedeng";
     tag = finalAttrs.version;
-    hash = "sha256-r3ReIdNIJss1FvbKT2WekzVugxelnTvgfpmZ1X0D5ss=";
+    hash = "sha256-81H063PpBF/+JDsRgBLwfAevb11yNkDtH4KdtOAL/Fg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/di/diffutils/package.nix

@@ -12,12 +12,12 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "diffutils";
   version = "3.12";
 
   src = fetchurl {
-    url = "mirror://gnu/diffutils/diffutils-${finalAttrs.version}.tar.xz";
+    url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz";
     hash = "sha256-fIt/n8hgkUH96pzs6FJJ0whiQ5H/Yd7a9Sj8szdyff0=";
   };
 
@@ -42,8 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
   # If no explicit coreutils is given, use the one from stdenv.
   buildInputs = [ coreutils ];
 
-  strictDeps = true;
-
   # Disable stack-related gnulib tests on x86_64-darwin because they have problems running under
   # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow and test-sigaction fail.
   # Disable all gnulib tests when building on Darwin due to test-nl_langinfo-mt failure
@@ -80,8 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
   # Test failure on QEMU only (#300550)
   doCheck = !stdenv.buildPlatform.isRiscV64;
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://www.gnu.org/software/diffutils/diffutils.html";
     description = "Commands for showing the differences between files (diff, cmp, etc.)";
@@ -92,4 +88,4 @@ stdenv.mkDerivation (finalAttrs: {
       helsinki-Jo
     ];
   };
-})
+}

pkgs/by-name/dn/dns-root-data/package.nix

@@ -27,9 +27,6 @@ stdenv.mkDerivation {
     cp ${./root.ds} $out/root.ds
   '';
 
-  strictDeps = true;
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://www.iana.org/domains/root/files";
     description = "DNS root data including root hints and DNSSEC root trust anchor + key";

pkgs/by-name/do/dokuwiki/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dokuwiki";
-  version = "2026-07-14b";
+  version = "2026-07-14a";
 
   src = fetchFromGitHub {
     owner = "dokuwiki";
     repo = "dokuwiki";
     rev = "release-${version}";
-    sha256 = "sha256-w/uVk60gdr4PhUMOHHYl+X87Hx9pojYqJo5sZXLUX6o=";
+    sha256 = "sha256-qj+Ng20aB3qV2afrER309kvlh6gXRFPh3MqnomvvCf4=";
   };
 
   preload = writeText "preload.php" ''

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

@@ -40,8 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://www.gnu.org/software/ed/";
     description = "GNU implementation of the standard Unix editor";

pkgs/by-name/ei/eigen/package.nix

@@ -40,8 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     ctestCheckHook
   ];
 
-  strictDeps = true;
-
   cmakeFlags = [
     (lib.cmakeBool "EIGEN_LEAVE_TEST_IN_ALL_TARGET" true) # Build tests in parallel
   ];
@@ -49,8 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
   # too many flaky tests
   doCheck = false;
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://eigen.tuxfamily.org";
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";

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

@@ -113,8 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
 
-  strictDeps = true;
-
   hardeningDisable = [ "strictflexarrays3" ];
 
   configureFlags = [
@@ -146,8 +144,6 @@ stdenv.mkDerivation (finalAttrs: {
     rev-prefix = "elfutils-";
   };
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://sourceware.org/elfutils/";
     description = "Set of utilities to handle ELF objects";

pkgs/by-name/ex/expat/package.nix

@@ -23,13 +23,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "expat";
-  version = "2.8.3";
+  version = "2.8.2";
 
   src = fetchurl {
     url =
       with finalAttrs;
       "https://github.com/libexpat/libexpat/releases/download/${tagFor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-9iVt+QyQZ3PTRNoIRAK30+TyLtQbGlnJiQmKg9PqDIU=";
+    hash = "sha256-OtibhYjmZEvU5JmBSA1IshKJ7rvNTwoaSvscKfmbarQ=";
   };
 
   strictDeps = true;
@@ -72,8 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  __structuredAttrs = true;
-
   meta = {
     changelog = "https://github.com/libexpat/libexpat/blob/${tagFor finalAttrs.version}/expat/Changes";
     homepage = "https://libexpat.github.io/";

pkgs/by-name/fi/fishy/package.nix

@@ -0,0 +1,41 @@
+{
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "fishy";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "p2panda";
+    repo = "fishy";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nRkP53v9+VzqHKTsHs+cBeLjh3yASFE18sSEY02NR1s=";
+  };
+
+  cargoHash = "sha256-F4zbalop1PEb381DctUIzdm3v71b6M/hnuw9BuIEkBU=";
+
+  env.OPENSSL_NO_VENDOR = 1;
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Create, manage and deploy p2panda schemas";
+    homepage = "https://github.com/p2panda/fishy";
+    changelog = "https://github.com/p2panda/fishy/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ confusedalex ];
+    mainProgram = "fishy";
+  };
+})

pkgs/by-name/fl/flclash/git-hashes.json

@@ -0,0 +1,6 @@
+{
+  "launch_at_startup": "sha256-vr679QsLuIYyW9gaAHA4Uya4f6spWHViijDJSEnfrPw=",
+  "tray_manager": "sha256-0BGLObYc17BsQbuOaDLC9zN0d6f/l7tRZfEljixF4aU=",
+  "window_manager": "sha256-5gVHmQNMSQ2/bD5rNqBREDv71IviWgH8LZMqhUcIYN0=",
+  "yaml_writer": "sha256-QWi019rnHrFYN0uSCQeDzoPDs0hyf21Xx4o2XgUfcqg="
+}

pkgs/by-name/fl/flclash/package.nix

@@ -0,0 +1,205 @@
+{
+  lib,
+  fetchFromGitHub,
+  flutter344,
+  stdenv,
+  keybinder3,
+  libayatana-appindicator,
+  buildGoModule,
+  rustPlatform,
+  writeText,
+  makeDesktopItem,
+  copyDesktopItems,
+  autoPatchelfHook,
+  imagemagick,
+}:
+
+let
+  pname = "flclash";
+  version = "0.8.94";
+
+  src = fetchFromGitHub {
+    owner = "chen08209";
+    repo = "FlClash";
+    tag = "v${version}";
+    preFetch = ''
+      export GIT_CONFIG_COUNT=1
+      export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf
+      export GIT_CONFIG_VALUE_0=git@github.com:
+    '';
+    hash = "sha256-kLSyLsnTzYspPQ2IZRGdUjHouFKvZWTvuYdcGxLWPdw=";
+    fetchSubmodules = true;
+  };
+
+  meta = {
+    description = "Proxy client based on ClashMeta, simple and easy to use";
+    homepage = "https://github.com/chen08209/FlClash";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ VZstless ];
+  };
+
+  core = buildGoModule {
+    pname = "core";
+    inherit version src meta;
+
+    modRoot = "core";
+
+    vendorHash = "sha256-sf8PXdkqgq/0hxbxP26a73XLT88tGiH5NDV6LoiHuZM=";
+
+    env.CGO_ENABLED = 0;
+
+    buildPhase = ''
+      runHook preBuild
+
+      mkdir --parents $out/bin
+      go build -ldflags="-w -s" -tags=with_gvisor -o $out/bin/FlClashCore
+
+      runHook postBuild
+    '';
+  };
+
+  rustApi = rustPlatform.buildRustPackage {
+    pname = "rustApi";
+    inherit version src meta;
+
+    sourceRoot = "${src.name}/plugins/rust_api/rust";
+
+    cargoHash = "sha256-8zY3VkbEatU78qUTDIocasw4ca/jC94NUjDvcKnkxAA=";
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir --parents $out/lib
+      cp target/*/release/librust_api.so $out/lib/
+
+      runHook postInstall
+    '';
+  };
+in
+flutter344.buildFlutterApplication {
+  inherit pname version src;
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  gitHashes = lib.importJSON ./git-hashes.json;
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    autoPatchelfHook
+    imagemagick
+  ];
+
+  buildInputs = [
+    keybinder3
+    libayatana-appindicator
+  ];
+
+  flutterBuildFlags = [ "--dart-define=APP_ENV=stable" ];
+
+  # RustLib.init() loads librust_api.so with dlopen(), which ignores
+  # RUNPATH and only consults LD_LIBRARY_PATH
+  extraWrapProgramArgs = "--prefix LD_LIBRARY_PATH : $out/app/flclash/lib";
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "flclash";
+      exec = "FlClash %U";
+      icon = "flclash";
+      genericName = "FlClash";
+      desktopName = "FlClash";
+      categories = [ "Network" ];
+      startupWMClass = "com.follow.clash";
+      keywords = [
+        "FlClash"
+        "Clash"
+        "ClashMeta"
+        "Proxy"
+      ];
+    })
+  ];
+
+  customSourceBuilders = {
+    setup =
+      { version, src, ... }:
+      stdenv.mkDerivation {
+        pname = "setup";
+        inherit version src;
+        inherit (src) passthru;
+
+        postPatch =
+          let
+            cmakeLists = writeText "CMakeLists.txt" ''
+              cmake_minimum_required(VERSION 3.10)
+              set(PROJECT_NAME "setup")
+              project(''${PROJECT_NAME} LANGUAGES CXX)
+              get_filename_component(PROJECT_ROOT "''${CMAKE_SOURCE_DIR}" DIRECTORY)
+              install(PROGRAMS "''${PROJECT_ROOT}/libclash/linux/FlClashCore"
+                DESTINATION "''${CMAKE_BINARY_DIR}/bundle"
+                COMPONENT Runtime
+              )
+            '';
+          in
+          ''
+            cp ${cmakeLists} plugins/setup/linux/CMakeLists.txt
+          '';
+
+        installPhase = ''
+          runHook preInstall
+
+          mkdir --parents $out/plugins
+          cp --recursive plugins/setup $out/plugins/
+
+          runHook postInstall
+        '';
+      };
+
+    rust_api =
+      { version, src, ... }:
+      stdenv.mkDerivation {
+        pname = "rust_api";
+        inherit version src;
+        inherit (src) passthru;
+
+        postPatch =
+          let
+            fakeCargokitCmake = writeText "FakeCargokit.cmake" ''
+              function(apply_cargokit target manifest_dir lib_name any_symbol_name)
+                set("''${target}_cargokit_lib" ${rustApi}/lib/librust_api.so PARENT_SCOPE)
+              endfunction()
+            '';
+          in
+          ''
+            cp ${fakeCargokitCmake} plugins/rust_api/cargokit/cmake/cargokit.cmake
+          '';
+
+        installPhase = ''
+          runHook preInstall
+
+          mkdir --parents $out/plugins
+          cp --recursive plugins/rust_api $out/plugins/
+
+          runHook postInstall
+        '';
+      };
+  };
+
+  preBuild = ''
+    mkdir --parents libclash/linux
+    cp ${core}/bin/FlClashCore libclash/linux/FlClashCore
+  '';
+
+  postInstall = ''
+    mkdir --parents $out/share/icons/hicolor/512x512/apps
+    magick assets/images/icon.png -resize 512x512 $out/share/icons/hicolor/512x512/apps/flclash.png
+  '';
+
+  passthru = {
+    inherit core rustApi;
+    updateScript = ./update.sh;
+  };
+
+  meta = meta // {
+    mainProgram = "FlClash";
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/fl/flclash/update.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update
+
+set -eou pipefail
+
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
+
+latestTag=$(curl --fail --location --silent ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name)
+latestVersion=$(echo "$latestTag" | sed 's/^v//')
+
+currentVersion=$(nix eval --file . --raw flclash.version)
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+    echo "package is up-to-date: $currentVersion"
+    exit 0
+fi
+
+nix-update --subpackage core --subpackage rustApi --use-github-releases flclash
+
+curl --fail --location --silent https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json
+$(nix eval --file . dart.fetchGitHashesScript) --input $PACKAGE_DIR/pubspec.lock.json --output $PACKAGE_DIR/git-hashes.json

pkgs/by-name/fo/folia-major/package.nix

@@ -14,7 +14,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "folia-major";
-  version = "0.6.19";
+  version = "0.6.15";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -23,12 +23,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "chthollyphile";
     repo = "folia-major";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H515DVSwMEz/2DyST3D55KaoBWJX1UX4on7im849J3k=";
+    hash = "sha256-UGISQdUPQAEn80VeBf+l+HYNJtFW5bDhAw2lA5jQjfk=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-7MIjM/US39wW+Xk6soMZuKdmL7KOONXcA6zIGGJ45CA=";
+    hash = "sha256-iLem10jROG1SEHCdDO8LeV0qaJHUC5JQeXf2HAk6EgU=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/gb/gbenchmark/package.nix

@@ -38,8 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeCheckInputs = lib.optionals (glibcLocales != null) [ glibcLocales ];
 
-  strictDeps = true;
-
   cmakeFlags = [
     (lib.cmakeBool "BENCHMARK_USE_BUNDLED_GTEST" false)
     (lib.cmakeBool "BENCHMARK_ENABLE_WERROR" false)
@@ -75,8 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
     inherit prometheus-cpp;
   };
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Microbenchmark support library";
     homepage = "https://github.com/google/benchmark";

pkgs/by-name/gd/gdbm/package.nix

@@ -17,8 +17,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 
-  strictDeps = true;
-
   hardeningDisable = [ "strictflexarrays3" ];
 
   configureFlags = [ (lib.enableFeature true "libgdbm-compat") ];
@@ -65,8 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://www.gnu.org/software/gdbm/";
     description = "GNU dbm key/value database library";

pkgs/by-name/gd/gdu/package.nix

@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gdu";
-  version = "5.37.0";
+  version = "5.36.1";
 
   src = fetchFromGitHub {
     owner = "dundee";
     repo = "gdu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V5Icy4A6hpvNErxroxnzeUNtBHLxeT8QJPpEGmLvWmM=";
+    hash = "sha256-jtIVfXCIuJPsw3ryJiMI9W0L2uMeCGKt/7dWCS519fI=";
   };
 
-  vendorHash = "sha256-M7KqrXMkiQnmoN3yYGSIyQkwC5b0+e8yJQ5d8WmFtZY=";
+  vendorHash = "sha256-L3nuVoxr+LqBT/9TrwAxJEOxOr53KlXH8rWsFTt2SNc=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/ge/geoclue2/package.nix

@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "geoclue";
-  version = "2.8.2";
+  version = "2.8.1";
 
   outputs = [
     "out"
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "geoclue";
     repo = "geoclue";
     tag = finalAttrs.version;
-    hash = "sha256-fjF0yd3+b+q3gTW2PpPNFE6zQafilj/g9rXWSgs/XGE=";
+    hash = "sha256-CyZhUMAa2vMUi61sL+gGBZFxGo0lu7Cm68fTjcbblTg=";
   };
 
   patches = [

pkgs/by-name/ge/getopt/package.nix

@@ -16,8 +16,6 @@ stdenv.mkDerivation (finalAttrs: {
   # attempt to use C library functions without declaring them, which is raised as an error.
   env.NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__";
 
-  strictDeps = true;
-
   makeFlags = [
     "WITHOUT_GETTEXT=1"
     "LIBCGETOPT=0"
@@ -25,8 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
     "CC:=$(CC)"
   ];
 
-  __structuredAttrs = true;
-
   meta = {
     platforms = lib.platforms.unix;
     homepage = "http://frodo.looijaard.name/project/getopt";

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

@@ -133,12 +133,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://lore.kernel.org/git/20260504101429.340123-1-joerg@thalheim.io/raw";
       hash = "sha256-44EPfEJ39LjPWjqjFb52EKNaJGzYxZzJaJOis8QnazU=";
     })
-    # Fix fortify darwin crashes when dealing with unicode filenames.
-    (fetchurl {
-      name = "darwin-unicode-filename-fix.patch";
-      url = "https://lore.kernel.org/git/20260704233724.16928-1-ihar.hrachyshka@gmail.com/raw";
-      hash = "sha256-lpGz3nFKQvFDtW2TtQLx/684ECJVBLGPGqip0XEtOdU=";
-    })
   ]
   ++ lib.optionals withSsh [
     # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of
@@ -213,8 +207,6 @@ stdenv.mkDerivation (finalAttrs: {
     buildPackages.stdenv.cc
   ];
 
-  strictDeps = true;
-
   env = {
     # required to support pthread_cancel()
     NIX_LDFLAGS =
@@ -236,7 +228,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   preBuild = ''
-    makeFlags+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') )
+    makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') )
   '';
 
   makeFlags = [
@@ -282,7 +274,7 @@ stdenv.mkDerivation (finalAttrs: {
         ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}}
         SHELL="$SHELL"
     )
-    concatTo flagsArray makeFlags buildFlags
+    concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
     echoCmd 'build flags' "''${flagsArray[@]}"
   ''
   + lib.optionalString withManual ''
@@ -343,7 +335,7 @@ stdenv.mkDerivation (finalAttrs: {
         ''${enableParallelInstalling:+-j''${NIX_BUILD_CORES}}
         SHELL="$SHELL"
     )
-    concatTo flagsArray makeFlags installFlags
+    concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray
     echoCmd 'install flags' "''${flagsArray[@]}"
 
     # Install git-subtree.
@@ -486,7 +478,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installCheckTarget = "test";
 
-  # see also installCheckFlags in preInstallCheck
+  # see also installCheckFlagsArray
   installCheckFlags = [
     "DEFAULT_TEST_TARGET=prove"
     "PERL_PATH=${buildPackages.perl}/bin/perl"
@@ -510,7 +502,7 @@ stdenv.mkDerivation (finalAttrs: {
       NIX_BUILD_CORES=32
     fi
 
-    installCheckFlags+=(
+    installCheckFlagsArray+=(
       GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"
       GIT_TEST_INSTALLED=$out/bin
       ${lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"}

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

@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "19.2.4";
+  version = "19.2.2";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,7 +21,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-tUofUDi2cb31qh5PX6fx7BZ8eflvR7fUi7jnK1fH0q8=";
+      hash = "sha256-S48IuJmL7Huo07ECTI953aFtjXdRJktrCWRoPHF0qjE=";
     };
 
     vendorHash = "sha256-4yB63q5a9GaCaasI40uObx6ZV/5FMIvkbkHt8fqD1gA=";

pkgs/by-name/gi/gitlab-pages/package.nix

@@ -6,14 +6,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-pages";
-  version = "19.2.4";
+  version = "19.2.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-GXhKAk6PVOK/y5FjRDWkKukqK4j2DTONsDMkbPZ/Iz4=";
+    hash = "sha256-lKLwhpHQcSfjLBumK6YcZ4TTj0sEZyJ7pmYeh1lLurY=";
   };
 
   vendorHash = "sha256-aTnRSas8PgxPLLcBExNb5GHYXV0eLc1gD4Ky+50/kfw=";

pkgs/by-name/gi/gitlab/data.json

@@ -1,17 +1,17 @@
 {
-  "version": "19.2.4",
-  "repo_hash": "sha256-AP2sWC0O5D8zPaIYm5/m8t/Z5aXq74AZsT4hH9B0Quk=",
+  "version": "19.2.2",
+  "repo_hash": "sha256-3JyP5xRjYegkjD3y8dVjMQ7zwLi+46GNKVcMb5bZGG4=",
   "yarn_hash": "sha256-UJS0ZX8d6iIRNa/LQLQTSNZDtjKNm9e35RKqvsXxv3c=",
   "frontend_islands_yarn_hash": "sha256-EvGQin+5DqqIgM36jlVkVI49WcJzVvceYnkSS9ybfcY=",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v19.2.4-ee",
+  "rev": "v19.2.2-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "19.2.4",
-    "GITLAB_KAS_VERSION": "19.2.4",
-    "GITLAB_PAGES_VERSION": "19.2.4",
+    "GITALY_SERVER_VERSION": "19.2.2",
+    "GITLAB_KAS_VERSION": "19.2.2",
+    "GITLAB_PAGES_VERSION": "19.2.2",
     "GITLAB_SHELL_VERSION": "14.56.1",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.7",
-    "GITLAB_WORKHORSE_VERSION": "19.2.4"
+    "GITLAB_WORKHORSE_VERSION": "19.2.2"
   }
 }

pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix

@@ -10,7 +10,7 @@ in
 buildGoModule (finalAttrs: {
   pname = "gitlab-workhorse";
 
-  version = "19.2.4";
+  version = "19.2.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {

pkgs/by-name/gl/glib/package.nix

@@ -366,8 +366,6 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  __structuredAttrs = true;
-
   meta = {
     description = "C library of programming buildings blocks";
     homepage = "https://gitlab.gnome.org/GNOME/glib";

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

@@ -259,7 +259,7 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   meta = {
-    description = "Core user interface for the GNOME desktop";
+    description = "Core user interface for the GNOME 3 desktop";
     homepage = "https://gitlab.gnome.org/GNOME/gnome-shell";
     changelog = "https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
     license = lib.licenses.gpl2Plus;

pkgs/by-name/gn/gnu-config/package.nix

@@ -67,8 +67,6 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Attempt to guess a canonical system name";
     homepage = "https://savannah.gnu.org/projects/config";

pkgs/by-name/gn/gnugrep/package.nix

@@ -15,12 +15,16 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gnugrep";
+let
   version = "3.12";
+in
+
+stdenv.mkDerivation {
+  pname = "gnugrep";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnu/grep/grep-${finalAttrs.version}.tar.xz";
+    url = "mirror://gnu/grep/grep-${version}.tar.xz";
     hash = "sha256-JkmyfA6Q5jLq3NdXvgbG6aT0jZQd5R58D4P/dkCKB7k=";
   };
 
@@ -35,9 +39,13 @@ stdenv.mkDerivation (finalAttrs: {
   # - on Musl: https://github.com/NixOS/nixpkgs/pull/228714
   # - on x86_64-darwin: https://github.com/NixOS/nixpkgs/pull/228714#issuecomment-1576826330
   # - when building on Darwin (cross-compilation): test-nl_langinfo-mt fails
-  postPatch = lib.optionalString (stdenv.hostPlatform.isMusl || stdenv.buildPlatform.isDarwin) ''
-    substituteInPlace Makefile.in --replace-fail "gnulib-tests" ""
-  '';
+  postPatch =
+    if stdenv.hostPlatform.isMusl || stdenv.buildPlatform.isDarwin then
+      ''
+        sed -i 's:gnulib-tests::g' Makefile.in
+      ''
+    else
+      null;
 
   nativeCheckInputs = [
     perl
@@ -55,8 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional (!stdenv.hostPlatform.isWindows) runtimeShellPackage;
 
-  strictDeps = true;
-
   # cygwin: FAIL: multibyte-white-space
   # freebsd: FAIL mb-non-UTF8-performance
   # x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator
@@ -91,8 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
   };
 
-  __structuredAttrs = true;
-
   meta = {
     homepage = "https://www.gnu.org/software/grep/";
     description = "GNU implementation of the Unix grep command";
@@ -112,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ lib.teams.security-review ];
     platforms = lib.platforms.all;
     mainProgram = "grep";
-    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" finalAttrs.version // {
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version // {
       product = "grep";
     };
   };
@@ -120,4 +124,4 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     inherit pcre2;
   };
-})
+}

pkgs/by-name/gn/gnum4/package.nix

@@ -47,8 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isMinGW "CFLAGS=-fno-stack-protector";
 
-  __structuredAttrs = true;
-
   meta = {
     description = "GNU M4, a macro processor";
     longDescription = ''

pkgs/by-name/gn/gnumake/package.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnu/make/make-${finalAttrs.version}.tar.gz";
-    hash = "sha256-3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M=";
+    sha256 = "sha256-3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M=";
   };
 
   # To update patches:
@@ -82,8 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
     gnumakeWithGuile = gnumake.override { guileSupport = true; };
   };
 
-  __structuredAttrs = true;
-
   meta = {
     description = "Tool to control the generation of non-source files from sources";
     longDescription = ''

pkgs/by-name/gn/gnupatch/package.nix

@@ -33,8 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  __structuredAttrs = true;
-
   meta = {
     description = "GNU Patch, a program to apply differences to files";
     mainProgram = "patch";

pkgs/by-name/gn/gnutls/package.nix

@@ -58,12 +58,12 @@ let
   util-linux = util-linuxMinimal;
 in
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "gnutls";
   version = "3.8.13";
 
   src = fetchurl {
-    url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor finalAttrs.version}/gnutls-${finalAttrs.version}.tar.xz";
+    url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
     hash = "sha256-/+2Owb8JwkJtTxSq43feR1O1PlN9aF5gTpmosWypyX4=";
   };
 
@@ -173,8 +173,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [ nettle ];
 
-  strictDeps = true;
-
   inherit doCheck;
   # stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` breaks tests.
   # Also empty files won't work, and we want to avoid potentially impure /etc/
@@ -217,8 +215,6 @@ stdenv.mkDerivation (finalAttrs: {
     static = pkgsStatic.gnutls;
   };
 
-  __structuredAttrs = true;
-
   meta = {
     description = "GNU Transport Layer Security Library";
 
@@ -240,6 +236,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ vcunat ];
     platforms = lib.platforms.all;
-    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" finalAttrs.version;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version;
   };
-})
+}

pkgs/by-name/go/go-csp-collector/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-csp-collector";
-  version = "0.0.23";
+  version = "0.0.22";
 
   src = fetchFromGitHub {
     owner = "jacobbednarz";
     repo = "go-csp-collector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ph9iaM80SUVUM64eqkHxrxWk7yRx6uJUKsq1gxUga1c=";
+    hash = "sha256-30+rLt0VonbwP3I09OrAxiCqrUuIvGivE3+6sQ/hnRo=";
   };
 
   vendorHash = "sha256-gto2lD3atZTy5QMECarLBWQR7Z1bBlFAoJtJYrzg7bY=";

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

@@ -9,15 +9,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "goperf";
-  version = "0-unstable-2026-08-13";
+  version = "0-unstable-2026-07-08";
 
   src = fetchgit {
     url = "https://go.googlesource.com/perf";
-    rev = "fd4a688df89207abdabe0a0cf5b2cd9ccfd376d2";
-    hash = "sha256-YgMIIF9DAjyAPpZJtVoOKSatNhRPg/nPOYr0P06Fi5s=";
+    rev = "82a0b07e230d76fa1b3036c383d7a98172f87334";
+    hash = "sha256-TOzEoIWofdWlAfKWBS5KWxVpHsn2wx6GZDjACxFZiKI=";
   };
 
-  vendorHash = "sha256-AZx9tPzsPvjc5kpmiBa6eYKtrw0hczYi0sbcd/lkiiA=";
+  vendorHash = "sha256-PBvMccuMBBGfJlETw0Xjm5Ojkgg1BS+y9Kc3vwGW5kk=";
 
   passthru.updateScript = writeShellScript "update-goperf" ''
     export UPDATE_NIX_ATTR_PATH=goperf

pkgs/by-name/gr/graphviz/package.nix

@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "graphviz";
-  version = "15.1.1";
+  version = "15.1.0";
 
   src = fetchFromGitLab {
     owner = "graphviz";
     repo = "graphviz";
     tag = finalAttrs.version;
-    hash = "sha256-nDuLQfYu0fzJXS8/oH6Bv9gGuLK+FwwgbPQE+nVKelw=";
+    hash = "sha256-5v/ib8hwqHrJLs+jvDGvg0aJiKIt8ipXEd1EUzew7XU=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/gt/gtk-doc/package.nix

@@ -14,7 +14,7 @@
   dblatex,
 }:
 
-python3.pkgs.buildPythonApplication (finalAttrs: {
+python3.pkgs.buildPythonApplication rec {
   pname = "gtk-doc";
   version = "1.36.1";
 
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "gtk-doc";
-    tag = finalAttrs.version;
+    tag = version;
     hash = "sha256-8hB43BCAtT1B7/ak2i0FAlYD3Kb4rNCWfsJ+wqGu3FA=";
   };
 
@@ -85,14 +85,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     };
   };
 
-  __structuredAttrs = true;
-
   meta = {
-    changelog = "https://gitlab.gnome.org/GNOME/gtk-doc/-/blob/${finalAttrs.src.tag}/NEWS";
+    changelog = "https://gitlab.gnome.org/GNOME/gtk-doc/-/blob/${src.tag}/NEWS";
     description = "Tools to extract documentation embedded in GTK and GNOME source code";
     homepage = "https://gitlab.gnome.org/GNOME/gtk-doc";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ pSub ];
     teams = [ lib.teams.gnome ];
   };
-})
+}