Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f2b3bbe44e4f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0a7e258012b6
Choose a head ref

Commits on Jul 9, 2018

  1. nixos/xserver: Implement configuration of NVIDIA Optimus via PRIME

    This adds configuration options which automate the configuration of NVIDIA Optimus using PRIME. This allows using the NVIDIA proprietary driver on Optimus laptops, in order to render using the NVIDIA GPU while outputting to displays connected only to the integrated Intel GPU. It also adds an option for enabling kernel modesetting for the NVIDIA driver (via a kernel command line flag); this is particularly useful together with Optimus/PRIME because it fixes tearing on PRIME-connected screens.
    
    The user still needs to enable the Optimus/PRIME feature and specify the bus IDs of the Intel and NVIDIA GPUs, but this is still much easier for users and more reliable. The implementation handles both the X configuration file as well as getting display managers to run certain necessary `xrandr` commands just after X has started.
    
    Configuration of commands run after X startup is done using a new configuration option `services.xserver.displayManager.setupCommands`. Support for this option is implemented for LightDM, GDM and SDDM; all of these have been tested with this feature including logging into a Plasma session.
    
    Note: support of `setupCommands` for GDM is implemented by making GDM run the session executable via a wrapper; the wrapper will run the `setupCommands` before execing. This seemed like the simplest and most reliable approach, and solves running these commands both for GDM's X server and user X servers (GDM starts separate X servers for itself and user sessions). An alternative approach would be with autostart files but that seems harder to set up and less reliable.
    
    Note that some simple features for X configuration file generation (in `xserver.nix`) are added which are used in the implementation:
    - `services.xserver.extraConfig`: Allows adding arbitrary new sections. This is used to add the Device section for the Intel GPU.
    - `deviceSection` and `screenSection` within `services.xserver.drivers`. This allows the nvidia configuration module to add additional contents into the `Device` and `Screen` sections of the "nvidia" driver, and not into such sections for other drivers that may be enabled.
    ambrop72 committed Jul 9, 2018
    Copy the full SHA
    f261537 View commit details

Commits on Sep 26, 2018

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    32f3e45 View commit details

Commits on Oct 1, 2018

  1. bitlbee: disable gcov

    Code coverage reports is not useful at all for users.
    This is a feature for developer.
    Mic92 committed Oct 1, 2018
    Copy the full SHA
    14cc9a2 View commit details
  2. Copy the full SHA
    d334c1c View commit details

Commits on Oct 3, 2018

  1. fswatch: 1.12.0 -> 1.13.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/fswatch/versions
    r-ryantm committed Oct 3, 2018
    Copy the full SHA
    e7c2c57 View commit details
  2. disorderfs: 0.5.3 -> 0.5.4

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/disorderfs/versions
    r-ryantm committed Oct 3, 2018
    Copy the full SHA
    f4c968e View commit details

