Unverified Commit a6ffc120 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 009de066 f6e560e4

maintainers/maintainer-list.nix

+19 −0
Original line number Diff line number Diff line
@@ -6472,6 +6472,13 @@ 
    name = "Duncan Dean";

    keys = [ { fingerprint = "9484 44FC E03B 05BA 5AB0  591E C37B 1C1D 44C7 86EE"; } ];

  };

  DutchGerman = {

    name = "Stefan Visser";

    email = "stefan.visser@apm-ecampus.de";

    github = "DutchGerman";

    githubId = 60694691;

    keys = [ { fingerprint = "A7C9 3DC7 E891 046A 980F  2063 F222 A13B 2053 27A5"; } ];

  };

  dvaerum = {

    email = "nixpkgs-maintainer@varum.dk";

    github = "dvaerum";
@@ -18700,6 +18707,12 @@ 
    github = "pladypus";

    githubId = 56337621;

  };

  plamper = {

    name = "Felix Plamper";

    email = "felix.plamper@tuta.io";

    github = "plamper";

    githubId = 59016721;

  };

  plchldr = {

    email = "mail@oddco.de";

    github = "plchldr";
@@ -18879,6 +18892,12 @@ 
    githubId = 4201956;

    name = "pongo1231";

  };

  poopsicles = {

    name = "Fumnanya";

    email = "fmowete@outlook.com";

    github = "poopsicles";

    githubId = 87488715;

  };

  PopeRigby = {

    name = "PopeRigby";

    github = "poperigby";

maintainers/scripts/update.nix

+15 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
  keep-going ? null,

  commit ? null,

  skip-prompt ? null,

  order ? null,

}:



let
@@ -217,6 +218,18 @@ let 
    to skip prompt:



        --argstr skip-prompt true



    By default, the updater will update the packages in arbitrary order. Alternately, you can force a specific order based on the packages’ dependency relations:



        - Reverse topological order (e.g. {"gnome-text-editor", "gimp"}, {"gtk3", "gtk4"}, {"glib"}) is useful when you want checkout each commit one by one to build each package individually but some of the packages to be updated would cause a mass rebuild for the others. Of course, this requires that none of the updated dependents require a new version of the dependency.



            --argstr order reverse-topological



        - Topological order (e.g. {"glib"}, {"gtk3", "gtk4"}, {"gnome-text-editor", "gimp"}) is useful when the updated dependents require a new version of updated dependency.



            --argstr order topological



    Note that sorting requires instantiating each package and then querying Nix store for requisites so it will be pretty slow with large number of packages.

  '';



  # Transform a matched package into an object for update.py.
@@ -241,7 +254,8 @@ let 
    lib.optional (max-workers != null) "--max-workers=${max-workers}"

    ++ lib.optional (keep-going == "true") "--keep-going"

    ++ lib.optional (commit == "true") "--commit"

    ++ lib.optional (skip-prompt == "true") "--skip-prompt";

    ++ lib.optional (skip-prompt == "true") "--skip-prompt"

    ++ lib.optional (order != null) "--order=${order}";



  args = [ packagesJson ] ++ optionalArgs;

maintainers/scripts/update.py

+437 −90

File changed.

Preview size limit exceeded, changes collapsed.

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ with lib.maintainers; 
    # Edits to this list should only be done by an already existing member.

    members = [

      wolfgangwalther

      DutchGerman

    ];

  };

nixos/doc/manual/configuration/x-windows.chapter.md

+48 −0
Original line number Diff line number Diff line
@@ -114,6 +114,54 @@ using lightdm for a user `alice`: 
}

```



## Running X without a display manager  {#sec-x11-startx}



It is possible to avoid a display manager entirely and starting the X server

manually from a virtual terminal. Add to your configuration

```nix

{

  services.xserver.displayManager.startx = {

    enable = true;

    generateScript = true;

  };

}

```

then you can start the X server with the `startx` command.



The second option will generate a base `xinitrc` script that will run your

window manager and set up the systemd user session.

You can extend the script using the [extraCommands](#opt-services.xserver.displayManager.startx.extraCommands) for example:

```nix

{

  services.xserver.displayManager.startx = {

    generateScript = true;

    extraCommands = ''

      xrdb -load .Xresources

      xsetroot -solid '#666661'

      xsetroot -cursor_name left_ptr

    '';

  };

}

```

or, alternatively, you can write your own from scratch in `~/.xinitrc`.



In this case, remember you're responsible for starting the window manager, for

example

```shell

sxhkd &

bspwm &

```

and if you have enabled some systemd user service, you will probably want to

also add these lines too:

```shell

# import required env variables from the current shell

systemctl --user import-environment DISPLAY XDG_SESSION_ID

# start all graphical user services

systemctl --user start nixos-fake-graphical-session.target

# start the user dbus daemon

dbus-daemon --session --address="unix:path=/run/user/$(id -u)/bus" &

```



## Intel Graphics drivers {#sec-x11--graphics-cards-intel}



The default and recommended driver for Intel Graphics in X.org is `modesetting`