From 4feb0a998adc60c1ff8a3e31b7a79455fe27f6d5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 14 Jan 2017 13:49:03 +0300 Subject: manual: mention needed options for IPv6 --- nixos/doc/manual/configuration/ipv6-config.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index bf86926f9bf5..6d9e0a164e9e 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -22,5 +22,25 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +As with IPv4 networking interfaces are automatically configured via +DHCPv6. You can configure an interface manually: + + +networking.interfaces.eth0.ip6 = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; + + + +For configuring a gateway, optionally with explicitly specified interface: + + +networking.defaultGateway6 = { + address = "fe00::1"; + interface = "enp0s3"; +} + + + +See for similar examples and additional information. + -- cgit 1.4.1 From 52c7e647ab81383c72117800b8cd5cd49bec9030 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 4 Feb 2017 14:48:11 +0300 Subject: postfix service: don't empty local_recipient_maps From Postfix documentation: With this setting, the Postfix SMTP server will not reject mail with "User unknown in local recipient table". Don't do this on systems that receive mail directly from the Internet. With today's worms and viruses, Postfix will become a backscatter source: it accepts mail for non-existent recipients and then tries to return that mail as "undeliverable" to the often forged sender address. --- nixos/doc/manual/release-notes/rl-1703.xml | 12 +++++++++++- nixos/modules/services/mail/postfix.nix | 2 -- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 09358f3af231..be6ad59ac5d7 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -46,6 +46,7 @@ following incompatible changes: for what those parameters represent. + ansible now defaults to ansible version 2 as version 1 @@ -54,6 +55,7 @@ following incompatible changes: vulnerability unpatched by upstream. + gnome alias has been removed along with @@ -116,7 +118,6 @@ following incompatible changes: - overridePackages function no longer exists. It is replaced by @@ -153,6 +154,15 @@ following incompatible changes: + + + local_recipient_maps is not set to empty value by + Postfix service. It's an insecure default as stated by Postfix + documentation. Those who want to retain this setting need to set it via + services.postfix.extraConfig. + + + diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index cdde41446224..caaa87b94d61 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -79,8 +79,6 @@ let relay_domains = ${concatStringsSep ", " cfg.relayDomains} '' + '' - local_recipient_maps = - relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then cfg.relayHost else -- cgit 1.4.1 From 4b5a230d1db8cd2f0f7bc75de5f0478874ccc5a6 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 6 Feb 2017 09:10:05 +0100 Subject: Add documentation for XFCE --- nixos/doc/manual/configuration/xfce.xml | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 nixos/doc/manual/configuration/xfce.xml (limited to 'nixos/doc') diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml new file mode 100644 index 000000000000..12eb30db21e8 --- /dev/null +++ b/nixos/doc/manual/configuration/xfce.xml @@ -0,0 +1,49 @@ + + + XFCE Desktop Environment + + + To enable the XFCE Desktop Environment, set + + services.xserver.desktopManager = { + xfce.enable = true; + default = "xfce"; + }; + + + + + Optionally, compton + can be enabled for nice graphical effects, some example settings: + + services.compton = { + enable = true; + fade = true; + inactiveOpacity = "0.9"; + shadow = true; + fadeDelta = 4; + }; + + + + + XFCE programs are not installed automatically. + To install them manually (system wide), put them into your + environment.systemPackages- + + + + NixOS’s default display manager (the + program that provides a graphical login prompt and manages the X + server) is SLiM. You can, for example, select KDE’s + kdm instead: + + services.xserver.displayManager.kdm.enable = true; + + + + -- cgit 1.4.1 From bf56d17b2c4beee6e1756d2c8113fd7907b6a23d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 6 Feb 2017 09:17:52 +0100 Subject: fixup! Add documentation for XFCE --- nixos/doc/manual/configuration/xfce.xml | 57 ++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 12eb30db21e8..d406616bae04 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -2,7 +2,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-x11"> + xml:id="sec-xfce"> XFCE Desktop Environment @@ -46,4 +46,59 @@ + + Thunar Volume Support + + + To enable + Thunar + volume support, put + + services.xserver.desktopManager.xfce.enable = true; + + into your configuration.nix. + + + + + + Polkit Authentication Agent + + + There is no authentication agent automatically installed alongside + XFCE. To allow mounting of local (non-removable) filesystems, you + will need to install one. + + Installing polkit_gnome, a rebuild, logout and + login did the trick. + + + + + + Troubleshooting + + + Even after enabling udisks2, volume management might not work. + Thunar and/or the desktop takes time to show up. + + Thunar will spit out this kind of message on start + (look at journalctl --user -b). + + + Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported + + + This is caused by some needed GNOME services not running. + This is all fixed by enabling "Launch GNOME services on startup" in + the Advanced tab of the Session and Startup settings panel. + Alternatively, you can run this command to do the same thing. + + $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true + + A log-out and re-log will be needed for this to take effect. + + + + -- cgit 1.4.1 From de592483d1f644cc46d9a8a00c36c1e7bda4ab1a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 7 Feb 2017 17:55:40 +0100 Subject: Add xfce documentation --- nixos/doc/manual/configuration/configuration.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 448e2a932e91..8677c13db40f 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -21,6 +21,7 @@ effect after you run nixos-rebuild. + -- cgit 1.4.1 From 504774e22368522e6188c2c812756f0dc14d8153 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Feb 2017 21:36:22 +0300 Subject: release notes: mention JRE changes and jre_headless --- nixos/doc/manual/release-notes/rl-1703.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index be6ad59ac5d7..278dc88e1de3 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -169,12 +169,24 @@ following incompatible changes: Other notable improvements: + Module type system have a new extensible option types feature that allow to extend certain types, such as enum, through multiple option declarations of the same option across multiple modules. + + + + jre now defaults to GTK+ UI by default. This + improves visual consistency and makes Java follow system font style, + improving the situation on HighDPI displays. This has a cost of increased + closure size; for server and other headless workloads it's recommended to + use jre_headless. + + + -- cgit 1.4.1 From a0505989c98580867286cc0674f0aac58a8c3bdc Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 9 Feb 2017 18:38:01 +0100 Subject: Xfce docs nitpicks - fix validity - XFCE -> Xfce, as that seems to be upstream preference --- nixos/doc/manual/configuration/xfce.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index d406616bae04..7b60493e9df5 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -4,10 +4,10 @@ version="5.0" xml:id="sec-xfce"> - XFCE Desktop Environment + Xfce Desktop Environment - To enable the XFCE Desktop Environment, set + To enable the Xfce Desktop Environment, set services.xserver.desktopManager = { xfce.enable = true; @@ -31,15 +31,16 @@ - XFCE programs are not installed automatically. + Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your - environment.systemPackages- - + environment.systemPackages. + - NixOS’s default display manager (the - program that provides a graphical login prompt and manages the X - server) is SLiM. You can, for example, select KDE’s + NixOS’s default display manageris SLiM. + (DM is the program that provides a graphical login prompt + and manages the X server.) + You can, for example, select KDE’s kdm instead: services.xserver.displayManager.kdm.enable = true; @@ -66,7 +67,7 @@ There is no authentication agent automatically installed alongside - XFCE. To allow mounting of local (non-removable) filesystems, you + Xfce. To allow mounting of local (non-removable) filesystems, you will need to install one. Installing polkit_gnome, a rebuild, logout and -- cgit 1.4.1 From 3c9d73f100f310a5b44497b66f391422a258d41e Mon Sep 17 00:00:00 2001 From: Edward Tjörnhammar Date: Thu, 9 Feb 2017 21:16:20 +0100 Subject: nixos, doc: named nylons --- nixos/doc/manual/release-notes/rl-1703.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 278dc88e1de3..7b288515506c 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -117,6 +117,36 @@ following incompatible changes: + + + service.nylon is now declared using named instances. + As an example: + + + services.nylon = { + enable = true; + acceptInterface = "br0"; + bindInterface = "tun1"; + port = 5912; + }; + + + should be replaced with: + + + services.nylon.myvpn = { + enable = true; + acceptInterface = "br0"; + bindInterface = "tun1"; + port = 5912; + }; + + + this enables you to declare a SOCKS proxy for each uplink. + + + + overridePackages function no longer exists. It is replaced by Date: Thu, 9 Feb 2017 22:22:46 +0100 Subject: nixos, doc: dictd dbs move --- nixos/doc/manual/release-notes/rl-1703.xml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 7b288515506c..ae8aeb6e7072 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -97,6 +97,15 @@ following incompatible changes: + + + Two lone top-level dict dbs moved into dictdDBs. This + affects: dictdWordnet which is now at + dictdDBs.wordnet and dictdWiktionary + which is now at dictdDBs.wiktionary + + + Parsoid service now uses YAML configuration format. -- cgit 1.4.1 From b12564cc1b8319b317d98df03fec8ba4bbf71877 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 9 Feb 2017 21:25:03 -0500 Subject: nixos: update default cases from KDM/KDE4 to SDDM/KDE5 --- nixos/doc/manual/configuration/modularity.xml | 5 +-- nixos/doc/manual/configuration/x-windows.xml | 6 +-- nixos/doc/manual/configuration/xfce.xml | 4 +- .../doc/manual/development/option-declarations.xml | 48 +++++++++++----------- .../installer/tools/nixos-generate-config.pl | 4 +- nixos/modules/profiles/graphical.nix | 4 +- nixos/modules/services/hardware/bluetooth.nix | 2 +- .../services/x11/display-managers/default.nix | 2 +- nixos/modules/services/x11/terminal-server.nix | 14 +------ nixos/release.nix | 4 +- nixos/tests/phabricator.nix | 2 +- nixos/tests/trac.nix | 2 +- 12 files changed, 43 insertions(+), 54 deletions(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 59a4e3b33ba1..30da064ac579 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -36,9 +36,8 @@ latter might look like this: { config, pkgs, ... }: { services.xserver.enable = true; - services.xserver.displayManager.kdm.enable = true; - services.xserver.desktopManager.kde4.enable = true; - environment.systemPackages = [ pkgs.kde4.kscreensaver ]; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.kde5.enable = true; } diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 3040839861c1..93d10d19b208 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -25,7 +25,7 @@ Otherwise, you can only log into a plain undecorated xterm window. Thus you should pick one or more of the following lines: -services.xserver.desktopManager.kde4.enable = true; +services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.xfce.enable = true; services.xserver.windowManager.xmonad.enable = true; services.xserver.windowManager.twm.enable = true; @@ -35,9 +35,9 @@ services.xserver.windowManager.icewm.enable = true; NixOS’s default display manager (the program that provides a graphical login prompt and manages the X -server) is SLiM. You can select KDE’s kdm instead: +server) is SLiM. You can select KDE’s sddm instead: -services.xserver.displayManager.kdm.enable = true; +services.xserver.displayManager.sddm.enable = true; diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 7b60493e9df5..af6278e9c920 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -41,9 +41,9 @@ (DM is the program that provides a graphical login prompt and manages the X server.) You can, for example, select KDE’s - kdm instead: + sddm instead: - services.xserver.displayManager.kdm.enable = true; + services.xserver.displayManager.sddm.enable = true; diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index ce432a7fa6ca..cab721f2e555 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -65,22 +65,22 @@ options = { -
Extensible Option +<section xml:id="sec-option-declarations-eot"><title>Extensible Option Types - Extensible option types is a feature that allow to extend certain types + Extensible option types is a feature that allow to extend certain types declaration through multiple module files. - This feature only work with a restricted set of types, namely + This feature only work with a restricted set of types, namely enum and submodules and any composed forms of them. - Extensible option types can be used for enum options - that affects multiple modules, or as an alternative to related + Extensible option types can be used for enum options + that affects multiple modules, or as an alternative to related enable options. As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a - module file per display manager backend (slim, kdm, gdm ...). + module file per display manager backend (slim, sddm, gdm ...). There are two approach to this module structure: @@ -96,7 +96,7 @@ options = { Both approachs have problems. - + Making backends independent can quickly become hard to manage. For display managers, there can be only one enabled at a time, but the type system can not enforce this restriction as there is no relation between @@ -108,18 +108,18 @@ options = { central module will require to change the central module option every time a new backend is added or removed. - By using extensible option types, it is possible to create a placeholder - option in the central module (), and to extend it in each backend module (, ). - + By using extensible option types, it is possible to create a placeholder + option in the central module (), and to extend it in each backend module (, ). + As a result, displayManager.enable option values can be added without changing the main service module file and the type system automatically enforce that there can only be a single display manager enabled. -Extensible type +<example xml:id='ex-option-declaration-eot-service'><title>Extensible type placeholder in the service module services.xserver.displayManager.enable = mkOption { @@ -127,29 +127,29 @@ services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ ]); }; -Extending - <literal>services.xserver.displayManager.enable</literal> in the +<example xml:id='ex-option-declaration-eot-backend-slim'><title>Extending + <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "slim" ]); }; -Extending - <literal>services.foo.backend</literal> in the <literal>kdm</literal> +<example xml:id='ex-option-declaration-eot-backend-sdm'><title>Extending + <literal>services.foo.backend</literal> in the <literal>sdm</literal> module services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "kdm" ]); + type = with types; nullOr (enum [ "sddm" ]); }; -The placeholder declaration is a standard mkOption - declaration, but it is important that extensible option declarations only use +The placeholder declaration is a standard mkOption + declaration, but it is important that extensible option declarations only use the type argument. -Extensible option types work with any of the composed variants of - enum such as - with types; nullOr (enum [ "foo" "bar" ]) +Extensible option types work with any of the composed variants of + enum such as + with types; nullOr (enum [ "foo" "bar" ]) or with types; listOf (enum [ "foo" "bar" ]).
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index c920a2b52d89..48f6cc76e4aa 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -607,8 +607,8 @@ $bootLoaderConfig # services.xserver.xkbOptions = "eurosign:e"; # Enable the KDE Desktop Environment. - # services.xserver.displayManager.kdm.enable = true; - # services.xserver.desktopManager.kde4.enable = true; + # services.xserver.displayManager.sddm.enable = true; + # services.xserver.desktopManager.kde5.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. # users.extraUsers.guest = { diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index 8ee1628f876c..73dd2d4bc9f7 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -6,8 +6,8 @@ { services.xserver = { enable = true; - displayManager.kdm.enable = true; - desktopManager.kde4.enable = true; + displayManager.sddm.enable = true; + desktopManager.kde5.enable = true; synaptics.enable = true; # for touchpad support on many laptops }; diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index f6cf2d01d809..ef2fce613f20 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -22,7 +22,7 @@ in }; ###### implementation - + config = mkIf config.hardware.bluetooth.enable { environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c0daf30d04eb..98d2d0ea834d 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -1,5 +1,5 @@ # This module declares the options to define a *display manager*, the -# program responsible for handling X logins (such as xdm, kdm, gdb, or +# program responsible for handling X logins (such as xdm, gdb, or # SLiM). The display manager allows the user to select a *session # type*. When the user logs in, the display manager starts the # *session script* ("xsession" below) to launch the selected session diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 785394d9648c..09a7f386876f 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -16,18 +16,8 @@ with lib; services.xserver.enable = true; services.xserver.videoDrivers = []; - # Enable KDM. Any display manager will do as long as it supports XDMCP. - services.xserver.displayManager.kdm.enable = true; - services.xserver.displayManager.kdm.enableXDMCP = true; - services.xserver.displayManager.kdm.extraConfig = - '' - [General] - # We're headless, so don't bother starting an X server. - StaticServers= - - [Xdmcp] - Xaccess=${pkgs.writeText "Xaccess" "localhost"} - ''; + # Enable GDM. Any display manager will do as long as it supports XDMCP. + services.xserver.displayManager.gdm.enable = true; systemd.sockets.terminal-server = { description = "Terminal Server Socket"; diff --git a/nixos/release.nix b/nixos/release.nix index 2d78a4db9736..0f298188c6c7 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -325,8 +325,8 @@ in rec { kde = makeClosure ({ pkgs, ... }: { services.xserver.enable = true; - services.xserver.displayManager.kdm.enable = true; - services.xserver.desktopManager.kde4.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.kde5.enable = true; }); xfce = makeClosure ({ pkgs, ... }: diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index 3bf83ab66655..85faafd56899 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ... }: { client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.desktopManager.kde4.enable = true; + services.xserver.desktopManager.kde5.enable = true; }; }; diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index e7d9759ae0cc..0d56c564e182 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -45,7 +45,7 @@ import ./make-test.nix ({ pkgs, ... }: { client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.desktopManager.kde4.enable = true; + services.xserver.desktopManager.kde5.enable = true; }; }; -- cgit 1.4.1 From d9ab783f581f5dc8aba02ba1d08cdc7e6706f431 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 10 Feb 2017 22:52:08 -0500 Subject: nixos manual: correct reference to sddm --- nixos/doc/manual/development/option-declarations.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index cab721f2e555..d62d0896bb7c 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -135,8 +135,8 @@ services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "slim" ]); }; -Extending - <literal>services.foo.backend</literal> in the <literal>sdm</literal> +<example xml:id='ex-option-declaration-eot-backend-sddm'><title>Extending + <literal>services.foo.backend</literal> in the <literal>sddm</literal> module services.xserver.displayManager.enable = mkOption { -- cgit 1.4.1 From d4bf624f968fa7b94988080be231285a95ea2ce8 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 11 Feb 2017 12:47:15 +0100 Subject: nixos manual: add grub option to avoid #21830 Close #22659. vcunat edited this slightly. --- nixos/doc/manual/configuration/luks-file-systems.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 2062456703f7..00c795cd0898 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -37,6 +37,10 @@ boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde- fileSystems."/".device = "/dev/mapper/crypted"; +Should grub be used as bootloader, and /boot is located +on an encrypted partition, it is necessary to add the following grub option: +boot.loader.grub.enableCryptodisk = true; + -- cgit 1.4.1 From 3348905cdecff53190eb011e76ab2dba5855c107 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 12 Feb 2017 13:12:10 +0100 Subject: xorg-server: major bump 1.18.4 -> 1.19.1 I encountered no problems with it. Nvidia binary drivers are tested, and AMD ones now both set `abiCompat` to use older server versions. --- nixos/doc/manual/release-notes/rl-1703.xml | 6 ++++++ pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/overrides.nix | 1 + pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index ae8aeb6e7072..37173ccd7442 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -15,6 +15,12 @@ has the following highlights: xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs manual for more information. + + + X.org server uses branch 1.19. Due to ABI incompatibilities, + ati_unfree keeps forcing 1.17 + and amdgpu-pro starts forcing 1.18. + The following new services were added since the last release: diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 01a452083096..d81879d51690 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2364,15 +2364,15 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.18.4"; + name = "xorg-server-1.19.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; - sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2; + sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; + }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d706a0963214..0afbb21ea228 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -428,6 +428,7 @@ in damageproto xcmiscproto bigreqsproto inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto + libXfont2 ]; # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316 commonPatches = [ ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8ca45b8b1616..8d37d9f46b5e 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 -- cgit 1.4.1 From b4cd251c54e8a07cfcb8cb46c53083f2f6c7a573 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 13 Feb 2017 11:44:22 +0000 Subject: Manual: document users.users..hashedPassword --- nixos/doc/manual/configuration/user-mgmt.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 829e5b9ea842..2bd9cca5622f 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -36,7 +36,10 @@ to set a password, which is retained across invocations of and /etc/group will be congruent to your NixOS configuration. For instance, if you remove a user from users.extraUsers and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users -and groups, such as useradd, are no longer available. +and groups, such as useradd, are no longer available. Passwords may still be +assigned by setting the user's hashedPassword option. A +hashed password can be generated using mkpasswd -m sha-512 +after installing the mkpasswd package. A user ID (uid) is assigned automatically. You can also specify a uid manually by adding -- cgit 1.4.1 From 7e5424ac0913e1f890fb8227c8e4790dbf098cb0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 13 Feb 2017 22:43:40 +0100 Subject: php: default to php71 --- nixos/doc/manual/release-notes/rl-1703.xml | 4 ++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'nixos/doc') diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 37173ccd7442..51de93db92f2 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -21,6 +21,10 @@ has the following highlights: ati_unfree keeps forcing 1.17 and amdgpu-pro starts forcing 1.18. + + + PHP now defaults to PHP 7.1 + The following new services were added since the last release: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30694dc8740d..33273481cd47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5792,7 +5792,7 @@ with pkgs; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php70; + php = php71; phpPackages = php70Packages; -- cgit 1.4.1