Commits on Oct 4, 2018

  1. camomile: 0.8.7 -> 1.0.1

    magnetophon committed Oct 4, 2018
    Copy the full SHA
    3f97539 View commit details
  2. Copy the full SHA
    d10a84e View commit details
  3. Copy the full SHA
    2c0d56f View commit details
  4. doc: installing-usb make macOS note a note.

    While it seemingly brings more attention to the macOS notes with the
    default docbook template, it better represents which parts of the
    section are about macOS, and which parts are simply in the flow of the
    text; otherwise the last paragraph may be lost into the details for
    macOS.
    samueldr committed Oct 4, 2018
    Copy the full SHA
    8192fcd View commit details
  5. doc: installing-usb: removes notes about unetbootin.

    They are known to cause more issues than solving issues; futhermore
    using `dd` should work everywhere without fail.
    samueldr committed Oct 4, 2018
    Copy the full SHA
    8467dc8 View commit details
  6. doc: Reviews partitioning instructions to use parted.

    The tests in <nixos/tests/installer.nix> are using `parted`, so they are
    bound to be better tested than `fdisk`.
    
    This is brought on by a couple issues, plus reports on IRC that the
    `fdisk` instructions didn't work as expected.
    
     * #39354
     * #46309
     * #39942
     * #45478
    
    Care was taken so that the other documented steps did not need changes.
    
    In all this kerfufle, a slight re-organization of the Chapter has been
    made, allowing better deep linking.
    samueldr committed Oct 4, 2018
    Copy the full SHA
    6cfbf40 View commit details
  7. Merge pull request #47697 from samueldr/fix/47602-new-partitioning-steps

    Manual: reviews partitioning steps
    grahamc authored Oct 4, 2018
    Copy the full SHA
    a8878f4 View commit details
  8. Copy the full SHA
    ebdc294 View commit details
  9. Copy the full SHA
    f058c23 View commit details
  10. Copy the full SHA
    06961cc View commit details
  11. Merge pull request #42846 from ambrop72/optimus-prime-config-master

    nixos/xserver: Implement configuration of NVIDIA Optimus via PRIME
    matthewbauer authored Oct 4, 2018
    Copy the full SHA
    1ffe83c View commit details
  12. Merge pull request #47382 from magnetophon/zita-njbridge

    zita-njbridge: init at 0.4.4
    peterhoeg authored Oct 4, 2018
    Copy the full SHA
    3f81cb1 View commit details
  13. khard: fixup zsh autocompletion

    I introduced an error in, install -D will create the folders until the last component excluded
    so I needed to add the filename for it to create _khard
    NixOS/nixpkgs#46515
    teto committed Oct 4, 2018
    Copy the full SHA
    e30a2b0 View commit details
  14. girara: 0.3.0 -> 0.3.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/girara/versions
    r-ryantm authored and garbas committed Oct 4, 2018
    Copy the full SHA
    0260116 View commit details
  15. haproxy: 1.8.13 -> 1.8.14

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/haproxy/versions
    r-ryantm authored and garbas committed Oct 4, 2018
    Copy the full SHA
    365dad8 View commit details
  16. bubblewrap: 0.3.0 -> 0.3.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/bubblewrap/versions
    r-ryantm authored and FRidh committed Oct 4, 2018
    Copy the full SHA
    06956fa View commit details
  17. Merge pull request #47854 from teto/khard_zsh

    khard: fixup zsh autocompletion
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    665da39 View commit details
  18. Merge pull request #47838 from peterhoeg/f/plasma

    kcheckpass: it is in kscreenlocker, not plasma-workspace
    peterhoeg authored Oct 4, 2018
    Copy the full SHA
    6b4d336 View commit details
  19. Merge pull request #47833 from magnetophon/camomile

    camomile: 0.8.7 -> 1.0.1
    srhb authored Oct 4, 2018
    Copy the full SHA
    07c24ee View commit details
  20. Merge pull request #47815 from r-ryantm/auto-update/disorderfs

    disorderfs: 0.5.3 -> 0.5.4
    pSub authored Oct 4, 2018
    Copy the full SHA
    ebcbef1 View commit details
  21. Merge pull request #47800 from r-ryantm/auto-update/fswatch

    fswatch: 1.12.0 -> 1.13.0
    pSub authored Oct 4, 2018
    Copy the full SHA
    3cb5b46 View commit details
  22. Copy the full SHA
    4569dd7 View commit details
  23. Merge pull request #47603 from Mic92/bitlbee

    nixos/bitlbee: add pam option
    pSub authored Oct 4, 2018
    Copy the full SHA
    b9e7935 View commit details
  24. Copy the full SHA
    2368d23 View commit details
  25. jackett: 0.10.250 -> 0.10.258

    edwtjo committed Oct 4, 2018
    Copy the full SHA
    914c341 View commit details
  26. Copy the full SHA
    e4f4e9f View commit details
  27. elan: 0.5.0 -> 0.7.1

    gebner committed Oct 4, 2018
    Copy the full SHA
    0a7e258 View commit details
