Merge remote-tracking branch 'origin/staging-next' into staging

.github/workflows/periodic-merge-24h.yml

@@ -35,10 +35,6 @@ jobs:
         pairs:
           - from: master
             into: haskell-updates
-          - from: release-24.05
-            into: staging-next-24.05
-          - from: staging-next-24.05
-            into: staging-24.05
           - from: release-24.11
             into: staging-next-24.11
           - from: staging-next-24.11

doc/doc-support/lib-function-docs.nix

@@ -94,17 +94,16 @@
 stdenvNoCC.mkDerivation {
   name = "nixpkgs-lib-docs";
 
-  src = lib.fileset.toSource {
-    root = ../..;
-    fileset = ../../lib;
-  };
+  src = ../../lib;
 
   nativeBuildInputs = [
     nixdoc
     nix
   ];
 
   installPhase = ''
+    cd ..
+
     export NIX_STATE_DIR=$(mktemp -d)
     nix-instantiate --eval --strict --json ${./lib-function-locations.nix} \
       --arg nixpkgsPath "./." \

doc/doc-support/package.nix

@@ -25,16 +25,22 @@ stdenvNoCC.mkDerivation (
 
     nativeBuildInputs = [ nixos-render-docs ];
 
-    src = lib.fileset.toSource {
-      root = ../.;
-      fileset = lib.fileset.unions [
-        (lib.fileset.fileFilter (file: file.hasExt "md" || file.hasExt "md.in") ../.)
-        ../style.css
-        ../anchor-use.js
-        ../anchor.min.js
-        ../manpage-urls.json
-        ../redirects.json
-      ];
+    src = lib.cleanSourceWith {
+      src = ../.;
+      filter =
+        path: type:
+        type == "directory"
+        || lib.hasSuffix ".md" path
+        || lib.hasSuffix ".md.in" path
+        || lib.elem path (
+          map toString [
+            ../style.css
+            ../anchor-use.js
+            ../anchor.min.js
+            ../manpage-urls.json
+            ../redirects.json
+          ]
+        );
     };
 
     postPatch = ''

lib/trivial.nix

@@ -416,7 +416,7 @@ in {
   */
   oldestSupportedRelease =
     # Update on master only. Do not backport.
-    2405;
+    2411;
 
   /**
     Whether a feature is supported in all supported releases (at the time of

nixos/lib/test-driver/default.nix

@@ -14,22 +14,12 @@
   extraPythonPackages ? (_: [ ]),
   nixosTests,
 }:
-let
-  fs = lib.fileset;
-in
 python3Packages.buildPythonApplication {
   pname = "nixos-test-driver";
   version = "1.1";
   pyproject = true;
 
-  src = fs.toSource {
-    root = ./.;
-    fileset = fs.unions [
-      ./pyproject.toml
-      ./test_driver
-      ./extract-docstrings.py
-    ];
-  };
+  src = ./src;
 
   build-system = with python3Packages; [
     setuptools

nixos/lib/test-driver/nixos-test-driver-docstrings.nix

@@ -11,6 +11,6 @@ in
 
 runCommand "nixos-test-driver-docstrings" env ''
   mkdir $out
-  python3 ${./extract-docstrings.py} ${./test_driver/machine.py} \
+  python3 ${./src/extract-docstrings.py} ${./src/test_driver/machine.py} \
     > $out/machine-methods.md
 ''

nixos/modules/services/continuous-integration/hydra/default.nix

@@ -515,12 +515,12 @@ in
           ''
             set -eou pipefail
             compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf)
-            if [[ $compression == "" ]]; then
-              compression="bzip2"
+            if [[ $compression == "" || $compression == bzip2 ]]; then
+              compressionCmd=(bzip2)
             elif [[ $compression == zstd ]]; then
-              compression="zstd --rm"
+              compressionCmd=(zstd --rm)
             fi
-            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "$compression" --force --quiet
+            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "''${compressionCmd[@]}" --force --quiet
           '';
         startAt = "Sun 01:45";
         serviceConfig.Slice = "system-hydra.slice";

nixos/modules/services/x11/colord.nix

@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.colord;
@@ -14,12 +17,12 @@ in
   options = {
 
     services.colord = {
-      enable = lib.mkEnableOption "colord, the color management daemon";
+      enable = mkEnableOption "colord, the color management daemon";
     };
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.colord ];
 

nixos/modules/services/x11/desktop-managers/cde.nix

@@ -4,16 +4,19 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.cde;
 in
 {
   options.services.xserver.desktopManager.cde = {
-    enable = lib.mkEnableOption "Common Desktop Environment";
+    enable = mkEnableOption "Common Desktop Environment";
 
-    extraPackages = lib.mkOption {
-      type = with lib.types; listOf package;
+    extraPackages = mkOption {
+      type = with types; listOf package;
       default = with pkgs.xorg; [
         xclock
         bitmap
@@ -26,7 +29,7 @@ in
         xwd
         xwud
       ];
-      defaultText = lib.literalExpression ''
+      defaultText = literalExpression ''
         with pkgs.xorg; [
           xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud
         ]
@@ -37,7 +40,7 @@ in
     };
   };
 
-  config = lib.mkIf (xcfg.enable && cfg.enable) {
+  config = mkIf (xcfg.enable && cfg.enable) {
     environment.systemPackages = cfg.extraPackages;
 
     services.rpcbind.enable = true;

nixos/modules/services/x11/desktop-managers/cinnamon.nix

@@ -1,4 +1,7 @@
 { config, lib, pkgs, utils, ... }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.desktopManager.cinnamon;
@@ -15,16 +18,16 @@ in
 {
   options = {
     services.cinnamon = {
-      apps.enable = lib.mkEnableOption "Cinnamon default applications";
+      apps.enable = mkEnableOption "Cinnamon default applications";
     };
 
     services.xserver.desktopManager.cinnamon = {
-      enable = lib.mkEnableOption "the cinnamon desktop manager";
+      enable = mkEnableOption "the cinnamon desktop manager";
 
-      sessionPath = lib.mkOption {
+      sessionPath = mkOption {
         default = [];
-        type = lib.types.listOf lib.types.package;
-        example = lib.literalExpression "[ pkgs.gpaste ]";
+        type = types.listOf types.package;
+        example = literalExpression "[ pkgs.gpaste ]";
         description = ''
           Additional list of packages to be added to the session search path.
           Useful for GSettings-conditional autostart.
@@ -33,53 +36,53 @@ in
         '';
       };
 
-      extraGSettingsOverrides = lib.mkOption {
+      extraGSettingsOverrides = mkOption {
         default = "";
-        type = lib.types.lines;
+        type = types.lines;
         description = "Additional gsettings overrides.";
       };
 
-      extraGSettingsOverridePackages = lib.mkOption {
+      extraGSettingsOverridePackages = mkOption {
         default = [];
-        type = lib.types.listOf lib.types.path;
+        type = types.listOf types.path;
         description = "List of packages for which gsettings are overridden.";
       };
     };
 
-    environment.cinnamon.excludePackages = lib.mkOption {
+    environment.cinnamon.excludePackages = mkOption {
       default = [];
-      example = lib.literalExpression "[ pkgs.blueman ]";
-      type = lib.types.listOf lib.types.package;
+      example = literalExpression "[ pkgs.blueman ]";
+      type = types.listOf types.package;
       description = "Which packages cinnamon should exclude from the default environment";
     };
 
   };
 
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
+  config = mkMerge [
+    (mkIf cfg.enable {
       services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];
 
       services.xserver.displayManager.lightdm.greeters.slick = {
-        enable = lib.mkDefault true;
+        enable = mkDefault true;
 
         # Taken from mint-artwork.gschema.override
-        theme = lib.mkIf (notExcluded pkgs.mint-themes) {
-          name = lib.mkDefault "Mint-Y-Aqua";
-          package = lib.mkDefault pkgs.mint-themes;
+        theme = mkIf (notExcluded pkgs.mint-themes) {
+          name = mkDefault "Mint-Y-Aqua";
+          package = mkDefault pkgs.mint-themes;
         };
-        iconTheme = lib.mkIf (notExcluded pkgs.mint-y-icons) {
-          name = lib.mkDefault "Mint-Y-Sand";
-          package = lib.mkDefault pkgs.mint-y-icons;
+        iconTheme = mkIf (notExcluded pkgs.mint-y-icons) {
+          name = mkDefault "Mint-Y-Sand";
+          package = mkDefault pkgs.mint-y-icons;
         };
-        cursorTheme = lib.mkIf (notExcluded pkgs.mint-cursor-themes) {
-          name = lib.mkDefault "Bibata-Modern-Classic";
-          package = lib.mkDefault pkgs.mint-cursor-themes;
+        cursorTheme = mkIf (notExcluded pkgs.mint-cursor-themes) {
+          name = mkDefault "Bibata-Modern-Classic";
+          package = mkDefault pkgs.mint-cursor-themes;
         };
       };
 
       # Have to take care of GDM + Cinnamon on Wayland users
       environment.extraInit = ''
-        ${lib.concatMapStrings (p: ''
+        ${concatMapStrings (p: ''
           if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
             export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
           fi
@@ -92,30 +95,30 @@ in
       '';
 
       # Default services
-      services.blueman.enable = lib.mkDefault (notExcluded pkgs.blueman);
-      hardware.bluetooth.enable = lib.mkDefault true;
+      services.blueman.enable = mkDefault (notExcluded pkgs.blueman);
+      hardware.bluetooth.enable = mkDefault true;
       security.polkit.enable = true;
       services.accounts-daemon.enable = true;
-      services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));
+      services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.dbus.packages = with pkgs; [
         cinnamon-common
         cinnamon-screensaver
         nemo-with-extensions
         xapp
       ];
-      services.cinnamon.apps.enable = lib.mkDefault true;
+      services.cinnamon.apps.enable = mkDefault true;
       services.gnome.evolution-data-server.enable = true;
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gvfs.enable = true;
-      services.power-profiles-daemon.enable = lib.mkDefault true;
-      services.switcherooControl.enable = lib.mkDefault true; # xapp-gpu-offload-helper
-      services.touchegg.enable = lib.mkDefault true;
+      services.power-profiles-daemon.enable = mkDefault true;
+      services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper
+      services.touchegg.enable = mkDefault true;
       services.udisks2.enable = true;
-      services.upower.enable = lib.mkDefault config.powerManagement.enable;
-      services.libinput.enable = lib.mkDefault true;
+      services.upower.enable = mkDefault config.powerManagement.enable;
+      services.libinput.enable = mkDefault true;
       services.xserver.updateDbusEnvironment = true;
-      networking.networkmanager.enable = lib.mkDefault true;
+      networking.networkmanager.enable = mkDefault true;
 
       # Enable colord server
       services.colord.enable = true;
@@ -201,9 +204,9 @@ in
         pkgs.xdg-desktop-portal-gtk
       ];
 
-      services.orca.enable = lib.mkDefault (notExcluded pkgs.orca);
+      services.orca.enable = mkDefault (notExcluded pkgs.orca);
 
-      xdg.portal.configPackages = lib.mkDefault [ pkgs.cinnamon-common ];
+      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
@@ -214,8 +217,8 @@ in
       ];
 
       # Shell integration for VTE terminals
-      programs.bash.vteIntegration = lib.mkDefault true;
-      programs.zsh.vteIntegration = lib.mkDefault true;
+      programs.bash.vteIntegration = mkDefault true;
+      programs.zsh.vteIntegration = mkDefault true;
 
       # Default Fonts
       fonts.packages = with pkgs; [
@@ -224,10 +227,10 @@ in
       ];
     })
 
-    (lib.mkIf serviceCfg.apps.enable {
-      programs.gnome-disks.enable = lib.mkDefault (notExcluded pkgs.gnome-disk-utility);
-      programs.gnome-terminal.enable = lib.mkDefault (notExcluded pkgs.gnome-terminal);
-      programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller);
+    (mkIf serviceCfg.apps.enable {
+      programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility);
+      programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
+      programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
 
       environment.systemPackages = with pkgs; utils.removePackagesByName [
         # cinnamon team apps