Merge master into staging-next

doc/languages-frameworks/haskell.section.md

@@ -223,6 +223,10 @@ If `null` (which is the default value), the one included in `src` is used.
 `editedCabalFile`
 : `sha256` hash of the cabal file identified by `revision` or `null`.
 
+`env`
+: Extra environment variables to set during the build.
+These will also be set inside the [development environment defined by the `passthru.env` attribute in the returned derivation](#haskell-development-environments), but will not be set inside a development environment built with [`shellFor`](#haskell-shellFor) that includes this package.
+
 `configureFlags`
 : Extra flags passed when executing the `configure` command of `Setup.hs`.
 

maintainers/maintainer-list.nix

@@ -6204,12 +6204,6 @@
     githubId = 21953890;
     name = "Tim Digel";
   };
-  desiderius = {
-    email = "didier@devroye.name";
-    github = "desiderius";
-    githubId = 1311761;
-    name = "Didier J. Devroye";
-  };
   desttinghim = {
     email = "opensource@louispearson.work";
     matrix = "@desttinghim:matrix.org";
@@ -11274,6 +11268,13 @@
     githubId = 45084216;
     keys = [ { fingerprint = "1BF9 8D10 E0D0 0B41 5723  5836 4C13 3A84 E646 9228"; } ];
   };
+  JacoMalan1 = {
+    name = "Jaco Malan";
+    email = "jacom@codelog.co.za";
+    github = "JacoMalan1";
+    githubId = 10290409;
+    keys = [ { fingerprint = "339C 9213 7F2D 5D6E 2B6A  6E98 240B B4C4 27BC 327A"; } ];
+  };
   jaculabilis = {
     name = "Tim Van Baak";
     email = "tim.vanbaak@gmail.com";
@@ -22479,10 +22480,10 @@
     name = "Sauyon Lee";
   };
   savalet = {
-    email = "savinien.petitjean@gmail.com";
+    email = "me@savalet.dev";
     github = "savalet";
     githubId = 73446695;
-    name = "savalet";
+    name = "Savinien Petitjean";
   };
   savannidgerinel = {
     email = "savanni@luminescent-dreams.com";

nixos/doc/manual/redirects.json

@@ -857,6 +857,12 @@
   "modules-services-akkoma-distributed-deployment": [
     "index.html#modules-services-akkoma-distributed-deployment"
   ],
+  "module-services-atalkd": [
+    "index.html#module-services-atalkd"
+  ],
+  "module-services-atalkd-basic-usage": [
+    "index.html#module-services-atalkd-basic-usage"
+  ],
   "module-services-systemd-lock-handler": [
     "index.html#module-services-systemd-lock-handler"
   ],

nixos/modules/module-list.nix

@@ -1073,6 +1073,7 @@
   ./services/networking/anubis.nix
   ./services/networking/aria2.nix
   ./services/networking/asterisk.nix
+  ./services/networking/atalkd.nix
   ./services/networking/atftpd.nix
   ./services/networking/atticd.nix
   ./services/networking/autossh.nix

nixos/modules/programs/nix-required-mounts.nix

@@ -47,7 +47,10 @@ let
     );
 
   driverPaths = [
+    # opengl:
+    # NOTE: Since driverLink is just a symlink, we need to include its target as well.
     pkgs.addDriverRunpath.driverLink
+    config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument
 
     # mesa:
     config.hardware.graphics.package

nixos/modules/services/networking/atalkd.md

@@ -0,0 +1,18 @@
+# atalkd {#module-services-atalkd}
+
+atalkd (AppleTalk daemon) is a component inside of the suite of software provided by Netatalk. It allows for the creation of AppleTalk networks, typically speaking over a Linux ethernet network interface, that can still be seen by classic macintosh computers. Using the NixOS module, you can specify a set of network interfaces that you wish to speak AppleTalk on, and the corresponding ATALKD.CONF(5) values to go along with it.
+
+## Basic Usage {#module-services-atalkd-basic-usage}
+
+A minimal configuration looks like this:
+
+```nix
+{
+  services.atalkd = {
+    enable = true;
+    interfaces.wlan0.config = "-router -phase 2 -net 1 -addr 1.48 -zone \"Default\"";
+  };
+}
+```
+
+It is also valid to use atalkd without setting `services.netatalk.interfaces` to any value, only providing `services.atalkd.enable = true`. In this case it will inherit the behavior of the upstream application when an empty config file is found, which is to listen on and use all interfaces.

nixos/modules/services/networking/atalkd.nix

@@ -0,0 +1,98 @@
+{
+  config,
+  pkgs,
+  lib,
+  utils,
+  ...
+}:
+
+let
+  cfg = config.services.atalkd;
+
+  # Generate atalkd.conf only if configFile isn't manually specified
+  atalkdConfFile = pkgs.writeText "atalkd.conf" (
+    lib.concatStringsSep "\n" (
+      lib.mapAttrsToList (
+        iface: ifaceCfg: iface + (if ifaceCfg.config != null then " ${ifaceCfg.config}" else "")
+      ) cfg.interfaces
+    )
+  );
+in
+{
+  options.services.atalkd = {
+    enable = lib.mkEnableOption "the AppleTalk daemon";
+
+    configFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = atalkdConfFile;
+      defaultText = "/nix/store/xxx-atalkd.conf";
+      description = ''
+        Optional path to a custom `atalkd.conf` file. When set, this overrides the generated
+        configuration from `services.atalkd.interfaces`.
+      '';
+    };
+
+    interfaces = lib.mkOption {
+      description = "Per-interface configuration for atalkd.";
+      type = lib.types.attrsOf (
+        lib.types.submodule {
+          options.config = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            description = "Optional configuration string for this interface.";
+          };
+        }
+      );
+      default = { };
+    };
+  };
+
+  config =
+    let
+      interfaces = map (iface: "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device") (
+        builtins.attrNames cfg.interfaces
+      );
+    in
+    lib.mkIf cfg.enable {
+      system.requiredKernelConfig = [
+        (config.lib.kernelConfig.isEnabled "APPLETALK")
+      ];
+      systemd.services.netatalk.partOf = [ "atalkd.service" ];
+      systemd.services.netatalk.after = interfaces;
+      systemd.services.netatalk.requires = interfaces;
+      systemd.services.atalkd =
+        let
+          interfaces = map (iface: "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device") (
+            builtins.attrNames cfg.interfaces
+          );
+        in
+        {
+
+          description = "atalkd AppleTalk daemon";
+          unitConfig.Documentation = "man:atalkd.conf(5) man:atalkd(8)";
+          after = interfaces;
+          wants = [ "network.target" ];
+          before = [ "netatalk.service" ];
+          requires = interfaces;
+
+          wantedBy = [ "multi-user.target" ];
+
+          path = [ pkgs.netatalk ];
+
+          serviceConfig = {
+            Type = "forking";
+            GuessMainPID = "no";
+            DynamicUser = true;
+            AmbientCapabilities = [ "CAP_NET_ADMIN" ];
+            RuntimeDirectory = "atalkd";
+            PIDFile = "/run/atalkd/atalkd";
+            BindPaths = [ "/run/atalkd:/run/lock" ];
+            ExecStart = "${pkgs.netatalk}/bin/atalkd -f ${cfg.configFile}";
+            Restart = "always";
+          };
+        };
+    };
+
+  meta.maintainers = with lib.maintainers; [ matthewcroughan ];
+  meta.doc = ./atalkd.md;
+}

