Merge master into staging-next

2025-06-07 18:05:03 +00:00 · 2025-06-07 18:05:03 +00:00 · 6382019211
commit 6382019211
parent 3ed8e14f90 cd64f1bd87
31 changed files with 140 additions and 134 deletions
--- a/nixos/lib/testing/network.nix
+++ b/nixos/lib/testing/network.nix
@ -3,15 +3,15 @@
 let
  inherit (lib)
    attrNames
-    concatMap
+    concatMapAttrs
    concatMapStrings
-    flip
    forEach
    head
    listToAttrs
    mkDefault
    mkOption
    nameValuePair
+    optionalAttrs
    optionalString
    range
    toLower
@ -91,23 +91,22 @@ let
        # interfaces, use the IP address corresponding to
        # the first interface (i.e. the first network in its
        # virtualisation.vlans option).
-        networking.extraHosts = flip concatMapStrings (attrNames nodes) (
-          m':
+        networking.hosts = concatMapAttrs (
+          name: config:
          let
-            config = nodes.${m'};
            hostnames =
              optionalString (
                config.networking.domain != null
              ) "${config.networking.hostName}.${config.networking.domain} "
              + "${config.networking.hostName}\n";
          in
-          optionalString (
-            config.networking.primaryIPAddress != ""
-          ) "${config.networking.primaryIPAddress} ${hostnames}"
-          + optionalString (config.networking.primaryIPv6Address != "") (
-            "${config.networking.primaryIPv6Address} ${hostnames}"
-          )
-        );
+          optionalAttrs (config.networking.primaryIPAddress != "") {
+            "${config.networking.primaryIPAddress}" = [ hostnames ];
+          }
+          // optionalAttrs (config.networking.primaryIPv6Address != "") {
+            "${config.networking.primaryIPv6Address}" = [ hostnames ];
+          }
+        ) nodes;

        virtualisation.qemu.options = qemuOptions;
        boot.initrd.services.udev.rules = concatMapStrings (x: x + "\n") udevRules;
--- a/nixos/modules/services/cluster/kubernetes/pki.nix
+++ b/nixos/modules/services/cluster/kubernetes/pki.nix
@ -365,9 +365,12 @@ in
        keyFile = mkDefault key;
        trustedCaFile = mkDefault caCert;
      };
