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

nixos/doc/manual/installation/changing-config.chapter.md

@@ -5,12 +5,13 @@ configuration of your machine. Whenever you've [changed
 something](#ch-configuration) in that file, you should do
 
 ```ShellSession
-# nixos-rebuild switch
+$ nixos-rebuild switch --use-remote-sudo
 ```
 
-to build the new configuration, make it the default configuration for
+to build the new configuration as your current user, and as the root user,
-booting, and try to realise the configuration in the running system
+make it the default configuration for booting. `switch` will also try to
-(e.g., by restarting system services).
+realise the configuration in the running system (e.g., by restarting system
+services).
 
 ::: {.warning}
 This command doesn't start/stop [user services](#opt-systemd.user.services)
@@ -19,14 +20,23 @@ user services.
 :::
 
 ::: {.warning}
-These commands must be executed as root, so you should either run them
+Applying a configuration is an action that must be done by the root user, so the
-from a root shell or by prefixing them with `sudo -i`.
+`switch`, `boot` and `test` commands should be ran with the `--use-remote-sudo`
+flag. Despite its odd name, this flag runs the activation script with elevated
+permissions, regardless of whether or not the target system is remote, without
+affecting the other stages of the `nixos-rebuild` call. This allows unprivileged
+users to rebuild the system and only elevate their permissions when necessary.
+
+Alternatively, one can run the whole command as root while preserving user
+environment variables by prefixing the command with `sudo -E`. However, this
+method may create root-owned files in `$HOME/.cache` if Nix decides to use the
+cache during evaluation.
 :::
 
 You can also do
 
 ```ShellSession
-# nixos-rebuild test
+$ nixos-rebuild test --use-remote-sudo
 ```
 
 to build the configuration and switch the running system to it, but
@@ -37,7 +47,7 @@ configuration.
 There is also
 
 ```ShellSession
-# nixos-rebuild boot
+$ nixos-rebuild boot --use-remote-sudo
 ```
 
 to build the configuration and make it the boot default, but not switch
@@ -47,7 +57,7 @@ You can make your configuration show up in a different submenu of the
 GRUB 2 boot screen by giving it a different *profile name*, e.g.
 
 ```ShellSession
-# nixos-rebuild switch -p test
+$ nixos-rebuild switch -p test --use-remote-sudo
 ```
 
 which causes the new configuration (and previous ones created using
@@ -58,7 +68,7 @@ configurations.
 A repl, or read-eval-print loop, is also available. You can inspect your configuration and use the Nix language with
 
 ```ShellSession
-# nixos-rebuild repl
+$ nixos-rebuild repl
 ```
 
 Your configuration is loaded into the `config` variable. Use tab for autocompletion, use the `:r` command to reload the configuration files. See `:?` or [`nix repl` in the Nix manual](https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-repl.html) to learn more.

pkgs/applications/editors/emacs/default.nix

@@ -2,11 +2,8 @@
 
 lib.makeScope pkgs.newScope (self:
   let
-    gconf = pkgs.gnome2.GConf;
     inherit (self) callPackage;
     inheritedArgs = {
-      inherit gconf;
-
       inherit (pkgs.darwin) sigtool;
       inherit (pkgs.darwin.apple_sdk.frameworks)
         Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit

pkgs/applications/editors/emacs/make-emacs.nix

@@ -16,7 +16,6 @@
 , dbus
 , emacsPackagesFor
 , fetchpatch
-, gconf
 , gettext
 , giflib
 , glib-networking
@@ -73,7 +72,6 @@
 , withDbus ? stdenv.isLinux
 , withGTK2 ? false
 , withGTK3 ? withPgtk && !noGui
-, withGconf ? false
 , withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets)
 , withGpm ? stdenv.isLinux
 , withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
@@ -126,7 +124,6 @@ assert withAcl -> stdenv.isLinux;
 assert withAlsaLib -> stdenv.isLinux;
 assert withGTK2 -> !(withGTK3 || withPgtk);
 assert withGTK3 -> !withGTK2 || withPgtk;
-assert withGconf -> withX;
 assert withGpm -> stdenv.isLinux;
 assert withNS -> stdenv.isDarwin && !(withX || variant == "macport");
 assert withPgtk -> withGTK3 && !withX;
@@ -224,8 +221,6 @@ mkDerivation (finalAttrs: {
     jansson
     libxml2
     ncurses
-  ] ++ lib.optionals withGconf [
-    gconf
   ] ++ lib.optionals withAcl [
     acl
   ] ++ lib.optionals withAlsaLib [

pkgs/applications/terminal-emulators/terminator/default.nix

@@ -30,7 +30,6 @@ python3.pkgs.buildPythonApplication rec {
     gobject-introspection
     makeBinaryWrapper
     wrapGAppsHook3
-    python3.pkgs.pytest-runner
   ];
 
   buildInputs = [

pkgs/applications/version-management/gh/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.56.0";
+  version = "2.57.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-PDw2u+2hMiPmQe1lnJXnZk8JVsti/j7Nq5Uv3b7RIk4=";
+    hash = "sha256-HNr/HBt1EqbV+/dLCztucmeAqw3jLPOgQ0WLPxGDYgY=";
   };
 
-  vendorHash = "sha256-rMJWUm79/wBBdVvNdIQc7jqzxfDXphBvGYU3wD/BITk=";
+  vendorHash = "sha256-gPUEfdS4iEzMQGdUNKMmEGRug66NVcrV3zvmkoEsNGo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/ef/efibootmgr/package.nix

@@ -2,19 +2,26 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  pkg-config,
   efivar,
+  nix-update-script,
+  pkg-config,
   popt,
+  testers,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "efibootmgr";
   version = "18";
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   src = fetchFromGitHub {
     owner = "rhboot";
     repo = "efibootmgr";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-DYYQGALEn2+mRHgqCJsA7OQCF7xirIgQlWexZ9uoKcg=";
   };
 
@@ -32,12 +39,18 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "prefix=${placeholder "out"}" ];
 
+  passthru = {
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
     homepage = "https://github.com/rhboot/efibootmgr";
-    changelog = "https://github.com/rhboot/efibootmgr/releases/tag/${src.rev}";
+    changelog = "https://github.com/rhboot/efibootmgr/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "efibootmgr";
     platforms = lib.platforms.linux;
   };
-}
+})