nixos/modules/services/networking/g3proxy.nix

@@ -54,7 +54,7 @@ in
           let
             g3proxy-yaml = settingsFormat.generate "g3proxy.yaml" cfg.settings;
           in
-          "${lib.getExe cfg.package} --config-file ${g3proxy-yaml}";
+          "${lib.getExe cfg.package} --config-file ${g3proxy-yaml} --systemd --control-dir %t/g3proxy";
 
         WorkingDirectory = "/var/lib/g3proxy";
         StateDirectory = "g3proxy";

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

@@ -22,6 +22,10 @@ in
         description = "Port for LANraragi's web interface.";
       };
 
+      openFirewall = lib.mkEnableOption "" // {
+        description = "Open ports in the firewall for the Radarr web interface.";
+      };
+
       passwordFile = lib.mkOption {
         type = lib.types.nullOr lib.types.path;
         default = null;
@@ -103,5 +107,9 @@ in
           EOF
         '';
     };
+
+    networking.firewall = lib.mkIf cfg.openFirewall {
+      allowedTCPPorts = [ cfg.port ];
+    };
   };
 }

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

@@ -34,7 +34,6 @@ let
     "@obsolete"
     "@privileged"
     "@setuid"
-    "@spawn"
   ];
 
   cfgService = {

pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix

@@ -16,7 +16,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     name = "python";
     publisher = "ms-python";
     version = "2025.10.0";
-    hash = "sha256-8dc1uM/6iUNF+9y4yKH7w4/FsrzgVoOJlIFfQOvY8YM=";
+    hash = "sha256-uD6NWGD5GyYwd7SeoGsgYEH26NI+hDxCx3f2EhqoOXk=";
   };
 
   buildInputs = [ icu ];

pkgs/applications/networking/instant-messengers/discord/default.nix

@@ -9,24 +9,24 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.101";
+        stable = "0.0.102";
         ptb = "0.0.152";
-        canary = "0.0.716";
-        development = "0.0.83";
+        canary = "0.0.723";
+        development = "0.0.84";
       }
     else
       {
-        stable = "0.0.353";
-        ptb = "0.0.181";
-        canary = "0.0.823";
-        development = "0.0.96";
+        stable = "0.0.354";
+        ptb = "0.0.182";
+        canary = "0.0.829";
+        development = "0.0.97";
       };
   version = versions.${branch};
   srcs = rec {
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-FB6GiCM+vGyjZLtF0GjAIq8etK5FYyQVisWX6IzB4Zc=";
+        hash = "sha256-xnl67Ty9uuAjOV5eWnR7xG+PR5J4M7nYc1hjRBjbaOI=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
@@ -34,29 +34,29 @@ let
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-W7uPrJRKY4I6nsdj/TNxT8kHh5ssn9KyCArhOhAlaH4=";
+        hash = "sha256-k1ClTRaYsb5rPV8AFtVg3iEZ44z5gmcBnOJgsQq9O1Y=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-KpZ90VekGf3KNpNpFfZlVXorv86yK1OuY0uqgBuWIQ4=";
+        hash = "sha256-0SmCBi/fl77m5PzI5O38CpAoIzyQc+eRUKLyKVMQ6Dc=";
       };
     };
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-qHOLhPhHwN0fy1KiJroJvshlYExBDsuna2PddjtNyEI=";
+        hash = "sha256-JucQ4EPWSMKAKvZhovij8YGWLhZ3IhnXoskce3RG0Do=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-Q153X08crRpXZMMgNDYbADHnL7MiBPCakJxQe8Pl0Uo=";
+        hash = "sha256-yL3NSjY3W1w1gfw7w7zdCgVcov18PtrT8RmcwgQLA6U=";
       };
       canary = fetchurl {
         url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-69Q8kTfenlmhjptVSQ9Y0AyeViRw+srMExOA7fAlaGw=";
+        hash = "sha256-pa7nJMJU6jPNcusIJ93aAH8AFQl93z1FX/sv6+M4WME=";
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
-        hash = "sha256-fe7yE+dxEATIdfITg57evbaQkChCcoaLrzV+8KwEBws=";
+        hash = "sha256-BVTQPr3Oox/mTNE7LTJfYuKhI8PlkJlznKiOffqpECs=";
       };
     };
     aarch64-darwin = x86_64-darwin;

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

@@ -14,7 +14,6 @@
   pkg-config,
   gnumake42,
   customOCamlPackages ? null,
-  ocamlPackages_4_05,
   ocamlPackages_4_09,
   ocamlPackages_4_10,
   ocamlPackages_4_12,
@@ -35,12 +34,6 @@ let
   lib = import ../../../../build-support/coq/extra-lib.nix { inherit (args) lib; };
 
   release = {
-    "8.5pl1".sha256 = "1976ki5xjg2r907xj9p7gs0kpdinywbwcqlgxqw75dgp0hkgi00n";
-    "8.5pl2".sha256 = "109rrcrx7mz0fj7725kjjghfg5ydwb24hjsa5hspa27b4caah7rh";
-    "8.5pl3".sha256 = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw";
-    "8.6.0".sha256 = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4";
-    "8.6.0".rev = "V8.6";
-    "8.6.1".sha256 = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
     "8.7.0".sha256 = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
     "8.7.1".sha256 = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8";
     "8.7.2".sha256 = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w";
@@ -131,10 +124,6 @@ let
           case = lib.versions.range "8.7" "8.10";
           out = ocamlPackages_4_09;
         }
