Merge branch staging-next into haskell-updates

ci/OWNERS

@@ -58,7 +58,7 @@
 /pkgs/build-support/bintools-wrapper             @Ericson2314
 /pkgs/build-support/setup-hooks                  @Ericson2314
 /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
-/pkgs/build-support/setup-hooks/auto-patchelf.py @layus
+/pkgs/by-name/au/auto-patchelf                   @layus
 /pkgs/pkgs-lib                                   @infinisil
 ## Format generators/serializers
 /pkgs/pkgs-lib/formats/libconfig                 @h7x4
@@ -406,3 +406,8 @@ pkgs/by-name/lx/lxc*                    @adamcstephens
 /pkgs/by-name/in/installShellFiles/*     @Ericson2314
 /pkgs/test/install-shell-files/*         @Ericson2314
 /doc/hooks/installShellFiles.section.md  @Ericson2314
+
+# Darwin
+/pkgs/by-name/ap/apple-sdk                     @NixOS/darwin-core
+/pkgs/os-specific/darwin/apple-source-releases @NixOS/darwin-core
+/pkgs/stdenv/darwin                            @NixOS/darwin-core

doc/build-helpers/special/vm-tools.section.md

@@ -125,6 +125,8 @@ A set of functions that build a predefined set of minimal Linux distributions im
   * `debian10x86_64`
   * `debian11i386`
   * `debian11x86_64`
+  * `debian12i386`
+  * `debian12x86_64`
 
 ### Attributes {#vm-tools-diskImageFuns-attributes}
 

doc/hooks/tauri.section.md

@@ -21,7 +21,7 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases.
   npmHooks,
   openssl,
   pkg-config,
-  webkitgtk,
+  webkitgtk_4_0,
   wrapGAppsHook3,
 }:
 
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optionals stdenv.isLinux [
       glib-networking # Most Tauri apps need networking
       libsoup
-      webkitgtk
+      webkitgtk_4_0
     ]
     ++ lib.optionals stdenv.isDarwin (
       with darwin.apple_sdk.frameworks;

doc/languages-frameworks/rust.section.md

@@ -678,7 +678,7 @@ Some projects, especially GNOME applications, are built with the Meson Build Sys
 , blueprint-compiler
 , libadwaita
 , libsecret
-, tracker
+, tinysparql
 }:
 
 stdenv.mkDerivation rec {
@@ -712,7 +712,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libadwaita
     libsecret
-    tracker
+    tinysparql
   ];
 
   # ...

maintainers/maintainer-list.nix

@@ -23179,6 +23179,17 @@
     githubId = 36118348;
     keys = [ { fingerprint = "69C9 876B 5797 1B2E 11C5  7C39 80A1 F76F C9F9 54AE"; } ];
   };
+  wizardlink = {
+    name = "wizardlink";
+    email = "[email protected]";
+    github = "wizardlink";
+    githubId = 26727907;
+    keys = [
+      {
+        fingerprint = "A1D3 A2B4 E14B D7C0 445B  B749 A576 7B54 367C FBDF";
+      }
+    ];
+  };
   wizeman = {
     email = "[email protected]";
     github = "wizeman";

maintainers/team-list.nix

@@ -194,9 +194,13 @@ with lib.maintainers;
   };
 
   darwin = {
-    members = [ toonn ];
-    githubTeams = [ "darwin-maintainers" ];
-    scope = "Maintain Darwin compatibility of packages and Darwin-only packages.";
+    members = [
+      emily
+      reckenrode
+      toonn
+    ];
+    githubTeams = [ "darwin-core" ];
+    scope = "Maintain core platform support and packages for macOS and other Apple platforms.";
     shortName = "Darwin";
     enableFeatureFreezePing = true;
   };

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

@@ -29,6 +29,8 @@
 
 - PostgreSQL now defaults to major version 16.
 
+- GNOME has been updated to version 47. Refer to the [release notes](https://release.gnome.org/47/) for more details.
+
 - `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/).
   This release also deprecates some configuration keys, which are likely to be removed in future version 5.0, but they are still supported and expected to be working in the current version.
 
@@ -42,6 +44,8 @@
   Users can use it by `services.displayManager.ly.enable` and config it by
   `services.displayManager.ly.settings` to generate `/etc/ly/config.ini`
 
+- `srcOnly` was rewritten to be more readable, have additional warnings in the event that something is probably wrong, use the `stdenv` provided by the derivation, and Noogle-compatible documentation was added.
+
 - The default sound server for most graphical sessions has been switched from PulseAudio to PipeWire.
   Users that want to keep PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`.
   There is currently no plan to fully deprecate and remove PulseAudio, however, PipeWire should generally be preferred for new installs.
@@ -221,7 +225,8 @@
 
 - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
 
-- `deno` has been updated to v2 which has breaking changes. Upstream will be abandoning v1 soon but for now you can use `deno_1` if you are yet to migrate (will be removed prior to cutting a final 24.11 release).
+- `deno` has been updated to Deno 2, which has breaking changes.
+  See the [migration guide](https://docs.deno.com/runtime/reference/migration_guide/) for details.
 
 - `gogs` has been removed. Upstream development has stalled and it has several
   [critical vulnerabilities](https://github.com/gogs/gogs/issues/7777) that weren't addressed
@@ -294,6 +299,10 @@
 - The `mautrix-signal` module was adapted to incorporate the configuration rearrangement that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work.
   In case you want to update your configuration make sure to check the NixOS manual.
 
+- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver.
+
+- `postgresql` no longer accepts the `enableSystemd` override. Use `systemdSupport` instead.
+
 - The dhcpcd service (`networking.useDHCP`) has been hardened and now runs exclusively as the "dhcpcd" user.
   Users that were relying on the root privileges in `networking.dhcpcd.runHook` will have to write specific [sudo](security.sudo.extraRules) or [polkit](security.polkit.extraConfig) rules to allow dhcpcd to perform privileged actions.
 
@@ -603,7 +612,7 @@
 - Minimal installer ISOs are no longer built on the small channel.
   Please obtain installer images from the full release channels.
 
-- The default FFmpeg version is now 7, and FFmpeg 5 has been removed.
+- The default FFmpeg version is now 7.1, and FFmpeg 5 has been removed.
   Please prefer using the package variants without a version suffix,
   or pin FFmpeg 6 or 4 if necessary for compatibility.
   Note that we keep old versions around only as required

nixos/modules/module-list.nix

@@ -519,10 +519,10 @@
   ./services/desktops/gnome/gnome-remote-desktop.nix
   ./services/desktops/gnome/gnome-settings-daemon.nix
   ./services/desktops/gnome/gnome-user-share.nix
+  ./services/desktops/gnome/localsearch.nix
   ./services/desktops/gnome/rygel.nix
   ./services/desktops/gnome/sushi.nix
-  ./services/desktops/gnome/tracker-miners.nix
-  ./services/desktops/gnome/tracker.nix
+  ./services/desktops/gnome/tinysparql.nix
   ./services/desktops/gsignond.nix
   ./services/desktops/gvfs.nix
   ./services/desktops/malcontent.nix

nixos/modules/security/wrappers/default.nix

@@ -249,8 +249,8 @@ in
           };
       in
       { # These are mount related wrappers that require the +s permission.
-        fusermount  = mkSetuidRoot "${pkgs.fuse}/bin/fusermount";
-        fusermount3 = mkSetuidRoot "${pkgs.fuse3}/bin/fusermount3";
+        fusermount  = mkSetuidRoot "${lib.getBin pkgs.fuse}/bin/fusermount";
+        fusermount3 = mkSetuidRoot "${lib.getBin pkgs.fuse3}/bin/fusermount3";
         mount  = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
         umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
       };

nixos/modules/services/desktops/gnome/localsearch.nix

@@ -0,0 +1,50 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  meta = {
+    maintainers = lib.teams.gnome.members;
+  };
+
+  imports = [
+    (lib.mkRenamedOptionModule
+      [
+        "services"
+        "gnome"
+        "tracker-miners"
+        "enable"
+      ]
+      [
+        "services"
+        "gnome"
+        "localsearch"
+        "enable"
+      ]
+    )
+  ];
+
+  options = {
+    services.gnome.localsearch = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = ''
+          Whether to enable LocalSearch, indexing services for TinySPARQL
+          search engine and metadata storage system.
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf config.services.gnome.localsearch.enable {
+    environment.systemPackages = [ pkgs.localsearch ];
+
+    services.dbus.packages = [ pkgs.localsearch ];
+
+    systemd.packages = [ pkgs.localsearch ];
+  };
+}

nixos/modules/services/desktops/gnome/tinysparql.nix

@@ -0,0 +1,66 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.services.gnome.tinysparql;
+in
+{
+  meta = {
+    maintainers = lib.teams.gnome.members;
+  };
+
+  imports = [
+    (lib.mkRemovedOptionModule
+      [
+        "services"
+        "gnome"
+        "tracker"
+        "subcommandPackages"
+      ]
+      ''
+        This option is broken since 3.7 and since 3.8 tracker (tinysparql) no longer expect
+        CLI to be extended by external projects, note that tracker-miners (localsearch) now
+        provides its own CLI tool.
+      ''
+    )
+    (lib.mkRenamedOptionModule
+      [
+        "services"
+        "gnome"
+        "tracker"
+        "enable"
+      ]
+      [
+        "services"
+        "gnome"
+        "tinysparql"
+        "enable"
+      ]
+    )
+  ];
+
+  options = {
+    services.gnome.tinysparql = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = ''
+          Whether to enable TinySPARQL services, a search engine,
+          search tool and metadata storage system.
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.tinysparql ];
+
+    services.dbus.packages = [ pkgs.tinysparql ];
+
+    systemd.packages = [ pkgs.tinysparql ];
+  };
+}