Showing with 780 additions and 411 deletions.
  1. +1 −1 nixos/doc/manual/Makefile
  2. +10 −38 nixos/doc/manual/installation/installing-usb.xml
  3. +409 −298 nixos/doc/manual/installation/installing.xml
  4. +116 −4 nixos/modules/hardware/video/nvidia.nix
  5. +28 −13 nixos/modules/services/networking/bitlbee.nix
  6. +1 −1 nixos/modules/services/x11/desktop-managers/plasma5.nix
  7. +11 −0 nixos/modules/services/x11/display-managers/default.nix
  8. +12 −0 nixos/modules/services/x11/display-managers/gdm.nix
  9. +6 −0 nixos/modules/services/x11/display-managers/lightdm.nix
  10. +3 −1 nixos/modules/services/x11/display-managers/sddm.nix
  11. +10 −0 nixos/modules/services/x11/xserver.nix
  12. +32 −0 pkgs/applications/audio/zita-njbridge/default.nix
  13. +2 −2 pkgs/applications/misc/girara/default.nix
  14. +1 −1 pkgs/applications/misc/khard/default.nix
  15. +7 −0 pkgs/applications/networking/cluster/terraform-providers/data.nix
  16. +3 −0 pkgs/applications/networking/cluster/terraform-providers/providers.txt
  17. +12 −6 pkgs/applications/networking/instant-messengers/bitlbee/default.nix
  18. +3 −3 pkgs/applications/science/logic/elan/default.nix
  19. +15 −1 pkgs/desktops/gnome-3/core/gdm/default.nix
  20. +31 −0 pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
  21. +0 −17 pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
  22. +40 −0 pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
  23. +3 −3 pkgs/development/ocaml-modules/camomile/default.nix
  24. +2 −2 pkgs/development/tools/misc/fswatch/default.nix
  25. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  26. +2 −2 pkgs/os-specific/linux/kernel/linux-4.18.nix
  27. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  28. +2 −2 pkgs/servers/jackett/default.nix
  29. +2 −2 pkgs/servers/lidarr/default.nix
  30. +2 −2 pkgs/tools/admin/bubblewrap/default.nix
  31. +2 −2 pkgs/tools/filesystems/disorderfs/default.nix
  32. +2 −2 pkgs/tools/networking/haproxy/default.nix
  33. +4 −4 pkgs/tools/networking/pykms/default.nix
  34. +2 −0 pkgs/top-level/all-packages.nix
2 changes: 1 addition & 1 deletion nixos/doc/manual/Makefile
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ all: manual-combined.xml format
.PHONY: debug
debug: generated manual-combined.xml

manual-combined.xml: generated *.xml
manual-combined.xml: generated *.xml **/*.xml
rm -f ./manual-combined.xml
nix-shell --packages xmloscopy \
--run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml"
48 changes: 10 additions & 38 deletions nixos/doc/manual/installation/installing-usb.xml
Original file line number Diff line number Diff line change
@@ -9,13 +9,12 @@
For systems without CD drive, the NixOS live CD can be booted from a USB
stick. You can use the <command>dd</command> utility to write the image:
<command>dd if=<replaceable>path-to-image</replaceable>
of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying
of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying
the correct drive; you can use the <command>lsblk</command> command to get a
list of block devices.
</para>

<para>
On macOS:
<note>
<title>On macOS</title>
<para>
<programlisting>
$ diskutil list
[..]
@@ -26,43 +25,16 @@ $ diskutil unmountDisk diskN
Unmount of all volumes on diskN was successful
$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
</programlisting>
Using the 'raw' <command>rdiskN</command> device instead of
<command>diskN</command> completes in minutes instead of hours. After
<command>dd</command> completes, a GUI dialog "The disk you inserted was not
readable by this computer" will pop up, which can be ignored.
Using the 'raw' <command>rdiskN</command> device instead of
<command>diskN</command> completes in minutes instead of hours. After
<command>dd</command> completes, a GUI dialog "The disk you inserted was
not readable by this computer" will pop up, which can be ignored.
</para>
</note>
</para>

<para>
The <command>dd</command> utility will write the image verbatim to the drive,
making it the recommended option for both UEFI and non-UEFI installations.
For non-UEFI installations, you can alternatively use
<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>. If
you cannot use <command>dd</command> for a UEFI installation, you can also
mount the ISO, copy its contents verbatim to your drive, then either:
<itemizedlist>
<listitem>
<para>
Change the label of the disk partition to the label of the ISO (visible
with the blkid command), or
</para>
</listitem>
<listitem>
<para>
Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive
and change the <literal>root=</literal> field in the
<literal>options</literal> line to point to your drive (see the
documentation on <literal>root=</literal> in
<link xlink:href="https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt">
the kernel documentation</link> for more details).
</para>
</listitem>
<listitem>
<para>
If you want to load the contents of the ISO to ram after bootin (So you
can remove the stick after bootup) you can append the parameter
<literal>copytoram</literal> to the <literal>options</literal> field.
</para>
</listitem>
</itemizedlist>
</para>
</section>
Loading