-        {
-          case = lib.versions.range "8.5" "8.6";
-          out = ocamlPackages_4_05;
-        }
       ] ocamlPackages_4_14;
   ocamlNativeBuildInputs = [
     ocamlPackages.ocaml

pkgs/by-name/an/ansible-doctor/package.nix

@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ansible-doctor";
-  version = "7.0.8";
+  version = "7.0.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "ansible-doctor";
     tag = "v${version}";
-    hash = "sha256-BwmmAd1mmyGQ5QQo6uS3+JmPP9kmZe2OOBDNAKFqEl0=";
+    hash = "sha256-d7KPn+nCrGEYE9lzfV3+Fl8MDUq8x5S8MPKrwX8XZ5w=";
   };
 
   build-system = with python3Packages; [
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
     description = "Annotation based documentation for your Ansible roles";
     mainProgram = "ansible-doctor";
     homepage = "https://github.com/thegeeklab/ansible-doctor";
-    changelog = "https://github.com/thegeeklab/ansible-doctor/releases/tag/v${version}";
+    changelog = "https://github.com/thegeeklab/ansible-doctor/releases/tag/${src.tag}";
     license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ tboerger ];
   };

pkgs/by-name/ap/apache-orc/package.nix

@@ -44,12 +44,20 @@ stdenv.mkDerivation (finalAttrs: {
     zstd
   ];
 
-  cmakeFlags = [
-    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
-    (lib.cmakeBool "BUILD_JAVA" false)
-    (lib.cmakeBool "STOP_BUILD_ON_WARNING" true)
-    (lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
-  ];
+  cmakeFlags =
+    [
+      (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
+      (lib.cmakeBool "BUILD_JAVA" false)
+      (lib.cmakeBool "STOP_BUILD_ON_WARNING" true)
+      (lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
+    ]
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+      # Fix (RiscV) cross-compilation
+      # See https://github.com/apache/orc/issues/2334
+      (lib.cmakeFeature "HAS_PRE_1970_EXITCODE" "0")
+      (lib.cmakeFeature "HAS_POST_2038_EXITCODE" "0")
+      (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-unused-parameter")
+    ];
 
   env = {
     GTEST_HOME = gtest.dev;

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

@@ -15,6 +15,7 @@
   dbus,
   embree,
   fetchzip,
+  fetchFromGitHub,
   ffmpeg,
   fftw,
   fftwFloat,
@@ -48,6 +49,7 @@
   libxkbcommon,
   llvmPackages,
   makeWrapper,
+  manifold,
   mesa,
   nix-update-script,
   openUsdSupport ? !stdenv.hostPlatform.isDarwin,
@@ -72,7 +74,7 @@
   spaceNavSupport ? stdenv.hostPlatform.isLinux,
   sse2neon,
   stdenv,
-  tbb,
+  tbb_2022,
   vulkan-headers,
   vulkan-loader,
   wayland,
@@ -100,26 +102,27 @@ let
     patches = (old.patches or [ ]) ++ [ ./libdecor.patch ];
   });
 
-  optix = fetchzip {
-    # Look at upstream Blender BuildBot logs to determine the current version,
-    # see Git blame here for historical details
-    url = "https://developer.download.nvidia.com/redist/optix/v7.4/OptiX-7.4.0-Include.zip";
-    hash = "sha256-ca08XetwaUYC9foeP5bff9kcDfuFgEzopvjspn2s8RY=";
+  # See build_files/config/pipeline_config.yaml in upstream source for version
+  optix = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "optix-dev";
+    tag = "v8.0.0";
+    hash = "sha256-SXkXZHzQH8JOkXypjjxNvT/lUlWZkCuhh6hNCHE7FkY=";
   };
+
+  tbb = tbb_2022;
 in
 
 stdenv'.mkDerivation (finalAttrs: {
   pname = "blender";
-  version = "4.4.3";
+  version = "4.5.0";
 
   src = fetchzip {
     name = "source";
     url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-    hash = "sha256-vHDOKI7uqB5EbdRu711axBuYX1zM746E6GvK2Nl5hZg=";
+    hash = "sha256-ERT/apulQ9ogA7Uk/AfjBee0rLjxEXItw6GwDOoysXk=";
   };
 
-  patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
-
   postPatch =
     (lib.optionalString stdenv.hostPlatform.isDarwin ''
       : > build_files/cmake/platform/platform_apple_xcode.cmake
@@ -247,13 +250,14 @@ stdenv'.mkDerivation (finalAttrs: {
       libsndfile
       libtiff
       libwebp
+      (manifold.override { tbb_2021 = tbb; })
       opencolorio
       openexr
       openimageio_2
       openjpeg
-      openpgl
+      (openpgl.override { inherit tbb; })
       (opensubdiv.override { inherit cudaSupport; })
-      openvdb
+      (openvdb.override { inherit tbb; })
       potrace
       pugixml
       python3
@@ -263,7 +267,7 @@ stdenv'.mkDerivation (finalAttrs: {
       zstd
     ]
     ++ lib.optional embreeSupport embree
-    ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
+    ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport tbb; })
     ++ (
       if (!stdenv.hostPlatform.isDarwin) then
         [
@@ -419,6 +423,7 @@ stdenv'.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    broken = stdenv.hostPlatform.isDarwin;
     description = "3D Creation/Animation/Publishing System";
     homepage = "https://www.blender.org";
     # They comment two licenses: GPLv2 and Blender License, but they

pkgs/by-name/bu/bumblebee/package.nix

@@ -35,8 +35,7 @@
   pkgsi686Linux,
   virtualgl,
   libglvnd,
-  automake111x,
-  autoconf,
+  autoreconfHook,
   # The below should only be non-null in a x86_64 system. On a i686
   # system the above nvidia_x11 and virtualgl will be the i686 packages.
   # TODO: Confusing. Perhaps use "SubArch" instead of i686?
@@ -124,10 +123,6 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure = ''
-    # Don't use a special group, just reuse wheel.
-    substituteInPlace configure \
-      --replace 'CONF_GID="bumblebee"' 'CONF_GID="wheel"'
-
     # Apply configuration options
     substituteInPlace conf/xorg.conf.nvidia \
       --subst-var nvidiaDeviceOptions
@@ -148,8 +143,7 @@ stdenv.mkDerivation rec {
     makeWrapper
     pkg-config
     help2man
-    automake111x
-    autoconf
+    autoreconfHook
   ];
 
   # The order of LDPATH is very specific: First X11 then the host
@@ -162,6 +156,8 @@ stdenv.mkDerivation rec {
   configureFlags =
     [
       "--with-udev-rules=$out/lib/udev/rules.d"
+      # Don't use a special group, just reuse wheel.
+      "CONF_GID=wheel"
       # see #10282
       #"CONF_PRIMUS_LD_PATH=${primusLibs}"
     ]

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

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  runCommand,
 
   # nativeBuildInputs
   cmake,
@@ -12,6 +13,7 @@
   perl,
   pkg-config,
   wrapGAppsHook3,
+  saxon,
 
   # buildInputs
   SDL2,
@@ -52,7 +54,6 @@
   libtiff,
   libwebp,
   libxml2,
-  libxslt,
   lua,
   util-linux,
   openexr,
@@ -79,6 +80,17 @@
   gitUpdater,
 }:
 
+let
+  # Create a wrapper for saxon to provide saxon-xslt command
+  saxon-xslt = runCommand "saxon-xslt" { } ''
+    mkdir -p $out/bin
+    cat > $out/bin/saxon-xslt << 'EOF'
+    #!/bin/sh
+    exec ${saxon}/bin/saxon "$@"
+    EOF
+    chmod +x $out/bin/saxon-xslt
+  '';
+in
 stdenv.mkDerivation rec {
   version = "5.2.0";
   pname = "darktable";
@@ -97,6 +109,7 @@ stdenv.mkDerivation rec {
     perl
     pkg-config
     wrapGAppsHook3
+    saxon-xslt # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues
   ];
 
   buildInputs =
@@ -120,7 +133,7 @@ stdenv.mkDerivation rec {
       lensfun
       lerc
       libaom
-      libavif
+      #libavif # TODO re-enable once cmake files are fixed (#425306)
       libdatrie
       libepoxy
       libexif
@@ -138,7 +151,6 @@ stdenv.mkDerivation rec {
       libtiff
       libwebp
       libxml2
-      libxslt
       lua
       openexr
       openjpeg

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

@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dokieli";
-  version = "0-unstable-2025-07-10";
+  version = "0-unstable-2025-07-11";
 
   src = fetchFromGitHub {
     owner = "dokieli";
     repo = "dokieli";
-    rev = "fbd73c78f4690452e86a2758825cc5f5209b5322";
-    hash = "sha256-LpUK8Uv8Qt3DMu5n7MHqbUIABlYSNzkw61BijlPRr7s=";
+    rev = "13c0c2d2d307ab1f391aca9aec4efc4ac4ba43c5";
+    hash = "sha256-V9tKoSu1r8LZaIZUu1JSyZ0dM7/zblTDQZHu86/V3LE=";
   };
 
   missingHashes = ./missing-hashes.json;

pkgs/by-name/do/dolphin-emu/package.nix

@@ -54,13 +54,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dolphin-emu";
-  version = "2506";
+  version = "2506a";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
     tag = finalAttrs.version;
-    hash = "sha256-JEp1rc5nNJY4GfNCR2Vi4ctQ14p+LZWuFPFirv6foUM=";
+    hash = "sha256-xYGq2Yt4Gqb/QDA6HZajs7JCwETufuqigk3bZbsgdEM=";
     fetchSubmodules = true;
     leaveDotGit = true;
     postFetch = ''

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

@@ -0,0 +1,52 @@
+{
+  lib,
+  fetchurl,
+  stdenv,
+  dpkg,
+  autoPatchelfHook,
+  cairo,
+  gdk-pixbuf,
+  webkitgtk_4_1,
+  gtk3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  name = "eigenwallet";
+  version = "2.0.3";
+
+  src = fetchurl {
+    url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/UnstoppableSwap_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-2uOsZ6IvaQes+FYGQ0cNYlySzjyNwf/3fqk3DJzN+WI=";
+  };
+
+  nativeBuildInputs = [
+    dpkg
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    cairo
+    gdk-pixbuf
+    webkitgtk_4_1
+    gtk3
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    mv {usr/bin,usr/share} $out
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Protocol and desktop application for swapping Monero and Bitcoin";
+    homepage = "https://unstoppableswap.net";
+    maintainers = with lib.maintainers; [ JacoMalan1 ];
+    license = lib.licenses.gpl3Only;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "unstoppableswap-gui-rs";
+  };
+})

pkgs/by-name/en/envoy-bin/package.nix

@@ -8,7 +8,7 @@
   versionCheckHook,
 }:
 let
-  version = "1.34.2";
+  version = "1.34.3";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-82jzPZ08FCuM2eABcqU/QTdxEipnnvNjb350ZSiUS0o=";
-      x86_64-linux = "sha256-B1tnshv5fIjIKjeSADSjBotakhUak3rM0NWt4kWoWhk=";
+      aarch64-linux = "sha256-LsNkrFJ59MUiKIF0Dcuq2Lhn3LnAW0Mwlx4kIx78KfQ=";
+      x86_64-linux = "sha256-04vGgR8U0qiNBvmiim0aKa6Ug2acR31F5H4biSWkrag=";
     }
     .${system} or throwSystem;
 in

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

@@ -24,7 +24,7 @@ buildNpmPackage rec {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     fetcherVersion = 1;
-    hash = "sha256-i1szy2JVKvq2rcL0l51vmsLano4l88s97EQPN9g4Qq4=";
+    hash = "sha256-xoCRZUJkdR4X5hszM5gaOyWXLNCbzG5CzF+6OXGEy1k=";
   };
 
   passthru = {

pkgs/by-name/fr/frida-tools/package.nix

@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "frida-tools";
-  version = "14.4.1";
+  version = "14.4.2";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Zb6Pk6c7QbJLsb4twhdVgaUWtxCy/Vff5PKIno9B/b4=";
+    hash = "sha256-M+iKHoJpxIUUoEVYntL8PPR7B3TbBDiW/Oc8ZE15wo8=";
   };
 
   build-system = with python3Packages; [

pkgs/by-name/g3/g3proxy/package.nix

@@ -7,51 +7,57 @@
   python3,
   lua5_4,
   capnproto,
-  cmake,
+  openssl,
+  rust-bindgen,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
-  pname = "g3";
-  version = "v1.10.4";
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "g3proxy";
+  version = "1.11.9";
 
   src = fetchFromGitHub {
     owner = "bytedance";
     repo = "g3";
-    tag = "g3proxy-${version}";
-    hash = "sha256-uafKYyzjGdtC+oMJG1wWOvgkSht/wTOzyODcPoTfOnU=";
+    tag = "g3proxy-v${finalAttrs.version}";
+    hash = "sha256-N6Fvdc+Vj7S9CgBby9unKBVBoM9pPlmfyJPxY3KdSXg=";
   };
 
-  cargoHash = "sha256-NbrJGGnpZkF7ZX3MqrMsZ03tWkN/nqWahh00O3IJGOw=";
+  cargoHash = "sha256-bLzkA50XiIUrGyKZ3upo2psjFnjUNups0aIEou+J5IA=";
   useFetchCargoVendor = true;
 
-  # TODO: can we unvendor AWS LC somehow?
-  buildFeatures = [
-    "vendored-aws-lc"
-    "rustls-aws-lc"
+  cargoBuildFlags = [
+    "-p"
+    "g3proxy"
   ];
-
-  # aws-lc/crypto compilation will trigger `strictoverflow` errors.
-  hardeningDisable = [ "strictoverflow" ];
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   nativeBuildInputs = [
     pkg-config
-    rustPlatform.bindgenHook
     python3
     capnproto
-    cmake
+    rust-bindgen
   ];
 
   buildInputs = [
     c-ares
     lua5_4
+    openssl
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^g3proxy-v([0-9.]+)$"
+    ];
+  };
+
   meta = {
     description = "Enterprise-oriented Generic Proxy Solutions";
     homepage = "https://github.com/bytedance/g3";
-    changelog = "https://github.com/bytedance/g3/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/bytedance/g3/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ raitobezarius ];
     mainProgram = "g3proxy";
   };
-}
+})

pkgs/by-name/ha/havoc/package.nix

@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
       publicDomain
     ];
     mainProgram = "havoc";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ videl ];
     inherit (wayland.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin; # fatal error: 'sys/epoll.h' file not found
   };