-      networking.extraHosts = mkIf (config.services.etcd.enable) ''
-        127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local
-      '';
+      networking.hosts = mkIf (config.services.etcd.enable) {
+        "127.0.0.1" = [
+          "etcd.${top.addons.dns.clusterDomain}"
+          "etcd.local"
+        ];
+      };

      services.flannel = with cfg.certs.flannelClient; {
        kubeconfig = top.lib.mkKubeConfig "flannel" {
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@ -11,13 +11,7 @@ in
 {
  options = {
    services.jenkins = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = ''
-          Whether to enable the jenkins continuous integration server.
-        '';
-      };
+      enable = lib.mkEnableOption "Jenkins, a continuous integration server";

      user = lib.mkOption {
        default = "jenkins";
@ -89,11 +83,13 @@ in

      package = lib.mkPackageOption pkgs "jenkins" { };

+      javaPackage = lib.mkPackageOption pkgs "jdk21" { };
+
      packages = lib.mkOption {
        default = [
          pkgs.stdenv
          pkgs.git
-          pkgs.jdk17
+          pkgs.jdk21
          config.programs.ssh.package
          pkgs.nix
        ];
@ -239,7 +235,7 @@ in

      # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
      script = ''
-        ${pkgs.jdk17}/bin/java ${lib.concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
+        ${cfg.javaPackage}/bin/java ${lib.concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
                                                  --httpPort=${toString cfg.port} \
                                                  --prefix=${cfg.prefix} \
                                                  -Djava.awt.headless=true \
--- a/nixos/modules/services/web-apps/lasuite-docs.nix
+++ b/nixos/modules/services/web-apps/lasuite-docs.nix
@ -176,6 +176,13 @@ in
              defaultText = lib.literalExpression "https://\${cfg.domain}";
              description = "URL to the backend server base";
            };
+
+            COLLABORATION_SERVER_ORIGIN = mkOption {
+              type = types.str;
+              default = "https://${cfg.domain}";
+              defaultText = lib.literalExpression "https://\${cfg.domain}";
+              description = "Origins allowed to connect to the collaboration server";
+            };
          };
        };
        default = { };
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@ -70,10 +70,12 @@ in
  # Rely on GCP's firewall instead
  networking.firewall.enable = mkDefault false;

-  # Configure default metadata hostnames
-  networking.extraHosts = ''
-    169.254.169.254 metadata.google.internal metadata
-  '';
+  networking.hosts = {
+    "169.254.169.254" = [
+      "metadata.google.internal"
+      "metadata"
+    ];
+  };

  networking.timeServers = [ "metadata.google.internal" ];

--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@ -1084,14 +1084,10 @@ in
          ) config.containers;

        # Generate /etc/hosts entries for the containers.
-        networking.extraHosts = concatStrings (
-          mapAttrsToList (
-            name: cfg:
-            optionalString (cfg.localAddress != null) ''
-              ${head (splitString "/" cfg.localAddress)} ${name}.containers
-            ''
-          ) config.containers
-        );
+        networking.hosts = lib.mapAttrs' (name: cfg: {
+          name = head (splitString "/" cfg.localAddress);
+          value = lib.optionals (cfg.localAddress != null) [ "${name}.containers" ];
+        }) config.containers;

        networking.dhcpcd.denyInterfaces = [
          "ve-*"
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -1960,6 +1960,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  checkmate-nvim = buildVimPlugin {
+    pname = "checkmate.nvim";
+    version = "2025-06-05";
+    src = fetchFromGitHub {
+      owner = "bngarren";
+      repo = "checkmate.nvim";
+      rev = "aabe87c58d3c30f45aadab4bef38536e9933cd4a";
+      sha256 = "1qc3i32hkp59sha7rxbil1r76krlxgqqxn9wj7qlabc99bh11d3s";
+    };
+    meta.homepage = "https://github.com/bngarren/checkmate.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  ci_dark = buildVimPlugin {
    pname = "ci_dark";
    version = "2022-03-27";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -149,6 +149,7 @@ https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
 https://github.com/ms-jpq/chadtree/,HEAD,
 https://github.com/vim-scripts/changeColorScheme.vim/,,
 https://github.com/sudormrfbin/cheatsheet.nvim/,,
+https://github.com/bngarren/checkmate.nvim/,HEAD,
 https://github.com/yunlingz/ci_dark/,,
 https://github.com/declancm/cinnamon.nvim/,HEAD,
 https://github.com/projekt0n/circles.nvim/,,
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@ -23,7 +23,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "palemoon-bin";
-  version = "33.7.1";
+  version = "33.7.2";

  src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";

@ -174,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: {
      {
        gtk3 = fetchzip {
          urls = urlRegionVariants "gtk3";
-          hash = "sha256-80L93pQaozdyqMnIswWnS+gNo+xVYv5eFVNnLiK/rcU=";
+          hash = "sha256-GE45GZ+OmNNwRLTD2pcZpqRA66k4q/+lkQnGJG+z6nQ=";
        };
        gtk2 = fetchzip {
          urls = urlRegionVariants "gtk2";
-          hash = "sha256-dnDQKRCqADzdotJRUeETqaGV+S+M6/de5LuBgMYYvPE=";
+          hash = "sha256-yJPmmQ9IkGzort9OPPWzv+LSeJci8VNoso3NLYev51Q=";
        };
      };

--- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
@ -8,13 +8,13 @@
 let
  drv = stdenv.mkDerivation rec {
    pname = "controller-topology-project";
-    version = "1.0.2";
+    version = "1.0.3";

    src = fetchFromGitHub {
      owner = "kodi-game";
      repo = "controller-topology-project";
      rev = "v${version}";
-      sha256 = "sha256-pbYFNCDhKhYKREffWbMbcd9xBL4ZiKWR7hMZUCTUHRg=";
+      sha256 = "sha256-KHM4DAF6xLLlxF19R4UKfVMbLsmniuxy/C4STcL0IHQ=";
    };

    postPatch = ''
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@ -7,20 +7,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "air-formatter";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "posit-dev";
    repo = "air";
    tag = finalAttrs.version;
-    hash = "sha256-32/wdz4CFYM/PFVSQiqYErXGHHn2KJyreiQq48vQryY=";
+    hash = "sha256-jFOhTol5e3TcU217HgcCKutydTePmc5/viilgiJqpqE=";
  };

  # Remove duplicate entries from cargo lock
  cargoPatches = [ ./cargo-lock.patch ];

  useFetchCargoVendor = true;
-  cargoHash = "sha256-zPT47K8OGtprxQt3ZOF2xmf6IRV5rsKWXeaXlyBdVlE=";
+  cargoHash = "sha256-3v/pgm6BjPvQToSmZ2PrUWTrgffjifB3Xmp1liWCUck=";

  useNextest = true;

--- a/pkgs/by-name/ap/app2unit/package.nix
+++ b/pkgs/by-name/ap/app2unit/package.nix
@ -0,0 +1,37 @@
+{
+  lib,
+  stdenvNoCC,
+  dash,
+  fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "app2unit";
+  version = "0-unstable-2025-05-09";
+
+  src = fetchFromGitHub {
+    owner = "Vladimir-csp";
+    repo = "app2unit";
+    rev = "7b9672a2dc16bdfbe7b7b7c27043529ca3bcb6ae";
+    sha256 = "03dnx5v75530fwppfgpjl6xzzmdbk73ymrlix129d9n5sqrz9wgk";
+  };
+
+  installPhase = ''
+    install -Dt $out/bin app2unit
+    ln -s $out/bin/app2unit $out/bin/app2unit-open
+  '';
+
+  dontPatchShebangs = true;
+  postFixup = ''
+    substituteInPlace $out/bin/app2unit \
+      --replace-fail '#!/bin/sh' '#!${lib.getExe dash}'
+  '';
+
+  meta = {
+    description = "Launches Desktop Entries as Systemd user units";
+    homepage = "https://github.com/Vladimir-csp/app2unit";
+    license = lib.licenses.gpl3;
+    mainProgram = "app2unit";
+    maintainers = with lib.maintainers; [ fazzi ];
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@ -19,13 +19,13 @@ in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {

  pname = "c3c${optionalString debug "-debug"}";
-  version = "0.7.1";
+  version = "0.7.2";

  src = fetchFromGitHub {
    owner = "c3lang";
    repo = "c3c";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-2nTFQNoSAdD12BiwWMtrD9SeelTUOM3DYUdjBSjWnVU=";
+    hash = "sha256-/S2rcZZe441b1sbiJDH1rnxT/mEP1694d5L8MIV6QQc=";
  };

  cmakeBuildType = if debug then "Debug" else "Release";
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@ -24,13 +24,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "cubeb";
-  version = "0-unstable-2025-05-29";
+  version = "0-unstable-2025-06-03";

  src = fetchFromGitHub {
    owner = "mozilla";
    repo = "cubeb";
-    rev = "78ee5f0efaaa395e3e1806e8ef85dcb15c7c063d";
-    hash = "sha256-PsBlZQTPiBt8Y3okFOZYhiFn58adxVlaf/hLA0doX0o=";
+    rev = "24c170b2346bb675456449f51406dac6442a84a7";
+    hash = "sha256-/XTDaG48IFPFPrEcDd3IqX4bN+VbrpaHpzd/7N8J3a8=";
  };

  outputs = [
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "debian-devscripts";
-  version = "2.25.10";
+  version = "2.25.14";

  src = fetchurl {
    url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz";
-    hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus=";
+    hash = "sha256-z95BOgGNYFvleqCv8e6B7Tl91xPzgQHkcxIg55maXvQ=";
  };

  patches = [
--- a/pkgs/by-name/de/debianutils/package.nix
+++ b/pkgs/by-name/de/debianutils/package.nix
@ -9,14 +9,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "debianutils";
-  version = "5.22";
+  version = "5.23.1";

  src = fetchFromGitLab {
    domain = "salsa.debian.org";
    owner = "debian";
    repo = "debianutils";
    rev = "debian/${finalAttrs.version}";
-    hash = "sha256-TcPWQIgCSJWvJiePqEdRK2kju9xDpl6c9+VOagDsOhs=";
+    hash = "sha256-kQFl57kusyL3kGG9pJ8j2AsKBH4245xiPoDUYHjjv1g=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@ -17,13 +17,13 @@
 }:

 let
-  version = "0.204.1";
+  version = "0.204.2";

  src = fetchFromGitHub {
    owner = "evcc-io";
    repo = "evcc";
    tag = version;
-    hash = "sha256-z3SwTBcCETIe2xPN9VU3mqYxd7npvrs44FkGQp56Y00=";
+    hash = "sha256-e0z1DUXEYbfSIcJBI2gpxY2hb0Tak3sFoYOi5WdsQPY=";
  };

  vendorHash = "sha256-dBOZ5kYQxVTWB1CTTF3L+FIsuLnVQmA7Vjid7CdJbeo=";
@ -52,7 +52,7 @@ buildGo124Module rec {

  npmDeps = fetchNpmDeps {
    inherit src;
-    hash = "sha256-z64qzc3rDFByJ6Usubm9IIHfu4/i07O/zjtq2VjN7lk=";
+    hash = "sha256-Hyx9jUVF6aCPD89cxQx7dl77lCfDxcOIZVhSXx0+q0U=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/gm/gmnisrv/package.nix
+++ b/pkgs/by-name/gm/gmnisrv/package.nix
@ -1,52 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromSourcehut,
-  pkg-config,
-  openssl,
-  mailcap,
-  scdoc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gmnisrv";
-  version = "1.0";
-
-  src = fetchFromSourcehut {
-    owner = "~sircmpwn";
-    repo = "gmnisrv";
-    rev = version;
-    sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ=";
-  };
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=deprecated-declarations"
-  ];
-
-  postPatch = ''
-    substituteInPlace config.sh \
-      --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config"
-  '';
-
-  MIMEDB = "${mailcap}/etc/mime.types";
-  nativeBuildInputs = [
-    pkg-config
-    scdoc
-  ];
-  buildInputs = [
-    openssl
-    mailcap
-  ];
-
-  meta = with lib; {
-    description = "Simple Gemini protocol server";
-    mainProgram = "gmnisrv";
-    homepage = "https://git.sr.ht/~sircmpwn/gmnisrv";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
-      bsima
-      jb55
-    ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@ -8,7 +8,7 @@
  gnused,
  makeWrapper,
  nix,
-  openjdk,
+  jdk21,
  writeScript,
  nixosTests,
  jq,
@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
    cp "$src" "$out/webapps/jenkins.war"

    # Create the `jenkins-cli` command.
-    ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \
+    ${jdk21}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \
      && mv WEB-INF/lib/cli-${finalAttrs.version}.jar "$out/share/jenkins-cli.jar"

-    makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \
+    makeWrapper "${jdk21}/bin/java" "$out/bin/jenkins-cli" \
      --add-flags "-jar $out/share/jenkins-cli.jar"
  '';

--- a/pkgs/by-name/os/osinfo-db/package.nix
+++ b/pkgs/by-name/os/osinfo-db/package.nix
@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  pname = "osinfo-db";
-  version = "20250124";
+  version = "20250606";

  src = fetchurl {
    url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    hash = "sha256-fKcX8JdaeYE1orOe790UNqCwaC4paFx/0B73+DolclA=";
+    hash = "sha256-mUCqR98pgHPFHc+KTcyFX0lKuGTCTNvaRr2JeVc1f+E=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@ -193,15 +193,15 @@
  },
  {
    "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "9.0.0-beta.25255.5",
-    "hash": "sha256-AgHPYDKvoO3a2zoRSgnokC6XrF521V1lQ9KEPcKyS5E=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25255.5/microsoft.dotnet.arcade.sdk.9.0.0-beta.25255.5.nupkg"
+    "version": "9.0.0-beta.25263.2",
+    "hash": "sha256-mFVYybJiMi58vu+hT4VfXgWCWAXGeKxI7OwUQi2FO/A=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25263.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.25263.2.nupkg"
  },
  {
    "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "9.0.0-beta.25255.5",
-    "hash": "sha256-yigTPcb88S+1FUal0K/fL5pu5I/dmPACAo2sPOTDfZk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25255.5/microsoft.dotnet.xlifftasks.9.0.0-beta.25255.5.nupkg"
+    "version": "9.0.0-beta.25263.2",
+    "hash": "sha256-J86joC1OMlnjMppEBf9GwEbc0IdVJ/XjshBiZunH/EU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25263.2/microsoft.dotnet.xlifftasks.9.0.0-beta.25263.2.nupkg"
  },
  {
    "pname": "Microsoft.Extensions.Configuration",
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@ -32,18 +32,18 @@ in
 buildDotnetModule rec {
  inherit pname dotnet-sdk dotnet-runtime;

-  vsVersion = "2.78.15";
+  vsVersion = "2.80.16";
  src = fetchFromGitHub {
    owner = "dotnet";
    repo = "roslyn";
    rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-Lim2f2//NFiMrZzvpREMlk6/5NWatVTiQrciAAxIiLY=";
+    hash = "sha256-4kFu0bxbLZ31ifGluSrN9sN5EwzLg3bVHnh9iB9TGpA=";
  };

  # versioned independently from vscode-csharp
  # "roslyn" in here:
  # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.0.0-1.25263.3";
+  version = "5.0.0-1.25266.2";
  projectFile = "src/LanguageServer/${project}/${project}.csproj";
  useDotnetFromEnv = true;
  nugetDeps = ./deps.json;
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@ -2,9 +2,9 @@
  teleport,
 }:
 teleport.override {
-  version = "16.5.10";
-  hash = "sha256-i+2IK+X0Opyv2tQPpj2XhY64aQGdbylS/C7LsTykuXI=";
-  vendorHash = "sha256-DdVBtMwz0AIGCYj/QLczG8GPP9mqKrdF+M0NqmM6J0I=";
+  version = "16.5.11";
+  hash = "sha256-uLis1oRTr5J2bKaJtnVAIQ0ixYT8BYLo4jQPcdFp82s=";
+  vendorHash = "sha256-OcVHckqxpTVz6Gaemt3+9WxBQc5D5QBxb3IMGOMq4LI=";
  pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10=";
  cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 }
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@ -4,8 +4,8 @@ let
  base = callPackage ./generic.nix (
    _args
    // {
-      version = "8.3.21";
-      hash = "sha256-0HaebhHPpsWaFt4kFmi+jH8xpymVCo0GGQ360thiKwQ=";
+      version = "8.3.22";
+      hash = "sha256-mRM+LNoq83uqedsX2O/UFGKPFKAux18UGKCqP2qmZzs=";
    }
  );
 in
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@ -260,6 +260,7 @@ stdenv.mkDerivation (

  // (removeAttrs args [
    "withLinuxHeaders"
+    "linuxHeaders"
    "withGd"
    "enableCET"
    "postInstall"
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@ -3,6 +3,7 @@
  stdenv,
  callPackage,
  withLinuxHeaders ? true,
+  linuxHeaders ? null,
  profilingLibraries ? false,
  withGd ? false,
  enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false,
@ -19,7 +20,7 @@ let
  ];
 in

-(callPackage ./common.nix { inherit stdenv; } {
+(callPackage ./common.nix { inherit stdenv linuxHeaders; } {
  inherit
    withLinuxHeaders
    withGd
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
  pname = "mesa";
-  version = "25.1.2";
+  version = "25.1.3";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "mesa";
    repo = "mesa";
    rev = "mesa-${version}";
-    hash = "sha256-oE1QZyCBFdWCFq5T+Unf0GYpvCssVNOEQtPQgPbatQQ=";
+    hash = "sha256-BFncfkbpjVYO+7hYh5Ui6RACLq7/m6b8eIJ5B5lhq5Y=";
  };

  meta = {
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "pylamarzocco";
-  version = "2.0.7";
+  version = "2.0.8";
  pyproject = true;

  disabled = pythonOlder "3.12";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "zweckj";
    repo = "pylamarzocco";
    tag = "v${version}";
-    hash = "sha256-IFac66zBGvRASXJDa/Y6F3BxZhRD9tG8yAB2l2IsDVk=";
+    hash = "sha256-Fsxs3ugjzU9l3SlxqKs+Bej34kRn2mKrwzCZ94P2UGo=";
  };

  build-system = [ setuptools ];
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@ -8,13 +8,13 @@

 postgresqlBuildExtension (finalAttrs: {
  pname = "pg_net";
-  version = "0.14.0";
+  version = "0.15.1";

  src = fetchFromGitHub {
    owner = "supabase";
    repo = "pg_net";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI=";
+    hash = "sha256-BhLZdoMeK6QkmEEn3/+G6+TElFea2uifaQBW5aftqpM=";
  };

  buildInputs = [ curl ];
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -786,6 +786,7 @@ mapAliases {
  glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
  glxinfo = mesa-demos; # Added 2024-07-04
  gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17
+  gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
  gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24
  gnatboot11 = gnat-bootstrap11;
  gnatboot12 = gnat-bootstrap12;
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -11264,6 +11264,7 @@ with pkgs;
      inherit lib config;
      fetchurl = import ../build-support/fetchurl/boot.nix {
        inherit (stdenv.buildPlatform) system;
+        inherit (config) rewriteURL;
      };
      checkMeta = callPackage ../stdenv/generic/check-meta.nix { inherit (stdenv) hostPlatform; };
    }