pkgs/by-name/je/jetbrains-toolbox/package.nix

@@ -15,8 +15,8 @@ let
   updateScript = ./update.sh;
 
   meta = {
-    description = "Jetbrains Toolbox";
-    homepage = "https://jetbrains.com/";
+    description = "JetBrains Toolbox";
+    homepage = "https://www.jetbrains.com/toolbox-app";
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ ners ];
@@ -91,6 +91,11 @@ selectKernel {
         ]
         ++ appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
       runScript = "${src}/bin/jetbrains-toolbox --update-failed";
+
+      extraInstallCommands = ''
+        install -Dm0644 ${src}/bin/jetbrains-toolbox.desktop -t $out/share/applications
+        install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/pixmaps/jetbrains-toolbox.png
+      '';
     };
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {

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

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libuninameslist";
-  version = "20240910";
+  version = "20250714";
 
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "libuninameslist";
     rev = version;
-    hash = "sha256-Pi30c3To57AzY59i39JVG2IUkGnq7CEAQkqJ1f5AZhw=";
+    hash = "sha256-2SC8hu4yHbSbmQL17bfF4BwPLzBhUvF8iGqEtueUZaU=";
   };
 
   nativeBuildInputs = [

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

@@ -27,9 +27,10 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
     glm
     tbb_2021
-    clipper2
   ];
 
+  propagatedBuildInputs = [ clipper2 ];
+
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
     "-DMANIFOLD_TEST=ON"

pkgs/by-name/op/openvscode-server/package.nix

@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openvscode-server";
-  version = "1.99.3";
+  version = "1.101.2";
 
   src = fetchFromGitHub {
     owner = "gitpod-io";
     repo = "openvscode-server";
     rev = "openvscode-server-v${finalAttrs.version}";
-    hash = "sha256-nA+StCJgutWjD7vgCCcj9B91QSF7dEHnlNtj7zgJRwI=";
+    hash = "sha256-pcsto9zEq8BTP5jlQoGQzWEhdJNJMNkJY9S6FGw7LrI=";
   };
 
   ## fetchNpmDeps doesn't correctly process git dependencies
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
         inherit (finalAttrs) src nativeBuildInputs;
         outputHashMode = "recursive";
         outputHashAlgo = "sha256";
-        outputHash = "sha256-lgzNpWFAIGNxjDZ60kRw80fP1qEItk3FN1s5t7KdxGA=";
+        outputHash = "sha256-iSKDwe/ufJnC7mDqG0x+WcCckyUY/9dI/4ZTMvfBWIc=";
         env = {
           FORCE_EMPTY_CACHE = true;
           FORCE_GIT_DEPS = true;

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

@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "opkssh";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "openpubkey";
     repo = "opkssh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8fbOhyrHgNG9ulu/DZvUHzIojvoHG/gb5+Ft/RmMHXk=";
+    hash = "sha256-8CWxxhqgSgFVRNjAvJ0faHI4rsSPQNkcSqVSzTHRJY4=";
   };
 
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 
-  vendorHash = "sha256-bkTQqtlZhZ2/WnQNRdZzfblkGKjaAS22RFl6I1O3/yA=";
+  vendorHash = "sha256-0H7hST5Czd/1rDQ0nO2FAnbG2lN3AZULs5M17zKa9FY=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

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

@@ -9,18 +9,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "pocket-id";
-  version = "1.6.2";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fg9iT4JGB3CvmPiRaQwfyKxZ5T0mweDQAQYYU/fdb/g=";
+    hash = "sha256-P6pA0760eo/dL1t5Jics4oSztM4F/C8lIuZ3dZ9x5C8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
 
-  vendorHash = "sha256-LutjhewhizxGc/YlNHpK81HrX+wSAAJLWtA+skTjn1w=";
+  vendorHash = "sha256-8D7sSmxR+Fq4ouB9SuoEDplu6Znv3U0BIyYISSmF6Bs=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
 
-    npmDepsHash = "sha256-AZ8je9uaJ1h9wxfs2RtPr2Ki0QNYD0nDd2BZDj6/sl8=";
+    npmDepsHash = "sha256-FiFSnN6DOMr8XghvyGTWB/EMTNfvpqlAgx7FPnbGQxU=";
     npmFlags = [ "--legacy-peer-deps" ];
 
     env.BUILD_OUTPUT_PATH = "dist";

pkgs/by-name/pr/prime-server/package.nix

@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/kevinkreiser/prime_server";
     license = licenses.bsd2;
     maintainers = [ maintainers.Thra11 ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-07-12";
+  version = "0-unstable-2025-07-20";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "8fc70859aaef7cc20181ac6d115a6ff8ca5a9162";
-    hash = "sha256-MbbjiLa24PxaD7ZizR2CbTPy6yDFZTAV3QurFyYb3r8=";
+    rev = "e490a11c1a2ecfadd2cbc0759d77f4706bc2ee61";
+    hash = "sha256-+UWVKs3xKitt8B/QCugnTuQaxWCgFcetJQ2RQNUDy00=";
   };
 
   dontConfigure = true;

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

@@ -11,6 +11,9 @@
 let
   jre11_minimal_headless = jre11_minimal.override {
     jdk = jdk11_headless;
+    modules = [
+      "java.logging"
+    ];
   };
 in
 stdenv.mkDerivation (finalAttrs: {

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

@@ -14,7 +14,7 @@
 
 python312Packages.buildPythonApplication rec {
   pname = "snapcraft";
-  version = "8.10.1";
+  version = "8.10.2";
 
   pyproject = true;
 
@@ -22,7 +22,7 @@ python312Packages.buildPythonApplication rec {
     owner = "canonical";
     repo = "snapcraft";
     tag = version;
-    hash = "sha256-WGCbqtuCOF5X8yOVrgLKWyDcqjpb8sbTPRZzVesnAIY=";
+    hash = "sha256-klG+cT2vXo9v9tIJhJNCeGTiuV5C+oed0Vi9310PnqQ=";
   };
 
   patches = [

pkgs/by-name/so/source-meta-json-schema/package.nix

@@ -5,7 +5,7 @@
   cmake,
 }:
 let
-  version = "9.4.0";
+  version = "10.0.0";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "source-meta-json-schema";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "sourcemeta";
     repo = "jsonschema";
     rev = "v${version}";
-    hash = "sha256-7Emcoabcj4p0bAAryIOaagojU3sQkO5NZ8UyerLjXms=";
+    hash = "sha256-fYNbHU9DcSzMrMt+pDbbtPirTc+Wu4jq+vSqq+qzhtE=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/wa/wayback-x11/package.nix

@@ -0,0 +1,64 @@
+{
+  fetchFromGitLab,
+  lib,
+  libxkbcommon,
+  meson,
+  ninja,
+  pixman,
+  pkg-config,
+  scdoc,
+  stdenv,
+  unstableGitUpdater,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  wlroots_0_19,
+  xwayland,
+}:
+
+stdenv.mkDerivation {
+  pname = "wayback";
+  version = "0-unstable-2025-07-20";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "wayback";
+    repo = "wayback";
+    rev = "4b1b4c59f67a2639e960d6b19e1282cf03fc3660";
+    hash = "sha256-+4fPMVVPoUAYbt0jgfl+dmt0ZNyGGWF7xuF1UzZ2uiU=";
+  };
+
+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    scdoc
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    libxkbcommon
+    pixman
+    wayland
+    wayland-protocols
+    wlroots_0_19
+    xwayland
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "X11 compatibility layer leveraging wlroots and Xwayland";
+    homepage = "https://wayback.freedesktop.org";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "wayback-session";
+    maintainers = with lib.maintainers; [ dramforever ];
+  };
+}

pkgs/by-name/wi/winbox4/package.nix

@@ -5,7 +5,7 @@
 }:
 let
   pname = "winbox";
-  version = "4.0beta21";
+  version = "4.0beta26";
 
   metaCommon = {
     description = "Graphical configuration utility for RouterOS-based devices";
@@ -23,13 +23,13 @@ let
   x86_64-zip = callPackage ./build-from-zip.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-Uoawz+CW1JLVOEoxSF49WpF31VuUDWK4q9tl1qAwS/c=";
+    hash = "sha256-m0+ofS1j6NaGW5ArldAn2dLUh0hfxtvEIRdRMKA1vc4=";
   };
 
   x86_64-dmg = callPackage ./build-from-dmg.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-PCdN5z77RU5WgYzk2h/ou2OeswZQl32FfxozEZ8ZlTo=";
+    hash = "sha256-3IrRDdNHzGyqLc2Ba5+WIpDN9CyCUvC8Q8Y0hMFazBk=";
   };
 in
 (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {

pkgs/by-name/za/zapzap/package.nix

@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "zapzap";
-  version = "6.1";
+  version = "6.1.1-2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rafatosta";
     repo = "zapzap";
     tag = version;
-    hash = "sha256-g3J9oVIRiar0QoksRjJZsbvSKiFBILaUdSUscNs1VXE=";
+    hash = "sha256-gd9DxTck0YG0ETmFMzsc/0osMTB4txr7pQ9Xw4dLP+A=";
   };
 
   nativeBuildInputs = [

pkgs/development/compilers/jetbrains-jdk/jcef.nix

@@ -46,9 +46,6 @@
   thrift,
 }:
 
-assert !stdenv.hostPlatform.isDarwin;
-# I can't test darwin
-
 let
   rpath = lib.makeLibraryPath [
     glib
@@ -306,5 +303,9 @@ stdenv.mkDerivation rec {
     description = "Jetbrains' fork of JCEF";
     license = lib.licenses.bsd3;
     homepage = "https://github.com/JetBrains/JCEF";
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
   };
 }

pkgs/development/haskell-modules/generic-builder.nix

@@ -57,6 +57,9 @@ in
   },
   sourceRoot ? null,
   setSourceRoot ? null,
+  # Extra environment variables to set during the build.
+  # See: `../../../doc/languages-frameworks/haskell.section.md`
+  env ? { },
   buildDepends ? [ ],
   setupHaskellDepends ? [ ],
   libraryHaskellDepends ? [ ],
@@ -556,6 +559,19 @@ let
       "haskellPackages.mkDerivation: testTarget is deprecated. Use testTargets instead"
       (lib.concatStringsSep " " testTargets);
 
+  env' =
+    {
+      LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase.
+    }
+    // env
+    # Implicit pointer to integer conversions are errors by default since clang 15.
+    # Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456.
+    // optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) {
+      NIX_CFLAGS_COMPILE =
+        "-Wno-error=int-conversion"
+        + lib.optionalString (env ? NIX_CFLAGS_COMPILE) (" " + env.NIX_CFLAGS_COMPILE);
+    };
+
 in
 lib.fix (
   drv:
@@ -589,7 +605,11 @@ lib.fix (
         ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ];
       propagatedBuildInputs = optionals isLibrary propagatedBuildInputs;
 
-      LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase.
+      env =
+        optionalAttrs (stdenv.buildPlatform.libc == "glibc") {
+          LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
+        }
+        // env';
 
       prePatch =
         optionalString (editedCabalFile != null) ''
@@ -995,16 +1015,37 @@ lib.fix (
             nativeBuildInputs =
               [ ghcEnv ] ++ optional (allPkgconfigDepends != [ ]) pkg-config ++ collectedToolDepends;
             buildInputs = otherBuildInputsSystem;
-            LANG = "en_US.UTF-8";
-            LOCALE_ARCHIVE = lib.optionalString (
-              stdenv.buildPlatform.libc == "glibc"
-            ) "${buildPackages.glibcLocales}/lib/locale/locale-archive";
-            "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
-            "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
-            # TODO: is this still valid?
-            "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
-            "NIX_${ghcCommandCaps}_LIBDIR" =
-              if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" else "${ghcEnv}/${ghcLibdir}";
+
+            env =
+              {
+                "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
+                "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
+                # TODO: is this still valid?
+                "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
+                "NIX_${ghcCommandCaps}_LIBDIR" =
+                  if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" else "${ghcEnv}/${ghcLibdir}";
+              }
+              // optionalAttrs (stdenv.buildPlatform.libc == "glibc") {
+                # TODO: Why is this written in terms of `buildPackages`, unlike
+                # the outer `env`?
+                #
+                # According to @sternenseemann [1]:
+                #
+                # > The condition is based on `buildPlatform`, so it needs to
+                # > match. `LOCALE_ARCHIVE` is set to accompany `LANG` which
+                # > concerns things we execute on the build platform like
+                # > `haddock`.
+                # >
+                # > Arguably the outer non `buildPackages` one is incorrect and
+                # > probably works by accident in most cases since the locale
+                # > archive is not platform specific (the trouble is that it
+                # > may sometimes be impossible to cross-compile). At least
+                # > that would be my assumption.
+                #
+                # [1]: https://github.com/NixOS/nixpkgs/pull/424368#discussion_r2202683378
+                LOCALE_ARCHIVE = "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+              }
+              // env';
           } "echo $nativeBuildInputs $buildInputs > $out";
 
         env = envFunc { };
@@ -1050,17 +1091,8 @@ lib.fix (
     // optionalAttrs (args ? postFixup) { inherit postFixup; }
     // optionalAttrs (args ? dontStrip) { inherit dontStrip; }
     // optionalAttrs (postPhases != [ ]) { inherit postPhases; }
-    // optionalAttrs (stdenv.buildPlatform.libc == "glibc") {
-      LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
-    }
     // optionalAttrs (disallowedRequisites != [ ] || disallowGhcReference) {
       disallowedRequisites = disallowedRequisites ++ (if disallowGhcReference then [ ghc ] else [ ]);
     }
-
-    # Implicit pointer to integer conversions are errors by default since clang 15.
-    # Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456.
-    // optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) {
-      NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion";
-    }
   )
 )

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

@@ -30,6 +30,5 @@ buildPythonPackage rec {
     description = "Python client for Consul (https://www.consul.io/)";
     homepage = "https://github.com/cablehead/python-consul";
     license = licenses.mit;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

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

@@ -46,6 +46,5 @@ buildPythonPackage rec {
     homepage = "https://django-appconf.readthedocs.org/";
     changelog = "https://github.com/django-compressor/django-appconf/blob/v${version}/docs/changelog.rst";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

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

@@ -81,6 +81,5 @@ buildPythonPackage rec {
     homepage = "https://django-compressor.readthedocs.org/";
     changelog = "https://github.com/django-compressor/django-compressor/blob/${version}/docs/changelog.txt";
     license = licenses.mit;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

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

@@ -48,6 +48,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/torchbox/django-modelcluster/";
     changelog = "https://github.com/wagtail/django-modelcluster/blob/v${version}/CHANGELOG.txt";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

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

@@ -45,6 +45,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/jazzband/django-taggit";
     changelog = "https://github.com/jazzband/django-taggit/blob/${version}/CHANGELOG.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

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

@@ -34,6 +34,5 @@ buildPythonPackage rec {
     homepage = "https://tabo.pe/projects/django-treebeard/";
     changelog = "https://github.com/django-treebeard/django-treebeard/blob/${version}/CHANGES.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

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

@@ -77,7 +77,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/encode/django-rest-framework/releases/tag/3.15.1";
     description = "Web APIs for Django, made easy";
     homepage = "https://www.django-rest-framework.org/";
-    maintainers = with maintainers; [ desiderius ];
     license = licenses.bsd2;
   };
 }

pkgs/development/python-modules/elasticsearch-dsl/default.nix

@@ -48,6 +48,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/elasticsearch/elasticsearch-dsl-py";
     changelog = "https://github.com/elastic/elasticsearch-dsl-py/blob/v${version}/Changelog.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

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

@@ -51,6 +51,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/elasticsearch/elasticsearch-py";
     changelog = "https://github.com/elastic/elasticsearch-py/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

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

@@ -93,6 +93,5 @@ buildPythonPackage rec {
     description = "Ultra-reliable, fast ASGI+WSGI framework for building data plane APIs at scale";
     homepage = "https://falconframework.org/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

pkgs/development/python-modules/httpx-aiohttp/default.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  aiohttp,
+  httpx,
+}:
+
+buildPythonPackage rec {
+  pname = "httpx-aiohttp";
+  version = "0.1.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "karpetrosyan";
+    repo = "httpx-aiohttp";
+    tag = version;
+    hash = "sha256-Fdu8aKsXWggRkc/512OBEiEwWNAajrhjfG/+v4+cows=";
+    fetchSubmodules = true;
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "requires = [\"hatchling\", \"hatch-fancy-pypi-readme\"]" \
+      "requires = [\"hatchling\"]"
+  '';
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    aiohttp
+    httpx
+  ];
+
+  pythonImportsCheck = [
+    "httpx_aiohttp"
+  ];
+
+  meta = {
+    description = "Transports for httpx to work atop aiohttp";
+    homepage = "https://github.com/karpetrosyan/httpx-aiohttp/";
+    changelog = "https://github.com/karpetrosyan/httpx-aiohttp/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sarahec ];
+  };
+}

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

@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "pymc";
-  version = "5.24.0";
+  version = "5.24.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymc-devs";
     repo = "pymc";
     tag = "v${version}";
-    hash = "sha256-B4HFb+2Hzxt/eK5PdE9wNxQRNouSPi/9aKSrBV8xba4=";
+    hash = "sha256-lBsVr3A7y9CP+41Tk5TraWhu59HJb2+r0I7WlXiP/sY=";
   };
 
   build-system = [

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

@@ -33,8 +33,5 @@ buildPythonPackage rec {
     homepage = "https://pypdf2.readthedocs.io/";
     changelog = "https://github.com/py-pdf/PyPDF2/raw/${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [
-      desiderius
-    ];
   };
 }

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

@@ -36,6 +36,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/tobgu/pyrsistent/";
     description = "Persistent/Functional/Immutable data structures";
     license = licenses.mit;
-    maintainers = with maintainers; [ desiderius ];
   };
 }

pkgs/development/python-modules/pytest-unmagic/default.nix

@@ -3,20 +3,21 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  gitUpdater,
   flit-core,
   pytest,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-unmagic";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dimagi";
     repo = "pytest-unmagic";
     tag = "v${version}";
-    hash = "sha256-5WnLjQ0RuwLBIZAbOJoQ0KBEnb7yUWTUFBKy+WgNctQ=";
+    hash = "sha256-XHeQuMCYHtrNF5+7e/eMzcvYukM+AobHCMRdzL+7KpU=";
   };
 
   build-system = [
@@ -29,6 +30,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "unmagic" ];
 
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
   meta = {
     description = "Pytest fixtures with conventional import semantics";
     homepage = "https://github.com/dimagi/pytest-unmagic";

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

@@ -53,7 +53,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/wagtail/Willow/releases/tag/v${version}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [
-      desiderius
       kuflierl
     ];
   };

pkgs/servers/sql/postgresql/ext/postgis.nix

@@ -91,12 +91,19 @@ postgresqlBuildExtension (finalAttrs: {
     ./autogen.sh
   '';
 
-  configureFlags = [
-    "--with-pgconfig=${postgresql.pg_config}/bin/pg_config"
-    "--with-gdalconfig=${gdal}/bin/gdal-config"
-    "--with-jsondir=${json_c.dev}"
-    "--disable-extension-upgrades-install"
-  ] ++ lib.optional withSfcgal "--with-sfcgal=${sfcgal}/bin/sfcgal-config";
+  configureFlags =
+    let
+      isCross = stdenv.hostPlatform.config != stdenv.buildPlatform.config;
+    in
+    [
+      (lib.enableFeature false "extension-upgrades-install")
+      (lib.withFeatureAs true "pgconfig" "${postgresql.pg_config}/bin/pg_config")
+      (lib.withFeatureAs true "gdalconfig" "${gdal}/bin/gdal-config")
+      (lib.withFeatureAs true "jsondir" (lib.getDev json_c))
+      (lib.withFeatureAs true "xml2config" (lib.getExe' (lib.getDev libxml2) "xml2-config"))
+      (lib.withFeatureAs withSfcgal "sfcgal" "${sfcgal}/bin/sfcgal-config")
+      (lib.withFeature (!isCross) "json") # configure: error: cannot check for file existence when cross compiling
+    ];
 
   makeFlags = [
     "PERL=${perl}/bin/perl"

pkgs/test/haskell/default.nix

@@ -3,6 +3,7 @@
 lib.recurseIntoAttrs {
   cabalSdist = callPackage ./cabalSdist { };
   documentationTarball = callPackage ./documentationTarball { };
+  env = callPackage ./env { };
   ghcWithPackages = callPackage ./ghcWithPackages { };
   incremental = callPackage ./incremental { };
   setBuildTarget = callPackage ./setBuildTarget { };

pkgs/test/haskell/env/default.nix

@@ -0,0 +1,55 @@
+{
+  lib,
+  haskellPackages,
+}:
+
+let
+  withEnv =
+    env:
+    haskellPackages.mkDerivation {
+      pname = "puppy";
+      version = "1.0.0";
+      src = null;
+      license = null;
+
+      inherit env;
+    };
+
+  failures = lib.runTests {
+    testCanSetEnv = {
+      expr =
+        (withEnv {
+          PUPPY = "DOGGY";
+        }).drvAttrs.PUPPY;
+      expected = "DOGGY";
+    };
+
+    testCanSetEnvMultiple = {
+      expr =
+        let
+          env =
+            (withEnv {
+              PUPPY = "DOGGY";
+              SILLY = "GOOFY";
+            }).drvAttrs;
+        in
+        {
+          inherit (env) PUPPY SILLY;
+        };
+      expected = {
+        PUPPY = "DOGGY";
+        SILLY = "GOOFY";
+      };
+    };
+
+    testCanSetEnvPassthru = {
+      expr =
+        (withEnv {
+          PUPPY = "DOGGY";
+        }).passthru.env.PUPPY;
+      expected = "DOGGY";
+    };
+  };
+in
+# TODO: Use `lib.debug.throwTestFailures`: https://github.com/NixOS/nixpkgs/pull/416207
+lib.optional (failures != [ ]) (throw "${lib.generators.toPretty { } failures}")

pkgs/top-level/all-packages.nix

@@ -15466,7 +15466,6 @@ with pkgs;
   inherit
     (callPackage ./coq-packages.nix {
       inherit (ocaml-ng)
-        ocamlPackages_4_05
         ocamlPackages_4_09
         ocamlPackages_4_10
         ocamlPackages_4_12
@@ -15479,10 +15478,6 @@ with pkgs;
         ;
     })
     mkCoqPackages
-    coqPackages_8_5
-    coq_8_5
-    coqPackages_8_6
-    coq_8_6
     coqPackages_8_7
     coq_8_7
     coqPackages_8_8

pkgs/top-level/coq-packages.nix

@@ -6,7 +6,6 @@
   callPackage,
   newScope,
   recurseIntoAttrs,
-  ocamlPackages_4_05,
   ocamlPackages_4_09,
   ocamlPackages_4_10,
   ocamlPackages_4_12,
@@ -272,7 +271,6 @@ let
     callPackage ../applications/science/logic/coq {
       inherit
         version
-        ocamlPackages_4_05
         ocamlPackages_4_09
         ocamlPackages_4_10
         ocamlPackages_4_12
@@ -299,8 +297,6 @@ rec {
     in
     self.filterPackages (!coq.dontFilter or false);
 
-  coq_8_5 = mkCoq "8.5" { };
-  coq_8_6 = mkCoq "8.6" { };
   coq_8_7 = mkCoq "8.7" { };
   coq_8_8 = mkCoq "8.8" { };
   coq_8_9 = mkCoq "8.9" { };
@@ -318,8 +314,6 @@ rec {
   coq_9_0 = mkCoq "9.0" rocqPackages_9_0;
   coq_9_1 = mkCoq "9.1" rocqPackages_9_1;
 
-  coqPackages_8_5 = mkCoqPackages coq_8_5;
-  coqPackages_8_6 = mkCoqPackages coq_8_6;
   coqPackages_8_7 = mkCoqPackages coq_8_7;
   coqPackages_8_8 = mkCoqPackages coq_8_8;
   coqPackages_8_9 = mkCoqPackages coq_8_9;

pkgs/top-level/python-packages.nix

@@ -6701,6 +6701,8 @@ self: super: with self; {
 
   httpx = callPackage ../development/python-modules/httpx { };
 
+  httpx-aiohttp = callPackage ../development/python-modules/httpx-aiohttp { };
+
   httpx-auth = callPackage ../development/python-modules/httpx-auth { };
 
   httpx-ntlm = callPackage ../development/python-modules/httpx-ntlm { };