From 0f663efc2c59c84528339caf6bf3691f8a371691 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 29 Sep 2019 03:27:09 +0200 Subject: [PATCH 001/192] phpPackages.phpcs: 3.4.2 -> 3.5.0 (cherry picked from commit 5e4de799bd84495ebd6e4c23866a72e0ef77aa7a) --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index fc6d76743385..ff5be8399b2c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -365,12 +365,12 @@ let }; phpcs = mkDerivation rec { - version = "3.4.2"; + version = "3.5.0"; pname = "phpcs"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "0hk9w5kn72z9xhswfmxilb2wk96vy07z4a1pwrpspjlr23aajrk9"; + sha256 = "078anf2r6a3p8v575m65vryazipgfchs07yb92m9xh41lk5wlndf"; }; phases = [ "installPhase" ]; From fb2ea4fa6a1152c2fa8a411a9a9cf768be376024 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 27 Sep 2019 11:10:17 -0700 Subject: [PATCH 002/192] pythonPackages.streamz: 0.5.1 -> 0.5.2 (cherry picked from commit 8d306d599a66503c02405b557af2c0bb6541ab85) --- .../python-modules/streamz/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 5360b951de26..da77691e354b 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -5,23 +5,23 @@ , toolz , zict , six -, pytest +, pytest_4 , networkx , distributed , confluent-kafka , graphviz +, requests }: buildPythonPackage rec { pname = "streamz"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "80c9ded1d6e68d3b78339deb6e9baf93a633d84b4a8875221e337ac06890103f"; + sha256 = "127rpdjgkcyjifmkqbhmqfbzlgi32n54rybrdxja610qr906y40c"; }; - checkInputs = [ pytest networkx distributed confluent-kafka graphviz ]; propagatedBuildInputs = [ tornado toolz @@ -29,6 +29,15 @@ buildPythonPackage rec { six ]; + checkInputs = [ + confluent-kafka + distributed + graphviz + networkx + pytest_4 + requests + ]; + # Disable test_tcp_async because fails on sandbox build checkPhase = '' pytest --deselect=streamz/tests/test_sources.py::test_tcp_async \ @@ -37,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pipelines to manage continuous streams of data"; - homepage = https://github.com/mrocklin/streamz/; + homepage = "https://github.com/mrocklin/streamz"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; From 83665e31dd08aed624f6f181c397dbff8cd50470 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 29 Sep 2019 15:11:00 +0200 Subject: [PATCH 003/192] nixos/tests/ferm: wait for DAD timeout before testing The test has recently been failing due to the IPv6 address on the server still being in the tentative state, when the client sends its first request. The server will not start using the IPv6 address until DAD has completed. Scripted networking seems not to wait for DAD completion before completing network-online.target, so let's switch to networkd instead, which does. (cherry picked from commit 1fb381844029d0bfd5f3ca85577695c112ce41f1) --- nixos/tests/ferm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index b8e8663e3ad2..14c1cd44f5ce 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -22,6 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : { { networking = { dhcpcd.enable = false; + useNetworkd = true; interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ]; interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ]; }; From e1b962d05b3c9ce5cc3d9b673a95a598970a46d2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 29 Sep 2019 05:52:08 -0700 Subject: [PATCH 004/192] pythonPackages.supervisor: 3.3.5 -> 4.0.4 (cherry picked from commit f08d4f78e4df759e244b96a944285c100218c9e1) --- .../python-modules/supervisor/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 4771ba7a89d1..e7bbb57cedcc 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -1,27 +1,26 @@ { lib, buildPythonPackage, isPy3k, fetchPypi , mock , meld3 +, setuptools }: + buildPythonPackage rec { pname = "supervisor"; - version = "3.3.5"; + version = "4.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1w3ahridzbc6rxfpbyx8lij6pjlcgf2ymzyg53llkjqxalp6sk8v"; + sha256 = "02pindhq84hb9a7ykyaqw8i2iqb21h69lpmclyqh7fm1446rji4n"; }; checkInputs = [ mock ]; - propagatedBuildInputs = [ meld3 ]; + propagatedBuildInputs = [ meld3 setuptools ]; - # Supervisor requires Python 2.4 or later but does not work on any version of Python 3. You are using version 3.6.5 (default, Mar 28 2018, 10:24:30) - disabled = isPy3k; - - meta = { + meta = with lib; { description = "A system for controlling process state under UNIX"; homepage = http://supervisord.org/; - license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt - maintainers = with lib.maintainers; [ zimbatm ]; + license = licenses.free; # http://www.repoze.org/LICENSE.txt + maintainers = with maintainers; [ zimbatm ]; }; } From 21a88397e137ed9d1409cdf80aa74ecfe15902b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 29 Sep 2019 05:39:36 -0700 Subject: [PATCH 005/192] pythonPackages.shodan: 1.14.0 -> 1.17.0 (cherry picked from commit fb41b3d9e6421f79b2f149edd12a31323fd59b0f) --- pkgs/development/python-modules/shodan/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 8723a7b940ca..ae9f9e42ecf0 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -4,22 +4,24 @@ , click-plugins , colorama , requests +, setuptools , XlsxWriter }: buildPythonPackage rec { pname = "shodan"; - version = "1.14.0"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "0c5x53757p6ihh1f8xqsal2gi9ikcl3464b38qinva51s0kkb58k"; + sha256 = "1sh7a2dsal3kzcl4s9xbpl7hxhm9k55s5hiqdqqnafhvhnh0vmbz"; }; propagatedBuildInputs = [ click-plugins colorama requests + setuptools XlsxWriter ]; From 88730466d7945f67e88a5936b53945f25a6d8750 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 13 Sep 2019 15:27:51 -0700 Subject: [PATCH 006/192] pythonPackages.xapian: disable smoketests (cherry picked from commit 24b364e0b55209f2261d56cb7caf44060646c5b9) --- pkgs/development/python-modules/xapian/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index c15f2682e63c..05c7fed589e1 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -30,7 +30,6 @@ buildPythonPackage rec { doCheck = true; checkPhase = '' - ${python.interpreter} python${pythonSuffix}/smoketest.py ${python.interpreter} python${pythonSuffix}/pythontest.py ''; From b1967e37cb50628f1f76c62cb8cfd6fe9a6849a4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 29 Sep 2019 23:24:07 +0200 Subject: [PATCH 007/192] phpPackages.phpcbf: 3.4.2 -> 3.5.0 (cherry picked from commit 096f03e414b72ac0ace5683c940c5a8ad92c20ea) --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ff5be8399b2c..b215a4c19860 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -338,12 +338,12 @@ let }; phpcbf = mkDerivation rec { - version = "3.4.2"; + version = "3.5.0"; pname = "phpcbf"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "08s47r8i5dyjivk1q3nhrz40n6fx3zghrn5irsxfnx5nj9pb7ffp"; + sha256 = "15n3r3sc62ar1kq38idw22y7gasvy747bix99zs0l0paapcbxz6n"; }; phases = [ "installPhase" ]; From ad36169300e768d8ae198e590f76c9efd58ea964 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 23 Sep 2019 15:09:06 +0200 Subject: [PATCH 008/192] nixos/systemd: pick more upstream tmpfiles confs In #68792 it was discovered that /dev/fuse doesn't have wordl-read-writeable permissions anymore. The cause of this is that the tmpfiles examples in systemd were reorganized and split into more files. We thus lost some of the configuration we were depending on. In this commit some of the new tmpfiles configuration that are applicable to us are added which also makes wtmp/lastlog in the pam module not necessary anymore. Rationale for the new tmpfile configs: - `journal-nowcow.conf`: Contains chattr +C for journald logs which makes sense on copy-on-write filesystems like Btrfs. Other filesystems shouldn't do anything funny when that flag is set. - `static-nodes-permissions.conf`: Contains some permission overrides for some device nodes like audio, loop, tun, fuse and kvm. - `systemd-nspawn.conf`: Makes sure `/var/lib/machines` exists and old snapshots are properly removed. - `systemd-tmp.conf`: Removes systemd services related private tmp folders and temporary coredump files. - `var.conf`: Creates some useful directories in `/var` which we would create anyway at some point. Also includes `/var/log/{wtmp,btmp,lastlog}`. Fixes #68792. (cherry picked from commit 0dc4fe0a44f16e730a422de21f8f5ebdf582f54a) --- nixos/modules/security/pam.nix | 7 ------- nixos/modules/system/boot/systemd.nix | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 9c7ddc2f4eea..eecc37bfbdd1 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -742,13 +742,6 @@ in environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; - systemd.tmpfiles.rules = optionals - (any (s: s.updateWtmp) (attrValues config.security.pam.services)) - [ - "f /var/log/wtmp" - "f /var/log/lastlog" - ]; - security.pam.services = { other.text = '' diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 2287a82418fe..5cf437bfbcbe 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -858,7 +858,12 @@ in "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; + "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf"; + "tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf"; "tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf"; + "tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/system-nspawn.conf"; + "tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/system-tmp.conf"; + "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf"; "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf"; "tmpfiles.d/nixos.conf".text = '' From 00f495f973b5c4d9751776bd0f57a4e0fdc89473 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Sep 2019 17:13:29 +0200 Subject: [PATCH 009/192] mkRemovedOptionModule: assert on removed options We don't want to ignore config that can mess up machines. In general this should always fail evaluation, as you think you are changing behaviour and don't, which can easily create run-time errors we can catch early. (cherry picked from commit b08b0bcbbec77046e5a7082177cedc12fbf1dc6c) --- lib/modules.nix | 11 +++++++---- .../monitoring/prometheus/exporters/nginx.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index c3c903c1dfa8..00c7712487bd 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -592,11 +592,14 @@ rec { { options = setAttrByPath optionName (mkOption { visible = false; }); - config.warnings = - let opt = getAttrFromPath optionName options; in - optional opt.isDefined '' + config.assertions = + let opt = getAttrFromPath optionName options; in [{ + assertion = !opt.isDefined; + message = '' The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it. - ${replacementInstructions}''; + ${replacementInstructions} + ''; + }]; }; /* Return a module that causes a warning to be shown if the diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index 554377df37ba..ba852fea4336 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -49,6 +49,6 @@ in (mkRemovedOptionModule [ "insecure" ] '' This option was replaced by 'prometheus.exporters.nginx.sslVerify'. '') - ({ options.warnings = options.warnings; }) + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) ]; } diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 29310f6f24aa..3038be6dbab4 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -305,7 +305,7 @@ let optional (defined ipv6Address && defined ipv6PrefixLength) { address = ipv6Address; prefixLength = ipv6PrefixLength; })) - ({ options.warnings = options.warnings; }) + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) ]; }; From 44f8f39734d71b57c8b1cdd092d04adf8699bd92 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 30 Sep 2019 11:02:01 -0400 Subject: [PATCH 010/192] libproxy: build with spidermonkey_60 --- .../libraries/libproxy/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 773acd035355..c9b08079c380 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -6,7 +6,7 @@ , fetchpatch , dbus , networkmanager -, spidermonkey_38 +, spidermonkey_60 , pcre , gsettings-desktop-schemas , glib @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { JavaScriptCore ] else [ glib - spidermonkey_38 + spidermonkey_60 dbus networkmanager ]); @@ -59,7 +59,21 @@ stdenv.mkDerivation rec { "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = [ + # Make build with spidermonkey_60 + (fetchpatch { + url = "https://github.com/libproxy/libproxy/pull/86.patch"; + sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs"; + }) + (fetchpatch { + url = "https://github.com/libproxy/libproxy/pull/87.patch"; + sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc"; + }) + (fetchpatch { + url = "https://github.com/libproxy/libproxy/pull/95.patch"; + sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi"; + }) + ] ++ stdenv.lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; From 6bce1acd26f6309322b620c2dddb7495a9ff40f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Sep 2019 18:34:09 -0700 Subject: [PATCH 011/192] roundcube: 1.3.9 -> 1.3.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/roundcube/versions (cherry picked from commit ad166725f1301dd7552a189269255e67541071a2) --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 0b774a4b5add..93499d87e0b6 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1b91amcpzb7935hpm67iqw92bl5r1a0rkfrc8gfm8w9sngzv8vbj"; + sha256 = "1gx8dgrr3p6fksv3pm381a080i9r6snwcmfd1q112mqg19ai3zk9"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From 0fc13aad1f0e91741baae59d4e2a1c4b544d5f9c Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 30 Aug 2019 00:22:16 -0400 Subject: [PATCH 012/192] quassel: Fix use of `mkDerivation` The `with stdenv;` would override the `mkDerivation` to be the regular one, instead of the libsForQt5 one. This simply removes the dangerous use of the all-encompassing `with`, and prefers using a more precise inherit for `lib`. See #65399 Co-authored-by: worldofpeace (cherry picked from commit c52b5b8a5d3319e7e0321c57c9435b32de824cf2) --- .../networking/irc/quassel/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 6addd66ac634..d1b950a7757c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -5,7 +5,7 @@ , static ? false # link statically , stdenv, fetchFromGitHub, cmake, makeWrapper, dconf -, qtbase, qtscript +, mkDerivation, qtbase, qtscript , phonon, libdbusmenu, qca-qt5 , withKDE ? true # enable KDE integration @@ -20,6 +20,7 @@ }: let + inherit (stdenv) lib; buildClient = monolithic || client; buildCore = monolithic || enableDaemon; in @@ -31,7 +32,7 @@ assert !buildClient -> !withKDE; # KDE is used by the client only let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; -in with stdenv; mkDerivation rec { +in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { name = "quassel${tag}-${version}"; version = "0.13.1"; @@ -67,13 +68,15 @@ in with stdenv; mkDerivation rec { ++ edf client "WANT_QTCLIENT" ++ edf withKDE "WITH_KDE"; - preFixup = + dontWrapQtApps = true; + + postFixup = lib.optionalString enableDaemon '' - wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" + wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" '' + lib.optionalString buildClient '' - wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; meta = with stdenv.lib; { From aaa1739e0a6f97578b530ef97874602c087f3fe1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 30 Sep 2019 22:55:17 -0400 Subject: [PATCH 013/192] blueman: no optional networkmanager blueman declares NetworkManager gi bindings as a required runtime dependency [0] Fixes #69555 [0]: https://github.com/blueman-project/blueman/blob/531da47b06de3617492cc5ae5530ca8b3f2e12a4/Dependencies.md (cherry picked from commit fcb84c55343b06683bd45708165a9ae89f03c542) --- pkgs/tools/bluetooth/blueman/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 8e393ac3f13e..01ab2eefc212 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,9 +1,7 @@ { config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 , obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute , gnome3, librsvg, wrapGAppsHook, gobject-introspection -, withNetworkManager ? - config.networking.networkmanager.enable or false, networkmanager -, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: +, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: let pythonPackages = python3Packages; @@ -24,10 +22,9 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome3.adwaita-icon-theme iproute libappindicator ] + gnome3.adwaita-icon-theme iproute libappindicator networkmanager ] ++ pythonPath - ++ lib.optional withPulseAudio libpulseaudio - ++ lib.optional withNetworkManager networkmanager; + ++ lib.optional withPulseAudio libpulseaudio; postPatch = lib.optionalString withPulseAudio '' sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py From 8ef6192d2af7a4db575133f2e8f80c74b65b3294 Mon Sep 17 00:00:00 2001 From: Dima Date: Tue, 24 Sep 2019 21:39:50 +0200 Subject: [PATCH 014/192] epson-escpr2: 1.0.29 -> 1.1.1 The build was failing because the source rpm does not exist on epsons servers anymore. Thus bumping it to an existing version https://hydra.nixos.org/build/101990975/nixlog/5 (cherry picked from commit e33810594d9689f693774694086e69ace787f7ca) --- pkgs/misc/drivers/epson-escpr2/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 2110de6e4c11..96399b9cd975 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.0.29"; + version = "1.1.1"; src = fetchurl { - url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${pname}-${version}-1lsb3.2.src.rpm"; - sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5"; + # To find new versions, visit http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX + # and search for some printer like for instance "WF-7210" to get to the most recent version. + # NOTE: keep in mind that many parts of the URL change and not just version. + url = "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/${pname}-${version}-1lsb3.2.src.rpm"; + sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; From 8d7f2c7f3ed311501fb091a315c7dc68610c69b5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 18 Sep 2019 17:20:20 -0700 Subject: [PATCH 015/192] pythonPackages.premailer: fix build (cherry picked from commit 17287938abbcc914b685377d2c931f2529b8e659) --- .../python-modules/premailer/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 14fa0d2f59d4..f19f2dfe265d 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -1,22 +1,22 @@ { lib, buildPythonPackage, fetchPypi, - cssselect, cssutils, lxml, mock, nose, requests + cssselect, cssutils, lxml, mock, nose, requests, cachetools }: buildPythonPackage rec { pname = "premailer"; version = "3.3.0"; - meta = { - description = "Turns CSS blocks into style attributes "; - homepage = https://github.com/peterbe/premailer; - license = lib.licenses.bsd3; - }; - src = fetchPypi { inherit pname version; sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1"; }; buildInputs = [ mock nose ]; - propagatedBuildInputs = [ cssselect cssutils lxml requests ]; + propagatedBuildInputs = [ cachetools cssselect cssutils lxml requests ]; + + meta = { + description = "Turns CSS blocks into style attributes "; + homepage = https://github.com/peterbe/premailer; + license = lib.licenses.bsd3; + }; } From c0fcb53d9b0c7281dd1393b6137522d8a059712b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 1 Oct 2019 11:09:41 +0200 Subject: [PATCH 016/192] python3Packages.scikit-build: fix build Build broke as it's attempted to run the cmake configure-phase which won't work as this package uses cmake, but builds via a `setup.py` rather than a `CMakeLists.txt`. ZHF #68361 (cherry picked from commit f8c6b826d4e481af8ec690682fada5fb6e6d8010) --- pkgs/development/python-modules/scikit-build/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 91fa26ef44d2..3fe7b9ff4ef6 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { requests flake8 ]; + dontUseCmakeConfigure = true; + disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ "test_hello_develop" # tries setuptools develop install "test_source_distribution" # pip has no way to install missing dependencies From e61638d768bc2837416e5f4416b80a51d772ddb8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 1 Oct 2019 13:53:33 +0200 Subject: [PATCH 017/192] python3Packages.pytaglib: fix build Applied several patches to fix the test suite on python 2.7 and to properly install the `pyprinttags` executable. Also switched to the GitHub source for now as the PyPI tarball was wrongly packaged and didn't contain the `pyprinttags.py` script (see the last two patches for further reference). See also https://hydra.nixos.org/build/102493330 ZHF #68361 (cherry picked from commit c7164ea3c49545c689a7b3c869d5a57b4d4d8228) --- .../python-modules/pytaglib/default.nix | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 46d4135d6afb..6b19a8f0c735 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -1,21 +1,46 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , taglib , cython , pytest , glibcLocales +, fetchpatch }: buildPythonPackage rec { pname = "pytaglib"; version = "1.4.5"; - src = fetchPypi { - inherit pname version; - sha256 = "8aec64bc146a9f72778a0d2d1f3448f58be6ebea68f64b0ff88ea8e0f4dc5d8f"; + src = fetchFromGitHub { + owner = "supermihi"; + repo = pname; + rev = "v${version}"; + sha256 = "1gvvadlgk8ny8bg76gwvvfcwp1nfgrjphi60h5f9ha7h5ff1g2wb"; }; + patches = [ + # fix tests on python 2.7 + (fetchpatch { + url = https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch; + sha256 = "1kv3c68vimx5dc8aacvzphiaq916avmprxddi38wji8p2ql6vngj"; + }) + + # properly install pyprinttags + (fetchpatch { + url = https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch; + sha256 = "0pi0dcq7db5fd3jnbwnfsfsgxvlhnm07z5yhpp93shk0s7ci2bwp"; + }) + (fetchpatch { + url = https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch; + sha256 = "0h259vzj1l0gpibdf322yclyd10x5rh1anzhsjj2ghm6rj6q0r0m"; + }) + ]; + + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner', " "" + ''; + buildInputs = [ taglib cython ]; checkInputs = [ pytest glibcLocales ]; From 4c50dc3cee926a58db7a68617076c906a1a00ff0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 1 Oct 2019 08:00:08 -0400 Subject: [PATCH 018/192] linux: 4.19.75 -> 4.19.76 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index a3d2235e9de1..c22e288bcbdd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.75"; + version = "4.19.76"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx"; + sha256 = "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds"; }; } // (args.argsOverride or {})) From 2a66f189cd6d25a5530fb936a02c371ab4546a6d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 1 Oct 2019 08:00:22 -0400 Subject: [PATCH 019/192] linux: 5.2.17 -> 5.2.18 --- pkgs/os-specific/linux/kernel/linux-5.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 34b86ddab9ad..57059d100468 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.17"; + version = "5.2.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv"; + sha256 = "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd"; }; } // (args.argsOverride or {})) From 1e3be238f607f1ce9124c4fdd389682a4e566100 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 1 Oct 2019 08:00:25 -0400 Subject: [PATCH 020/192] linux: 5.3.1 -> 5.3.2 --- pkgs/os-specific/linux/kernel/linux-5.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix index b3a96e356bab..009d2d5d30c7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3.1"; + version = "5.3.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q"; + sha256 = "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn"; }; } // (args.argsOverride or {})) From d7c9be97ea75ba68a224a229bee994d47ffeb3d2 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 1 Oct 2019 14:30:52 +0200 Subject: [PATCH 021/192] transifex-client: Add missing setuptools dependency (cherry picked from commit d1a8006b89bdfb511450316e5088a179a8e69d78) --- pkgs/tools/text/transifex-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 9a11b5fba57a..12e68689934c 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonApplication, fetchPypi -, python-slugify, requests, urllib3, six }: +, python-slugify, requests, urllib3, six, setuptools }: buildPythonApplication rec { pname = "transifex-client"; version = "0.13.6"; propagatedBuildInputs = [ - urllib3 requests python-slugify six + urllib3 requests python-slugify six setuptools ]; src = fetchPypi { @@ -24,7 +24,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://www.transifex.com/; + homepage = "https://www.transifex.com/"; license = licenses.gpl2; description = "Transifex translation service client"; maintainers = [ maintainers.etu ]; From 000a9108aee65c9944fc94f6d3ce505cc05e1e1e Mon Sep 17 00:00:00 2001 From: Victor SENE Date: Mon, 30 Sep 2019 22:09:25 +0200 Subject: [PATCH 022/192] nexcloud: 16.0.4 -> 16.0.5 (cherry picked from commit 70d08871da69299d167e3dee779440b2b21d7037) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 69b1f28d2d68..c99ccc6e3cc4 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nextcloud"; - version = "16.0.4"; + version = "16.0.5"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - sha256 = "1l7ckzyqz7g4ny8s2q4xal72p57ldfjs947sk2ya2df93qjh0qz0"; + sha256 = "0lg5zaakfdngrh0ida0qbq76jbiab5fv46jziqf77zbnlx7wc2c7"; }; installPhase = '' From eafcb18d7351f8c4c6d17424bd30efc22e40cff1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 Oct 2019 11:21:25 -0400 Subject: [PATCH 023/192] Revert "nixos/desktop-managers/xterm: Disable by default" This reverts commit f140dfb161804871048c00f2c51485dd55b50efa. This reverts commit cf56cefd95eb6f0ead3856ed69299b8ae7153712. This reverts commit 456c42c3e8787d83d577526af90263de9b3d512d. --- nixos/doc/manual/release-notes/rl-1909.xml | 5 ----- nixos/modules/services/x11/desktop-managers/xterm.nix | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 4220a9500b0e..9e02c0197693 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -870,11 +870,6 @@ The old deprecated emacs package sets have been dropped. What used to be called emacsPackagesNg is now simply called emacsPackages. - - - is now disabled by default. It was not useful except for debugging purposes and was confusingly set as default in some circumstances. - - The WeeChat plugin pkgs.weechatScripts.weechat-xmpp has been removed as it doesn't receive any updates from upstream and depends on outdated Python2-based modules. diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 93987bd1dfc5..ea441fbbe715 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.xserver.desktopManager.xterm; + xserverEnabled = config.services.xserver.enable; in @@ -13,7 +14,7 @@ in services.xserver.desktopManager.xterm.enable = mkOption { type = types.bool; - default = false; + default = xserverEnabled; defaultText = "config.services.xserver.enable"; description = "Enable a xterm terminal as a desktop manager."; }; From 3098d652100d698d466a37ce7215065743d1038e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 1 Oct 2019 12:51:57 -0400 Subject: [PATCH 024/192] lib: Add armv7a-linux to doubles.nix This is needed for android. --- lib/systems/doubles.nix | 2 +- lib/tests/systems.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 8e02fcb5de0c..58cff18e6488 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -7,7 +7,7 @@ let all = [ "aarch64-linux" - "armv5tel-linux" "armv6l-linux" "armv7l-linux" + "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "mipsel-linux" diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 5748c09b564d..818749442f9f 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -14,7 +14,7 @@ let in with lib.systems.doubles; lib.runTests { testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded); - testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; + testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; testmips = mseteq mips [ "mipsel-linux" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; @@ -24,7 +24,7 @@ in with lib.systems.doubles; lib.runTests { testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ]; testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; From 2fc4fabd6cf6a6ca5db6fe77c8cb6435cb9d4de8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 1 Oct 2019 09:48:23 +0200 Subject: [PATCH 025/192] svgbob: fix build See https://hydra.nixos.org/build/102480738 Bumping to latest version (which is 0.4.2 according to Cargo.lock) fixes the build error. As no dependency changes happened, cargoSha256 doesn't need to be updated. ZHF #68361 (cherry picked from commit b5204d9f5fab3562c3ac9f0e34e65d7aa40d35bf) --- pkgs/tools/graphics/svgbob/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index ecf982c21cda..24736b8f0fff 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "unstable-2018-10-05"; + version = "0.4.2"; src = fetchFromGitHub { owner = "ivanceras"; repo = pname; - rev = "43fb0364e989d0e9a7656b148c947d47cc769622"; - sha256 = "1imjj57dx1af3wrs214yzaa2qfk8ld00nj3nx4z450gw2xjjj1gw"; + rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432"; + sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr"; }; sourceRoot = "source/svgbob_cli"; From e326c4f603d4102ab9fde7bb03a239de5146c201 Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 1 Oct 2019 20:49:48 +0200 Subject: [PATCH 026/192] riot-web: 1.4.0 -> 1.4.1 (cherry picked from commit bdd869352f65f65019adb94f05c63f283f39718a) --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index d0ee71b9969c..1b9b34ed4aaa 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1si11hxkfn6sqaq1hddm5vkfrd0pghzwqld1wv4vxlb5jyn32qqk"; + sha256 = "16lgxyqxs6vpjcfdr4j7gnn7h8gyi6b5520b8nq8hxynh24iyhcq"; }; installPhase = let From 445ea37ef77a5d0aa66b92ee27c0fa102821888a Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 1 Oct 2019 20:50:00 +0200 Subject: [PATCH 027/192] riot-desktop: 1.4.0 -> 1.4.1 (cherry picked from commit 7a82c74afebb1f5ec631033d39d2ffbb6f744d05) --- .../instant-messengers/riot/riot-desktop-package.json | 2 +- .../networking/instant-messengers/riot/riot-desktop.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index cfc38fb4ae7e..d305fade0382 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.4.0", + "version": "1.4.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 885e90a98c44..7b5bb1e04f33 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.4.0"; + version = "1.4.1"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1p8bl7v2214shywn53fpcb27vvvdjrs3kcys3f045v2l5fg5xhsa"; + sha256 = "0w4w39smak6hp65vam5rrz6l48rb4yzszzyn1yjhr1m8w8j9bvfl"; }; in yarn2nix-moretea.mkYarnPackage rec { From d1ab8913ac855f98dd40634546cefeeb04e1f421 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 1 Oct 2019 15:46:52 +0200 Subject: [PATCH 028/192] grafana: 6.3.6 -> 6.4.0 (cherry picked from commit 79b99099cf21613e3a5d28cbc8ffe6ff9bac3d49) --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 3d61961321d4..3c10ec6f9852 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.3.6"; + version = "6.4.0"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1dxsd32ny7wcpfyhhdf5m6anzgs0mkyvlrha7ps5pfyiix7brrlk"; + sha256 = "0rqfgswlq4fs3kb1cdpisvhawxvfirrs5pja6143sm1via3p8y59"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0cz6bg8q8lxxvqh9nb2b64rr5brkmbvpvvg4x7dykc04vcjivf6n"; + sha256 = "1hyawiq7jgdak93ayzxmksbvkvdmfc26ska0n28f4gqppvrvkcqn"; }; postPatch = '' From e97e6ae183b0dbe64cf1fa536b6182066e55e617 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 2 Oct 2019 00:41:03 +0300 Subject: [PATCH 029/192] buildBazelPackage: remove rules_cc It's a new builtin dependency from Bazel 0.29. (cherry picked from commit 280f17c893f28ddc39a7e4cbe71e32c2ffb96029) --- pkgs/build-support/build-bazel-package/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index d4318b715ba3..a1a38484386d 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -60,6 +60,7 @@ in stdenv.mkDerivation (fBuildAttrs // { # Remove all built in external workspaces, Bazel will recreate them when building rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} + rm -rf $bazelOut/external/{rules_cc,\@rules_cc.marker} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} rm -rf $bazelOut/external/{local_*,\@local_*.marker} From 9d4759dda03a611e9f46cfce2a4f056898c1daef Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Tue, 1 Oct 2019 23:48:23 +0200 Subject: [PATCH 030/192] owncloud-client: Use qt5's own mkDerivation (#70187) (cherry picked from commit e120e00d54a8edffcff6208c105c06211a1ec4d9) cc #70187 --- pkgs/applications/networking/owncloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 7907365a6a39..c674956066ac 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }: +{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "owncloud-client"; version = "2.5.4.11654"; From d079834907ef4f03b53d7617d2b6ca69adf96e01 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Sep 2019 17:44:02 -0400 Subject: [PATCH 031/192] kwallet-pam: wrap pam_kwallet_init This needs a compatible env as kwalletd daemon. Need to wrap it to correct this. Fixes #68316 (cherry picked from commit a296cc254f6845dccb05402eb8f7ce5c9ca172ac) --- pkgs/desktops/plasma-5/kwallet-pam.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index b4fd032cf1f7..7ddd6e2abb77 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -7,4 +7,8 @@ mkDerivation { postPatch = '' sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; + postFixup = '' + wrapQtApp $out/libexec/pam_kwallet_init + ''; + dontWrapQtApps = true; } From 15bc013a10ede3f7cc0801eda18eb5e540dae80d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 13 Sep 2019 14:42:08 -0700 Subject: [PATCH 032/192] pythonPackage.cli-helpers: disable python2 tests ZHF #68361 (cherry picked from commit 7eed92a7ac22d28cb04909a272108fdffbb38ec2) Signed-off-by: Jonathan Ringer --- .../python-modules/cli-helpers/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 1c209353f0e3..2ebc6f44b44d 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -1,14 +1,11 @@ -{ lib -, buildPythonPackage -, fetchPypi -, configobj -, terminaltables -, tabulate +{ lib, buildPythonPackage, fetchPypi, isPy27 , backports_csv -, wcwidth -, pytest +, configobj , mock -, isPy27 +, pytest +, tabulate +, terminaltables +, wcwidth }: buildPythonPackage rec { @@ -27,6 +24,9 @@ buildPythonPackage rec { wcwidth ] ++ (lib.optionals isPy27 [ backports_csv ]); + # namespace collision between backport.csv and backports.configparser + doCheck = !isPy27; + checkInputs = [ pytest mock ]; checkPhase = '' From 20e214bd23133f1cc9b1100aba69928807136928 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 26 Sep 2019 16:15:46 +0100 Subject: [PATCH 033/192] pythonPackages.pyrsistent: 0.15.2 -> 0.15.4 ZHF #68361 (cherry picked from commit 0f8d1129b151ea8174863cff5bc69d6960e4a4dc) Signed-off-by: Jonathan Ringer --- pkgs/development/python-modules/pyrsistent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index cabb96d22565..74c3724aa194 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -2,23 +2,23 @@ , buildPythonPackage , fetchPypi , six -, pytest +, pytest_4 , hypothesis , pytestrunner }: buildPythonPackage rec { pname = "pyrsistent"; - version = "0.15.2"; + version = "0.15.4"; src = fetchPypi { inherit pname version; - sha256 = "0fjwnxg7q1b02j7hk1wqm5xdn7wck9j2g3ggkkizab6l77kjws8n"; + sha256 = "0cv5xvhfhlj88pb0ghdwivkfcmgi6503qjwxx4r6n06nd6hpzd1l"; }; propagatedBuildInputs = [ six ]; - checkInputs = [ pytestrunner pytest hypothesis ]; + checkInputs = [ pytestrunner pytest_4 hypothesis ]; meta = with stdenv.lib; { homepage = https://github.com/tobgu/pyrsistent/; From 8aac337d71ae6b7964def0ca16c19c2b4f4f15a1 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 28 Sep 2019 12:35:03 +0200 Subject: [PATCH 034/192] nvidia-x11: Make vulkan library path absolute for >= 435. The original file contains just a library name, which does not work when LD_LIBRARY_PATH does not contain /run/opengl-driver/lib, as is the case in unstable NixOS. Fixes https://github.com/NixOS/nixpkgs/issues/69264 (cherry picked from commit d156b2b619ba207e12c5ca3abfbfaace6dfe7ce1) --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 2b1b37db344d..b4c6952d44d3 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -59,15 +59,24 @@ installPhase() { mv $i/lib/libvdpau* $i/lib/vdpau # Install ICDs, make absolute paths. + # Be careful not to modify any original files because this runs twice. + + # OpenCL sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd - if [ -e nvidia_icd.json.template ]; then - # template patching for version < 435 - sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json - fi - if [ -e nvidia_icd.json ]; then - install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json + + # Vulkan + if [ -e nvidia_icd.json.template ] || [ -e nvidia_icd.json ]; then + if [ -e nvidia_icd.json.template ]; then + # template patching for version < 435 + sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json.fixed + else + sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed + fi + install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia.json fi + + # EGL if [ "$useGLVND" = "1" ]; then sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json From 59211d576adb3b1ddd74546795da89dfb03ad2cc Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 30 Sep 2019 19:01:32 +0200 Subject: [PATCH 035/192] exim: 4.92.2 -> 4.92.3 security update: CVE-2019-16928 (cherry picked from commit aaa1ba37002d68c807b6464d1afd68fa390aabbb) cc #70074 --- pkgs/servers/mail/exim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index fcafd5817d4e..ba68258e2596 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "exim-4.92.2"; + name = "exim-4.92.3"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "0m56jsh2fzvwj4rdpcc3pkd5vsi40cjrpzalis7l1zq33m4axmq1"; + sha256 = "1zfj4zblv5881qxpzkrg3f6a96pbcq270s9p6p1w85lfxjsknif4"; }; nativeBuildInputs = [ pkgconfig ]; From be0688dba48cd50298d459563bdd7e31df1ecfe7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 2 Oct 2019 01:00:22 +0300 Subject: [PATCH 036/192] tensorflow: fix CUDA build using wrong GCC (cherry picked from commit 46b7933d9a21e67c52c7a9c31af057e607170349) --- pkgs/development/python-modules/tensorflow/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 7f6952e8fe54..c511049ec030 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -203,6 +203,7 @@ let TF_NEED_CUDA = tfFeature cudaSupport; TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; + GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; postPatch = '' From 433022f307c4617064ff9725a3aafa03997c60eb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 2 Oct 2019 10:32:40 +0300 Subject: [PATCH 037/192] libtensorflow: add meta (cherry picked from commit 4947ddf3478910800bc8538596ab8c20b03f9b74) --- .../python-modules/tensorflow/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index c511049ec030..1895f2bfd0a8 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -297,6 +297,15 @@ let cp -Lr "$PWD/dist" "$python" ''; }; + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = platforms.linux; + broken = !(xlaSupport -> cudaSupport); + }; }; in buildPythonPackage { @@ -347,12 +356,5 @@ in buildPythonPackage { passthru.libtensorflow = bazel-build.out; - meta = with stdenv.lib; { - description = "Computation using data flow graphs for scalable machine learning"; - homepage = http://tensorflow.org; - license = licenses.asl20; - maintainers = with maintainers; [ jyp abbradar ]; - platforms = platforms.linux; - broken = !(xlaSupport -> cudaSupport); - }; + inherit (bazel-build) meta; } From bb7c495f2e74bf49c32b14051c74b3847e1e2be0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 2 Oct 2019 10:32:48 +0300 Subject: [PATCH 038/192] tensorflow: add OpenGL path to find libcudart (cherry picked from commit 1c429acbffc650d960ec64014e9af92c8f2577f3) --- .../libraries/science/math/tensorflow/bin.nix | 7 ++++++- .../python-modules/tensorflow/bin.nix | 10 +++++++++- .../python-modules/tensorflow/default.nix | 17 ++++++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index 3db7a6f1d1e2..f9f300883a16 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, patchelf +, addOpenGLRunpath , cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 }: @@ -35,6 +35,9 @@ let else '' patchelf --set-rpath "${rpath}:$out/lib" $out/lib/libtensorflow.so patchelf --set-rpath "${rpath}" $out/lib/libtensorflow_framework.so + ${optionalString cudaSupport '' + addOpenGLRunpath $out/lib/libtensorflow.so $out/lib/libtensorflow_framework.so + ''} ''; in stdenv.mkDerivation rec { @@ -43,6 +46,8 @@ in stdenv.mkDerivation rec { src = fetchurl url; + nativeBuildInputs = optional cudaSupport addOpenGLRunpath; + # Patch library to use our libc, libstdc++ and others buildCommand = '' mkdir -pv $out diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index e46d02989531..db2308a0be8a 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -26,6 +26,7 @@ , symlinkJoin , keras-applications , keras-preprocessing +, addOpenGLRunpath }: # We keep this binary build for two reasons: @@ -76,6 +77,8 @@ in buildPythonPackage { ] ++ lib.optional (!isPy3k) mock ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ]; + nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow # and the propageted input tensorflow-tensorboard which causes environment collisions. # another possibility would be to have tensorboard only in the buildInputs @@ -94,7 +97,12 @@ in buildPythonPackage { lib.optionalString stdenv.isLinux '' rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}" internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" - find $out \( -name '*.so' -or -name '*.so.*' \) -exec patchelf --set-rpath "$rrPath" {} \; + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + patchelf --set-rpath "$rrPath" "$lib" + ${lib.optionalString cudaSupport '' + addOpenGLRunpath "$lib" + ''} + done ''; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 1895f2bfd0a8..e180c9d70e94 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,4 +1,5 @@ { stdenv, pkgs, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +, addOpenGLRunpath # Python deps , buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python # Python libraries @@ -112,7 +113,7 @@ let nativeBuildInputs = [ swig which pythonEnv - ]; + ] ++ lib.optional cudaSupport addOpenGLRunpath; buildInputs = [ jemalloc @@ -296,6 +297,12 @@ let bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "$PWD/dist" cp -Lr "$PWD/dist" "$python" ''; + + postFixup = lib.optionalString cudaSupport '' + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + addOpenGLRunpath "$lib" + done + ''; }; meta = with stdenv.lib; { @@ -347,6 +354,14 @@ in buildPythonPackage { tensorflow-tensorboard ]; + nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + + postFixup = lib.optionalString cudaSupport '' + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + addOpenGLRunpath "$lib" + done + ''; + # Actual tests are slow and impure. # TODO try to run them anyway # TODO better test (files in tensorflow/tools/ci_build/builds/*test) From 0c02d01479fe2ba3dd8aaac43904b62f54cd70e7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Oct 2019 04:20:00 -0500 Subject: [PATCH 039/192] ruby_2_4: 2.4.7 -> 2.4.9 Changelog: - https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-4-8-released/ - https://www.ruby-lang.org/en/news/2019/10/02/ruby-2-4-9-released/ (cherry picked from commit 5ed9d8b8aaa1ce53b658704e075387678ba19222) --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 3494c8dee243..5ebd3dd63866 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -212,10 +212,10 @@ let in { ruby_2_4 = generic { - version = rubyVersion "2" "4" "7" ""; + version = rubyVersion "2" "4" "9" ""; sha256 = { - src = "12cbyf7zai8mi3mxffm5ynq3mmkcbvs7kb1bbrs259m61irgqvnd"; - git = "1dgch9xz4wdcncb6pf2dvijm10yk6mbw2wfdrj7d3wazrjzh305z"; + src = "1bn6n5b920qy3lsx99jr8495jkc3sg89swgb96d5fgd579g6p6zr"; + git = "066kb1iki7mx7qkm10xhj5b6v8s47wg68v43l3nc36y2hyim1w2c"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 56164de5b5f2..3dd66cb381f1 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -6,7 +6,7 @@ "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.7" = ops useRailsExpress [ + "2.4.9" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" From cb9cea0e96e4b3d2605d6d7e4d7609ed55ad07c7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Oct 2019 00:02:00 -0500 Subject: [PATCH 040/192] ruby_2_5: 2.5.6 -> 2.5.7 Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-5-7-released/ (cherry picked from commit 5e76e7b4301981d4118337c8f9a14a27cc5c7995) --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 5ebd3dd63866..c963652f06f2 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -220,10 +220,10 @@ in { }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "6" ""; + version = rubyVersion "2" "5" "7" ""; sha256 = { - src = "19xy6rf138ys4qycv0ibsycqwbjmf1j6iv9plw9cs81hcxnd0zhx"; - git = "067gyy7149m6vk9dfyx22mghm2gbgy7snfa7df4ddrvr1pqffqmz"; + src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b"; + git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3dd66cb381f1..0b8fbee29e74 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,7 +11,7 @@ "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.5.6" = ops useRailsExpress [ + "2.5.7" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" From 85289edbd9ff82d3dc76fa7a4c0fb3086abebd0a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 2 Oct 2019 00:01:00 -0500 Subject: [PATCH 041/192] ruby_2_6: 2.6.4 -> 2.6.5 Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-6-5-released/ (cherry picked from commit 4ee22f3a9cd385f7dc7c984ec007ba90827657c1) --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index c963652f06f2..723a49782345 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -228,10 +228,10 @@ in { }; ruby_2_6 = generic { - version = rubyVersion "2" "6" "4" ""; + version = rubyVersion "2" "6" "5" ""; sha256 = { - src = "0dvrw4g2igvjclxk9bmb9pf6mzxwm22zqvqa0abkfnshfnxdihag"; - git = "1h4z66amjykpzl6lxx6yad2yfpwnwix4sw19bd96jnwg248kviqf"; + src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6"; + git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 0b8fbee29e74..c1e906002a5d 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -16,12 +16,7 @@ "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.6.4" = [ - (fetchpatch { - url = "https://git.ruby-lang.org/ruby.git/patch/?id=ade1283ca276f7d589ffd3539fbc7b9817f682d5"; - sha256 = "1vgrckmzz0ykyxgzyp8fcifa93xz2hvyfil79bw1gc3xx94wnnxd"; - }) - ] ++ ops useRailsExpress [ + "2.6.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" From e0a544ccfc82444e33da54161108cc07df09824c Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 2 Oct 2019 12:46:01 +0200 Subject: [PATCH 042/192] vulnix: add missing setuptools dependency More #68314 related breakage. (cherry picked from commit 01aa4bb7cb1ec6dba14ce9df17215f7f0fc07418) --- pkgs/tools/security/vulnix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 2f7986c128b5..25d3e8d105b9 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -27,6 +27,7 @@ pythonPackages.buildPythonApplication rec { lxml pyyaml requests + setuptools toml zodb ]); From 1f65fe630bef83bfe9b981c9fc651d5c60b19ba1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 29 Sep 2019 02:07:31 -0700 Subject: [PATCH 043/192] xterm: 348 -> 349 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xterm/versions (cherry picked from commit 3062ec7f3e694e0ea0e6c89bbcf53788609aad9d) --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 60231350edbc..83ba28bfce37 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-348"; + name = "xterm-349"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1gkmj9v44xg4jahivhnpbmq22w1mwclr6fssv3lhssgkvchm27wb"; + sha256 = "0ps7b2b2kbrkv5q49cmb8c51z0w21jmm7hwciw30m6jgfb9s79ir"; }; buildInputs = From 482ba41d6ec15d4112e72239baae36ad1c8553eb Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 28 Sep 2019 03:52:01 +0200 Subject: [PATCH 044/192] lib.mkRemovedOptionModule: Show replacement for option usage too Previously mkRemovedOptionModule would only show the replacement instructions when the removed option was *defined*. With this change, it also does so when an option is *used*. This is essential for options that are only intended to be used such as `security.acme.directory`, whose replacement instructions would never trigger without this change because almost everybody only uses the option and isn't defining it. (cherry picked from commit ebb136da9f4e743c8c1f873e9d85840559127265) --- lib/modules.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/modules.nix b/lib/modules.nix index 00c7712487bd..71672c7d112b 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -591,6 +591,7 @@ rec { { options, ... }: { options = setAttrByPath optionName (mkOption { visible = false; + apply = x: throw "The option `${showOption optionName}' can no longer be used since it's been removed. ${replacementInstructions}"; }); config.assertions = let opt = getAttrFromPath optionName options; in [{ From 8349643269ad07a33f99eb02f61c352f30e3f52a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 1 Oct 2019 14:07:57 +0200 Subject: [PATCH 045/192] cawbird: init at 1.0.1 Cawbird is a fork of the discontinued Corebird Twitter client. Co-Authored-By: Jon (cherry picked from commit e1c7d2079336148dd48cdd17cfc7b35e0d1559b3) --- .../networking/cawbird/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/networking/cawbird/default.nix diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix new file mode 100644 index 000000000000..edcf9b2846ed --- /dev/null +++ b/pkgs/applications/networking/cawbird/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala +, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection +, glib-networking, python3 }: + +stdenv.mkDerivation rec { + version = "1.0.1"; + pname = "cawbird"; + + src = fetchFromGitHub { + owner = "IBBoard"; + repo = "cawbird"; + rev = "v${version}"; + sha256 = "sha256:0bk33fh32nnv6ya6j0ij34abw6a3g6m8fq13303slhhja8xhvmb1"; + }; + + nativeBuildInputs = [ + meson ninja vala pkgconfig wrapGAppsHook python3 + gobject-introspection # for setup hook + ]; + + buildInputs = [ + glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]); + + postPatch = '' + chmod +x data/meson_post_install.py # patchShebangs requires executable file + patchShebangs data/meson_post_install.py + ''; + + meta = with stdenv.lib; { + description = "Native GTK Twitter client for the Linux desktop"; + longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; + homepage = https://ibboard.co.uk/cawbird/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a72ae1301118..0dfda23dd91d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1302,6 +1302,8 @@ in cardpeek = callPackage ../applications/misc/cardpeek { }; + cawbird = callPackage ../applications/networking/cawbird { }; + cde = callPackage ../tools/package-management/cde { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; From b919677835d6c06b3b86eb961f876ae74ffce1c7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 2 Oct 2019 22:05:43 +0200 Subject: [PATCH 046/192] corebird: drop package due to discontinuation, recommend `cawbird` as alternative (cherry picked from commit f855e588b74d1b1d3fe5aac47482a6dc17703e34) --- .../networking/corebird/default.nix | 38 ------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/applications/networking/corebird/default.nix diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix deleted file mode 100644 index 73c0e234945e..000000000000 --- a/pkgs/applications/networking/corebird/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40 -, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection -, glib-networking, python3 }: - -stdenv.mkDerivation rec { - version = "1.7.4"; - pname = "corebird"; - - src = fetchFromGitHub { - owner = "baedert"; - repo = "corebird"; - rev = version; - sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n"; - }; - - nativeBuildInputs = [ - meson ninja vala_0_40 pkgconfig wrapGAppsHook python3 - gobject-introspection # for setup hook - ]; - - buildInputs = [ - glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking - ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]); - - postPatch = '' - chmod +x data/meson_post_install.py # patchShebangs requires executable file - patchShebangs data/meson_post_install.py - ''; - - meta = { - description = "Native GTK Twitter client for the Linux desktop"; - longDescription = "Corebird is a modern, easy and fun Twitter client."; - homepage = https://corebird.baedert.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jonafato ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dfda23dd91d..e56fa122ab10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1378,7 +1378,7 @@ in copyright-update = callPackage ../tools/text/copyright-update { }; - corebird = callPackage ../applications/networking/corebird { }; + corebird = throw "corebird has been discontinued, use cawbird instead"; inherit (callPackage ../tools/misc/coreboot-utils { }) msrtool From 5e0b687ac0fb79e5bb95a9e3d70f1eef562bc1bb Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 3 Oct 2019 00:41:33 +0200 Subject: [PATCH 047/192] corebird: move deprecation warning to aliases and release notes (cherry picked from commit 45a9542a37315f3857f1d1e2a0e886a3218d54d7) --- nixos/doc/manual/release-notes/rl-1909.xml | 6 ++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 4220a9500b0e..c93d5706de4d 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -924,6 +924,12 @@ must be owned by either root or the user specified in . + + + The Twitter client corebird has been dropped as it is discontinued and does not work against the new Twitter API. + Please use the fork cawbird instead which has been adapted to the API changes and is still maintained. + + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2d02f187a4f9..73a3540604d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -66,6 +66,7 @@ mapAliases ({ compton-git = compton; # added 2019-05-20 conntrack_tools = conntrack-tools; # added 2018-05 cool-old-term = cool-retro-term; # added 2015-01-31 + corebird = throw "deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement."; cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e56fa122ab10..c7dd797324ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1378,8 +1378,6 @@ in copyright-update = callPackage ../tools/text/copyright-update { }; - corebird = throw "corebird has been discontinued, use cawbird instead"; - inherit (callPackage ../tools/misc/coreboot-utils { }) msrtool cbmem From 4f0e6ee51821d42c275426f5aec5a945663e47ab Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 28 Sep 2019 16:49:53 +0200 Subject: [PATCH 048/192] nixos/nix-daemon: Prevent network warning when checking config Since version 2.3 (https://github.com/NixOS/nix/pull/2949 which was cherry-picked to master) Nix issues a warning when --no-net wasn't passed and there is no network interface. This commit adds the --no-net flag to the nix.conf check such that no warning is issued. (cherry picked from commit e463c7cd75f68e112b838252963ca20495903210) --- nixos/modules/services/misc/nix-daemon.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 3826f728afd0..3263f6954236 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -11,6 +11,7 @@ let nixVersion = getVersion nix; isNix20 = versionAtLeast nixVersion "2.0pre"; + isNix23 = versionAtLeast nixVersion "2.3pre"; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -63,7 +64,7 @@ let builders = ''} system-features = ${toString cfg.systemFeatures} - ${optionalString (versionAtLeast nixVersion "2.3pre") '' + ${optionalString isNix23 '' sandbox-fallback = false ''} $extraOptions @@ -74,7 +75,7 @@ let '' else '' echo "Checking that Nix can read nix.conf..." ln -s $out ./nix.conf - NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null + NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net"} >/dev/null '') ); From ae35fe9cb355ba0eb42ca4ae2e04743b73639ecc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 29 Sep 2019 18:51:15 -0400 Subject: [PATCH 049/192] nixos/gnome-settings-daemon: drop package option After some thought, it doesn't make sense for this module to be shared. (cherry picked from commit 68ab37aa4491c8f870483c9eff888dc5fc88d2c8) --- .../desktops/gnome3/gnome-settings-daemon.nix | 21 +++++++++++-------- .../services/x11/desktop-managers/mate.nix | 3 ++- .../x11/desktop-managers/pantheon.nix | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix index 7f7adcf26acf..9d080acb2aaf 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix @@ -12,6 +12,12 @@ in { + imports = [ + (mkRemovedOptionModule + ["services" "gnome3" "gnome-settings-daemon" "package"] + "") + ]; + ###### interface options = { @@ -20,13 +26,6 @@ in enable = mkEnableOption "GNOME Settings Daemon"; - # There are many forks of gnome-settings-daemon - package = mkOption { - type = types.package; - default = pkgs.gnome3.gnome-settings-daemon; - description = "Which gnome-settings-daemon package to use."; - }; - }; }; @@ -36,9 +35,13 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ + pkgs.gnome3.gnome-settings-daemon + ]; - services.udev.packages = [ cfg.package ]; + services.udev.packages = [ + pkgs.gnome3.gnome-settings-daemon + ]; }; diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index d7a871c9c704..07984fe42fb3 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -91,6 +91,7 @@ in pkgs.gtk3.out pkgs.shared-mime-info pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ + pkgs.mate.mate-settings-daemon ]; programs.dconf.enable = true; @@ -104,7 +105,7 @@ in services.gnome3.at-spi2-core.enable = true; services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-settings-daemon.enable = true; - services.gnome3.gnome-settings-daemon.package = pkgs.mate.mate-settings-daemon; + services.udev.packages = [ pkgs.mate.mate-settings-daemon ]; services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index e313a194c345..b6bec0ca6ffa 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -124,7 +124,7 @@ in # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-settings-daemon.enable = true; - services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon; + services.udev.packages = [ pkgs.pantheon.elementary-settings-daemon ]; services.gvfs.enable = true; services.gnome3.rygel.enable = mkDefault true; services.gsignond.enable = mkDefault true; From 77b5a1965fcc7da69364976f0ec1d59b86637d21 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 29 Sep 2019 20:05:40 -0400 Subject: [PATCH 050/192] nixos/networkmanager: remove basePackages option This option in now completely useless. All the default configs for these packages already have GNOME features default, (cherry picked from commit 9bc81696957106cd5ba51be104d86cff60063620) --- .../services/networking/networkmanager.nix | 30 ++++++++++--------- .../services/x11/desktop-managers/gnome3.nix | 8 ----- .../x11/desktop-managers/pantheon.nix | 5 ---- .../x11/desktop-managers/xfce4-14.nix | 8 ----- 4 files changed, 16 insertions(+), 35 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index bef0ff365676..f0d2f5e781b3 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -5,6 +5,19 @@ with lib; let cfg = config.networking.networkmanager; + basePackages = with pkgs; [ + crda + modemmanager + networkmanager + networkmanager-fortisslvpn + networkmanager-iodine + networkmanager-l2tp + networkmanager-openconnect + networkmanager-openvpn + networkmanager-vpnc + wpa_supplicant + ]; + dynamicHostsEnabled = cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {}; @@ -173,24 +186,13 @@ in { ''; }; - # Ugly hack for using the correct gnome3 packageSet - basePackages = mkOption { - type = types.attrsOf types.package; - default = { inherit (pkgs) - networkmanager modemmanager wpa_supplicant crda - networkmanager-openvpn networkmanager-vpnc - networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-l2tp networkmanager-iodine; }; - internal = true; - }; - packages = mkOption { - type = types.listOf types.path; + type = types.listOf types.package; default = [ ]; description = '' Extra packages that provide NetworkManager plugins. ''; - apply = list: (attrValues cfg.basePackages) ++ list; + apply = list: basePackages ++ list; }; dhcp = mkOption { @@ -388,7 +390,7 @@ in { } ]; - environment.etc = with cfg.basePackages; [ + environment.etc = with pkgs; [ { source = configFile; target = "NetworkManager/NetworkManager.conf"; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 30c5250221c1..2334e6d6894d 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -209,14 +209,6 @@ in networking.networkmanager.enable = mkDefault true; - # Use the correct gnome3 packageSet - networking.networkmanager.basePackages = { - inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; - inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc - networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-iodine networkmanager-l2tp; - }; - services.xserver.updateDbusEnvironment = true; # Needed for themes and backgrounds diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index b6bec0ca6ffa..67248c1afab9 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -159,11 +159,6 @@ in qt5.style = "adwaita"; networking.networkmanager.enable = mkDefault true; - networking.networkmanager.basePackages = - { inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; - inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc - networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-iodine networkmanager-l2tp; }; # Override GSettings schemas environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index f0f47cb70dc4..849b656c3d79 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -108,14 +108,6 @@ in "/share/gtksourceview-4.0" ]; - # Use the correct gnome3 packageSet - networking.networkmanager.basePackages = mkIf config.networking.networkmanager.enable { - inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; - inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc - networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-iodine networkmanager-l2tp; - }; - services.xserver.desktopManager.session = [{ name = "xfce4-14"; bgSupport = true; From f5b52d2ad89def6469ad0d436ce21f328a18b99f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 2 Oct 2019 15:15:31 -0400 Subject: [PATCH 051/192] sourcehut: use recurseIntoAttrs (cherry picked from commit c83db0cc536a1ed604f5d9b6e316d943f76ffcac) --- pkgs/applications/version-management/sourcehut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 00a3cf271113..3fa5399c2b56 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,5 +1,5 @@ { python37, openssl -, callPackage }: +, callPackage, recurseIntoAttrs }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` # Then we expose them through all-packages.nix as an application through `toPythonApplication` @@ -25,7 +25,7 @@ let scmsrht = self.callPackage ./scm.nix { }; }; }; -in with python.pkgs; { +in with python.pkgs; recurseIntoAttrs { inherit python; buildsrht = toPythonApplication buildsrht; dispatchsrht = toPythonApplication dispatchsrht; From 810a56870b01f32bc6e5bcd4229163da85921e72 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 1 Oct 2019 22:17:48 -0700 Subject: [PATCH 052/192] pythonPackages.trackpy: disable plot tests ZHF #68361 (cherry picked from commit 64205fa1080f25a868c951e055832ae015e12889) Signed-off-by: Jonathan Ringer --- pkgs/development/python-modules/trackpy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 2e26679ebf2a..32c8c64c68c7 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { pytest trackpy --ignore trackpy/tests/test_motion.py \ --ignore trackpy/tests/test_feature_saving.py \ --ignore trackpy/tests/test_feature.py \ + --ignore trackpy/tests/test_plots.py \ --ignore trackpy/tests/test_legacy_linking.py ''; From 73becf99d2f3be112b6a4cee8f644de93c3a911b Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Wed, 18 Sep 2019 22:38:10 +0200 Subject: [PATCH 053/192] kubernetes: 1.15.3 -> 1.15.4 (cherry picked from commit b21a3356f01b59992432a907f17e66abc77f17a0) Backport of #69044 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index cbe32e57f20d..1ad7ad3e393d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0vamr7m8i5svmvb0z01cngv3sffdfjj0bky2zalm7cfnapib8vz1"; + sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From 014afee914b2b46e239ae796f981cde6a22b6d41 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Sun, 29 Sep 2019 12:42:16 +0200 Subject: [PATCH 054/192] pythonPackages.bleach: add implicit setuptools dependency Fixes error on `python -c "import bleach"` (cherry picked from commit 31c4f79289d75b897005759559d647cb96866392) Signed-off-by: Jonathan Ringer --- pkgs/development/python-modules/bleach/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 7de124267f0e..86b253a72c95 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -5,6 +5,7 @@ , pytestrunner , six , html5lib +, setuptools }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six html5lib ]; + propagatedBuildInputs = [ six html5lib setuptools ]; postPatch = '' substituteInPlace setup.py --replace ",<3dev" "" From 5d4d45f717a2f28ba6cf3fceee61f16e3924b874 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Oct 2019 11:03:07 +0200 Subject: [PATCH 055/192] python3Packages.asdf: 2.3.3 -> 2.4.2 Bump to fix the broken build of the package: * Disable doctest as they're currently broken in our test env * Loosen version constraint for `semantic_version` as it was only introduced to work around some deprecation warnings[1] See also: https://hydra.nixos.org/build/102480957 ZHF #68361 [1] https://github.com/spacetelescope/asdf/commit/3446ae072ba99b72d8f6405853f832ef8197f270 (cherry picked from commit 06041fd174fe53b2db7c487cbad0acfe10ffdaef) --- pkgs/development/python-modules/asdf/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 8efc251140a8..6d685429e50b 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -9,18 +9,26 @@ , numpy , isPy27 , astropy +, setuptools_scm +, setuptools }: buildPythonPackage rec { pname = "asdf"; - version = "2.3.3"; + version = "2.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d02e936a83abd206e7bc65050d94e8848da648344dbec9e49dddc2bdc3bd6870"; + sha256 = "1wlgx8469wwsczc2gjka9k1a03yzird67zg3va0kg8y6j1qmbwvg"; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "semantic_version>=2.3.1,<=2.6.0" "semantic_version>=2.3.1" \ + --replace "doctest_plus = enabled" "" + ''; + checkInputs = [ pytest-astropy astropy @@ -32,6 +40,8 @@ buildPythonPackage rec { jsonschema six numpy + setuptools_scm + setuptools ]; checkPhase = '' From dde4512da9d1d91512f6b54a8f2b7b7b45271e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 3 Oct 2019 11:30:17 +0200 Subject: [PATCH 056/192] cachix: fix package --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 88ec8ad85ff0..d8184e949ab1 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -94,7 +94,7 @@ self: super: builtins.intersectAttrs super { # Won't find it's header files without help. sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; - cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: { + cachix = overrideCabal (addBuildTools super.cachix [pkgs.boost]) (drv: { postPatch = (drv.postPatch or "") + '' substituteInPlace cachix.cabal --replace "c++14" "c++17" ''; From a7d57a967a9bb0da0d2a7317681552925759c7bb Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 2 Oct 2019 10:08:44 +0200 Subject: [PATCH 057/192] grafana: 6.4.0 -> 6.4.1 (cherry picked from commit dbdb787cce9cdeb2f9e1fe4df19a456f7855cb9e) --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 3c10ec6f9852..04ddde004585 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.4.0"; + version = "6.4.1"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0rqfgswlq4fs3kb1cdpisvhawxvfirrs5pja6143sm1via3p8y59"; + sha256 = "0z615a885vh92kv9jm6ixhj0i1w0k44wl4rczvp6mcmasbvfb5fb"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1hyawiq7jgdak93ayzxmksbvkvdmfc26ska0n28f4gqppvrvkcqn"; + sha256 = "08y2h7c2zavxwmxlajg2qzfd0lhkj00i2azz5ydm184m38b98kk7"; }; postPatch = '' From 8e1ce32f491422e0944f398eb24f653f8499b1a8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Oct 2019 02:15:30 -0700 Subject: [PATCH 058/192] racerd: 2019-03-20 -> 2019-09-02 (cherry picked from commit 02795b4ed5103e05f0f9b41bc0ecb3f8dcf19b44) --- pkgs/development/tools/rust/racerd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index bfc30193eeda..54d4702c09aa 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -4,12 +4,12 @@ with rustPlatform; buildRustPackage rec { pname = "racerd"; - version = "2019-03-20"; + version = "unstable-2019-09-02"; src = fetchFromGitHub { owner = "jwilm"; repo = "racerd"; - rev = "6f74488e58e42314a36ff000bae796fe54c1bdd1"; - sha256 = "1lg7j2plxpn5l65jxhsm99vmy08ljdb666hm0y1nnmmzalrakrg1"; + rev = "e3d380b9a1d3f3b67286d60465746bc89fea9098"; + sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln"; }; # a nightly compiler is required unless we use this cheat code. @@ -17,7 +17,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "15894qr0kpp5kivx0p71zmmfhfh8in0ydkvfirxh2r12x0r2jhdd"; + cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i"; buildInputs = [ makeWrapper ]; From b98fdaf535f20cf92bde1dd71f8155607b2022cb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Oct 2019 18:23:48 +0300 Subject: [PATCH 059/192] gnome15: mark as broken It doesn't support Python 3 and newer versions of libraries are Python 2-only. (cherry picked from commit 0c02ecaea2b862cb0374cd64b5f5b8a71d2746e3) --- pkgs/applications/misc/gnome15/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix index 7a918d961f63..41d535b35106 100644 --- a/pkgs/applications/misc/gnome15/default.nix +++ b/pkgs/applications/misc/gnome15/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A set of tools for configuring the Logitech G15 keyboard"; + # Doesn't work with new `keyring` library which is Python 3-only now. + # https://github.com/Gnome15/gnome15/issues/29 + broken = true; license = licenses.gpl3; homepage = https://gnome15.org/; platforms = platforms.linux; From 7949b4f90e974d500a4ed3335491dba1538408ba Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Oct 2019 18:24:25 +0300 Subject: [PATCH 060/192] python2.pkgs.mkrose: mark as broken It supports only Python 3 now. (cherry picked from commit 2dfb002a9bcaba0548d780910f2db108008bba2e) --- pkgs/development/python-modules/mlrose/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index f7d43115a1b5..6222921db746 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, scikitlearn }: +{ stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: buildPythonPackage rec { pname = "mlrose"; version = "1.2.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 3ba0d9f75ccffd41e32cfea4046805f8bbab12f5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 3 Oct 2019 10:30:22 -0400 Subject: [PATCH 061/192] opera: use autoPatchelfHook, use wrapGAppsHook Fixes #70322 (cherry picked from commit 68543580f4e67647cb55b1d06f0fe288c33e3182) --- .../networking/browsers/opera/default.nix | 118 +++++++++--------- 1 file changed, 56 insertions(+), 62 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 062d2e6582b1..b968c4f3d9d1 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -36,60 +36,14 @@ , systemd , at-spi2-atk , at-spi2-core +, autoPatchelfHook +, wrapGAppsHook }: let mirror = "https://get.geo.opera.com/pub/opera/desktop"; - rpath = lib.makeLibraryPath [ - - # These provide shared libraries loaded when starting. If one is missing, - # an error is shown in stderr. - alsaLib.out - atk.out - cairo.out - cups - curl.out - dbus.lib - expat.out - fontconfig.lib - freetype.out - gdk-pixbuf.out - glib.out - gnome2.GConf - gtk3.out - libX11.out - libXScrnSaver.out - libXcomposite.out - libXcursor.out - libXdamage.out - libXext.out - libXfixes.out - libXi.out - libXrandr.out - libXrender.out - libXtst.out - libxcb.out - libnotify.out - libuuid.out - nspr.out - nss.out - pango.out - stdenv.cc.cc.lib - - # This is a little tricky. Without it the app starts then crashes. Then it - # brings up the crash report, which also crashes. `strace -f` hints at a - # missing libudev.so.0. - systemd.lib - - # Works fine without this except there is no sound. - libpulseaudio.out - - at-spi2-atk - at-spi2-core - ]; - in stdenv.mkDerivation rec { pname = "opera"; @@ -102,21 +56,61 @@ in stdenv.mkDerivation rec { unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; - installPhase = '' - mkdir --parent $out - mv * $out/ - mv $out/lib/*/opera/*.so $out/lib/ - ''; + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; - postFixup = '' - find $out -executable -type f \ - | while read f - do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${rpath}" \ - "$f" - done + buildInputs = [ + alsaLib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig.lib + freetype + gdk-pixbuf + glib + gnome2.GConf + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libnotify + libuuid + libxcb + nspr + nss + pango + stdenv.cc.cc.lib + ]; + + runtimeDependencies = [ + # Works fine without this except there is no sound. + libpulseaudio.out + + # This is a little tricky. Without it the app starts then crashes. Then it + # brings up the crash report, which also crashes. `strace -f` hints at a + # missing libudev.so.0. + systemd.lib + ]; + + installPhase = '' + mkdir -p $out + cp -r . $out/ + mv $out/lib/*/opera/*.so $out/lib/ ''; meta = with lib; { From 4a10b030ce9a67c3c04e72e315460432248050f4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Oct 2019 00:43:52 -0700 Subject: [PATCH 062/192] Revert "racerd: 2019-03-20 -> 2019-09-02" 8e1ce32f491422 fixes the build for rustc v1.38, but breaks it otherwise This reverts commit 8e1ce32f491422e0944f398eb24f653f8499b1a8. --- pkgs/development/tools/rust/racerd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 54d4702c09aa..bfc30193eeda 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -4,12 +4,12 @@ with rustPlatform; buildRustPackage rec { pname = "racerd"; - version = "unstable-2019-09-02"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "jwilm"; repo = "racerd"; - rev = "e3d380b9a1d3f3b67286d60465746bc89fea9098"; - sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln"; + rev = "6f74488e58e42314a36ff000bae796fe54c1bdd1"; + sha256 = "1lg7j2plxpn5l65jxhsm99vmy08ljdb666hm0y1nnmmzalrakrg1"; }; # a nightly compiler is required unless we use this cheat code. @@ -17,7 +17,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i"; + cargoSha256 = "15894qr0kpp5kivx0p71zmmfhfh8in0ydkvfirxh2r12x0r2jhdd"; buildInputs = [ makeWrapper ]; From 5aa46b6bdb5fd383d681cd7a2186f4a814f31fa9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 27 Sep 2019 10:53:55 -0700 Subject: [PATCH 063/192] python3Packages.lammps-cython: fix tests ZHF #68361 (cherry picked from commit 2aaea01b2be8e60bd52d79f2ec1d15bc027b7505) Signed-off-by: Jonathan Ringer --- pkgs/development/python-modules/lammps-cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix index 501e4adc21d6..df2a122d0681 100644 --- a/pkgs/development/python-modules/lammps-cython/default.nix +++ b/pkgs/development/python-modules/lammps-cython/default.nix @@ -9,7 +9,7 @@ , pymatgen , ase , pytestrunner -, pytest +, pytest_4 , pytestcov , isPy3k , openssh @@ -26,7 +26,7 @@ buildPythonPackage rec { }; buildInputs = [ cython pytestrunner ]; - checkInputs = [ pytest pytestcov openssh ]; + checkInputs = [ pytest_4 pytestcov openssh ]; propagatedBuildInputs = [ mpi4py pymatgen ase numpy ]; preBuild = '' From 4b4790f28f22fd8803049ae090fb2e213fbe3fa5 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 4 Oct 2019 12:03:09 +0200 Subject: [PATCH 064/192] desmume: copy debian patches Obtained from http://deb.debian.org/debian/pool/main/d/desmume/desmume_0.9.11-3.diff.gz since desmume never moved to salsa.debian.org (previously on anonscm.debian.org as a subversion repo) --- .../desmume/01_use_system_tinyxml.patch | 231 ++++++++++++++++++ pkgs/misc/emulators/desmume/default.nix | 11 +- pkgs/misc/emulators/desmume/gcc6_fixes.patch | 59 +++++ pkgs/misc/emulators/desmume/gcc7_fixes.patch | 18 ++ 4 files changed, 313 insertions(+), 6 deletions(-) create mode 100644 pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch create mode 100644 pkgs/misc/emulators/desmume/gcc6_fixes.patch create mode 100644 pkgs/misc/emulators/desmume/gcc7_fixes.patch diff --git a/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch b/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch new file mode 100644 index 000000000000..8cec26026e7f --- /dev/null +++ b/pkgs/misc/emulators/desmume/01_use_system_tinyxml.patch @@ -0,0 +1,231 @@ +From: Evgeni Golov +Subject: use the system tinyxml instead of the embedded copy +Last-Update: 2015-08-09 + +diff --git a/src/Makefile.am b/src/Makefile.am +index 7b9e263..bc7ba8c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -81,12 +81,6 @@ libdesmume_a_SOURCES = \ + utils/libfat/mem_allocate.h \ + utils/libfat/partition.cpp \ + utils/libfat/partition.h \ +- utils/tinyxml/tinystr.cpp \ +- utils/tinyxml/tinystr.h \ +- utils/tinyxml/tinyxml.cpp \ +- utils/tinyxml/tinyxml.h \ +- utils/tinyxml/tinyxmlerror.cpp \ +- utils/tinyxml/tinyxmlparser.cpp \ + utils/glcorearb.h \ + addons/slot2_auto.cpp addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/slot2_gbagame.cpp addons/slot2_none.cpp addons/slot2_rumblepak.cpp addons/slot2_guitarGrip.cpp addons/slot2_expMemory.cpp addons/slot2_piano.cpp addons/slot2_passme.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail_nand.cpp addons/slot1_retail_auto.cpp addons/slot1_retail_mcrom.cpp addons/slot1_retail_mcrom_debug.cpp addons/slot1comp_mc.cpp addons/slot1comp_mc.h addons/slot1comp_rom.h addons/slot1comp_rom.cpp addons/slot1comp_protocol.h addons/slot1comp_protocol.cpp \ + cheatSystem.cpp cheatSystem.h \ +@@ -204,3 +198,4 @@ if HAVE_GDB_STUB + libdesmume_a_SOURCES += gdbstub.h + endif + libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT) ++LIBS += -ltinyxml +diff --git a/src/Makefile.in b/src/Makefile.in +index 9cf26a3..d9ff7b2 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -184,9 +184,6 @@ am__libdesmume_a_SOURCES_DIST = armcpu.cpp armcpu.h \ + utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \ + utils/libfat/lock.h utils/libfat/mem_allocate.h \ + utils/libfat/partition.cpp utils/libfat/partition.h \ +- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \ +- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \ +- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \ + utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ + addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ + addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ +@@ -324,10 +321,6 @@ am_libdesmume_a_OBJECTS = armcpu.$(OBJEXT) arm_instructions.$(OBJEXT) \ + utils/libfat/libfat.$(OBJEXT) \ + utils/libfat/libfat_public_api.$(OBJEXT) \ + utils/libfat/lock.$(OBJEXT) utils/libfat/partition.$(OBJEXT) \ +- utils/tinyxml/tinystr.$(OBJEXT) \ +- utils/tinyxml/tinyxml.$(OBJEXT) \ +- utils/tinyxml/tinyxmlerror.$(OBJEXT) \ +- utils/tinyxml/tinyxmlparser.$(OBJEXT) \ + addons/slot2_auto.$(OBJEXT) addons/slot2_mpcf.$(OBJEXT) \ + addons/slot2_paddle.$(OBJEXT) addons/slot2_gbagame.$(OBJEXT) \ + addons/slot2_none.$(OBJEXT) addons/slot2_rumblepak.$(OBJEXT) \ +@@ -475,7 +468,7 @@ LIBAGG_LIBS = @LIBAGG_LIBS@ + LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ + LIBGLADE_LIBS = @LIBGLADE_LIBS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -ltinyxml + LIBSOUNDTOUCH_CFLAGS = @LIBSOUNDTOUCH_CFLAGS@ + LIBSOUNDTOUCH_LIBS = @LIBSOUNDTOUCH_LIBS@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -625,9 +618,6 @@ libdesmume_a_SOURCES = armcpu.cpp armcpu.h arm_instructions.cpp \ + utils/libfat/libfat_public_api.h utils/libfat/lock.cpp \ + utils/libfat/lock.h utils/libfat/mem_allocate.h \ + utils/libfat/partition.cpp utils/libfat/partition.h \ +- utils/tinyxml/tinystr.cpp utils/tinyxml/tinystr.h \ +- utils/tinyxml/tinyxml.cpp utils/tinyxml/tinyxml.h \ +- utils/tinyxml/tinyxmlerror.cpp utils/tinyxml/tinyxmlparser.cpp \ + utils/glcorearb.h addons/slot2_auto.cpp addons/slot2_mpcf.cpp \ + addons/slot2_paddle.cpp addons/slot2_gbagame.cpp \ + addons/slot2_none.cpp addons/slot2_rumblepak.cpp \ +@@ -760,20 +750,6 @@ utils/libfat/lock.$(OBJEXT): utils/libfat/$(am__dirstamp) \ + utils/libfat/$(DEPDIR)/$(am__dirstamp) + utils/libfat/partition.$(OBJEXT): utils/libfat/$(am__dirstamp) \ + utils/libfat/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/$(am__dirstamp): +- @$(MKDIR_P) utils/tinyxml +- @: > utils/tinyxml/$(am__dirstamp) +-utils/tinyxml/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) utils/tinyxml/$(DEPDIR) +- @: > utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/tinystr.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ +- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/tinyxml.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ +- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/tinyxmlerror.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ +- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +-utils/tinyxml/tinyxmlparser.$(OBJEXT): utils/tinyxml/$(am__dirstamp) \ +- utils/tinyxml/$(DEPDIR)/$(am__dirstamp) + addons/$(am__dirstamp): + @$(MKDIR_P) addons + @: > addons/$(am__dirstamp) +@@ -1035,10 +1011,6 @@ mostlyclean-compile: + -rm -f utils/libfat/partition.$(OBJEXT) + -rm -f utils/md5.$(OBJEXT) + -rm -f utils/task.$(OBJEXT) +- -rm -f utils/tinyxml/tinystr.$(OBJEXT) +- -rm -f utils/tinyxml/tinyxml.$(OBJEXT) +- -rm -f utils/tinyxml/tinyxmlerror.$(OBJEXT) +- -rm -f utils/tinyxml/tinyxmlparser.$(OBJEXT) + -rm -f utils/vfat.$(OBJEXT) + -rm -f utils/xstring.$(OBJEXT) + +@@ -1175,10 +1147,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/libfat_public_api.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/lock.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@utils/libfat/$(DEPDIR)/partition.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinystr.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxml.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlerror.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@utils/tinyxml/$(DEPDIR)/tinyxmlparser.Po@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@@ -1449,8 +1417,6 @@ distclean-generic: + -rm -f utils/decrypt/$(am__dirstamp) + -rm -f utils/libfat/$(DEPDIR)/$(am__dirstamp) + -rm -f utils/libfat/$(am__dirstamp) +- -rm -f utils/tinyxml/$(DEPDIR)/$(am__dirstamp) +- -rm -f utils/tinyxml/$(am__dirstamp) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1460,7 +1426,7 @@ clean: clean-recursive + clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am + + distclean: distclean-recursive +- -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR) ++ -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags +@@ -1506,7 +1472,7 @@ install-ps-am: + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +- -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) utils/tinyxml/$(DEPDIR) ++ -rm -rf ./$(DEPDIR) addons/$(DEPDIR) filter/$(DEPDIR) metaspu/$(DEPDIR) utils/$(DEPDIR) utils/AsmJit/core/$(DEPDIR) utils/AsmJit/x86/$(DEPDIR) utils/decrypt/$(DEPDIR) utils/libfat/$(DEPDIR) + -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic + +diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am +index 1985209..d958323 100755 +--- a/src/cli/Makefile.am ++++ b/src/cli/Makefile.am +@@ -5,7 +5,7 @@ AM_CPPFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(GLIB_CFLAGS) $(GT + + bin_PROGRAMS = desmume-cli + desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp +-desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS) ++desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml + if HAVE_GDB_STUB + desmume_cli_LDADD += ../gdbstub/libgdbstub.a + endif +diff --git a/src/cli/Makefile.in b/src/cli/Makefile.in +index 14efd77..f04ab7d 100644 +--- a/src/cli/Makefile.in ++++ b/src/cli/Makefile.in +@@ -311,7 +311,7 @@ AM_LDFLAGS = + desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../driver.h ../driver.cpp + desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) \ + $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) \ +- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) ++ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) + all: all-recursive + + .SUFFIXES: +diff --git a/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am +index b667fca..c79fdac 100755 +--- a/src/gtk-glade/Makefile.am ++++ b/src/gtk-glade/Makefile.am +@@ -33,7 +33,7 @@ desmume_glade_SOURCES = \ + desmume_glade_LDADD = ../libdesmume.a \ + $(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \ + $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ +- $(LIBSOUNDTOUCH_LIBS) ++ $(LIBSOUNDTOUCH_LIBS) -ltinyxml + if HAVE_GDB_STUB + desmume_glade_LDADD += ../gdbstub/libgdbstub.a + endif +diff --git a/src/gtk-glade/Makefile.in b/src/gtk-glade/Makefile.in +index 5f77ec5..012aa72 100644 +--- a/src/gtk-glade/Makefile.in ++++ b/src/gtk-glade/Makefile.in +@@ -367,7 +367,7 @@ desmume_glade_SOURCES = \ + + desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTKGLEXT_LIBS) \ + $(LIBGLADE_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ +- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) ++ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) + all: all-recursive + + .SUFFIXES: +diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am +index 59cb1f2..e451102 100755 +--- a/src/gtk/Makefile.am ++++ b/src/gtk/Makefile.am +@@ -32,7 +32,7 @@ desmume_SOURCES = \ + ../filter/videofilter.cpp ../filter/videofilter.h \ + main.cpp main.h + desmume_LDADD = ../libdesmume.a \ +- $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS) ++ $(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(LIBSOUNDTOUCH_LIBS) -ltinyxml + if HAVE_GDB_STUB + desmume_LDADD += ../gdbstub/libgdbstub.a + endif +diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in +index e1a2c37..75f392f 100644 +--- a/src/gtk/Makefile.in ++++ b/src/gtk/Makefile.in +@@ -382,7 +382,7 @@ desmume_SOURCES = \ + + desmume_LDADD = ../libdesmume.a $(SDL_LIBS) $(GTK_LIBS) \ + $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ +- $(LIBSOUNDTOUCH_LIBS) $(am__append_1) $(am__append_2) \ ++ $(LIBSOUNDTOUCH_LIBS) -ltinyxml $(am__append_1) $(am__append_2) \ + $(am__append_3) + UPDATE_DESKTOP = \ + appsdir=$(DESTDIR)$(datadir)/applications ; \ +diff --git a/src/utils/advanscene.cpp b/src/utils/advanscene.cpp +index 8d8f370..09c35bb 100755 +--- a/src/utils/advanscene.cpp ++++ b/src/utils/advanscene.cpp +@@ -19,7 +19,7 @@ + #include + + #define TIXML_USE_STL +-#include "tinyxml/tinyxml.h" ++#include + + #include "advanscene.h" + #include "../common.h" diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 6bb5be3c7137..67fb3b4d24b8 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -2,6 +2,7 @@ , pkgconfig, libtool, intltool , libXmu , lua +, tinyxml , agg, alsaLib, soundtouch, openal , desktop-file-utils , gtk2, gtkglext, libglade, pangox_compat @@ -19,11 +20,9 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { - name = "gcc6_fixes.patch"; - url = "https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/desmume/debian/patches/gcc6_fixes.patch?revision=15925"; - sha256 = "0j3fmxz0mfb3f4biks03pyz8f9hy958ks6qplisl60rzq9v9qpks"; - }) + ./gcc6_fixes.patch + ./gcc7_fixes.patch + ./01_use_system_tinyxml.patch ]; CXXFLAGS = "-fpermissive"; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch openal desktop-file-utils gtk2 gtkglext libglade pangox_compat - libGLU libpcap SDL zziplib ]; + libGLU libpcap SDL zziplib tinyxml ]; configureFlags = [ "--disable-glade" # Failing on compile step diff --git a/pkgs/misc/emulators/desmume/gcc6_fixes.patch b/pkgs/misc/emulators/desmume/gcc6_fixes.patch new file mode 100644 index 000000000000..6eb9576f649b --- /dev/null +++ b/pkgs/misc/emulators/desmume/gcc6_fixes.patch @@ -0,0 +1,59 @@ +From: zeromus +Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sourceforge.net/p/desmume/code/5517, https://sourceforge.net/p/desmume/code/5430 +Subject: fix GCC6 issues +Bug: https://sourceforge.net/p/desmume/bugs/1570/ +Bug-Debian: http://bugs.debian.org/811691 + +Index: desmume/src/MMU_timing.h +=================================================================== +--- desmume/src/MMU_timing.h (revision 5513) ++++ desmume/src/MMU_timing.h (revision 5517) +@@ -155,8 +155,8 @@ + enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT }; + enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT }; + enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT }; +- enum { TAGMASK = (u32)(~0 << TAGSHIFT) }; +- enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) }; ++ enum { TAGMASK = (u32)(~0U << TAGSHIFT) }; ++ enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) }; + enum { WORDSIZE = sizeof(u32) }; + enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; + enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; +Index: desmume/src/ctrlssdl.cpp +=================================================================== +--- desmume/src/ctrlssdl.cpp (revision 5513) ++++ desmume/src/ctrlssdl.cpp (revision 5517) +@@ -200,7 +200,7 @@ + break; + case SDL_JOYAXISMOTION: + /* Dead zone of 50% */ +- if( (abs(event.jaxis.value) >> 14) != 0 ) ++ if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) + { + key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); + if (event.jaxis.value > 0) { +@@ -370,7 +370,7 @@ + Note: button constants have a 1bit offset. */ + case SDL_JOYAXISMOTION: + key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); +- if( (abs(event->jaxis.value) >> 14) != 0 ) ++ if( ((u32)abs(event->jaxis.value) >> 14) != 0 ) + { + if (event->jaxis.value > 0) + key_code |= 1; +Index: desmume/src/wifi.cpp +=================================================================== +--- desmume/src/wifi.cpp (revision 5429) ++++ desmume/src/wifi.cpp (revision 5430) +@@ -320,9 +320,9 @@ + + #if (WIFI_LOGGING_LEVEL >= 1) + #if WIFI_LOG_USE_LOGC +- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__); + #else +- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__); ++ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__); + #endif + #else + #define WIFI_LOG(level, ...) {} diff --git a/pkgs/misc/emulators/desmume/gcc7_fixes.patch b/pkgs/misc/emulators/desmume/gcc7_fixes.patch new file mode 100644 index 000000000000..a4934ff6e611 --- /dev/null +++ b/pkgs/misc/emulators/desmume/gcc7_fixes.patch @@ -0,0 +1,18 @@ +From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 +From: rogerman +Date: Mon, 17 Aug 2015 21:15:04 +0000 +Subject: Fix bug with libfat string handling. + +diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp +index 765d7ae5..b6d7f01f 100644 +--- a/src/utils/libfat/directory.cpp ++++ b/src/utils/libfat/directory.cpp +@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len + int bytes; + size_t count = 0; + +- while (count < len-1 && src != '\0') { ++ while (count < len-1 && *src != '\0') { + bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps); + if (bytes > 0) { + *dst = (ucs2_t)tempChar; From 3d81600b6c7ff5780ba6d9ab9a9c17d829f441f9 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 4 Oct 2019 12:33:31 +0200 Subject: [PATCH 065/192] ipsecTools: ship patch directly No longer available since anonscm.debian.org is shut down (#39927). Replacement obtained from OpenSUSE source package http://download.opensuse.org/repositories/openSUSE:/Factory/standard/src/ipsec-tools-0.8.2-9.6.src.rpm --- .../linux/ipsec-tools/CVE-2016-10396.patch | 193 ++++++++++++++++++ .../os-specific/linux/ipsec-tools/default.nix | 5 +- 2 files changed, 194 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch b/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch new file mode 100644 index 000000000000..b644d46f8c9d --- /dev/null +++ b/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch @@ -0,0 +1,193 @@ +From: Antoine_Beaupre +Acked-by: Jiri Bohac +Subject: PR/51682: Avoid DoS with fragment out of order insertion; keep fragments sorted in the list. +References: bsc#1047443, CVE-2016-10396 + + + +Index: a/src/racoon/handler.h +=================================================================== +--- a/src/racoon/handler.h.orig 2018-01-26 18:05:21.114764376 +0100 ++++ a/src/racoon/handler.h 2018-01-26 18:05:33.986741103 +0100 +@@ -141,6 +141,7 @@ struct ph1handle { + #endif + #ifdef ENABLE_FRAG + int frag; /* IKE phase 1 fragmentation */ ++ int frag_last_index; + struct isakmp_frag_item *frag_chain; /* Received fragments */ + #endif + +Index: a/src/racoon/isakmp.c +=================================================================== +--- a/src/racoon/isakmp.c.orig 2018-01-26 18:05:21.118764369 +0100 ++++ a/src/racoon/isakmp.c 2018-01-26 18:05:33.986741103 +0100 +@@ -1069,6 +1069,7 @@ isakmp_ph1begin_i(rmconf, remote, local) + iph1->frag = 1; + else + iph1->frag = 0; ++ iph1->frag_last_index = 0; + iph1->frag_chain = NULL; + #endif + iph1->approval = NULL; +@@ -1173,6 +1174,7 @@ isakmp_ph1begin_r(msg, remote, local, et + #endif + #ifdef ENABLE_FRAG + iph1->frag = 0; ++ iph1->frag_last_index = 0; + iph1->frag_chain = NULL; + #endif + iph1->approval = NULL; +Index: a/src/racoon/isakmp_frag.c +=================================================================== +--- a/src/racoon/isakmp_frag.c.orig 2018-01-26 18:05:21.118764369 +0100 ++++ a/src/racoon/isakmp_frag.c 2018-01-26 18:05:33.986741103 +0100 +@@ -173,6 +173,43 @@ vendorid_frag_cap(gen) + return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]); + } + ++static int ++isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item) ++{ ++ struct isakmp_frag_item *pitem = NULL; ++ struct isakmp_frag_item *citem = iph1->frag_chain; ++ ++ /* no frag yet, just insert at beginning of list */ ++ if (iph1->frag_chain == NULL) { ++ iph1->frag_chain = item; ++ return 0; ++ } ++ ++ do { ++ /* duplicate fragment number, abort (CVE-2016-10396) */ ++ if (citem->frag_num == item->frag_num) ++ return -1; ++ ++ /* need to insert before current item */ ++ if (citem->frag_num > item->frag_num) { ++ if (pitem != NULL) ++ pitem->frag_next = item; ++ else ++ /* insert at the beginning of the list */ ++ iph1->frag_chain = item; ++ item->frag_next = citem; ++ return 0; ++ } ++ ++ pitem = citem; ++ citem = citem->frag_next; ++ } while (citem != NULL); ++ ++ /* we reached the end of the list, insert */ ++ pitem->frag_next = item; ++ return 0; ++} ++ + int + isakmp_frag_extract(iph1, msg) + struct ph1handle *iph1; +@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg) + item->frag_next = NULL; + item->frag_packet = buf; + +- /* Look for the last frag while inserting the new item in the chain */ +- if (item->frag_last) +- last_frag = item->frag_num; ++ /* Check for the last frag before inserting the new item in the chain */ ++ if (item->frag_last) { ++ /* if we have the last fragment, indices must match */ ++ if (iph1->frag_last_index != 0 && ++ item->frag_last != iph1->frag_last_index) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "Repeated last fragment index mismatch\n"); ++ racoon_free(item); ++ vfree(buf); ++ return -1; ++ } + +- if (iph1->frag_chain == NULL) { +- iph1->frag_chain = item; +- } else { +- struct isakmp_frag_item *current; ++ last_frag = iph1->frag_last_index = item->frag_num; ++ } + +- current = iph1->frag_chain; +- while (current->frag_next) { +- if (current->frag_last) +- last_frag = item->frag_num; +- current = current->frag_next; +- } +- current->frag_next = item; ++ /* insert fragment into chain */ ++ if (isakmp_frag_insert(iph1, item) == -1) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "Repeated fragment index mismatch\n"); ++ racoon_free(item); ++ vfree(buf); ++ return -1; + } + +- /* If we saw the last frag, check if the chain is complete */ ++ /* If we saw the last frag, check if the chain is complete ++ * we have a sorted list now, so just walk through */ + if (last_frag != 0) { ++ item = iph1->frag_chain; + for (i = 1; i <= last_frag; i++) { +- item = iph1->frag_chain; +- do { +- if (item->frag_num == i) +- break; +- item = item->frag_next; +- } while (item != NULL); +- ++ if (item->frag_num != i) ++ break; ++ item = item->frag_next; + if (item == NULL) /* Not found */ + break; + } + +- if (item != NULL) /* It is complete */ ++ if (i > last_frag) /* It is complete */ + return 1; + } + +@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1) + } + data = buf->v; + ++ item = iph1->frag_chain; + for (i = 1; i <= frag_count; i++) { +- item = iph1->frag_chain; +- do { +- if (item->frag_num == i) +- break; +- item = item->frag_next; +- } while (item != NULL); +- +- if (item == NULL) { ++ if (item->frag_num != i) { + plog(LLV_ERROR, LOCATION, NULL, + "Missing fragment #%d\n", i); + vfree(buf); +@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1) + } + memcpy(data, item->frag_packet->v, item->frag_packet->l); + data += item->frag_packet->l; ++ item = item->frag_next; + } + + out: + + +diff -u -p -r1.50 -r1.51 +--- a/src/racoon/isakmp_inf.c 2013/04/12 09:53:10 1.50 ++++ a/src/racoon/isakmp_inf.c 2017/01/24 19:23:56 1.51 +@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca + #endif + #ifdef ENABLE_FRAG + iph1->frag = 0; ++ iph1->frag_last_index = 0; + iph1->frag_chain = NULL; + #endif + diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 0aa074b4df8f..551fc61f8145 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -19,10 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./dont-create-localstatedir-during-install.patch ./CVE-2015-4047.patch - (fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-ipsec-tools/pkg-ipsec-tools.git/plain/debian/patches/CVE-2016-10396.patch?id=62ac12648a4eb7c5ba5dba0f81998d1acf310d8b"; - sha256 = "1kf7j2pf1blni52z7q41n0yisqb7gvk01lvldr319zaxxg7rm84a"; - }) + ./CVE-2016-10396.patch ]; # fix build with newer gcc versions From 4b7a1231f1959f5548cc972ae3a1ea68d885f70c Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 4 Oct 2019 12:40:43 +0200 Subject: [PATCH 066/192] diffoscope: get source from upstream tarball anonscm.debian.org is dead --- pkgs/tools/misc/diffoscope/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 22da00da9fca..93906834a60e 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python3Packages, docutils, help2man +{ lib, stdenv, fetchurl, python3Packages, docutils, help2man , acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite @@ -8,13 +8,12 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { - name = "diffoscope-${version}"; + pname = "diffoscope"; version = "110"; - src = fetchgit { - url = "https://anonscm.debian.org/git/reproducible/diffoscope.git"; - rev = "refs/tags/${version}"; - sha256 = "0rhjxigwxbqbqk7xv7n4m4rh693rg3cbp4x565jv68iy423mf2fb"; + src = fetchurl { + url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; + sha256 = "0nrcrqnh4fb0db7wgxkqn7475xk76nq8k0nlr5lbpnqfg5dy039g"; }; patches = [ @@ -34,7 +33,7 @@ python3Packages.buildPythonApplication rec { # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # - # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript + # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript wasm2wat zipnode # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils From d5639a07dee1bb4c125eeadfd6c256d268c15159 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 4 Oct 2019 12:42:21 +0200 Subject: [PATCH 067/192] treewide: fix dead anonscm.debian.org links --- .../applications/virtualization/OVMF/default.nix | 2 +- pkgs/misc/drivers/foomatic-filters/default.nix | 2 +- pkgs/misc/emulators/pcsxr/default.nix | 16 ++++++++-------- pkgs/os-specific/linux/acpitool/default.nix | 2 +- pkgs/os-specific/linux/molly-guard/default.nix | 2 +- pkgs/tools/networking/ppp/default.nix | 4 ++-- pkgs/tools/networking/uwimap/default.nix | 2 +- pkgs/tools/text/catdoc/default.nix | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index ecf6f1c54218..c0080329487f 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -42,7 +42,7 @@ edk2.mkDerivation projectDscPath { mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec - # FIXME: why is it different from Debian dir layout? https://anonscm.debian.org/cgit/pkg-qemu/edk2.git/tree/debian/rules + # FIXME: why is it different from Debian dir layout? https://salsa.debian.org/qemu-team/edk2/blob/debian/debian/rules dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=/dev/zero bs=1M count=64 dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=$fd/FV/QEMU_EFI.fd conv=notrunc dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M count=64 diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 580b473b0cd6..d4f15992e742 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ # for CVE-2015-8327 & CVE-2015-8560 (fetchpatch { - url = "https://anonscm.debian.org/cgit/collab-maint/foomatic-filters.git/plain/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch"; + url = "https://salsa.debian.org/debian/foomatic-filters/raw/a3abbef2d2f8c7e62d2fe64f64afe294563fdf8f/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch"; sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4"; }) ]; diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index 8f1e5e02c186..1035061d0570 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -14,35 +14,35 @@ stdenv.mkDerivation rec { patches = [ ( fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/01_fix-i386-exec-stack.patch?h=debian/1.9.94-2"; + url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/01_fix-i386-exec-stack.patch"; sha256 = "17497wjxd6b92bj458s2769d9bpp68ydbvmfs9gp51yhnq4zl81x"; }) ( fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/02_disable-ppc-auto-dynarec.patch?h=debian/1.9.94-2"; + url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/02_disable-ppc-auto-dynarec.patch"; sha256 = "0v8n79z034w6cqdrzhgd9fkdpri42mzvkdjm19x4asz94gg2i2kf"; }) ( fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/03_fix-plugin-dir.patch?h=debian/1.9.94-2"; + url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/03_fix-plugin-dir.patch"; sha256 = "0vkl0mv6whqaz79kvvvlmlmjpynyq4lh352j3bbxcr0vjqffxvsy"; }) ( fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/04_update-homedir-symlinks.patch?h=debian/1.9.94-2"; + url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/04_update-homedir-symlinks.patch"; sha256 = "18r6n025ybr8fljfsaqm4ap31wp8838j73lrsffi49fkis60dp4j"; }) ( fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/05_format-security.patch?h=debian/1.9.94-2"; + url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/05_format-security.patch"; sha256 = "03m4kfc9bk5669hf7ji1anild08diliapx634f9cigyxh72jcvni"; }) ( fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/06_warnings.patch?h=debian/1.9.94-2"; + url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/06_warnings.patch"; sha256 = "0iz3g9ihnhisfgrzma9l74y4lhh57na9h41bmiam1millb796g71"; }) ( fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/07_non-linux-ip-addr.patch?h=debian/1.9.94-2"; + url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/07_non-linux-ip-addr.patch"; sha256 = "14vb9l0l4nzxcymhjjs4q57nmsncmby9qpdr7c19rly5wavm4k77"; }) ( fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/08_reproducible.patch?h=debian/1.9.94-2"; + url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/08_reproducible.patch"; sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06"; }) diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index ce47932587cf..86e6b54906ad 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -3,7 +3,7 @@ let acpitool-patch-051-4 = params: fetchpatch rec { inherit (params) name sha256; - url = "https://anonscm.debian.org/cgit/pkg-acpi/acpitool.git/plain/debian/patches/${name}?h=debian/0.5.1-4&id=3fd9f396f12ec9c1cae3337a2a25026b7faad2ae"; + url = "https://salsa.debian.org/debian/acpitool/raw/33e2ef42a663de820457b212ea2925e506df3b88/debian/patches/${name}"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index 766c01eed3fc..cdd9d162f4a4 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Attempts to prevent you from accidentally shutting down or rebooting machines"; - homepage = https://anonscm.debian.org/git/collab-maint/molly-guard.git/; + homepage = https://salsa.debian.org/debian/molly-guard; license = licenses.artistic2; platforms = platforms.linux; maintainers = with maintainers; [ DerTim1 ]; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index b072ed21318c..987960c9c50a 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { ./nonpriv.patch (fetchurl { name = "CVE-2015-3310.patch"; - url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/rc_mksid-no-buffer-overflow?h=debian/2.4.7-1%2b4"; + url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/rc_mksid-no-buffer-overflow"; sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh"; }) (fetchurl { - url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch"; + url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch"; sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8"; }) (fetchurl { diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 125c83da4c4f..bc500a01c113 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (!stdenv.isDarwin) pam; patches = [ (fetchpatch { - url = "https://anonscm.debian.org/cgit/collab-maint/uw-imap.git/plain/debian/patches/1006_openssl1.1_autoverify.patch?id=b4df81d246a6cdbfd035c21f43e844effda3582b"; + url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch"; sha256 = "09xb58awvkhzmmjhrkqgijzgv7ia381ablf0y7i1rvhcqkb5wga7"; }) ]; diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 16d5b9995c24..d4f402709157 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://anonscm.debian.org/git/collab-maint/catdoc.git/diff/debian/patches/05-CVE-2017-11110.patch?id=21dd5b29b11be04149587657dd90253f52dfef0b"; - sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + url = "https://sources.debian.org/data/main/c/catdoc/1:0.95-4.1/debian/patches/05-CVE-2017-11110.patch"; + sha256 = "1ljnwvssvzig94hwx8843b88p252ww2lbxh8zybcwr3kwwlcymx7"; }) ]; From 0dc92e096d12e667746dfe027cc16dbdacb5d213 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 4 Oct 2019 08:44:07 -0400 Subject: [PATCH 068/192] libmediaart: apply patch to fix gnome-music crash See https://bugzilla.gnome.org/show_bug.cgi?id=792272 (cherry picked from commit 85b7d89892a4ea088d541a694addb2e363758e44) --- pkgs/development/libraries/libmediaart/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 569c567e9282..20a63fd6eb03 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib gdk-pixbuf ]; + patches = [ + # https://bugzilla.gnome.org/show_bug.cgi?id=792272 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libmediaart/commit/a704d0b6cfea091274bd79aca6d15f19b4f6e5b5.patch"; + sha256 = "0606qfmdqxcxrydv1fgwq11hmas34ba4a5kzbbqdhfh0h9ldgwkv"; + }) + ]; + # FIXME: Turn on again when https://github.com/NixOS/nixpkgs/issues/53701 # is fixed on master. doCheck = false; From 4eb97255228d03f17ebe245d0012158c21dcd760 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 4 Oct 2019 13:21:00 +0200 Subject: [PATCH 069/192] Revert "grub2: 2.04-rc1 -> 2.04 (#67622)" This reverts commit 8ba94a8fe8eb8904f6a2ce4cdd114ea4741b57da. See #61718 for rationale. --- pkgs/tools/misc/grub/2.0x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 3f5485718dc5..8ea7a0fa0a2a 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -31,7 +31,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.04"; + version = "2.04-rc1"; in ( @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; rev = "${pname}-${version}"; - sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w"; + sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0"; }; patches = [ From 862f05cb00da70f86705ec6c70c2efb2fcd02e60 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 4 Oct 2019 15:08:28 +0200 Subject: [PATCH 070/192] Revert "grub: 2.02 -> 2.04-rc1" This reverts commit df4d0fab2f62fc1ce1d904dbbfd29e5c66da67bf. See #61718 for rationale. --- pkgs/tools/misc/grub/2.0x.nix | 35 ++++++++++--------- .../misc/grub/relocation-not-implemented.diff | 25 +++++++++++++ 2 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 pkgs/tools/misc/grub/relocation-not-implemented.diff diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 8ea7a0fa0a2a..a38218ce07e8 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool +{ stdenv, fetchurl, fetchpatch, flex, bison, python , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null @@ -31,7 +31,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.04-rc1"; + version = "2.02"; in ( @@ -43,18 +43,28 @@ stdenv.mkDerivation rec { pname = "grub"; inherit version; - src = fetchgit { - url = "git://git.savannah.gnu.org/grub.git"; - rev = "${pname}-${version}"; - sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0"; + src = fetchurl { + url = "mirror://gnu/grub/${pname}-${version}.tar.xz"; + sha256 = "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1"; }; patches = [ ./fix-bash-completion.patch + # This patch makes grub compatible with the XFS sparse inode + # feature introduced by xfsprogs-4.16. + # to be removed in grub-2.03 + (fetchpatch { + url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff; + sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0"; + }) + ./relocation-not-implemented.diff ]; + postPatch = '' + substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' + ''; - nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 fuse libtool ] + nativeBuildInputs = [ bison flex python pkgconfig ]; + buildInputs = [ ncurses libusb freetype gettext lvm2 fuse ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -82,15 +92,6 @@ stdenv.mkDerivation rec { -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' unset CPP # setting CPP intereferes with dependency calculation - - cp -r ${gnulib} $PWD/gnulib - chmod u+w -R $PWD/gnulib - - patchShebangs . - - ./bootstrap --no-git --gnulib-srcdir=$PWD/gnulib - - substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; configureFlags = [ "--enable-grub-mount" ] # dep of os-prober diff --git a/pkgs/tools/misc/grub/relocation-not-implemented.diff b/pkgs/tools/misc/grub/relocation-not-implemented.diff new file mode 100644 index 000000000000..0b7bf947d142 --- /dev/null +++ b/pkgs/tools/misc/grub/relocation-not-implemented.diff @@ -0,0 +1,25 @@ +https://git.savannah.gnu.org/cgit/grub.git/commit/util?id=842c390469e2c2e10b5 +diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c +index a2bb054..39d7efb 100644 +--- a/util/grub-mkimagexx.c ++++ b/util/grub-mkimagexx.c +@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + { + grub_uint32_t *t32 = (grub_uint32_t *) target; + *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) +diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c +index 9179285..a79271f 100644 +--- a/util/grub-module-verifier.c ++++ b/util/grub-module-verifier.c +@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { + -1 + }, (int[]){ + R_X86_64_PC32, ++ R_X86_64_PLT32, + -1 + } + }, From 28a0caef8f5229da8b8b4dd88eb9465effd38831 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Oct 2019 17:09:43 +0200 Subject: [PATCH 071/192] python3Packages.asyncpg: fix hash The hash to the patch is broken, even with the original revision which adds asyncpg (ee2161c5e82b2c7be9dcfcb0105e99fee1bddd3f). As the downloaded patch seems fine, I guess that it was generated with `nix-prefetch-url` (the hashes for `fetchpatch` usually differ) and the issue wasn't found as the fixed-output-derivation was already in the contributor's store. See https://hydra.nixos.org/build/102495795 ZHF #68361 (cherry picked from commit 7c74ebd2a631ab52618829c367e112ed24fb97a6) --- pkgs/development/python-modules/asyncpg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index a71ffd853675..6722d3ee0fd6 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { url = "https://github.com/MagicStack/asyncpg/commit/aaeb7076e5acb045880b46155014c0640624797e.patch"; - sha256 = "0r6g6pvb39vzci8g67mv9rlrvavqvfz6vlv8988wv53bpz1mss3p"; + sha256 = "0l420cmk7469wgb1xq2rxinvja1f2brb5cm4smj2s2wqgymbrf6h"; }) ]; From 3a12434b93f0360e924621be590675dabc5977cf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Oct 2019 17:12:58 +0200 Subject: [PATCH 072/192] nodejs-11_x: remove Package is EOLed by upstream: https://github.com/nodejs/Release Fixes #69008 (cherry picked from commit 334641d1127fdd90475bd128011dabc21d9b8141) --- nixos/doc/manual/release-notes/rl-1909.xml | 5 +++++ .../applications/version-management/sourcehut/core.nix | 6 +++--- pkgs/development/web/nodejs/v11.nix | 10 ---------- pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v11.nix diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index c93d5706de4d..79f8edcc81a5 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -930,6 +930,11 @@ Please use the fork cawbird instead which has been adapted to the API changes and is still maintained. + + + The nodejs-11_x package has been removed as it's EOLed by upstream. + + diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index ca054c5cfde9..21ee99684bd7 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests , sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic -, sassc, nodejs-11_x +, sassc, nodejs , writeText }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { node_modules = fetchNodeModules { src = "${src}/srht"; - nodejs = nodejs-11_x; + nodejs = nodejs; sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p"; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sassc - nodejs-11_x + nodejs ]; propagatedBuildInputs = [ diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix deleted file mode 100644 index 7b60a3772d3c..000000000000 --- a/pkgs/development/web/nodejs/v11.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, openssl, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; -in - buildNodejs { - inherit enableNpm; - version = "11.15.0"; - sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76"; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7dd797324ef..5f96c3532d68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4412,10 +4412,6 @@ in nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; }; - nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { }; - nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix { - enableNpm = false; - }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; From 4e3230f71911ce5e64a3abe437ca1988705da95b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Oct 2019 17:13:37 +0200 Subject: [PATCH 073/192] sourcehut: mark as broken There were several custom python dependencies broken. I decided to modify the `sourcehut` expression as it wouldn't even evaluate without nodejs-11_x I didn't manage to get it building. (cherry picked from commit 594378ceeab609270541926860d7805620b39d00) --- pkgs/applications/version-management/sourcehut/core.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 21ee99684bd7..4b12d66a3a2d 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -75,6 +75,7 @@ buildPythonPackage rec { homepage = https://git.sr.ht/~sircmpwn/srht; description = "Core modules for sr.ht"; license = licenses.bsd3; + broken = true; maintainers = with maintainers; [ eadwu ]; }; } From 699e081a6007e2552dc6c8fe8d2150cbf6fe7e1a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 4 Oct 2019 20:19:34 +0200 Subject: [PATCH 074/192] Revert "nodejs-11_x: remove" This reverts commit 3a12434b93f0360e924621be590675dabc5977cf. The commit broke eval since the removed attribute is still in use. --- nixos/doc/manual/release-notes/rl-1909.xml | 5 ----- .../applications/version-management/sourcehut/core.nix | 6 +++--- pkgs/development/web/nodejs/v11.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/web/nodejs/v11.nix diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 79f8edcc81a5..c93d5706de4d 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -930,11 +930,6 @@ Please use the fork cawbird instead which has been adapted to the API changes and is still maintained. - - - The nodejs-11_x package has been removed as it's EOLed by upstream. - - diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 4b12d66a3a2d..f20ede9db05d 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests , sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic -, sassc, nodejs +, sassc, nodejs-11_x , writeText }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { node_modules = fetchNodeModules { src = "${src}/srht"; - nodejs = nodejs; + nodejs = nodejs-11_x; sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p"; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sassc - nodejs + nodejs-11_x ]; propagatedBuildInputs = [ diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix new file mode 100644 index 000000000000..7b60a3772d3c --- /dev/null +++ b/pkgs/development/web/nodejs/v11.nix @@ -0,0 +1,10 @@ +{ callPackage, openssl, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; +in + buildNodejs { + inherit enableNpm; + version = "11.15.0"; + sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76"; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f96c3532d68..c7dd797324ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4412,6 +4412,10 @@ in nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; }; + nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { }; + nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix { + enableNpm = false; + }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; From 28e8f30daecb8cf48dc95de36011378e76daa0fd Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 23 Sep 2019 15:13:39 +0200 Subject: [PATCH 075/192] sage: add pager to environment Temporary fixup while waiting for an upstream fix. (cherry picked from commit cbe12344ca9315ee10fd0f7749561840921f1a00) --- pkgs/applications/science/math/sage/sage-env.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 8fd69f62171a..0b67b3cff12b 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -44,6 +44,7 @@ , gsl , ntl , jdk +, less }: # This generates a `sage-env` shell file that will be sourced by sage on startup. @@ -92,6 +93,7 @@ let rubiks flintqs jdk # only needed for `jmol` which may be replaced in the future + less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved ] )); in From 973530c8b6ddf0e5ed96bf37a62ac38126e83176 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Oct 2019 20:37:06 +0200 Subject: [PATCH 076/192] Revert "Revert "nodejs-11_x: remove"" This reverts commit 699e081a6007e2552dc6c8fe8d2150cbf6fe7e1a. --- nixos/doc/manual/release-notes/rl-1909.xml | 5 +++++ .../applications/version-management/sourcehut/core.nix | 6 +++--- pkgs/development/web/nodejs/v11.nix | 10 ---------- pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v11.nix diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index c93d5706de4d..79f8edcc81a5 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -930,6 +930,11 @@ Please use the fork cawbird instead which has been adapted to the API changes and is still maintained. + + + The nodejs-11_x package has been removed as it's EOLed by upstream. + + diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index f20ede9db05d..4b12d66a3a2d 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests , sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic -, sassc, nodejs-11_x +, sassc, nodejs , writeText }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { node_modules = fetchNodeModules { src = "${src}/srht"; - nodejs = nodejs-11_x; + nodejs = nodejs; sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p"; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sassc - nodejs-11_x + nodejs ]; propagatedBuildInputs = [ diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix deleted file mode 100644 index 7b60a3772d3c..000000000000 --- a/pkgs/development/web/nodejs/v11.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, openssl, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; -in - buildNodejs { - inherit enableNpm; - version = "11.15.0"; - sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76"; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7dd797324ef..5f96c3532d68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4412,10 +4412,6 @@ in nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; }; - nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { }; - nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix { - enableNpm = false; - }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; From c2fd152c98dc618c9c06b1551faee17e79a03b7f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Oct 2019 21:05:03 +0200 Subject: [PATCH 077/192] nim: build with nodejs v10 As in 8fcbbc94ef2cf943622e8f15168ffeaafecfecea we build `nim` with NodeJS v10 to avoid eval errors since nodejs v11 got removed as it's been EOLed by upstream. --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 4228c368e566..b802f9475dbb 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -1,6 +1,6 @@ # based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml -{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-11_x, openssl, pcre, readline, +{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim, openssl, pcre, readline, boehmgc, sfml, tzdata, coreutils, sqlite }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # as part of building it, so it cannot be read-only checkInputs = [ - nodejs-slim-11_x tzdata coreutils + nodejs-slim tzdata coreutils ]; nativeBuildInputs = [ From 358337d609017256a7e1cc240b19c1f9120daea2 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 2 Oct 2019 23:41:25 +0200 Subject: [PATCH 078/192] libpng12: 1.2.57 -> 1.2.59 CVE-2017-12652 (cherry picked from commit 12f31b73667fc55905b453afd4cb09665edb2fd3) --- pkgs/development/libraries/libpng/12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 2cd8c1debaf2..6f59c94a56b5 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -3,11 +3,11 @@ assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.2.57"; + name = "libpng-1.2.59"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "1n2lrzjkm5jhfg2bs10q398lkwbbx742fi27zgdgx0x23zhj0ihg"; + sha256 = "1izw9ybm27llk8531w6h4jp4rk2rxy2s9vil16nwik5dp0amyqxl"; }; outputs = [ "out" "dev" "man" ]; From 6a35f11361e0a33bea8a62970c6acbbe7cf20e9b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 3 Oct 2019 22:27:04 -0400 Subject: [PATCH 079/192] nixos/gnome3: copy gnome-shell override Without this these default settings overrides to gnome-shell don't appear to be used completely. (cherry picked from commit eb14b000e589417ab5a136b6f8b25984b814d84c) --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 2334e6d6894d..1e4f917921bc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -28,6 +28,8 @@ let (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") (defaultPackages ++ cfg.extraGSettingsOverridePackages)} + cp -f ${pkgs.gnome3.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] From 4bd651df48c73a9228459932ace12ab3a001ac51 Mon Sep 17 00:00:00 2001 From: elseym Date: Sat, 5 Oct 2019 00:40:44 +0200 Subject: [PATCH 080/192] documize: introduce state directory (cherry picked from commit 93fa16f93980d38bdd1b3f4e415abad2c1fd3147) --- nixos/modules/services/web-apps/documize.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/web-apps/documize.nix b/nixos/modules/services/web-apps/documize.nix index 37359869cb64..1b90299aa23c 100644 --- a/nixos/modules/services/web-apps/documize.nix +++ b/nixos/modules/services/web-apps/documize.nix @@ -14,6 +14,15 @@ in { options.services.documize = { enable = mkEnableOption "Documize Wiki"; + stateDirectoryName = mkOption { + type = types.str; + default = "documize"; + description = '' + The name of the directory below /var/lib/private + where documize runs in and stores, for example, backups. + ''; + }; + package = mkOption { type = types.package; default = pkgs.documize-community; @@ -132,6 +141,8 @@ in { ]; Restart = "always"; DynamicUser = "yes"; + StateDirectory = cfg.stateDirectoryName; + WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; }; }; }; From cdc37e5d6d5c2f77e0249d5d6aa13d696ed39f50 Mon Sep 17 00:00:00 2001 From: Quentin Vaucher Date: Fri, 4 Oct 2019 11:59:55 +0200 Subject: [PATCH 081/192] timetable: 1.0.8 -> 1.0.9 (cherry picked from commit 2691337a68c3c23d85679800b824bb6e049a7885) --- pkgs/applications/office/timetable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index fa2d59392180..6d8f095dc9c1 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "timetable"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0s825al10s0hwfzl90bplwwasx89wx28n41sg2md71l9hfqy296q"; + sha256 = "1n02y7vpi4lb888iic06xifc86n2xirk50s1ssf84vlc5md1kq9f"; }; nativeBuildInputs = [ From 1281668f4a2549a82599cb457c4b36092640ffea Mon Sep 17 00:00:00 2001 From: Quentin Vaucher Date: Fri, 4 Oct 2019 12:06:40 +0200 Subject: [PATCH 082/192] ephemeral: 5.3.0 -> 5.4.0 (cherry picked from commit 5a547851b1b1536b0c05b0eebb114447ae5da618) --- pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 369689520d8a..170e0f98c905 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1xglhv4rpl6vqryvliyvr9y8mqli4x4bjcfjsl1v8gdxkzkwfy39"; + sha256 = "1bl5x79nvzq49azcghc2sx9l709524zixh7py8ddccfnhrq641w8"; }; nativeBuildInputs = [ From 6ae771e8d5319f45401e3afba90b5eafc2c48635 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 4 Oct 2019 08:55:46 +0200 Subject: [PATCH 083/192] php73: 7.3.9 -> 7.3.10 Changelog: https://www.php.net/ChangeLog-7.php#7.3.10 (cherry picked from commit c1e531bf5edfa7e039b04ac2510ce0d41e0b44f3) --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 9a82868b7b3d..e82ecf819915 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -262,8 +262,8 @@ in { }; php73 = generic { - version = "7.3.9"; - sha256 = "1i33v50rbqrfwjwch1d46mbpwbxrg1xfycs9mjl7xsy9m04rg753"; + version = "7.3.10"; + sha256 = "0j2lqiw8miv9aqg55z2dvfg3mwm5vyqx6ggmfbw013zvq1qxhvah"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; From 63b18e757620223b4f9ac1cd2f65fb9709d2aa2a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 4 Oct 2019 08:58:32 +0200 Subject: [PATCH 084/192] php72: 7.2.22 -> 7.2.23 Changelog: https://www.php.net/ChangeLog-7.php#7.2.23 (cherry picked from commit b5f73124e4ffc367a1abc8fe41ace190fd2ccdcd) --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e82ecf819915..356aa8c7ce0c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -254,8 +254,8 @@ let in { php72 = generic { - version = "7.2.22"; - sha256 = "12phn0rrd5r1j6xlz83h7v6gszmj4lb5gwj927psbbc6nn1rh2n1"; + version = "7.2.23"; + sha256 = "03a3snx8wdn2pwfy8qdk035da9g3qdnpgqvpz4qfgmr97mjg6ym1"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; From 1735d77242f227107e23dc5ec37b3968b27932d4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 5 Oct 2019 13:49:52 +0200 Subject: [PATCH 085/192] libcouchbase: fix build This applies an upstream fix from libcouchbase to fix a timeout issue with openssl 1.1. See also https://hydra.nixos.org/build/102495724 ZHF #68361 (cherry picked from commit fd41a333d806b9d4ac4a5f39775b650edc5756f6) --- ...x-timeouts-in-libcouchbase-testsuite.patch | 36 +++++++++++++++++++ .../libraries/libcouchbase/default.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch diff --git a/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch b/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch new file mode 100644 index 000000000000..1c57757f855c --- /dev/null +++ b/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch @@ -0,0 +1,36 @@ +From 58237e64fa77ec5cdec658b3295f71ec899175fa Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 5 Oct 2019 13:47:59 +0200 +Subject: [PATCH] Fix timeouts in libcouchbase testsuite + +Nix-specific patch. Basically +https://github.com/couchbase/libcouchbase/commit/b272f6ab88be523bbcf9d5c4252d07fccb023fe5, but +rebased onto 2.10.4. +--- + src/ssl/ssl_e.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/ssl/ssl_e.c b/src/ssl/ssl_e.c +index f4506cf..734a3e6 100644 +--- a/src/ssl/ssl_e.c ++++ b/src/ssl/ssl_e.c +@@ -210,10 +210,16 @@ flush_ssl_data(lcbio_ESSL *es) + * calls. While we could have done this inline with the send() call this + * would make future optimization more difficult. */ + GT_WRITE_DONE: ++#if !LCB_CAN_OPTIMIZE_SSL_BIO ++ BIO_get_mem_ptr(es->wbio, &wmb); ++#endif + while (wmb->length > (size_t)tmp_len) { + char dummy[4096]; + unsigned to_read = MINIMUM(wmb->length-tmp_len, sizeof dummy); + BIO_read(es->wbio, dummy, to_read); ++#if !LCB_CAN_OPTIMIZE_SSL_BIO ++ BIO_get_mem_ptr(es->wbio, &wmb); ++#endif + } + BIO_clear_retry_flags(es->wbio); + return 0; +-- +2.23.0 + diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 23b39bca1f3a..ccfe241324e1 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { # Running tests in parallel does not work enableParallelChecking = false; + patches = [ ./0001-Fix-timeouts-in-libcouchbase-testsuite.patch ]; + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { From 06df4a79f40ee5b955186f35562c4561343bccba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Sep 2019 08:22:02 -0700 Subject: [PATCH 086/192] libfilezilla: 0.18.1 -> 0.18.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libfilezilla/versions (cherry picked from commit 6c55dc2828278f8b3484d4c28ac2bb709c0c3ee0) --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 9b6c1d505c1e..95954a120c8b 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.18.1"; + version = "0.18.2"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "15vzi95ibp6a9n4jjfs78z4b1iym8x1yv849gjipxzx64y5awyyb"; + sha256 = "1j9da9xi2k4nw97m14mpp7h39rh03br0gmjj9ff819l6nhlnkn20"; }; nativeBuildInputs = [ pkgconfig ]; From 72f9bc5d17dc09806a156d64becc2aaeef8d7901 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Sep 2019 20:32:52 -0700 Subject: [PATCH 087/192] signal-cli: 0.6.2 -> 0.6.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/signal-cli/versions (cherry picked from commit b31e2832b594ed281ca0ac99a5d91bb99cc8b8df) --- .../networking/instant-messengers/signal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 010ea1bff7c3..7c474d26c88c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.2"; + version = "0.6.3"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "050nizf7v10jlrwr8f4awzi2368qr01pzpvl2qkrwhdk25r505yr"; + sha256 = "1gvdifscyxmxn2dwlkqi684ahy5kbcj84mqda0m8l4aa8iaq1d59"; }; buildInputs = [ makeWrapper ]; From 5f51f818cb55ea589c1fcdb5f8588215f813f5f8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 5 Oct 2019 16:17:37 +0300 Subject: [PATCH 088/192] cntk: partially unbreak * Use GCC 7 to unbreak the build; * Mark CUDA build as broken due to cub incompatibility. (cherry picked from commit de171ba0c687374bd5694c57ff85c8d29f8aa1f1) --- .../science/math/cntk/default.nix | 19 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index c20a6954c3cb..ceb87b25ba85 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,7 +1,7 @@ -{ config, lib, stdenv, fetchgit, fetchFromGitHub, cmake +{ lib, stdenv, fetchgit, fetchFromGitHub, cmake , openblas, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false -, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: @@ -27,7 +27,10 @@ in stdenv.mkDerivation rec { sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optional cudaSupport addOpenGLRunpath; + + # Force OpenMPI to use g++ in PATH. + OMPI_CXX = "g++"; buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ] ++ lib.optional cudaSupport cudatoolkit @@ -69,6 +72,7 @@ in stdenv.mkDerivation rec { ln -s ${cudnn}/include cuda export configureFlags="$configureFlags --with-cudnn=$PWD" ''} + ../configure $configureFlags ''; @@ -79,9 +83,18 @@ in stdenv.mkDerivation rec { cp bin/cntk $out/bin ''; + postFixup = lib.optionalString cudaSupport '' + for lib in $out/lib/*; do + addOpenGLRunpath "$lib" + done + ''; + enableParallelBuilding = true; meta = with lib; { + # Newer cub is included with cudatoolkit now and it breaks the build. + # https://github.com/Microsoft/CNTK/issues/3191 + broken = cudaSupport; homepage = https://github.com/Microsoft/CNTK; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f96c3532d68..b9ff1493f152 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23333,8 +23333,10 @@ in caffeine-ng = callPackage ../tools/X11/caffeine-ng {}; cntk = callPackage ../applications/science/math/cntk { + stdenv = gcc7Stdenv; inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. + cudaSupport = pkgs.config.cudaSupport or false; }; ecm = callPackage ../applications/science/math/ecm { }; From b9f54b2d234d3d7d205abb855d86f413eb3e0bfc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 5 Oct 2019 10:35:23 -0400 Subject: [PATCH 089/192] linux: 4.14.146 -> 4.14.147 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 07f5974a2fe6..2b83773e7d7a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.146"; + version = "4.14.147"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3"; + sha256 = "04jvp05spszcxmkdsl21dylbcf76ns9bwxf1zlk4x7cxiil97mwg"; }; } // (args.argsOverride or {})) From 3c115d87695b8d50e66a50f5ddb8afba66169b25 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 5 Oct 2019 10:35:57 -0400 Subject: [PATCH 090/192] linux: 4.19.76 -> 4.19.77 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c22e288bcbdd..95443993f6b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.76"; + version = "4.19.77"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds"; + sha256 = "1agksl35amjzc6g6d9zjwz6p5qir2cligb5c1d9s2bag9766jav1"; }; } // (args.argsOverride or {})) From 22c2fa17c5b2e720dbfb08431b0fb7455a3690d2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 5 Oct 2019 10:36:19 -0400 Subject: [PATCH 091/192] linux: 4.4.194 -> 4.4.195 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9ca235ae24c7..99f2b219165c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.194"; + version = "4.4.195"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0kvlp2v4nvkilaanhpgwf8dkyfj24msaw0m38rbc4y51y69yhqvz"; + sha256 = "1dilaz0ghmkml10cvzzpz7ivcx9d8d6fpb76vmixcg634w2jx962"; }; } // (args.argsOverride or {})) From da71a886cdf9fd235e1a2326f81fdb953f1c28be Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 5 Oct 2019 10:36:49 -0400 Subject: [PATCH 092/192] linux: 4.9.194 -> 4.9.195 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index e5b2d0d386b4..299fce9eab4d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.194"; + version = "4.9.195"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m"; + sha256 = "0s4xj8f1dpnz3fbrqmgwq02smhcrq1ni8hgn2bbfqvm15lm5dgjl"; }; } // (args.argsOverride or {})) From 4aa350491051d679453a5e9507c2786c310ef87e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 5 Oct 2019 10:37:27 -0400 Subject: [PATCH 093/192] linux: 5.2.18 -> 5.2.19 --- pkgs/os-specific/linux/kernel/linux-5.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 57059d100468..e21407cc95db 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.18"; + version = "5.2.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd"; + sha256 = "12mi857lyd5vj8qhj2f505hqnwzsnd829hxd78n9kk88iv1f966y"; }; } // (args.argsOverride or {})) From 95aa1b3c8b12d6233378044a0bc50ff64ea76c1b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 5 Oct 2019 10:37:52 -0400 Subject: [PATCH 094/192] linux: 5.3.2 -> 5.3.4 --- pkgs/os-specific/linux/kernel/linux-5.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix index 009d2d5d30c7..def3acc6a5b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3.2"; + version = "5.3.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn"; + sha256 = "0vi4bgcr921z5l6fbcrcgmhaji5gl2avpmp7njna6v0f7sxism0r"; }; } // (args.argsOverride or {})) From 26dfb4f86b49ca03ac3c7f894a136d61d96e346a Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sat, 5 Oct 2019 15:48:30 +0000 Subject: [PATCH 095/192] nixos/doc: fix manpage format Spaces inside cause stray double underscore in generated manual pages. Fixes #70468 (cherry picked from commit 0eaf29433e9f96205cbe8e9db76b94799a79ddec) --- nixos/doc/manual/man-configuration.xml | 4 ++-- nixos/doc/manual/man-nixos-build-vms.xml | 4 ++-- nixos/doc/manual/man-nixos-enter.xml | 4 ++-- nixos/doc/manual/man-nixos-generate-config.xml | 4 ++-- nixos/doc/manual/man-nixos-install.xml | 4 ++-- nixos/doc/manual/man-nixos-option.xml | 4 ++-- nixos/doc/manual/man-nixos-rebuild.xml | 4 ++-- nixos/doc/manual/man-nixos-version.xml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml index c6cbaaee5414..a876821fc37f 100644 --- a/nixos/doc/manual/man-configuration.xml +++ b/nixos/doc/manual/man-configuration.xml @@ -8,8 +8,8 @@ - configuration.nix - NixOS system configuration specification + configuration.nix + NixOS system configuration specification Description diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml index 98f29436b2d7..25f05257a72f 100644 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ b/nixos/doc/manual/man-nixos-build-vms.xml @@ -8,8 +8,8 @@ - nixos-build-vms - build a network of virtual machines from a network of NixOS configurations + nixos-build-vms + build a network of virtual machines from a network of NixOS configurations diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml index 8cea628a694c..9e84dd6d9b0e 100644 --- a/nixos/doc/manual/man-nixos-enter.xml +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -8,8 +8,8 @@ - nixos-enter - run a command in a NixOS chroot environment + nixos-enter + run a command in a NixOS chroot environment diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml index 3ebfd50f036d..2b24d1c322a1 100644 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ b/nixos/doc/manual/man-nixos-generate-config.xml @@ -8,8 +8,8 @@ - nixos-generate-config - generate NixOS configuration modules + nixos-generate-config + generate NixOS configuration modules diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index aec01b0ee3b1..bd3ae5fb24e3 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -8,8 +8,8 @@ - nixos-install - install bootloader and NixOS + nixos-install + install bootloader and NixOS diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index 29a6ca082058..0e625e7bbc3f 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -8,8 +8,8 @@ - nixos-option - inspect a NixOS configuration + nixos-option + inspect a NixOS configuration diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 85929bf1b153..d1a31e1e7d82 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -8,8 +8,8 @@ - nixos-rebuild - reconfigure a NixOS machine + nixos-rebuild + reconfigure a NixOS machine diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml index cb844da10f01..a7ea69cfca07 100644 --- a/nixos/doc/manual/man-nixos-version.xml +++ b/nixos/doc/manual/man-nixos-version.xml @@ -7,8 +7,8 @@ NixOS - nixos-version - show the NixOS version + nixos-version + show the NixOS version From 26cebb4b3d93dfb3143df47d4134cb7f64cde3f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 6 Oct 2019 10:48:55 +0200 Subject: [PATCH 096/192] bird, bird6: 1.6.6 -> 1.6.8 (security) I haven't tested running them, but the bumps are almost exclusively bugfixes, in particular CVE-2019-16159. (cherry picked from commit 13886ac10eb5de4c844f222bf835edf6f4fb1cb3) --- pkgs/servers/bird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index d4b4441408e7..514971820de5 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -47,13 +47,13 @@ in { bird = generic { - version = "1.6.6"; - sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp"; + version = "1.6.8"; + sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc"; }; bird6 = generic { - version = "1.6.6"; - sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp"; + version = "1.6.8"; + sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc"; enableIPv6 = true; }; From 3976563ad9209d74be8335be9a7e78792259ee9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 6 Oct 2019 10:24:54 +0200 Subject: [PATCH 097/192] Merge #69463: bird2: 2.0.5 -> 2.0.6 (security) Fixes CVE-2019-16159. I haven't tested running it, but the changes in NEWS seem quite small. (cherry picked from commit 54acf550faf648dff9c3b691210b8897eec68ed5) --- pkgs/servers/bird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 514971820de5..13b5a19a7515 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -58,7 +58,7 @@ in }; bird2 = generic { - version = "2.0.5"; - sha256 = "1lr963ywy0mkrhgs5969wc354lizddsagrlbf8x84yb5s9pp6jsf"; + version = "2.0.6"; + sha256 = "1ankpxvmn12kzgv5vh7awnkj34jzjciy5baq3smkj079db74r4wh"; }; } From 0e7e613f44a8530c3864d9af284fdfd5096194f8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 6 Oct 2019 08:06:25 +0200 Subject: [PATCH 098/192] nixos/blcr: remove (cherry picked from commit 923c449e9bf554f0bd0aa2df4d1f857e144eeaf3) --- nixos/modules/module-list.nix | 1 - nixos/modules/programs/blcr.nix | 27 --------------------------- nixos/modules/rename.nix | 3 +++ 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 nixos/modules/programs/blcr.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5b7f391ed5a5..24f5e3f40fa1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -98,7 +98,6 @@ ./programs/autojump.nix ./programs/bash/bash.nix ./programs/bcc.nix - ./programs/blcr.nix ./programs/browserpass.nix ./programs/captive-browser.nix ./programs/ccache.nix diff --git a/nixos/modules/programs/blcr.nix b/nixos/modules/programs/blcr.nix deleted file mode 100644 index 804e1d01f12b..000000000000 --- a/nixos/modules/programs/blcr.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, lib, ... }: - -let - inherit (lib) mkOption mkIf; - cfg = config.environment.blcr; - blcrPkg = config.boot.kernelPackages.blcr; -in - -{ - ###### interface - - options = { - environment.blcr.enable = mkOption { - default = false; - description = - "Whether to enable support for the BLCR checkpointing tool."; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - boot.kernelModules = [ "blcr" "blcr_imports" ]; - boot.extraModulePackages = [ blcrPkg ]; - environment.systemPackages = [ blcrPkg ]; - }; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0c7c45a4708b..8ee632fee227 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -273,6 +273,9 @@ with lib; (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) + # BLCR + (mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed") + # Redis (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.") (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.") From f89dbe188ad2e3ef31e3d2eab5ef55023cde5169 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 5 Oct 2019 19:12:24 +0200 Subject: [PATCH 099/192] linuxPackages.blcr: remove blcr is only supported for pre v4 kernels. (cherry picked from commit 83ffa1457bb45bcc1f5edeb891fa0f9a26ce42d0) --- pkgs/os-specific/linux/blcr/default.nix | 43 ------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 45 deletions(-) delete mode 100644 pkgs/os-specific/linux/blcr/default.nix diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix deleted file mode 100644 index e018f4622b48..000000000000 --- a/pkgs/os-specific/linux/blcr/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, kernel, perl, makeWrapper }: - -# BLCR version 0.8.6 should works with linux kernel up to version 3.17.x - -assert stdenv.lib.versionOlder "3.18" kernel.version; - -stdenv.mkDerivation { - name = "blcr_${kernel.version}-0.8.6pre4"; - - src = fetchurl { - url = https://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.6_b4.tar.gz; - sha256 = "1a3gdhdnmk592jc652szxgfz8rjd8dax5jwxfsypiqx5lgkj3m21"; - }; - - buildInputs = [ perl makeWrapper ]; - - hardeningDisable = [ "pic" ]; - - preConfigure = '' - configureFlagsArray=( - --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - --with-kmod-dir=$out/lib/modules/${kernel.modDirVersion} - --with-system-map=${kernel}/System.map - ) - ''; - - postInstall = '' - for prog in "$out/bin/"* - do - wrapProgram "$prog" --prefix LD_LIBRARY_PATH ":" "$out/lib" - done - ''; - - meta = { - description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)"; - homepage = https://ftg.lbl.gov/projects/CheckpointRestart/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ - z77z - ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9ff1493f152..7cc1a533b354 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15756,8 +15756,6 @@ in ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; - blcr = if stdenv.lib.versionOlder "3.18" kernel.version then callPackage ../os-specific/linux/blcr { } else null; - chipsec = callPackage ../tools/security/chipsec { inherit kernel; withDriver = true; From db8676117f2f108874f70767f885a0d665a1a537 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 6 Oct 2019 16:22:09 +0100 Subject: [PATCH 100/192] varnish6: 6.2.0 -> 6.2.1 (security) fixes CVE-2019-15892 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 8a63ed3ea7f1..5b40c2b523cb 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -51,8 +51,8 @@ in python = python2; }; varnish6 = common { - version = "6.2.0"; - sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"; + version = "6.2.1"; + sha256 = "15qfvw3fp05bgyspcm6gbsnxhs430p4z3fwz5kkd1z68jb90b3pj"; python = python3; extraNativeBuildInputs = [ python3.pkgs.sphinx ]; }; From 8244f41f1024c9c5a149ff96be38e6a78671ed53 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 6 Oct 2019 12:00:00 +0000 Subject: [PATCH 101/192] nixos/xfce4-14: add xfce4-volumed-pulse when not using the desktop xfce4-volumed-pulse is not abandoned, but is superseded by a panel plugin which is not available when not using the desktop. Fixes: volume up/down keys support (cherry picked from commit d9cac95878cde76a4bbce7f4790544f45f724357) --- nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index 849b656c3d79..fc3515a3030d 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -91,7 +91,11 @@ in ++ optional config.powerManagement.enable xfce4-power-manager ++ optionals config.hardware.pulseaudio.enable [ pavucontrol - xfce4-pulseaudio-plugin + # volume up/down keys support: + # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse + # but can only be used with xfce4-panel, so for no-desktop usage we still include + # xfce4-volumed-pulse + (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin) ] ++ optionals cfg.enableXfwm [ xfwm4 xfwm4-themes From a8d71d38594208bce3ed37cf25df97e133861f90 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 27 Sep 2019 10:40:31 -0500 Subject: [PATCH 102/192] pim-data-exporter: Add missing dependencies (cherry picked from commit d6bbc18708704105ebb35e2a94afc898ddac5a72) --- pkgs/applications/kde/pim-data-exporter.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix index d17ffb3c0444..9f2117b41fb4 100644 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -1,10 +1,10 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, - kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, - kwallet, libkdepim, libkleo, pimcommon, qttools, - karchive, mailcommon, messagelib + akonadi, akonadi-notes, kcalcore, kcmutils, kcrash, kdbusaddons, + kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, + knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, + pimcommon, qttools, karchive, mailcommon, messagelib }: mkDerivation { @@ -15,8 +15,9 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport - knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim - libkleo pimcommon qttools karchive mailcommon messagelib + akonadi akonadi-notes kcalcore kcmutils kcrash kdbusaddons + kidentitymanagement kldap kmailtransport knewstuff knotifications + knotifyconfig kparts kross ktexteditor kwallet libkdepim libkleo pimcommon + qttools karchive mailcommon messagelib ]; } From aded58688eba2499b0a5e0c5ab2d2d2cd42f79f7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 6 Oct 2019 21:41:41 -0400 Subject: [PATCH 103/192] ghc modules: use permanent urls This is a backport of dbb72303b ('ghc modules: use specific commit ...') cc #70546 --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 69bd3844c9c4..ab06b0c549a5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -161,11 +161,11 @@ self: super: { system-fileio = doJailbreak super.system-fileio; yaml = self.yaml_0_11_1_2; haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch"; + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/8be3fb8a6779d0317066d501a3b9dffdf6bb06b0/patches/haskell-src-meta-0.8.2.patch"; sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc"; }); asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch"; + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/asn1-encoding-0.9.5.patch"; sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5"; }); tls = self.tls_1_5_1; From 4c6b739fd7244fa4c8c041ef7624d5fd9dd6c09f Mon Sep 17 00:00:00 2001 From: Thomas Depierre Date: Sun, 6 Oct 2019 23:55:51 +0200 Subject: [PATCH 104/192] doc/beam: rebar3-open is now removed (#70523) (cherry picked from commit 0ce30f8c67db15ae312f1e27f9228468bbdbb528) --- doc/languages-frameworks/beam.xml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index 65f28d0a2d3b..74c595cc89b4 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -55,20 +55,7 @@ Rebar3 - By default, Rebar3 wants to manage its own dependencies. This is perfectly acceptable in the normal, non-Nix setup, but in the Nix world, it is not. To rectify this, we provide two versions of Rebar3: - - - - rebar3: patched to remove the ability to download anything. When not running it via nix-shell or nix-build, it's probably not going to work as desired. - - - - - rebar3-open: the normal, unmodified Rebar3. It should work exactly as would any other version of Rebar3. Any Erlang package should rely on rebar3 instead. See . - - - + We provide a version of Rebar3, which is the normal, unmodified Rebar3, under rebar3. We also provide a helper to fetch Rebar3 dependencies from a lockfile under fetchRebar3Deps. From cc25b7a7bd17624daf4f7f60a99f8dc8266215c0 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sun, 6 Oct 2019 10:57:00 +0200 Subject: [PATCH 105/192] zncModules.fish: fix build ZHF #68361 (cherry picked from commit 8c9c942e90e8dce4f587e61fe120bf6e2d152999) Signed-off-by: Jonathan Ringer --- pkgs/applications/networking/znc/modules.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 54e148f0833e..5e7bdd09b036 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -79,15 +79,15 @@ in { fish = zncDerivation rec { name = "znc-fish-${version}"; - version = "git-2014-10-10"; + version = "git-2017-06-26"; module_name = "fish"; src = fetchFromGitHub { - # this fork works with ZNC 1.6 - owner = "jarrydpage"; + # this fork works with ZNC 1.7 + owner = "oilslump"; repo = "znc-fish"; - rev = "9c580e018a1a08374e814fc06f551281cff827de"; - sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl"; + rev = "7d91467dbb195f7b591567911210523c6087662e"; + sha256 = "1ky5xg17k5f393whrv5iv8zsmdvdyk2f7z5qdsmxcwy3pdxy6vsm"; }; meta = { From dbc6baadca4d5835da669585c741aac9d284ece2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 1 Oct 2019 20:38:58 -0700 Subject: [PATCH 106/192] pythonPackages.chart-studio: init at 1.0.0 ZHF #68361 (cherry picked from commit ceefed0723ce291ff810bc8fdfff5fe154cb487b) Signed-off-by: Jonathan Ringer --- .../python-modules/chart-studio/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/chart-studio/default.nix diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix new file mode 100644 index 000000000000..0eed42dc286e --- /dev/null +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -0,0 +1,44 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, mock +, nose +, plotly +, pytest +, requests +, retrying +, six +}: + +buildPythonPackage rec { + pname = "chart-studio"; + version = "1.0.0"; + + # chart-studio was split from plotly + src = fetchFromGitHub { + owner = "plotly"; + repo = "plotly.py"; + rev = "${pname}-v${version}"; + sha256 = "14lyqbjdffnlnkzlfnn60k7yxjd99vx3hfcs23apsiyinzipjlbf"; + }; + + sourceRoot = "source/packages/python/chart-studio"; + + propagatedBuildInputs = [ + plotly + requests + retrying + six + ]; + + checkInputs = [ mock nose pytest ]; + # most tests talk to a service + checkPhase = '' + HOME=$TMPDIR pytest chart_studio/tests/test_core chart_studio/tests/test_plot_ly/test_api + ''; + + meta = with lib; { + description = "Utilities for interfacing with Plotly's Chart Studio service"; + homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56a53c0b8e86..5dc17f20f288 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1776,6 +1776,8 @@ in { characteristic = callPackage ../development/python-modules/characteristic { }; + chart-studio = callPackage ../development/python-modules/chart-studio { }; + cheetah = callPackage ../development/python-modules/cheetah { }; cherrypy = if isPy3k then From f364b997a18b29b043b169ca7083dab81c6b88ec Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 1 Oct 2019 20:40:20 -0700 Subject: [PATCH 107/192] pythonPackages.cufflinks: 0.15 -> 0.16 ZHF #68361 (cherry picked from commit 7d297e45910cded782e7b2d7a7cff64348364216) Signed-off-by: Jonathan Ringer --- .../python-modules/cufflinks/default.nix | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 18693a204c53..ed25c2c73717 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -1,40 +1,59 @@ -{ buildPythonPackage, stdenv, fetchPypi, fetchpatch -, numpy, pandas, plotly, six, colorlover -, ipython, ipywidgets, nose +{ lib, buildPythonPackage, fetchPypi, fetchpatch +, chart-studio +, colorlover +, ipython +, ipywidgets +, nose +, numpy +, pandas +, six +, statsmodels }: buildPythonPackage rec { pname = "cufflinks"; - version = "0.15"; + version = "0.16"; src = fetchPypi { inherit pname version; - sha256 = "014098a4568199957198c0a7fe3dbeb3b4010b6de8d692a41fe3b3ac107b660e"; + sha256 = "163lag5g4micpqm3m4qy9b5r06a7pw45nq80x4skxc7dcrly2ygd"; }; propagatedBuildInputs = [ - numpy pandas plotly six colorlover - ipython ipywidgets + chart-studio + colorlover + ipython + ipywidgets + numpy + pandas + six + statsmodels ]; patches = [ - # Plotly 3.8 compatibility. Remove with the next release. See https://github.com/santosjorge/cufflinks/pull/178 + # Plotly 4 compatibility. Remove with next release, assuming it gets merged. (fetchpatch { - url = "https://github.com/santosjorge/cufflinks/commit/cc4c23c2b45b870f6801d1cb0312948e1f73f424.patch"; - sha256 = "1psl2h7vscpzvb4idr6s175v8znl2mfhkcyhb1926p4saswmghw1"; + url = "https://github.com/santosjorge/cufflinks/pull/202/commits/e291dce14181858cb457404adfdaf2624b6d0594.patch"; + sha256 = "1l0dahwqn3cxg49v3i3amwi80dmx2bi5zrazmgzpwsfargmk2kd1"; }) ]; + # in plotly4+, the plotly.plotly module was moved to chart-studio.plotly + postPatch = '' + substituteInPlace requirements.txt \ + --replace "plotly>=3.0.0,<4.0.0a0" "chart-studio" + ''; + checkInputs = [ nose ]; checkPhase = '' nosetests -xv tests.py ''; - meta = { - homepage = https://github.com/santosjorge/cufflinks; + meta = with lib; { description = "Productivity Tools for Plotly + Pandas"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ globin ]; + homepage = "https://github.com/santosjorge/cufflinks"; + license = licenses.mit; + maintainers = with maintainers; [ globin ]; }; } From 907bb84e4b34e99b3d280452c073e06594531fb9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Sep 2019 16:37:58 +0200 Subject: [PATCH 108/192] networking.useDHCP: disallow for networkd This setting will be removed with the switch to systemd-networkd. The use of per interface config is encouraged instead. (cherry picked from commit c26c6241eae93985c33590401fda971d7574c136) --- .../tasks/network-interfaces-systemd.nix | 12 ++++++---- nixos/tests/networking.nix | 23 +++++++++++++++---- nixos/tests/predictable-interface-names.nix | 1 + nixos/tests/systemd-networkd-wireguard.nix | 1 + 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 7c6604922cf7..863072e33dc3 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -38,6 +38,12 @@ in } { assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null; message = "networking.defaultGateway6.interface is not supported by networkd."; + } { + assertion = cfg.useDHCP == false; + message = '' + networking.useDHCP is not supported by networkd. + Please use per interface configuration and set the global option to false. + ''; } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; @@ -56,9 +62,7 @@ in genericNetwork = override: let gateway = optional (cfg.defaultGateway != null) cfg.defaultGateway.address ++ optional (cfg.defaultGateway6 != null) cfg.defaultGateway6.address; - in { - DHCP = override (dhcpStr cfg.useDHCP); - } // optionalAttrs (gateway != [ ]) { + in optionalAttrs (gateway != [ ]) { routes = override [ { routeConfig = { @@ -97,7 +101,7 @@ in networks."40-${i.name}" = mkMerge [ (genericNetwork mkDefault) { name = mkDefault i.name; DHCP = mkForce (dhcpStr - (if i.useDHCP != null then i.useDHCP else cfg.useDHCP && interfaceIps i == [ ])); + (if i.useDHCP != null then i.useDHCP else false)); address = forEach (interfaceIps i) (ip: "${ip.address}/${toString ip.prefixLength}"); networkConfig.IPv6PrivacyExtensions = "kernel"; diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 7452768033ab..f12a5fc9ae57 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -72,6 +72,7 @@ let testCases = { loopback = { name = "Loopback"; + machine.networking.useDHCP = false; machine.networking.useNetworkd = networkd; testScript = '' startAll; @@ -139,14 +140,16 @@ let virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; - useDHCP = true; + useDHCP = false; interfaces.eth1 = { ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; }; interfaces.eth2 = { ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; }; }; }; @@ -320,13 +323,19 @@ let virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; + useDHCP = false; firewall.logReversePathDrops = true; # to debug firewall rules # reverse path filtering rules for the macvlan interface seem # to be incorrect, causing the test to fail. Disable temporarily. firewall.checkReversePath = false; - useDHCP = true; macvlans.macvlan.interface = "eth1"; - interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; + interfaces.macvlan = { + useDHCP = true; + }; }; }; testScript = { ... }: @@ -440,6 +449,7 @@ let virtual = { name = "Virtual"; machine = { + networking.useNetworkd = networkd; networking.interfaces.tap0 = { ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ]; @@ -489,6 +499,7 @@ let boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { useNetworkd = networkd; + useDHCP = false; interfaces.eth1.ipv6.addresses = singleton { address = "fd00:1234:5678:1::1"; prefixLength = 64; @@ -514,11 +525,12 @@ let virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; - useDHCP = true; + useDHCP = false; interfaces.eth1 = { preferTempAddress = true; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; }; }; }; @@ -526,11 +538,12 @@ let virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; - useDHCP = true; + useDHCP = false; interfaces.eth1 = { preferTempAddress = false; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; }; }; }; diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 85047f66f23c..194b4dafa772 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -16,6 +16,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { networking.usePredictableInterfaceNames = lib.mkForce predictable; networking.useNetworkd = withNetworkd; networking.dhcpcd.enable = !withNetworkd; + networking.useDHCP = !withNetworkd; }; testScript = '' diff --git a/nixos/tests/systemd-networkd-wireguard.nix b/nixos/tests/systemd-networkd-wireguard.nix index f1ce1e791ce3..aa0ac54e7969 100644 --- a/nixos/tests/systemd-networkd-wireguard.nix +++ b/nixos/tests/systemd-networkd-wireguard.nix @@ -2,6 +2,7 @@ let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ... imports = [ common/user-account.nix ]; systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; networking.useNetworkd = true; + networking.useDHCP = false; networking.firewall.enable = false; virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ wireguard-tools ]; From da9e914b6c0962b3f8d2578cb0b55d041ad0d10a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 24 Sep 2019 09:36:49 +0200 Subject: [PATCH 109/192] networking.useDHCP: add release notes and docs (cherry picked from commit e862dd637350ddd1812a6c1fb5811c6464e74ff5) --- nixos/doc/manual/release-notes/rl-1909.xml | 8 ++++++++ nixos/modules/tasks/network-interfaces.nix | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index fe3fd5bae3e7..0a5ca4652927 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -930,6 +930,14 @@ The nodejs-11_x package has been removed as it's EOLed by upstream. + + + The option is unsupported in combination with + in anticipation of defaulting to it by default. + It has to be set to false and enabled per + interface with + + diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 3038be6dbab4..31e2ed1cd1ea 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -903,6 +903,11 @@ in Whether to use DHCP to obtain an IP address and other configuration for all network interfaces that are not manually configured. + + Using this option is highly discouraged and also incompatible with + . Please use + instead + and set this to false. ''; }; From 1cb925e8a1ff7cfb303e2aaeb70ae901c0a6257f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 24 Sep 2019 11:41:12 +0200 Subject: [PATCH 110/192] nixos-generate-config: add useDHCP per interface This sets networking.useDHCP to false and for all interfaces found the per-interface useDHCP to true. This replicates the current default behaviour and prepares for the switch to networkd. (cherry picked from commit 5ee383ea8c31cd7c8489c2b076aac9c51f63b55c) --- .../installer/tools/nixos-generate-config.pl | 20 +++++++++++++++++++ nixos/modules/installer/tools/tools.nix | 1 + 2 files changed, 21 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index cfdbdaabf5c5..f2ffe61c42cb 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -563,6 +563,24 @@ $fsAndSwap ${\join "", (map { " $_\n" } (uniq @attrs))}} EOF +sub generateNetworkingDhcpConfig { + my $config = < Date: Mon, 7 Oct 2019 14:45:54 +0200 Subject: [PATCH 111/192] knot-resolver: 4.2.1 -> 4.2.2 (tiny bugfix) https://gitlab.labs.nic.cz/knot/knot-resolver/tags/v4.2.2 (cherry picked from commit 39049dbd37fbdc6183526fcda16fc00e0c7423fb) --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1daa3916925e..3fe8499a58ce 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -23,11 +23,11 @@ exportLuaPathsFor = luaPkgs: '' unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "286e432762f8aa5e605e5e8fecf81815b55c4ed0be19a63e81fbc28171ae553b"; + sha256 = "03b68dff16429aed7a5b0cea7189276c8056e8ecd567b678c2595d48d9a51458"; }; # https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496 From 250751b88c6eaca59fdb27b801e71d6e959e5747 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 7 Oct 2019 10:16:26 -0400 Subject: [PATCH 112/192] README: Update to 19.09 (cherry picked from commit bdf4441d64e71dd1cd5f50729fb7112defcce6cc) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b34438e41a8f..49550f8fe7a9 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 19.03 release](https://hydra.nixos.org/jobset/nixos/release-19.03) +* [Continuous package builds for the NixOS 19.09 release](https://hydra.nixos.org/jobset/nixos/release-19.09) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 19.03 release](https://hydra.nixos.org/job/nixos/release-19.03/tested#tabs-constituents) +* [Tests for the NixOS 19.09 release](https://hydra.nixos.org/job/nixos/release-19.09/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are From 325c40739ee86dd953260ce1b75ae910e4496a41 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 7 Oct 2019 10:31:02 -0400 Subject: [PATCH 113/192] nixos/manual: update 19.03 -> 19.09 in upgrading section (cherry picked from commit 4d25ec0caf37eeb1f2b8b678f73a894e0f1efe71) --- nixos/doc/manual/installation/upgrading.xml | 41 ++++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index d8b6cda2f2d9..d78453bd42c1 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -8,8 +8,15 @@ - Stable channels, such as nixos-19.03. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not from 4.19.x to 4.20.x (a major change that has the potential to break things). Stable channels are generally maintained until the next stable branch is created. + Stable channels, such as + nixos-19.09. + These only get conservative bug fixes and package upgrades. For instance, + a channel update may cause the Linux kernel on your system to be upgraded + from 4.19.34 to 4.19.38 (a minor bug fix), but not from + 4.19.x to 4.20.x (a + major change that has the potential to break things). Stable channels are + generally maintained until the next stable branch is created. @@ -21,16 +28,29 @@ - Small channels, such as nixos-19.03-small or nixos-unstable-small. These are identical to the stable and unstable channels described above, except that they contain fewer binary packages. This means they get updated faster than the regular channels (for instance, when a critical security patch is committed to NixOS’s source tree), but may require more packages to be built from source than usual. They’re mostly intended for server environments and as such contain few GUI applications. + Small channels, such as + nixos-19.09-small + or + nixos-unstable-small. + These are identical to the stable and unstable channels described above, + except that they contain fewer binary packages. This means they get + updated faster than the regular channels (for instance, when a critical + security patch is committed to NixOS’s source tree), but may require + more packages to be built from source than usual. They’re mostly + intended for server environments and as such contain few GUI applications. To see what channels are available, go to . (Note that the URIs of the various channels redirect to a directory that contains the channel’s latest version and includes ISO images and VirtualBox appliances.) Please note that during the release process, channels that are not yet released will be present here as well. See the Getting NixOS page to find the newest supported stable release. - When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For instance, if you installed from a 19.03 ISO, you will be subscribed to the nixos-19.03 channel. To see which NixOS channel you’re subscribed to, run the following as root: + When you first install NixOS, you’re automatically subscribed to the NixOS + channel that corresponds to your installation source. For instance, if you + installed from a 19.09 ISO, you will be subscribed to the + nixos-19.09 channel. To see which NixOS channel you’re + subscribed to, run the following as root: # nix-channel --list | grep nixos nixos https://nixos.org/channels/nixos-unstable @@ -39,13 +59,14 @@ nixos https://nixos.org/channels/nixos-unstable # nix-channel --add https://nixos.org/channels/channel-name nixos - (Be sure to include the nixos parameter at the end.) For instance, to use the NixOS 19.03 stable channel: + (Be sure to include the nixos parameter at the end.) For + instance, to use the NixOS 19.09 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-19.03 nixos +# nix-channel --add https://nixos.org/channels/nixos-19.09 nixos If you have a server, you may want to use the “small” channel instead: -# nix-channel --add https://nixos.org/channels/nixos-19.03-small nixos +# nix-channel --add https://nixos.org/channels/nixos-19.09-small nixos And if you want to live on the bleeding edge: @@ -79,7 +100,7 @@ nixos https://nixos.org/channels/nixos-unstable This enables a periodically executed systemd service named nixos-upgrade.service. It runs nixos-rebuild switch --upgrade to upgrade NixOS to the latest version in the current channel. (To see when the service runs, see systemctl list-timers.) You can also specify a channel explicitly, e.g. - = https://nixos.org/channels/nixos-19.03; + = https://nixos.org/channels/nixos-19.09; From e9f56dd979caabed3ea455fbb71cccd75c3bd1ca Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 7 Oct 2019 16:17:57 +0200 Subject: [PATCH 114/192] 19.09 notes: document timesyncd issue See #64922. (cherry picked from commit 25a36477c8284a93264651aa59623064463efcd7) --- nixos/doc/manual/release-notes/rl-1909.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 0a5ca4652927..0a3f7aadd54d 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -938,6 +938,17 @@ interface with + + + Because of the systemd upgrade, + systemd-timesyncd will no longer work if + is not set correctly. When + upgrading from NixOS 19.03, please make sure that + is set to + "19.03", or lower if the installation dates back to an + earlier version of NixOS. + + From c922d882991b6ddf94511547f8ef8a3937c64490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Oct 2019 17:49:17 +0200 Subject: [PATCH 115/192] Merge #70618: linuxPackages.virtualBoxGuestAdditions: fix build (cherry picked from commit b7b8e1f2e73d1e0c5a4905735af1a9fac9635ab0) --- .../virtualization/virtualbox/guest-additions/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index e20fbf73190e..47ea4fc62b48 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -55,6 +55,8 @@ in stdenv.mkDerivation { ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run chmod 755 ./VBoxLinuxAdditions.run + # An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is + sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run ./VBoxLinuxAdditions.run --noexec --keep '' else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions") From 75ecca47dbeb2e6e47875218dfd15ba0343b4b6f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 30 Sep 2019 10:17:58 -0700 Subject: [PATCH 116/192] pythonPackages.supervisor: fix tests (cherry picked from commit 5d761d985b1032212b3c4c18820cc67236059b68) --- .../development/python-modules/supervisor/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index e7bbb57cedcc..18ab5bca7ea9 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -1,6 +1,7 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi +{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi , mock , meld3 +, pytest , setuptools }: @@ -13,7 +14,13 @@ buildPythonPackage rec { sha256 = "02pindhq84hb9a7ykyaqw8i2iqb21h69lpmclyqh7fm1446rji4n"; }; - checkInputs = [ mock ]; + # wants to write to /tmp/foo which is likely already owned by another + # nixbld user on hydra + doCheck = !stdenv.isDarwin; + checkInputs = [ mock pytest ]; + checkPhase = '' + pytest + ''; propagatedBuildInputs = [ meld3 setuptools ]; From e6754980264fe927320d5ff2dbd24ca4fac9a160 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 7 Oct 2019 17:20:23 +0200 Subject: [PATCH 117/192] treewide: mark some broken stuff as broken (WIP) --- pkgs/applications/audio/quodlibet/default.nix | 1 + pkgs/applications/audio/sonic-pi/default.nix | 1 + pkgs/applications/blockchains/polkadot/default.nix | 1 + pkgs/applications/graphics/photoflow/default.nix | 2 +- pkgs/applications/misc/digitalbitbox/default.nix | 1 + pkgs/applications/misc/opencpn/default.nix | 1 + pkgs/applications/misc/opentx/default.nix | 1 + pkgs/applications/misc/pbpst/default.nix | 1 + pkgs/applications/misc/sleepyhead/default.nix | 1 + pkgs/applications/networking/feedreaders/newsboat/default.nix | 1 + .../networking/instant-messengers/psi-plus/default.nix | 1 + .../networking/instant-messengers/telepathy/salut/default.nix | 1 + pkgs/applications/networking/mailreaders/notbit/default.nix | 1 + pkgs/applications/office/kmymoney/default.nix | 1 + pkgs/applications/office/skrooge/default.nix | 1 + pkgs/applications/science/biology/EZminc/default.nix | 1 + pkgs/applications/science/biology/paml/default.nix | 1 + pkgs/applications/science/biology/strelka/default.nix | 1 + pkgs/applications/science/chemistry/pymol/default.nix | 1 + pkgs/applications/science/electronics/kicad/default.nix | 1 + pkgs/applications/science/electronics/kicad/unstable.nix | 1 + pkgs/applications/science/logic/jonprl/default.nix | 1 + pkgs/applications/science/logic/lean2/default.nix | 1 + pkgs/applications/science/logic/monosat/default.nix | 3 ++- pkgs/applications/science/robotics/qgroundcontrol/default.nix | 1 + pkgs/applications/video/obs-studio/linuxbrowser.nix | 1 + pkgs/desktops/plasma-5/kdecoration.nix | 1 + pkgs/desktops/plasma-5/kscreen.nix | 1 + .../panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix | 1 + pkgs/desktops/xfce4-14/xfburn/default.nix | 1 + pkgs/development/interpreters/love/0.9.nix | 1 + pkgs/development/interpreters/proglodyte-wasm/default.nix | 1 + pkgs/development/libraries/gdata-sharp/default.nix | 1 + pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix | 1 + pkgs/development/libraries/libcef/default.nix | 1 + pkgs/development/libraries/libclc/default.nix | 1 + pkgs/development/libraries/libguestfs/default.nix | 1 + pkgs/development/libraries/qca2/default.nix | 1 + .../development/libraries/science/biology/elastix/default.nix | 1 + pkgs/development/libraries/torch/default.nix | 1 + pkgs/development/misc/stm32/betaflight/default.nix | 1 + pkgs/development/misc/stm32/inav/default.nix | 1 + pkgs/development/python-modules/bidict/default.nix | 1 + pkgs/development/python-modules/django-pipeline/default.nix | 1 + pkgs/development/python-modules/django_evolution/default.nix | 1 + pkgs/development/python-modules/django_taggit/default.nix | 1 + pkgs/development/python-modules/exchangelib/default.nix | 1 + pkgs/development/python-modules/filemagic/default.nix | 1 + pkgs/development/python-modules/filterpy/default.nix | 1 + .../python-modules/flake8-future-import/default.nix | 1 + pkgs/development/python-modules/gensim/default.nix | 1 + pkgs/development/python-modules/geopy/default.nix | 1 + pkgs/development/python-modules/jenkinsapi/default.nix | 1 + .../python-modules/maildir-deduplicate/default.nix | 1 + pkgs/development/python-modules/minidb/default.nix | 1 + pkgs/development/python-modules/openrazer/common.nix | 1 + pkgs/development/python-modules/paperspace/default.nix | 1 + pkgs/development/python-modules/percol/default.nix | 1 + pkgs/development/python-modules/pgsanity/default.nix | 1 + pkgs/development/python-modules/piccata/default.nix | 1 + pkgs/development/python-modules/pip-tools/default.nix | 1 + pkgs/development/python-modules/poetry/default.nix | 1 + pkgs/development/python-modules/ptpython/default.nix | 1 + pkgs/development/python-modules/py3exiv2/default.nix | 1 + pkgs/development/python-modules/pybfd/default.nix | 1 + pkgs/development/python-modules/pyezminc/default.nix | 1 + pkgs/development/python-modules/pygbm/default.nix | 1 + pkgs/development/python-modules/pykickstart/default.nix | 1 + pkgs/development/python-modules/pyro-ppl/default.nix | 1 + pkgs/development/python-modules/pysvn/default.nix | 1 + pkgs/development/python-modules/pytaglib/default.nix | 1 + pkgs/development/python-modules/pythonnet/default.nix | 1 + pkgs/development/python-modules/pytorch/default.nix | 1 + pkgs/development/python-modules/qscintilla-qt5/default.nix | 1 + pkgs/development/python-modules/qutip/default.nix | 1 + pkgs/development/python-modules/rubymarshal/default.nix | 1 + pkgs/development/python-modules/snug/default.nix | 1 + pkgs/development/python-modules/sparse/default.nix | 1 + pkgs/development/python-modules/spectral-cube/default.nix | 1 + .../development/python-modules/sqlalchemy-migrate/default.nix | 1 + pkgs/development/python-modules/ssdp/default.nix | 1 + pkgs/development/python-modules/supervisor/default.nix | 1 + .../python-modules/swagger-spec-validator/default.nix | 1 + pkgs/development/python-modules/symengine/default.nix | 1 + pkgs/development/python-modules/torchvision/default.nix | 1 + pkgs/development/python-modules/vmprof/default.nix | 1 + pkgs/development/python-modules/word2vec/default.nix | 1 + pkgs/development/python-modules/yt/default.nix | 1 + pkgs/development/python-modules/zake/default.nix | 1 + pkgs/development/python-modules/zope_contenttype/default.nix | 1 + pkgs/development/python-modules/zope_i18n/default.nix | 1 + pkgs/development/tools/fedpkg/default.nix | 1 + pkgs/development/tools/vogl/default.nix | 1 + pkgs/games/liquidwar/5.nix | 1 + pkgs/games/simutrans/default.nix | 1 + pkgs/games/spring/default.nix | 1 + pkgs/misc/drivers/utsushi/default.nix | 1 + pkgs/misc/emulators/qmc2/default.nix | 1 + pkgs/misc/emulators/retroarch/cores.nix | 4 +++- pkgs/misc/logging/beats/6.x.nix | 1 + pkgs/servers/http/tengine/default.nix | 1 + pkgs/servers/scylladb/default.nix | 1 + pkgs/servers/x11/xorg/overrides.nix | 2 ++ pkgs/tools/X11/winswitch/default.nix | 1 + pkgs/tools/backup/wal-g/default.nix | 1 + pkgs/tools/filesystems/irods/default.nix | 1 + pkgs/tools/filesystems/nixpart/0.4/default.nix | 1 + pkgs/tools/graphics/neural-style/default.nix | 1 + pkgs/tools/misc/svtplay-dl/default.nix | 1 + pkgs/tools/networking/http-prompt/default.nix | 1 + pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 1 + pkgs/tools/networking/unbound/python.nix | 1 + pkgs/tools/security/mbox/default.nix | 1 + pkgs/tools/security/meo/default.nix | 1 + pkgs/tools/security/sequoia/default.nix | 1 + pkgs/top-level/dotnet-packages.nix | 1 + 116 files changed, 120 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index c874bdd40d24..573dca518e3a 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -65,5 +65,6 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; + broken = true; }; } diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 7934af8aad8e..e66ee6880adc 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -95,5 +95,6 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 100c0f8ba41f..681268b4f327 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; maintainers = [ maintainers.akru ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index db41ee0566fe..78d16e692261 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = [ maintainers.MtP ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = true; }; } diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index a4f6b1ce9881..a6ae45306552 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -138,5 +138,6 @@ in stdenv.mkDerivation rec { vidbina ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 5c7e7355c662..041ba7811db0 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; homepage = https://opencpn.org/; + broken = true; }; } diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 585c85cbd2c5..370f88d7b479 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -58,6 +58,7 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ elitak ]; + broken = true; }; } diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix index fcf88200133c..c1fd6c5d7cb8 100644 --- a/pkgs/applications/misc/pbpst/default.nix +++ b/pkgs/applications/misc/pbpst/default.nix @@ -45,5 +45,6 @@ llvmPackages.stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ tmplt ]; + broken = true; }; } diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index cf5c4625c952..a32709294175 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -37,6 +37,7 @@ in stdenv.mkDerivation { license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.krav ]; + broken = true; }; } diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index f7a9521c9937..4273545a8e5a 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -53,5 +53,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ dotlambda nicknovitski ]; license = licenses.mit; platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 16fb1bbab1ed..5ca28fca7a79 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej ]; license = licenses.gpl2; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 0bc9b3124ee9..6513c6324a61 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Link-local XMPP connection manager for Telepathy"; platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; + broken = true; }; } diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index fcf1464ba239..370c4f838870 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ mog ]; + broken = true; }; } diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 0cb23abea66a..20ba1abd36aa 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { homepage = https://kmymoney.org/; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; + broken = true; }; } diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 42fddb972c9f..dfa08b1924ef 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -37,5 +37,6 @@ mkDerivation rec { license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ joko ]; homepage = https://skrooge.org/; + broken = true; }; } diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index dbcfead6b1ea..696162d2dc53 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { pname = "EZminc"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.free; + broken = true; }; } diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 161188f7ef16..fe6919656d9d 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.''; license = "non-commercial"; homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; + broken = true; }; } diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index 84c90d895566..c791e8ef89bb 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/Illumina/strelka; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 1fc387fcc66d..b1bd01fb2f7f 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -47,5 +47,6 @@ python3Packages.buildPythonApplication { description = description; homepage = https://www.pymol.org/; license = licenses.psfl; + broken = true; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index f31dd0daa5c3..889d2107fb29 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -116,5 +116,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ berce ]; platforms = with platforms; linux; + broken = true; }; } diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index 7475170d6a72..5310da0699e2 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ berce ]; platforms = with platforms; linux; + broken = true; }; } diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix index 61ca78d85ed1..e503836098f1 100644 --- a/pkgs/applications/science/logic/jonprl/default.nix +++ b/pkgs/applications/science/logic/jonprl/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 8cc50bb5e295..612c9d6f92a2 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice gebner ]; + broken = true; }; } diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 30d47687a3eb..fba3bc479060 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -39,6 +39,7 @@ let platforms = platforms.unix; license = if includeGplCode then licenses.gpl2 else licenses.mit; homepage = https://github.com/sambayless/monosat; + broken = true; }; }; @@ -64,4 +65,4 @@ let --replace '../../../../libmonosat.so' '${core}/lib/libmonosat.so' ''; }; -in core \ No newline at end of file +in core diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 1863757adbcf..f9fea3f31462 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ pxc ]; + broken = true; }; } diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 52aa57bf1986..4761cd0e50a3 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ puffnfresh ]; license = licenses.gpl2; platforms = with platforms; linux; + broken = true; }; } diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 569da3c70349..fa6092d24752 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -5,4 +5,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ki18n ]; outputs = [ "out" "dev" ]; + broken = true; } diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 422bb95c6059..4ef6eaf4bded 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -14,4 +14,5 @@ mkDerivation { libkscreen qtdeclarative qtgraphicaleffects kwindowsystem kdeclarative plasma-framework ]; + meta.broken = true; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index 144291da86d7..2e8de0f7f6e7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { description = "Global Menu applet for XFCE4"; license = licenses.lgpl3; maintainers = with maintainers; [ jD91mZM2 ]; + meta.broken = true; }; } diff --git a/pkgs/desktops/xfce4-14/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix index 27fae12981ca..dd3a9af16804 100644 --- a/pkgs/desktops/xfce4-14/xfburn/default.nix +++ b/pkgs/desktops/xfce4-14/xfburn/default.nix @@ -9,4 +9,5 @@ mkXfceDerivation { nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ exo gtk2 libburn libisofs libxfce4ui ]; + meta.broken = true; } diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 425239af2242..f1571dc726c0 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; + broken = true; }; } diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix index 5710f1066757..8ebbf6cf5012 100644 --- a/pkgs/development/interpreters/proglodyte-wasm/default.nix +++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ proglodyte ]; platforms = platforms.linux; license = licenses.asl20; + broken = true; }; } diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 1a3447f6674f..58036351a09f 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -37,5 +37,6 @@ in stdenv.mkDerivation { license = licenses.asl20; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index a099643061a1..77b88a0b75d9 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; license = licenses.lgpl21; + broken = true; }; } diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index e161948db404..e01142c12efe 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ puffnfresh ]; license = licenses.bsd3; platforms = with platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 78f5e9d233ca..119adcb4ef2b 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; platforms = platforms.all; + broken = true; }; } diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 9b50ddd4b7f4..5b0749632ca7 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -85,5 +85,6 @@ stdenv.mkDerivation rec { homepage = http://libguestfs.org/; maintainers = with maintainers; [offline]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 19b11a60e7b6..b9348c0c50b1 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = http://delta.affinix.com/qca; maintainers = [ maintainers.sander ]; platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 5f4cbbaa5670..9105b1c52acf 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; license = licenses.asl20; + broken = true; }; } diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix index ff8c26062d3c..b5cb0f76e9ff 100644 --- a/pkgs/development/libraries/torch/default.nix +++ b/pkgs/development/libraries/torch/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec{ license = stdenv.lib.licenses.bsd3 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index bc806410b1ea..ee424d18f159 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -62,6 +62,7 @@ in stdenv.mkDerivation rec { homepage = https://github.com/betaflight/betaflight; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; + broken = true; }; } diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 5014cdce8f37..27e96b067b4f 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -54,6 +54,7 @@ in stdenv.mkDerivation rec { homepage = https://inavflight.github.io; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index a3fd59eea434..eb0d549b1d46 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -38,5 +38,6 @@ buildPythonPackage rec { description = "Efficient, Pythonic bidirectional map data structures and related functionality"; license = licenses.mpl20; maintainers = with maintainers; [ jakewaksbaum ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix index 58e9d746b97f..acb5587186db 100644 --- a/pkgs/development/python-modules/django-pipeline/default.nix +++ b/pkgs/development/python-modules/django-pipeline/default.nix @@ -32,5 +32,6 @@ buildPythonPackage rec { description = "Pipeline is an asset packaging library for Django"; homepage = https://github.com/cyberdelia/django-pipeline; license = licenses.mit; + broken = true; }; } diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix index 45447b70ae60..ea02467764d6 100644 --- a/pkgs/development/python-modules/django_evolution/default.nix +++ b/pkgs/development/python-modules/django_evolution/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { description = "A database schema evolution tool for the Django web framework"; homepage = http://code.google.com/p/django-evolution/; license = licenses.bsd0; + broken = true; }; } diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index b454fc321084..fed23958b9e0 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { homepage = https://github.com/alex/django-taggit/tree/master/; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index d6f533a58bfe..ed2a7d69da89 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -28,5 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/ecederstrand/exchangelib"; license = licenses.bsd2; maintainers = with maintainers; [ catern ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix index cbb5ca56fed5..422c13b4d13f 100644 --- a/pkgs/development/python-modules/filemagic/default.nix +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -25,5 +25,6 @@ buildPythonPackage { homepage = https://github.com/aliles/filemagic; license = licenses.asl20; maintainers = with maintainers; [ earvstedt ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 47f2c083d8a3..196659dd4f0c 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -31,5 +31,6 @@ buildPythonPackage rec { description = "Kalman filtering and optimal estimation library"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index c9cf3fe4ca84..5dde2ecf7844 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -26,5 +26,6 @@ buildPythonPackage rec { homepage = https://github.com/xZise/flake8-future-import; description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base"; license = lib.licenses.mit; + broken = true; }; } diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index a717a0ef6e8a..465566e9be26 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -37,5 +37,6 @@ buildPythonPackage rec { homepage = https://radimrehurek.com/gensim/; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ jyp ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 9dbfeb7472c0..3a9e8b86c917 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { homepage = "https://github.com/geopy/geopy"; description = "Python Geocoding Toolbox"; license = licenses.mit; + broken = true; }; } diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index edfeb0a59714..1222b07fc99f 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { homepage = https://github.com/salimfadhley/jenkinsapi; maintainers = with maintainers; [ drets ]; license = licenses.mit; + broken = true; }; } diff --git a/pkgs/development/python-modules/maildir-deduplicate/default.nix b/pkgs/development/python-modules/maildir-deduplicate/default.nix index 1a16e253f298..33728ef4113c 100644 --- a/pkgs/development/python-modules/maildir-deduplicate/default.nix +++ b/pkgs/development/python-modules/maildir-deduplicate/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { description = "Command-line tool to deduplicate mails from a set of maildir folders"; homepage = "https://github.com/kdeldycke/maildir-deduplicate"; license = licenses.gpl2; + broken = true; }; } diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 209ecf998ccf..335f306c715b 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { homepage = https://thp.io/2010/minidb/; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.tv ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index eac2751ce3e5..29a1095ffa00 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -13,5 +13,6 @@ license = licenses.gpl2; maintainers = with maintainers; [ roelvandijk ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 6f73004deeb9..e3427add427f 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -22,5 +22,6 @@ buildPythonPackage rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix index 9523a3e28fab..d0f9c0d49d33 100644 --- a/pkgs/development/python-modules/percol/default.nix +++ b/pkgs/development/python-modules/percol/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; license = licenses.mit; maintainers = with maintainers; [ koral ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index 85db917cef82..c6fa96bccf79 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -31,5 +31,6 @@ buildPythonPackage rec { ''; license = stdenv.lib.licenses.mit; maintainers = with maintainers; [ nalbyuites ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index bd00b2f6d557..4ad33fcba035 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -15,5 +15,6 @@ buildPythonPackage rec { description = "Simple CoAP (RFC7252) toolkit"; homepage = "https://github.com/NordicSemiconductor/piccata"; maintainers = with lib.maintainers; [ gebner ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index a9054b2ed857..3358c27a29a7 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -50,5 +50,6 @@ buildPythonPackage rec { homepage = https://github.com/jazzband/pip-tools/; license = licenses.bsd3; maintainers = with maintainers; [ zimbatm ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index d7e2a1db2ffb..998318659595 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -85,5 +85,6 @@ in buildPythonPackage rec { description = "Python dependency management and packaging made easy"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index d48e42ef2646..fbb5088cf4a1 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ mlieberman85 ]; platforms = platforms.all; + broken = true; }; } diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index d3ed2659f6a6..fe0827c4f8f6 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -29,5 +29,6 @@ buildPythonPackage rec { license = with stdenv.lib.licenses; [ gpl3 ]; maintainers = with stdenv.lib.maintainers; [ vinymeuh ]; platforms = with stdenv.lib.platforms; linux ++ darwin; + broken = true; }; } diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix index f9737b935833..29ae5ed3c5c8 100644 --- a/pkgs/development/python-modules/pybfd/default.nix +++ b/pkgs/development/python-modules/pybfd/default.nix @@ -24,5 +24,6 @@ buildPythonPackage { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ orivej ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/pyezminc/default.nix b/pkgs/development/python-modules/pyezminc/default.nix index 614a1555cbef..2aad1906be27 100644 --- a/pkgs/development/python-modules/pyezminc/default.nix +++ b/pkgs/development/python-modules/pyezminc/default.nix @@ -29,5 +29,6 @@ buildPythonPackage rec { description = "Python API for libminc using EZMINC"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ bcdarwin ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/pygbm/default.nix b/pkgs/development/python-modules/pygbm/default.nix index 6e4c70aaaf13..702dbf70ee96 100644 --- a/pkgs/development/python-modules/pygbm/default.nix +++ b/pkgs/development/python-modules/pygbm/default.nix @@ -42,5 +42,6 @@ buildPythonPackage rec { homepage = https://github.com/ogrisel/pygbm; license = licenses.mit; maintainers = [ maintainers.costrouc ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix index 27827270fa17..7e1e1f90fe6a 100644 --- a/pkgs/development/python-modules/pykickstart/default.nix +++ b/pkgs/development/python-modules/pykickstart/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { homepage = "http://fedoraproject.org/wiki/Pykickstart"; description = "Read and write Fedora kickstart files"; license = licenses.gpl2Plus; + broken = true; }; } diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index f70f10da41ad..5211b1377ac7 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -34,5 +34,6 @@ buildPythonPackage rec { homepage = http://pyro.ai; license = lib.licenses.mit; maintainers = with lib.maintainers; [ teh ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 2dcb7908522a..c1c765f1adc9 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { description = "Python bindings for Subversion"; homepage = http://pysvn.tigris.org/; license = licenses.asl20; + broken = true; }; } diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 6b19a8f0c735..b84faf0e0922 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -54,5 +54,6 @@ buildPythonPackage rec { description = "Python 2.x/3.x bindings for the Taglib audio metadata library"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.mrkkrp ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 98f714c8d538..9bcbaf3e6f72 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -80,5 +80,6 @@ buildPythonPackage rec { homepage = https://pythonnet.github.io; license = licenses.mit; maintainers = with maintainers; [ jraygauthier ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 17bf6f5cdab7..1584a73f4adb 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -106,5 +106,6 @@ in buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ teh thoughtpolice ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index e8076db60534..16369c73ea29 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -37,5 +37,6 @@ buildPythonPackage { license = licenses.lgpl21Plus; maintainers = with maintainers; [ lsix ]; homepage = https://www.riverbankcomputing.com/software/qscintilla/; + broken = true; }; } diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 13c24312ed0f..2f609651c8e7 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { ''; homepage = http://qutip.org/; license = licenses.bsd0; + broken = true; }; } diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index ac7ba00c5867..c68c43fd6002 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -16,5 +16,6 @@ buildPythonPackage rec { description = "Read and write Ruby-marshalled data"; license = licenses.wtfpl; maintainers = [ maintainers.ryantm ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/snug/default.nix b/pkgs/development/python-modules/snug/default.nix index 0b3adbe15d90..fb4cd0ad55b1 100644 --- a/pkgs/development/python-modules/snug/default.nix +++ b/pkgs/development/python-modules/snug/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { license = licenses.mit; homepage = https://snug.readthedocs.io/en/latest/; maintainers = with maintainers; [ mredaelli ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 168c491f7ef8..bbbcb2e06904 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -35,5 +35,6 @@ buildPythonPackage rec { homepage = https://github.com/pydata/sparse/; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index c28b249d192c..e12f00cf7a75 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ smaret ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ba93fb040b9a..427085b872eb 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -45,5 +45,6 @@ buildPythonPackage rec { description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; maintainers = with maintainers; [ makefu ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 82f1315ba3d2..152ed8cbca08 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -22,5 +22,6 @@ buildPythonPackage rec { homepage = https://github.com/codingjoe/ssdp; description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; license = licenses.mit; + broken = true; }; } diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 18ab5bca7ea9..1654da442226 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -29,5 +29,6 @@ buildPythonPackage rec { homepage = http://supervisord.org/; license = licenses.free; # http://www.repoze.org/LICENSE.txt maintainers = with maintainers; [ zimbatm ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix index dc4b99c40a7a..73ea94cbe9fb 100644 --- a/pkgs/development/python-modules/swagger-spec-validator/default.nix +++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { license = licenses.asl20; description = "Validation of Swagger specifications"; maintainers = with maintainers; [ vanschelven ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index a2c0578f0c7f..68664d0d0fdb 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -48,5 +48,6 @@ buildPythonPackage rec { homepage = https://github.com/symengine/symengine.py; license = licenses.mit; maintainers = [ maintainers.costrouc ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 0413fd33f6f0..632e060f7dd4 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -26,5 +26,6 @@ buildPythonPackage rec { homepage = https://pytorch.org/; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ericsagnes ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 25cd5b9a90d7..4d80bb3da68c 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { description = "A vmprof client"; license = licenses.mit; homepage = https://vmprof.readthedocs.org/; + broken = true; }; } diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index d61567f92242..36b4b71e0524 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { homepage = "https://github.com/danielfrg/word2vec"; license = licenses.asl20; maintainers = with maintainers; [ NikolaMandic ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index 845fba749d69..b1a6c1a92976 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -48,5 +48,6 @@ buildPythonPackage rec { homepage = https://github.com/yt-project/yt; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix index 143f609d8338..e536d9335d5a 100644 --- a/pkgs/development/python-modules/zake/default.nix +++ b/pkgs/development/python-modules/zake/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { homepage = "https://github.com/yahoo/Zake"; description = "A python package that works to provide a nice set of testing utilities for the kazoo library"; license = licenses.asl20; + broken = true; }; } diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index 9dac64907be9..fc28a740d62b 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { description = "A utility module for content-type (MIME type) handling"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix index aad822bca594..3fb967099c20 100644 --- a/pkgs/development/python-modules/zope_i18n/default.nix +++ b/pkgs/development/python-modules/zope_i18n/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { description = "Zope Internationalization Support"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; + broken = true; }; } diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix index 5548b20de83c..f257ae8adbf6 100644 --- a/pkgs/development/tools/fedpkg/default.nix +++ b/pkgs/development/tools/fedpkg/default.nix @@ -31,5 +31,6 @@ in buildPythonApplication rec { homepage = https://pagure.io/fedpkg; license = licenses.gpl2; maintainers = with maintainers; [ ]; + broken = true; }; } diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index e6dccbd332e1..266024d323de 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -52,5 +52,6 @@ mkDerivation { license = licenses.mit; maintainers = [ maintainers.deepfire ]; platforms = [ "x86_64-linux" "i686-linux" ]; + broken = true; }; } diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index 0bd90f77b240..7c1e9d3e95d1 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; license = licenses.gpl2Plus; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index d8ab792bb62a..1004a6ad26fd 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -164,6 +164,7 @@ let license = with licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ kkallio vcunat phile314 ]; platforms = with platforms; linux; # TODO: ++ darwin; + broken = true; }; }; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 9bfd917d1aa0..e98148cbc832 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 328e8ce45625..5972773d1ad2 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -150,5 +150,6 @@ stdenv.mkDerivation rec { - XP-960 Series ''; license = stdenv.lib.licenses.gpl3Plus; + broken = true; }; } diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index ca8d87b38005..660eba5fd03c 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index fbde2ff54c9e..e55cefdd3202 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -7,7 +7,7 @@ let d2u = stdenv.lib.replaceChars ["-"] ["_"]; - mkLibRetroCore = ({ core, src, description, license, ... }@a: + mkLibRetroCore = ({ core, src, description, license, broken ? false, ... }@a: stdenv.lib.makeOverridable stdenv.mkDerivation rec { name = "libretro-${core}-${version}"; @@ -38,6 +38,7 @@ let inherit description; homepage = https://www.libretro.com/; inherit license; + inherit broken; maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; platforms = platforms.unix; }; @@ -145,6 +146,7 @@ in with stdenv.lib.licenses; }; description = "Port of Dolphin to libretro"; license = gpl2Plus; + broken = true; extraBuildInputs = [ cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index fe1f655246ef..a0a29f95abab 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -28,6 +28,7 @@ in { metricbeat6 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; packetbeat6 = beat "packetbeat" { buildInputs = [ libpcap ]; + meta.broken = true; meta.description = "Network packet analyzer that ships data to Elasticsearch"; meta.longDescription = '' Packetbeat is an open source network packet analyzer that ships the diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index a7ea61de0420..fac90fd0df61 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -102,5 +102,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; + broken = true; }; } diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index f48ace22f8fb..dfbb8fd4b88e 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -92,5 +92,6 @@ gcc8Stdenv.mkDerivation { license = licenses.agpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.farlion ]; + broken = true; }; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 4dc96ddd91b6..e6a94daee106 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -375,6 +375,8 @@ self: super: xf86videoglide = super.xf86videoglide.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videonewport = super.xf86videonewport.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); + xf86videos3virge = super.xf86videos3virge.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); + xf86videosavage = super.xf86videosavage.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videotga = super.xf86videotga.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videov4l = super.xf86videov4l.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videovoodoo = super.xf86videovoodoo.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index e8b2be4b7837..404cef72a3ec 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -38,6 +38,7 @@ let doCheck = false; meta.platforms = stdenv.lib.platforms.linux; + meta.broken = true; }; in stdenv.lib.overrideDerivation base (b: { postFixup = b.postFixup + '' diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index 70cc8a425c16..c6c47ce4f16c 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -21,5 +21,6 @@ buildGoPackage rec { license = stdenv.lib.licenses.asl20; description = "An archival restoration tool for Postgres"; maintainers = [ stdenv.lib.maintainers.ocharles ]; + broken = true; }; } diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 14790ae70870..56fc2e40ba2f 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -87,6 +87,7 @@ in rec { description = common.meta.description + " CLI clients"; longDescription = common.meta.longDescription + '' This package provides the CLI clients, called 'icommands'.''; + broken = true; }; }); } diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 129283e83ebe..b293b6d8146d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -73,5 +73,6 @@ in buildPythonApplication rec { license = licenses.gpl2Plus; maintainers = [ maintainers.aszlig ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/graphics/neural-style/default.nix b/pkgs/tools/graphics/neural-style/default.nix index a4706e95ceef..36ee5c227a23 100644 --- a/pkgs/tools/graphics/neural-style/default.nix +++ b/pkgs/tools/graphics/neural-style/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; # Eats a lot of RAM platforms = ["x86_64-linux"]; + broken = true; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 12ba89304c0e..d1884b875988 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -44,5 +44,6 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ maintainers.rycee ]; + broken = true; }; } diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index bcaca9ef0ce5..049fb7a1a6e6 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -30,5 +30,6 @@ pythonPackages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux ++ platforms.darwin; + broken = true; }; } diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index a5305acdf597..e8a4261ed12e 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -90,5 +90,6 @@ pythonPackages.buildPythonApplication rec { license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index fdd110e14b3c..c11862041049 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -60,5 +60,6 @@ in stdenv.mkDerivation rec { homepage = http://www.unbound.net; maintainers = with maintainers; [ leenaars ]; platforms = stdenv.lib.platforms.unix; + broken = true; }; } diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix index 24a7ea51a82c..1ef282b8b6eb 100644 --- a/pkgs/tools/security/mbox/default.nix +++ b/pkgs/tools/security/mbox/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ehmry ]; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 308b94231e76..19f51775ff24 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 9d6928abf86f..554ed93f0934 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -87,5 +87,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ minijackson doronbehar ]; platforms = platforms.all; + broken = true; }; } diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index f06b4f1c2866..35cbcebb2422 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -527,6 +527,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; }; From 0b427f50863e16774dda708bf314391781adaa75 Mon Sep 17 00:00:00 2001 From: ysander Date: Sat, 3 Aug 2019 16:28:49 +0200 Subject: [PATCH 118/192] solaar: track latest release and set correct repo owner Update project homepage Drop 'unstable' package name attribute (cherry picked from commit 84d4243ccc6677a1e76f2f85efcc07fac5279efb) --- pkgs/applications/misc/solaar/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index f2e1aa6bdb68..722b0bc5077e 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,17 +1,14 @@ { fetchFromGitHub, lib, gobject-introspection, gtk3, python3Packages }: - # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of # adding this to services.udev.packages on NixOS - -python3Packages.buildPythonApplication { - pname = "solaar-unstable"; - version = "2019-01-30"; - +python3Packages.buildPythonApplication rec { + pname = "solaar"; + version = "1.0.1"; src = fetchFromGitHub { - owner = "pwr"; + owner = "pwr-Solaar"; repo = "Solaar"; - rev = "c07c115ee379e82db84283aaa29dc53df033a8c8"; - sha256 = "0xg181xcwzzs8pdqvjrkjyaaga7ir93hzjvd17j9g3ns8xfj2mvr"; + rev = "${version}"; + sha256 = "1ni3aimpl9vyhwzi61mvm8arkii52cmb6bzjma9cnkjyx328pkid"; }; propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ]; @@ -28,7 +25,6 @@ python3Packages.buildPythonApplication { ''; enableParallelBuilding = true; - meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' @@ -43,7 +39,7 @@ python3Packages.buildPythonApplication { To be able to use it, make sure you have access to /dev/hidraw* files. ''; license = licenses.gpl2; - homepage = https://pwr.github.io/Solaar/; + homepage = https://pwr-solaar.github.io/Solaar/; platforms = platforms.linux; maintainers = with maintainers; [ spinus ysndr ]; }; From 5b93ae127a608bdf261ff71b31f2b8ac6d72a313 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 1 Oct 2019 20:09:15 +0000 Subject: [PATCH 119/192] linux: drop non-LTS versioned kernel attributes Quoting the release manual: > Remove attributes that we know we will not be able to support, > especially if there is a stable alternative. E.g. Check that our Linux > kernels' projected end-of-life are after our release projected > end-of-life --- pkgs/os-specific/linux/kernel/linux-5.2.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 18 +++--------------- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.2.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix deleted file mode 100644 index e21407cc95db..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.2.19"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "12mi857lyd5vj8qhj2f505hqnwzsnd829hxd78n9kk88iv1f966y"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d8eecb73722..6bf1bbb26cfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15689,15 +15689,8 @@ in ]; }; - linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions - ]; - }; - - linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix { + # Update this when adding the newest kernel major version! + linux_latest = callPackage ../os-specific/linux/kernel/linux-5.3.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ]; }; @@ -15892,19 +15885,14 @@ in linuxPackages = linuxPackages_4_19; linux = linuxPackages.kernel; - # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_3; - linux_latest = linuxPackages_latest.kernel; - # Build the kernel modules for the some of the kernels. + linuxPackages_latest = linuxPackagesFor pkgs.linux_latest; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); - linuxPackages_5_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_3); # When adding to this list: # - Update linuxPackages_latest to the latest version From 8aeeb87b8ebd7facdc19216283babe2fdc6552f4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Oct 2019 17:54:26 -0400 Subject: [PATCH 120/192] linux: 5.3.4 -> 5.3.5 --- pkgs/os-specific/linux/kernel/linux-5.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix index def3acc6a5b6..97ecf3a68e73 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3.4"; + version = "5.3.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0vi4bgcr921z5l6fbcrcgmhaji5gl2avpmp7njna6v0f7sxism0r"; + sha256 = "1w2k3q6q9cf3r27z084c9nsxh49bq4cvky39pp6dp3r9zif8rvc0"; }; } // (args.argsOverride or {})) From cbac5e256a6128528e6ad0b8208f2a48f4fc95ee Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Oct 2019 17:51:49 -0400 Subject: [PATCH 121/192] linux: 4.14.147 -> 4.14.148 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 2b83773e7d7a..34073a4fc786 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.147"; + version = "4.14.148"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04jvp05spszcxmkdsl21dylbcf76ns9bwxf1zlk4x7cxiil97mwg"; + sha256 = "1b8ggknvaidsvqnzpgbcmz3ybys9a8jm8iq6aqcnqfp10d0bglhj"; }; } // (args.argsOverride or {})) From 0477e3406ad23571380358599cc961f7702e636f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Oct 2019 17:52:45 -0400 Subject: [PATCH 122/192] linux: 4.19.77 -> 4.19.78 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 95443993f6b6..28e7a3184aa9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.77"; + version = "4.19.78"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1agksl35amjzc6g6d9zjwz6p5qir2cligb5c1d9s2bag9766jav1"; + sha256 = "0jah57k3q7b674dr544cniwhya667d8h7x9k5886d1g2qrvylqyz"; }; } // (args.argsOverride or {})) From 57dd876cfc7ab8b436e9c6ddfeaf210d6b77b056 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Oct 2019 17:53:10 -0400 Subject: [PATCH 123/192] linux: 4.4.195 -> 4.4.196 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 99f2b219165c..65ee9634ba40 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.195"; + version = "4.4.196"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dilaz0ghmkml10cvzzpz7ivcx9d8d6fpb76vmixcg634w2jx962"; + sha256 = "0vd7fra22ky4sqp6vamracp5xd4900md5vdx0n4i6dhkf03kz7hn"; }; } // (args.argsOverride or {})) From c96bd67803ce849820048594a823f84da52bbc98 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Oct 2019 17:53:31 -0400 Subject: [PATCH 124/192] linux: 4.9.195 -> 4.9.196 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 299fce9eab4d..c9e72a3264bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.195"; + version = "4.9.196"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0s4xj8f1dpnz3fbrqmgwq02smhcrq1ni8hgn2bbfqvm15lm5dgjl"; + sha256 = "1vy6j9ycl5aw0dmj4n9kih5i8igybk0ilahlwbn30mlp9aq15az0"; }; } // (args.argsOverride or {})) From 1e9cc5b9844ef603fe160e9f671178f96200774f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 8 Oct 2019 09:24:38 +0200 Subject: [PATCH 125/192] treewide: undo some incorrect mark-as-brokens --- pkgs/applications/science/electronics/kicad/default.nix | 1 - pkgs/desktops/plasma-5/kscreen.nix | 1 - pkgs/development/libraries/qca2/default.nix | 1 - pkgs/development/python-modules/filemagic/default.nix | 1 - pkgs/development/python-modules/flake8-future-import/default.nix | 1 - pkgs/development/python-modules/sqlalchemy-migrate/default.nix | 1 - pkgs/tools/graphics/neural-style/default.nix | 1 - 7 files changed, 7 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 889d2107fb29..f31dd0daa5c3 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -116,6 +116,5 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ berce ]; platforms = with platforms; linux; - broken = true; }; } diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 4ef6eaf4bded..422bb95c6059 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -14,5 +14,4 @@ mkDerivation { libkscreen qtdeclarative qtgraphicaleffects kwindowsystem kdeclarative plasma-framework ]; - meta.broken = true; } diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index b9348c0c50b1..19b11a60e7b6 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { homepage = http://delta.affinix.com/qca; maintainers = [ maintainers.sander ]; platforms = platforms.unix; - broken = true; }; } diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix index 422c13b4d13f..cbb5ca56fed5 100644 --- a/pkgs/development/python-modules/filemagic/default.nix +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -25,6 +25,5 @@ buildPythonPackage { homepage = https://github.com/aliles/filemagic; license = licenses.asl20; maintainers = with maintainers; [ earvstedt ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 5dde2ecf7844..c9cf3fe4ca84 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -26,6 +26,5 @@ buildPythonPackage rec { homepage = https://github.com/xZise/flake8-future-import; description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base"; license = lib.licenses.mit; - broken = true; }; } diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 427085b872eb..ba93fb040b9a 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -45,6 +45,5 @@ buildPythonPackage rec { description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; maintainers = with maintainers; [ makefu ]; - broken = true; }; } diff --git a/pkgs/tools/graphics/neural-style/default.nix b/pkgs/tools/graphics/neural-style/default.nix index 36ee5c227a23..a4706e95ceef 100644 --- a/pkgs/tools/graphics/neural-style/default.nix +++ b/pkgs/tools/graphics/neural-style/default.nix @@ -54,6 +54,5 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; # Eats a lot of RAM platforms = ["x86_64-linux"]; - broken = true; }; } From 793a2fe1e8bb886ca2096c5904e1193dc3268b6d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 8 Oct 2019 11:19:34 +0200 Subject: [PATCH 126/192] pythonPackages: fix incorrectly broken packages --- pkgs/development/python-modules/bidict/default.nix | 3 ++- pkgs/development/python-modules/django_taggit/default.nix | 4 ++-- pkgs/development/python-modules/filterpy/default.nix | 3 ++- pkgs/development/python-modules/gensim/default.nix | 3 ++- pkgs/development/python-modules/minidb/default.nix | 3 ++- pkgs/development/python-modules/openrazer/common.nix | 1 - pkgs/development/python-modules/openrazer/daemon.nix | 3 +++ pkgs/development/python-modules/piccata/default.nix | 4 ++-- pkgs/development/python-modules/ptpython/default.nix | 4 ++-- pkgs/development/python-modules/pykickstart/default.nix | 3 ++- pkgs/development/python-modules/pytorch/default.nix | 4 ++-- pkgs/development/python-modules/rubymarshal/default.nix | 4 ++-- pkgs/development/python-modules/snug/default.nix | 3 ++- pkgs/development/python-modules/ssdp/default.nix | 3 ++- .../python-modules/swagger-spec-validator/default.nix | 3 +-- pkgs/development/python-modules/torchvision/default.nix | 1 - pkgs/development/python-modules/yt/default.nix | 3 ++- 17 files changed, 30 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index eb0d549b1d46..e3ceaa0dc9ab 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -7,11 +7,13 @@ , pytest-benchmark , sortedcollections , sortedcontainers +, isPy3k }: buildPythonPackage rec { pname = "bidict"; version = "0.18.2"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; @@ -38,6 +40,5 @@ buildPythonPackage rec { description = "Efficient, Pythonic bidirectional map data structures and related functionality"; license = licenses.mpl20; maintainers = with maintainers; [ jakewaksbaum ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index fed23958b9e0..6ca498ce5e9e 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -6,12 +6,13 @@ , django , mock , isort +, isPy3k }: buildPythonPackage rec { pname = "django-taggit"; version = "1.1.0"; - disabled = pythonOlder "2.7"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; @@ -32,7 +33,6 @@ buildPythonPackage rec { homepage = https://github.com/alex/django-taggit/tree/master/; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 196659dd4f0c..076a3a72b89f 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -5,11 +5,13 @@ , scipy , matplotlib , pytest +, isPy3k }: buildPythonPackage rec { version = "1.4.5"; pname = "filterpy"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; @@ -31,6 +33,5 @@ buildPythonPackage rec { description = "Kalman filtering and optimal estimation library"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 465566e9be26..18815cfe64b5 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -6,11 +6,13 @@ , scipy , smart_open , scikitlearn, testfixtures, unittest2 +, isPy3k }: buildPythonPackage rec { pname = "gensim"; version = "3.8.0"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; @@ -37,6 +39,5 @@ buildPythonPackage rec { homepage = https://radimrehurek.com/gensim/; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ jyp ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 335f306c715b..1520eb82871d 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -2,11 +2,13 @@ , buildPythonPackage , fetchurl , nose +, isPy3k }: buildPythonPackage rec { pname = "minidb"; version = "2.0.2"; + disabled = !isPy3k; src = fetchurl { url = "https://github.com/thp/minidb/archive/${version}.tar.gz"; @@ -24,7 +26,6 @@ buildPythonPackage rec { homepage = https://thp.io/2010/minidb/; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.tv ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 29a1095ffa00..eac2751ce3e5 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -13,6 +13,5 @@ license = licenses.gpl2; maintainers = with maintainers; [ roelvandijk ]; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 6e3ab1e78338..cd40ab83330f 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -11,6 +11,7 @@ , setproctitle , stdenv , wrapGAppsHook +, isPy3k }: let @@ -19,6 +20,8 @@ in buildPythonApplication (common // rec { pname = "openrazer_daemon"; + disabled = !isPy3k; + sourceRoot = "source/daemon"; outputs = [ "out" "man" ]; diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index 4ad33fcba035..f1cfb362a80c 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -1,8 +1,9 @@ -{ buildPythonPackage, fetchPypi, lib, ipaddress }: +{ buildPythonPackage, fetchPypi, lib, ipaddress, isPy3k }: buildPythonPackage rec { pname = "piccata"; version = "1.0.1"; + disabled = isPy3k; src = fetchPypi { inherit pname version; @@ -15,6 +16,5 @@ buildPythonPackage rec { description = "Simple CoAP (RFC7252) toolkit"; homepage = "https://github.com/NordicSemiconductor/piccata"; maintainers = with lib.maintainers; [ gebner ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index fbb5088cf4a1..cf722e90ab3e 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments }: +{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments, isPy3k }: buildPythonPackage rec { pname = "ptpython"; version = "2.0.4"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; @@ -19,6 +20,5 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ mlieberman85 ]; platforms = platforms.all; - broken = true; }; } diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix index 7e1e1f90fe6a..6461f0391caa 100644 --- a/pkgs/development/python-modules/pykickstart/default.nix +++ b/pkgs/development/python-modules/pykickstart/default.nix @@ -3,12 +3,14 @@ , fetchurl , urlgrabber , python +, isPy3k }: buildPythonPackage rec { pname = "pykickstart"; version = "1.99.39"; md5_path = "d249f60aa89b1b4facd63f776925116d"; + disabled = isPy3k; src = fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/" @@ -31,7 +33,6 @@ buildPythonPackage rec { homepage = "http://fedoraproject.org/wiki/Pykickstart"; description = "Read and write Fedora kickstart files"; license = licenses.gpl2Plus; - broken = true; }; } diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 1584a73f4adb..92afa80852af 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -2,7 +2,7 @@ cudaSupport ? false, cudatoolkit ? null, cudnn ? null, fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl, linkFarm, symlinkJoin, - utillinux, which }: + utillinux, which, isPy3k }: assert cudnn == null || cudatoolkit != null; assert !cudaSupport || cudatoolkit != null; @@ -27,6 +27,7 @@ let in buildPythonPackage rec { version = "1.0.0"; pname = "pytorch"; + disabled = !isPy3k; src = fetchFromGitHub { owner = "pytorch"; @@ -106,6 +107,5 @@ in buildPythonPackage rec { license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ teh thoughtpolice ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index c68c43fd6002..f37843422816 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, hypothesis }: +{ stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }: buildPythonPackage rec { pname = "rubymarshal"; version = "1.2.6"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; @@ -16,6 +17,5 @@ buildPythonPackage rec { description = "Read and write Ruby-marshalled data"; license = licenses.wtfpl; maintainers = [ maintainers.ryantm ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/snug/default.nix b/pkgs/development/python-modules/snug/default.nix index fb4cd0ad55b1..a697ed0161a0 100644 --- a/pkgs/development/python-modules/snug/default.nix +++ b/pkgs/development/python-modules/snug/default.nix @@ -1,11 +1,13 @@ { buildPythonPackage, lib, fetchFromGitHub, glibcLocales , pytest, pytest-mock, gentools , typing, singledispatch, pythonOlder +, isPy3k }: buildPythonPackage rec { pname = "snug"; version = "1.3.4"; + disabled = isPy3k; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { @@ -32,7 +34,6 @@ buildPythonPackage rec { license = licenses.mit; homepage = https://snug.readthedocs.io/en/latest/; maintainers = with maintainers; [ mredaelli ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 152ed8cbca08..3e54d820ecb8 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -3,11 +3,13 @@ , fetchPypi , pbr , pytest +, isPy3k }: buildPythonPackage rec { pname = "ssdp"; version = "1.0.1"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; @@ -22,6 +24,5 @@ buildPythonPackage rec { homepage = https://github.com/codingjoe/ssdp; description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; license = licenses.mit; - broken = true; }; } diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix index 73ea94cbe9fb..3c83aa643f5d 100644 --- a/pkgs/development/python-modules/swagger-spec-validator/default.nix +++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock }: +{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock, isPy3k }: buildPythonPackage rec { pname = "swagger-spec-validator"; @@ -31,7 +31,6 @@ buildPythonPackage rec { license = licenses.asl20; description = "Validation of Swagger specifications"; maintainers = with maintainers; [ vanschelven ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 632e060f7dd4..0413fd33f6f0 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -26,6 +26,5 @@ buildPythonPackage rec { homepage = https://pytorch.org/; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ericsagnes ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index b1a6c1a92976..f2d7e62eca36 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -10,11 +10,13 @@ , nose , cython , python +, isPy3k }: buildPythonPackage rec { pname = "yt"; version = "3.5.1"; + disabled = isPy3k; src = fetchPypi { inherit pname version; @@ -48,6 +50,5 @@ buildPythonPackage rec { homepage = https://github.com/yt-project/yt; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; - broken = true; }; } From c19cf65261639f749012454932a532aa7c681e4b Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 8 Oct 2019 11:39:56 +0200 Subject: [PATCH 127/192] libguestfs: unmark broken --- pkgs/development/libraries/libguestfs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 5b0749632ca7..9b50ddd4b7f4 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -85,6 +85,5 @@ stdenv.mkDerivation rec { homepage = http://libguestfs.org/; maintainers = with maintainers; [offline]; platforms = platforms.linux; - broken = true; }; } From f6544d618f30fae0bc4798c4387a8c7c9c047a7c Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 8 Oct 2019 11:51:09 +0200 Subject: [PATCH 128/192] pythonPackages.pytaglib,supervisor: unmark broken --- pkgs/development/python-modules/pytaglib/default.nix | 1 - pkgs/development/python-modules/supervisor/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index b84faf0e0922..6b19a8f0c735 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -54,6 +54,5 @@ buildPythonPackage rec { description = "Python 2.x/3.x bindings for the Taglib audio metadata library"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.mrkkrp ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 1654da442226..18ab5bca7ea9 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -29,6 +29,5 @@ buildPythonPackage rec { homepage = http://supervisord.org/; license = licenses.free; # http://www.repoze.org/LICENSE.txt maintainers = with maintainers; [ zimbatm ]; - broken = true; }; } From 9287221f4eae622d00de2deb0541053bf40067c4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Sep 2019 18:51:56 +0200 Subject: [PATCH 129/192] rtl8812au, rtl8821au: Prevent runtime dependency on kernel.dev (cherry picked from commit 711cbb9117144efad576167125c9f9e2e04065db) --- pkgs/os-specific/linux/rtl8812au/default.nix | 8 ++++++-- pkgs/os-specific/linux/rtl8821au/default.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 81c1f8ab0f52..683645803464 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, bc }: +{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr"; }; - nativeBuildInputs = [ bc ]; + nativeBuildInputs = [ bc nukeReferences ]; buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + postInstall = '' + nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko + ''; + meta = with stdenv.lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index ca63c5c6a8df..1829bd6763f0 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, bc }: +{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { name = "rtl8821au-${kernel.version}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q"; }; - nativeBuildInputs = [ bc ]; + nativeBuildInputs = [ bc nukeReferences ]; buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + postInstall = '' + nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko + ''; + meta = with stdenv.lib; { description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; homepage = https://github.com/zebulon2/rtl8812au; From f0cd4e44646163b0989b9597e38c3bdca235ebed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Sep 2019 19:03:13 +0200 Subject: [PATCH 130/192] libotr: Use multiple outputs (cherry picked from commit 760bcf678e7ef36dd98c5d625bc13511cfcdef60) --- pkgs/development/libraries/libotr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 080a19452154..db79bad745f0 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; }; + outputs = [ "bin" "out" "dev" ]; + nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; propagatedBuildInputs = [ libgcrypt ]; meta = with stdenv.lib; { From 1475797aa31b6165e6ef835dc01466a64f828725 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Sep 2019 19:10:55 +0200 Subject: [PATCH 131/192] awscli: Get rid of runtime -dev dependencies (cherry picked from commit c8bc18bcc21c14e3d64f4c7b8f44c36e188efc1f) --- pkgs/development/python-modules/botocore/default.nix | 2 ++ pkgs/development/python-modules/s3transfer/default.nix | 2 +- pkgs/development/python-modules/urllib3/default.nix | 2 ++ pkgs/tools/admin/awscli/default.nix | 6 +++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 5c8b00fc6c15..e1465e86b0e7 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ dateutil jmespath diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 7589d0fce73c..0c227bc6377b 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021"; }; - foo = 1; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ botocore diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index d951e436480b..e50d90266bf6 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -11,6 +11,8 @@ buildPythonPackage rec { sha256 = "2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4"; }; + outputs = [ "out" "dev" ]; + NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 33526ba11dfc..7e3e0c9fff05 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -38,7 +38,7 @@ in py.pkgs.buildPythonApplication rec { # No tests included doCheck = false; - propagatedBuildInputs = with py.pkgs; [ + pythonPath = with py.pkgs; [ botocore bcdoc s3transfer @@ -49,6 +49,10 @@ in py.pkgs.buildPythonApplication rec { pyyaml groff less + urllib3 + dateutil + jmespath + futures ]; postInstall = '' From 5d1649a047af1ded09b7083a80ff852c4621e9a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Sep 2019 19:17:30 +0200 Subject: [PATCH 132/192] Revert "nixos/doc: re-format" This reverts commit ea6e8775bd69e4676c623a85c39f1da540d29ad1. The new format is not an improvement. (cherry picked from commit b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30) (Also synced rl-19.09.xml with master.) --- .../manual/administration/boot-problems.xml | 32 +- .../manual/administration/cleaning-store.xml | 32 +- .../administration/container-networking.xml | 26 +- .../doc/manual/administration/containers.xml | 19 +- .../manual/administration/control-groups.xml | 33 +- .../administration/declarative-containers.xml | 31 +- .../administration/imperative-containers.xml | 57 +- nixos/doc/manual/administration/logging.xml | 19 +- .../administration/maintenance-mode.xml | 4 +- .../administration/network-problems.xml | 13 +- nixos/doc/manual/administration/rebooting.xml | 11 +- nixos/doc/manual/administration/rollback.xml | 15 +- nixos/doc/manual/administration/running.xml | 3 +- .../manual/administration/service-mgmt.xml | 26 +- .../administration/store-corruption.xml | 17 +- .../manual/administration/troubleshooting.xml | 3 +- .../manual/administration/user-sessions.xml | 15 +- .../doc/manual/configuration/abstractions.xml | 48 +- .../configuration/ad-hoc-network-config.xml | 5 +- .../manual/configuration/ad-hoc-packages.xml | 26 +- .../configuration/adding-custom-packages.xml | 23 +- .../doc/manual/configuration/config-file.xml | 71 +- .../manual/configuration/config-syntax.xml | 14 +- .../manual/configuration/configuration.xml | 6 +- .../configuration/customizing-packages.xml | 54 +- .../configuration/declarative-packages.xml | 27 +- .../doc/manual/configuration/file-systems.xml | 28 +- nixos/doc/manual/configuration/firewall.xml | 15 +- .../doc/manual/configuration/ipv4-config.xml | 15 +- .../doc/manual/configuration/ipv6-config.xml | 13 +- nixos/doc/manual/configuration/kubernetes.xml | 74 +- .../doc/manual/configuration/linux-kernel.xml | 59 +- .../configuration/luks-file-systems.xml | 12 +- nixos/doc/manual/configuration/matrix.xml | 73 +- nixos/doc/manual/configuration/modularity.xml | 63 +- .../manual/configuration/network-manager.xml | 22 +- nixos/doc/manual/configuration/networking.xml | 3 +- .../doc/manual/configuration/package-mgmt.xml | 13 +- nixos/doc/manual/configuration/profiles.xml | 13 +- .../configuration/profiles/all-hardware.xml | 10 +- .../manual/configuration/profiles/base.xml | 6 +- .../configuration/profiles/clone-config.xml | 10 +- .../manual/configuration/profiles/demo.xml | 6 +- .../profiles/docker-container.xml | 7 +- .../configuration/profiles/graphical.xml | 11 +- .../configuration/profiles/hardened.xml | 14 +- .../configuration/profiles/headless.xml | 6 +- .../profiles/installation-device.xml | 33 +- .../manual/configuration/profiles/minimal.xml | 8 +- .../configuration/profiles/qemu-guest.xml | 7 +- nixos/doc/manual/configuration/ssh.xml | 7 +- nixos/doc/manual/configuration/summary.xml | 8 +- nixos/doc/manual/configuration/user-mgmt.xml | 53 +- nixos/doc/manual/configuration/wireless.xml | 18 +- nixos/doc/manual/configuration/x-windows.xml | 151 +- nixos/doc/manual/configuration/xfce.xml | 21 +- nixos/doc/manual/development/assertions.xml | 18 +- .../doc/manual/development/building-nixos.xml | 11 +- .../doc/manual/development/building-parts.xml | 31 +- .../manual/development/importing-modules.xml | 7 +- .../manual/development/meta-attributes.xml | 19 +- nixos/doc/manual/development/nixos-tests.xml | 9 +- .../development/option-declarations.xml | 80 +- nixos/doc/manual/development/option-def.xml | 34 +- nixos/doc/manual/development/option-types.xml | 208 ++- nixos/doc/manual/development/releases.xml | 126 +- .../manual/development/replace-modules.xml | 22 +- .../running-nixos-tests-interactively.xml | 14 +- .../development/running-nixos-tests.xml | 13 +- nixos/doc/manual/development/sources.xml | 48 +- .../manual/development/testing-installer.xml | 6 +- .../development/writing-documentation.xml | 74 +- .../manual/development/writing-modules.xml | 69 +- .../development/writing-nixos-tests.xml | 113 +- .../manual/installation/changing-config.xml | 53 +- .../doc/manual/installation/installation.xml | 3 +- .../installing-behind-a-proxy.xml | 15 +- .../installing-from-other-distro.xml | 152 +- .../manual/installation/installing-pxe.xml | 25 +- .../manual/installation/installing-usb.xml | 15 +- .../installing-virtualbox-guest.xml | 29 +- nixos/doc/manual/installation/installing.xml | 230 ++- nixos/doc/manual/installation/obtaining.xml | 38 +- nixos/doc/manual/installation/upgrading.xml | 51 +- nixos/doc/manual/man-configuration.xml | 5 +- nixos/doc/manual/man-nixos-build-vms.xml | 41 +- nixos/doc/manual/man-nixos-enter.xml | 22 +- .../doc/manual/man-nixos-generate-config.xml | 64 +- nixos/doc/manual/man-nixos-install.xml | 95 +- nixos/doc/manual/man-nixos-option.xml | 27 +- nixos/doc/manual/man-nixos-rebuild.xml | 309 ++-- nixos/doc/manual/man-nixos-version.xml | 23 +- nixos/doc/manual/manual.xml | 21 +- .../manual/release-notes/release-notes.xml | 3 +- nixos/doc/manual/release-notes/rl-1404.xml | 83 +- nixos/doc/manual/release-notes/rl-1412.xml | 81 +- nixos/doc/manual/release-notes/rl-1509.xml | 208 ++- nixos/doc/manual/release-notes/rl-1603.xml | 205 ++- nixos/doc/manual/release-notes/rl-1609.xml | 161 +- nixos/doc/manual/release-notes/rl-1703.xml | 193 ++- nixos/doc/manual/release-notes/rl-1709.xml | 292 +++- nixos/doc/manual/release-notes/rl-1803.xml | 266 +++- nixos/doc/manual/release-notes/rl-1809.xml | 311 +++- nixos/doc/manual/release-notes/rl-1903.xml | 448 ++++-- nixos/doc/manual/release-notes/rl-1909.xml | 1295 ++++++----------- nixos/modules/i18n/input-method/default.xml | 74 +- nixos/modules/programs/digitalbitbox/doc.xml | 33 +- nixos/modules/programs/plotinus.xml | 13 +- nixos/modules/programs/zsh/oh-my-zsh.xml | 62 +- nixos/modules/security/acme.xml | 30 +- nixos/modules/security/hidepid.xml | 11 +- .../services/databases/foundationdb.xml | 197 ++- .../modules/services/databases/postgresql.xml | 39 +- nixos/modules/services/desktops/flatpak.xml | 25 +- nixos/modules/services/editors/emacs.xml | 221 ++- nixos/modules/services/hardware/trezord.xml | 10 +- nixos/modules/services/misc/gitlab.xml | 34 +- .../modules/services/misc/taskserver/doc.xml | 74 +- nixos/modules/services/misc/weechat.xml | 21 +- .../monitoring/prometheus/exporters.xml | 51 +- .../services/networking/dnscrypt-proxy.xml | 14 +- .../modules/services/web-apps/matomo-doc.xml | 56 +- nixos/modules/services/web-apps/nextcloud.xml | 55 +- 123 files changed, 5716 insertions(+), 2379 deletions(-) diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml index d6f9cb190fbf..de3d8ac21aeb 100644 --- a/nixos/doc/manual/administration/boot-problems.xml +++ b/nixos/doc/manual/administration/boot-problems.xml @@ -6,7 +6,12 @@ Boot Problems - If NixOS fails to boot, there are a number of kernel command line parameters that may help you to identify or fix the issue. You can add these parameters in the GRUB boot menu by pressing “e” to modify the selected boot entry and editing the line starting with linux. The following are some useful kernel command line parameters that are recognised by the NixOS boot scripts or by systemd: + If NixOS fails to boot, there are a number of kernel command line parameters + that may help you to identify or fix the issue. You can add these parameters + in the GRUB boot menu by pressing “e” to modify the selected boot entry + and editing the line starting with linux. The following + are some useful kernel command line parameters that are recognised by the + NixOS boot scripts or by systemd: @@ -14,7 +19,9 @@ - Start a root shell if something goes wrong in stage 1 of the boot process (the initial ramdisk). This is disabled by default because there is no authentication for the root shell. + Start a root shell if something goes wrong in stage 1 of the boot process + (the initial ramdisk). This is disabled by default because there is no + authentication for the root shell. @@ -24,7 +31,10 @@ - Start an interactive shell in stage 1 before anything useful has been done. That is, no modules have been loaded and no file systems have been mounted, except for /proc and /sys. + Start an interactive shell in stage 1 before anything useful has been + done. That is, no modules have been loaded and no file systems have been + mounted, except for /proc and + /sys. @@ -44,7 +54,11 @@ - Boot into rescue mode (a.k.a. single user mode). This will cause systemd to start nothing but the unit rescue.target, which runs sulogin to prompt for the root password and start a root login shell. Exiting the shell causes the system to continue with the normal boot process. + Boot into rescue mode (a.k.a. single user mode). This will cause systemd + to start nothing but the unit rescue.target, which + runs sulogin to prompt for the root password and start + a root login shell. Exiting the shell causes the system to continue with + the normal boot process. @@ -54,7 +68,8 @@ - Make systemd very verbose and send log messages to the console instead of the journal. + Make systemd very verbose and send log messages to the console instead of + the journal. @@ -65,6 +80,11 @@ - If no login prompts or X11 login screens appear (e.g. due to hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start rescue mode (described above). (Also note that since most units have a 90-second timeout before systemd gives up on them, the agetty login prompts should appear eventually unless something is very wrong.) + If no login prompts or X11 login screens appear (e.g. due to hanging + dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start + rescue mode (described above). (Also note that since most units have a + 90-second timeout before systemd gives up on them, the + agetty login prompts should appear eventually unless + something is very wrong.) diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml index 3cbc022cd33c..526803e429ba 100644 --- a/nixos/doc/manual/administration/cleaning-store.xml +++ b/nixos/doc/manual/administration/cleaning-store.xml @@ -5,22 +5,31 @@ xml:id="sec-nix-gc"> Cleaning the Nix Store - Nix has a purely functional model, meaning that packages are never upgraded in place. Instead new versions of packages end up in a different location in the Nix store (/nix/store). You should periodically run Nix’s garbage collector to remove old, unreferenced packages. This is easy: + Nix has a purely functional model, meaning that packages are never upgraded + in place. Instead new versions of packages end up in a different location in + the Nix store (/nix/store). You should periodically run + Nix’s garbage collector to remove old, unreferenced + packages. This is easy: $ nix-collect-garbage - Alternatively, you can use a systemd unit that does the same in the background: + Alternatively, you can use a systemd unit that does the same in the + background: # systemctl start nix-gc.service - You can tell NixOS in configuration.nix to run this unit automatically at certain points in time, for instance, every night at 03:15: + You can tell NixOS in configuration.nix to run this unit + automatically at certain points in time, for instance, every night at 03:15: = true; = "03:15"; - The commands above do not remove garbage collector roots, such as old system configurations. Thus they do not remove the ability to roll back to previous configurations. The following command deletes old roots, removing the ability to roll back to them: + The commands above do not remove garbage collector roots, such as old system + configurations. Thus they do not remove the ability to roll back to previous + configurations. The following command deletes old roots, removing the ability + to roll back to them: $ nix-collect-garbage -d @@ -28,20 +37,27 @@ $ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old - Note that NixOS system configurations are stored in the profile /nix/var/nix/profiles/system. + Note that NixOS system configurations are stored in the profile + /nix/var/nix/profiles/system. - Another way to reclaim disk space (often as much as 40% of the size of the Nix store) is to run Nix’s store optimiser, which seeks out identical files in the store and replaces them with hard links to a single copy. + Another way to reclaim disk space (often as much as 40% of the size of the + Nix store) is to run Nix’s store optimiser, which seeks out identical files + in the store and replaces them with hard links to a single copy. $ nix-store --optimise - Since this command needs to read the entire Nix store, it can take quite a while to finish. + Since this command needs to read the entire Nix store, it can take quite a + while to finish.
NixOS Boot Entries - If your /boot partition runs out of space, after clearing old profiles you must rebuild your system with nixos-rebuild to update the /boot partition and clear space. + If your /boot partition runs out of space, after + clearing old profiles you must rebuild your system with + nixos-rebuild to update the /boot + partition and clear space.
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index 745fa524916b..42486f01fe8c 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -6,7 +6,10 @@ Container Networking - When you create a container using nixos-container create, it gets it own private IPv4 address in the range 10.233.0.0/16. You can get the container’s IPv4 address as follows: + When you create a container using nixos-container create, + it gets it own private IPv4 address in the range + 10.233.0.0/16. You can get the container’s IPv4 address + as follows: # nixos-container show-ip foo 10.233.4.2 @@ -17,21 +20,34 @@ - Networking is implemented using a pair of virtual Ethernet devices. The network interface in the container is called eth0, while the matching interface in the host is called ve-container-name (e.g., ve-foo). The container has its own network namespace and the CAP_NET_ADMIN capability, so it can perform arbitrary network configuration such as setting up firewall rules, without affecting or having access to the host’s network. + Networking is implemented using a pair of virtual Ethernet devices. The + network interface in the container is called eth0, while + the matching interface in the host is called + ve-container-name (e.g., + ve-foo). The container has its own network namespace and + the CAP_NET_ADMIN capability, so it can perform arbitrary + network configuration such as setting up firewall rules, without affecting or + having access to the host’s network. - By default, containers cannot talk to the outside network. If you want that, you should set up Network Address Translation (NAT) rules on the host to rewrite container traffic to use your external IP address. This can be accomplished using the following configuration on the host: + By default, containers cannot talk to the outside network. If you want that, + you should set up Network Address Translation (NAT) rules on the host to + rewrite container traffic to use your external IP address. This can be + accomplished using the following configuration on the host: = true; = ["ve-+"]; = "eth0"; - where eth0 should be replaced with the desired external interface. Note that ve-+ is a wildcard that matches all container interfaces. + where eth0 should be replaced with the desired external + interface. Note that ve-+ is a wildcard that matches all + container interfaces. - If you are using Network Manager, you need to explicitly prevent it from managing container interfaces: + If you are using Network Manager, you need to explicitly prevent it from + managing container interfaces: networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml index 2d5a6dd46a32..0d3355e56a58 100644 --- a/nixos/doc/manual/administration/containers.xml +++ b/nixos/doc/manual/administration/containers.xml @@ -5,15 +5,28 @@ xml:id="ch-containers"> Container Management - NixOS allows you to easily run other NixOS instances as containers. Containers are a light-weight approach to virtualisation that runs software in the container at the same speed as in the host system. NixOS containers share the Nix store of the host, making container creation very efficient. + NixOS allows you to easily run other NixOS instances as + containers. Containers are a light-weight approach to + virtualisation that runs software in the container at the same speed as in + the host system. NixOS containers share the Nix store of the host, making + container creation very efficient. - Currently, NixOS containers are not perfectly isolated from the host system. This means that a user with root access to the container can do things that affect the host. So you should not give container root access to untrusted users. + Currently, NixOS containers are not perfectly isolated from the host system. + This means that a user with root access to the container can do things that + affect the host. So you should not give container root access to untrusted + users. - NixOS containers can be created in two ways: imperatively, using the command nixos-container, and declaratively, by specifying them in your configuration.nix. The declarative approach implies that containers get upgraded along with your host system when you run nixos-rebuild, which is often not what you want. By contrast, in the imperative approach, containers are configured and updated independently from the host system. + NixOS containers can be created in two ways: imperatively, using the command + nixos-container, and declaratively, by specifying them in + your configuration.nix. The declarative approach implies + that containers get upgraded along with your host system when you run + nixos-rebuild, which is often not what you want. By + contrast, in the imperative approach, containers are configured and updated + independently from the host system. diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml index d6ae89da30c4..16d03cc0d1ab 100644 --- a/nixos/doc/manual/administration/control-groups.xml +++ b/nixos/doc/manual/administration/control-groups.xml @@ -5,10 +5,16 @@ xml:id="sec-cgroups"> Control Groups - To keep track of the processes in a running system, systemd uses control groups (cgroups). A control group is a set of processes used to allocate resources such as CPU, memory or I/O bandwidth. There can be multiple control group hierarchies, allowing each kind of resource to be managed independently. + To keep track of the processes in a running system, systemd uses + control groups (cgroups). A control group is a set of + processes used to allocate resources such as CPU, memory or I/O bandwidth. + There can be multiple control group hierarchies, allowing each kind of + resource to be managed independently. - The command systemd-cgls lists all control groups in the systemd hierarchy, which is what systemd uses to keep track of the processes belonging to each service or user session: + The command systemd-cgls lists all control groups in the + systemd hierarchy, which is what systemd uses to keep + track of the processes belonging to each service or user session: $ systemd-cgls ├─user @@ -26,19 +32,34 @@ │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf └─ ... - Similarly, systemd-cgls cpu shows the cgroups in the CPU hierarchy, which allows per-cgroup CPU scheduling priorities. By default, every systemd service gets its own CPU cgroup, while all user sessions are in the top-level CPU cgroup. This ensures, for instance, that a thousand run-away processes in the httpd.service cgroup cannot starve the CPU for one process in the postgresql.service cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL process would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s CPU share in configuration.nix: + Similarly, systemd-cgls cpu shows the cgroups in the CPU + hierarchy, which allows per-cgroup CPU scheduling priorities. By default, + every systemd service gets its own CPU cgroup, while all user sessions are in + the top-level CPU cgroup. This ensures, for instance, that a thousand + run-away processes in the httpd.service cgroup cannot + starve the CPU for one process in the postgresql.service + cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL + process would get 1/1001 of the cgroup’s CPU time.) You can limit a + service’s CPU share in configuration.nix: systemd.services.httpd.serviceConfig.CPUShares = 512; - By default, every cgroup has 1024 CPU shares, so this will halve the CPU allocation of the httpd.service cgroup. + By default, every cgroup has 1024 CPU shares, so this will halve the CPU + allocation of the httpd.service cgroup. - There also is a memory hierarchy that controls memory allocation limits; by default, all processes are in the top-level cgroup, so any service or session can exhaust all available memory. Per-cgroup memory limits can be specified in configuration.nix; for instance, to limit httpd.service to 512 MiB of RAM (excluding swap): + There also is a memory hierarchy that controls memory + allocation limits; by default, all processes are in the top-level cgroup, so + any service or session can exhaust all available memory. Per-cgroup memory + limits can be specified in configuration.nix; for + instance, to limit httpd.service to 512 MiB of RAM + (excluding swap): systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; - The command systemd-cgtop shows a continuously updated list of all cgroups with their CPU and memory usage. + The command systemd-cgtop shows a continuously updated + list of all cgroups with their CPU and memory usage. diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index a463d2014784..d03dbc4d7055 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -6,7 +6,10 @@ Declarative Container Specification - You can also specify containers and their configuration in the host’s configuration.nix. For example, the following specifies that there shall be a container named database running PostgreSQL: + You can also specify containers and their configuration in the host’s + configuration.nix. For example, the following specifies + that there shall be a container named database running + PostgreSQL: containers.database = { config = @@ -16,11 +19,18 @@ containers.database = }; }; - If you run nixos-rebuild switch, the container will be built. If the container was already running, it will be updated in place, without rebooting. The container can be configured to start automatically by setting containers.database.autoStart = true in its configuration. + If you run nixos-rebuild switch, the container will be + built. If the container was already running, it will be updated in place, + without rebooting. The container can be configured to start automatically by + setting containers.database.autoStart = true in its + configuration. - By default, declarative containers share the network namespace of the host, meaning that they can listen on (privileged) ports. However, they cannot change the network configuration. You can give a container its own network as follows: + By default, declarative containers share the network namespace of the host, + meaning that they can listen on (privileged) ports. However, they cannot + change the network configuration. You can give a container its own network as + follows: containers.database = { privateNetwork = true; @@ -28,14 +38,23 @@ containers.database = { localAddress = "192.168.100.11"; }; - This gives the container a private virtual Ethernet interface with IP address 192.168.100.11, which is hooked up to a virtual Ethernet interface on the host with IP address 192.168.100.10. (See the next section for details on container networking.) + This gives the container a private virtual Ethernet interface with IP address + 192.168.100.11, which is hooked up to a virtual Ethernet + interface on the host with IP address 192.168.100.10. (See + the next section for details on container networking.) - To disable the container, just remove it from configuration.nix and run nixos-rebuild switch. Note that this will not delete the root directory of the container in /var/lib/containers. Containers can be destroyed using the imperative method: nixos-container destroy foo. + To disable the container, just remove it from + configuration.nix and run nixos-rebuild + switch. Note that this will not delete the root directory of the + container in /var/lib/containers. Containers can be + destroyed using the imperative method: nixos-container destroy + foo. - Declarative containers can be started and stopped using the corresponding systemd service, e.g. systemctl start container@database. + Declarative containers can be started and stopped using the corresponding + systemd service, e.g. systemctl start container@database. diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index d5da6bf2017e..7ded0c11786e 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -6,7 +6,9 @@ Imperative Container Management - We’ll cover imperative container management using nixos-container first. Be aware that container management is currently only possible as root. + We’ll cover imperative container management using + nixos-container first. Be aware that container management + is currently only possible as root. @@ -14,14 +16,23 @@ # nixos-container create foo - This creates the container’s root directory in /var/lib/containers/foo and a small configuration file in /etc/containers/foo.conf. It also builds the container’s initial system configuration and stores it in /nix/var/nix/profiles/per-container/foo/system. You can modify the initial configuration of the container on the command line. For instance, to create a container that has sshd running, with the given public key for root: + This creates the container’s root directory in + /var/lib/containers/foo and a small configuration file + in /etc/containers/foo.conf. It also builds the + container’s initial system configuration and stores it in + /nix/var/nix/profiles/per-container/foo/system. You can + modify the initial configuration of the container on the command line. For + instance, to create a container that has sshd running, + with the given public key for root: # nixos-container create foo --config ' = true; users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' - By default the next free address in the 10.233.0.0/16 subnet will be chosen as container IP. This behavior can be altered by setting --host-address and --local-address: + By default the next free address in the 10.233.0.0/16 subnet will be chosen + as container IP. This behavior can be altered by setting --host-address and + --local-address: # nixos-container create test --config-file test-container.nix \ --local-address 10.235.1.2 --host-address 10.235.1.1 @@ -33,25 +44,35 @@ # nixos-container start foo - This command will return as soon as the container has booted and has reached multi-user.target. On the host, the container runs within a systemd unit called container@container-name.service. Thus, if something went wrong, you can get status info using systemctl: + This command will return as soon as the container has booted and has reached + multi-user.target. On the host, the container runs within + a systemd unit called + container@container-name.service. + Thus, if something went wrong, you can get status info using + systemctl: # systemctl status container@foo - If the container has started successfully, you can log in as root using the root-login operation: + If the container has started successfully, you can log in as root using the + root-login operation: # nixos-container root-login foo [root@foo:~]# - Note that only root on the host can do this (since there is no authentication). You can also get a regular login prompt using the login operation, which is available to all users on the host: + Note that only root on the host can do this (since there is no + authentication). You can also get a regular login prompt using the + login operation, which is available to all users on the + host: # nixos-container login foo foo login: alice Password: *** - With nixos-container run, you can execute arbitrary commands in the container: + With nixos-container run, you can execute arbitrary + commands in the container: # nixos-container run foo -- uname -a Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux @@ -59,11 +80,15 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux - There are several ways to change the configuration of the container. First, on the host, you can edit /var/lib/container/name/etc/nixos/configuration.nix, and run + There are several ways to change the configuration of the container. First, + on the host, you can edit + /var/lib/container/name/etc/nixos/configuration.nix, + and run # nixos-container update foo - This will build and activate the new configuration. You can also specify a new configuration on the command line: + This will build and activate the new configuration. You can also specify a + new configuration on the command line: # nixos-container update foo --config ' = true; @@ -74,15 +99,23 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux # curl http://$(nixos-container show-ip foo)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… - However, note that this will overwrite the container’s /etc/nixos/configuration.nix. + However, note that this will overwrite the container’s + /etc/nixos/configuration.nix. - Alternatively, you can change the configuration from within the container itself by running nixos-rebuild switch inside the container. Note that the container by default does not have a copy of the NixOS channel, so you should run nix-channel --update first. + Alternatively, you can change the configuration from within the container + itself by running nixos-rebuild switch inside the + container. Note that the container by default does not have a copy of the + NixOS channel, so you should run nix-channel --update + first. - Containers can be stopped and started using nixos-container stop and nixos-container start, respectively, or by using systemctl on the container’s service unit. To destroy a container, including its file system, do + Containers can be stopped and started using nixos-container + stop and nixos-container start, respectively, or + by using systemctl on the container’s service unit. To + destroy a container, including its file system, do # nixos-container destroy foo diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml index 8089b457786c..da4877fcdf08 100644 --- a/nixos/doc/manual/administration/logging.xml +++ b/nixos/doc/manual/administration/logging.xml @@ -5,11 +5,18 @@ xml:id="sec-logging"> Logging - System-wide logging is provided by systemd’s journal, which subsumes traditional logging daemons such as syslogd and klogd. Log entries are kept in binary files in /var/log/journal/. The command journalctl allows you to see the contents of the journal. For example, + System-wide logging is provided by systemd’s journal, + which subsumes traditional logging daemons such as syslogd and klogd. Log + entries are kept in binary files in /var/log/journal/. + The command journalctl allows you to see the contents of + the journal. For example, $ journalctl -b - shows all journal entries since the last reboot. (The output of journalctl is piped into less by default.) You can use various options and match operators to restrict output to messages of interest. For instance, to get all messages from PostgreSQL: + shows all journal entries since the last reboot. (The output of + journalctl is piped into less by + default.) You can use various options and match operators to restrict output + to messages of interest. For instance, to get all messages from PostgreSQL: $ journalctl -u postgresql.service -- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- @@ -19,7 +26,8 @@ Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections - Or to get all messages since the last reboot that have at least a “critical” severity level: + Or to get all messages since the last reboot that have at least a + “critical” severity level: $ journalctl -b -p crit Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] @@ -27,6 +35,9 @@ Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature ab - The system journal is readable by root and by users in the wheel and systemd-journal groups. All users have a private journal that can be read using journalctl. + The system journal is readable by root and by users in the + wheel and systemd-journal groups. All + users have a private journal that can be read using + journalctl. diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml index dc11316dc1a1..71e3f9ea665d 100644 --- a/nixos/doc/manual/administration/maintenance-mode.xml +++ b/nixos/doc/manual/administration/maintenance-mode.xml @@ -9,6 +9,8 @@ You can enter rescue mode by running: # systemctl rescue - This will eventually give you a single-user root shell. Systemd will stop (almost) all system services. To get out of maintenance mode, just exit from the rescue shell. + This will eventually give you a single-user root shell. Systemd will stop + (almost) all system services. To get out of maintenance mode, just exit from + the rescue shell. diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml index 1d41e5c29957..570f58358845 100644 --- a/nixos/doc/manual/administration/network-problems.xml +++ b/nixos/doc/manual/administration/network-problems.xml @@ -6,11 +6,20 @@ Network Problems - Nix uses a so-called binary cache to optimise building a package from source into downloading it as a pre-built binary. That is, whenever a command like nixos-rebuild needs a path in the Nix store, Nix will try to download that path from the Internet rather than build it from source. The default binary cache is https://cache.nixos.org/. If this cache is unreachable, Nix operations may take a long time due to HTTP connection timeouts. You can disable the use of the binary cache by adding , e.g. + Nix uses a so-called binary cache to optimise building a + package from source into downloading it as a pre-built binary. That is, + whenever a command like nixos-rebuild needs a path in the + Nix store, Nix will try to download that path from the Internet rather than + build it from source. The default binary cache is + https://cache.nixos.org/. If this cache is unreachable, Nix + operations may take a long time due to HTTP connection timeouts. You can + disable the use of the binary cache by adding , e.g. # nixos-rebuild switch --option use-binary-caches false - If you have an alternative binary cache at your disposal, you can use it instead: + If you have an alternative binary cache at your disposal, you can use it + instead: # nixos-rebuild switch --option binary-caches http://my-cache.example.org/ diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml index 989712b20faf..a5abd6f02588 100644 --- a/nixos/doc/manual/administration/rebooting.xml +++ b/nixos/doc/manual/administration/rebooting.xml @@ -16,15 +16,20 @@ # reboot - which is equivalent to systemctl reboot. Alternatively, you can quickly reboot the system using kexec, which bypasses the BIOS by directly loading the new kernel into memory: + which is equivalent to systemctl reboot. Alternatively, + you can quickly reboot the system using kexec, which + bypasses the BIOS by directly loading the new kernel into memory: # systemctl kexec - The machine can be suspended to RAM (if supported) using systemctl suspend, and suspended to disk using systemctl hibernate. + The machine can be suspended to RAM (if supported) using systemctl + suspend, and suspended to disk using systemctl + hibernate. - These commands can be run by any user who is logged in locally, i.e. on a virtual console or in X11; otherwise, the user is asked for authentication. + These commands can be run by any user who is logged in locally, i.e. on a + virtual console or in X11; otherwise, the user is asked for authentication. diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml index aa6d3c956766..fb87810ba461 100644 --- a/nixos/doc/manual/administration/rollback.xml +++ b/nixos/doc/manual/administration/rollback.xml @@ -6,11 +6,19 @@ Rolling Back Configuration Changes - After running nixos-rebuild to switch to a new configuration, you may find that the new configuration doesn’t work very well. In that case, there are several ways to return to a previous configuration. + After running nixos-rebuild to switch to a new + configuration, you may find that the new configuration doesn’t work very + well. In that case, there are several ways to return to a previous + configuration. - First, the GRUB boot manager allows you to boot into any previous configuration that hasn’t been garbage-collected. These configurations can be found under the GRUB submenu “NixOS - All configurations”. This is especially useful if the new configuration fails to boot. After the system has booted, you can make the selected configuration the default for subsequent boots: + First, the GRUB boot manager allows you to boot into any previous + configuration that hasn’t been garbage-collected. These configurations can + be found under the GRUB submenu “NixOS - All configurations”. This is + especially useful if the new configuration fails to boot. After the system + has booted, you can make the selected configuration the default for + subsequent boots: # /run/current-system/bin/switch-to-configuration boot @@ -22,7 +30,8 @@ This is equivalent to running: # /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch - where N is the number of the NixOS system configuration. To get a list of the available configurations, do: + where N is the number of the NixOS system + configuration. To get a list of the available configurations, do: $ ls -l /nix/var/nix/profiles/system-*-link ... diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 12512a003c8e..19bec1f7794d 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -6,7 +6,8 @@ Administration - This chapter describes various aspects of managing a running NixOS system, such as how to use the systemd service manager. + This chapter describes various aspects of managing a running NixOS system, + such as how to use the systemd service manager. diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml index 4ad30ce55a86..1b9c745eb59f 100644 --- a/nixos/doc/manual/administration/service-mgmt.xml +++ b/nixos/doc/manual/administration/service-mgmt.xml @@ -5,10 +5,21 @@ xml:id="sec-systemctl"> Service Management - In NixOS, all system services are started and monitored using the systemd program. Systemd is the “init” process of the system (i.e. PID 1), the parent of all other processes. It manages a set of so-called “units”, which can be things like system services (programs), but also mount points, swap files, devices, targets (groups of units) and more. Units can have complex dependencies; for instance, one unit can require that another unit must be successfully started before the first unit can be started. When the system boots, it starts a unit named default.target; the dependencies of this unit cause all system services to be started, file systems to be mounted, swap files to be activated, and so on. + In NixOS, all system services are started and monitored using the systemd + program. Systemd is the “init” process of the system (i.e. PID 1), the + parent of all other processes. It manages a set of so-called “units”, + which can be things like system services (programs), but also mount points, + swap files, devices, targets (groups of units) and more. Units can have + complex dependencies; for instance, one unit can require that another unit + must be successfully started before the first unit can be started. When the + system boots, it starts a unit named default.target; the + dependencies of this unit cause all system services to be started, file + systems to be mounted, swap files to be activated, and so on. - The command systemctl is the main way to interact with systemd. Without any arguments, it shows the status of active units: + The command systemctl is the main way to interact with + systemd. Without any arguments, it shows the status of + active units: $ systemctl -.mount loaded active mounted / @@ -19,7 +30,8 @@ graphical.target loaded active active Graphical Interface - You can ask for detailed status information about a unit, for instance, the PostgreSQL database service: + You can ask for detailed status information about a unit, for instance, the + PostgreSQL database service: $ systemctl status postgresql.service postgresql.service - PostgreSQL Server @@ -39,7 +51,9 @@ Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. - Note that this shows the status of the unit (active and running), all the processes belonging to the service, as well as the most recent log messages from the service. + Note that this shows the status of the unit (active and running), all the + processes belonging to the service, as well as the most recent log messages + from the service. Units can be stopped, started or restarted: @@ -48,7 +62,9 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. # systemctl start postgresql.service # systemctl restart postgresql.service - These operations are synchronous: they wait until the service has finished starting or stopping (or has failed). Starting a unit will cause the dependencies of that unit to be started as well (if necessary). + These operations are synchronous: they wait until the service has finished + starting or stopping (or has failed). Starting a unit will cause the + dependencies of that unit to be started as well (if necessary). users.users.alice.openssh.authorizedKeys.keys = diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml index c9c8b67b0cfc..ea980254a8fc 100644 --- a/nixos/doc/manual/configuration/summary.xml +++ b/nixos/doc/manual/configuration/summary.xml @@ -6,8 +6,12 @@ Syntax Summary - Below is a summary of the most important syntactic constructs in the Nix expression language. It’s not complete. In particular, there are many other built-in functions. See the Nix manual for the rest. + Below is a summary of the most important syntactic constructs in the Nix + expression language. It’s not complete. In particular, there are many other + built-in functions. See the + Nix + manual for the rest. diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index db8323ec4d4f..4b1710f3a2b1 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -5,7 +5,10 @@ xml:id="sec-user-management"> User Management - NixOS supports both declarative and imperative styles of user management. In the declarative style, users are specified in configuration.nix. For instance, the following states that a user account named alice shall exist: + NixOS supports both declarative and imperative styles of user management. In + the declarative style, users are specified in + configuration.nix. For instance, the following states + that a user account named alice shall exist: .alice = { isNormalUser = true; @@ -15,33 +18,60 @@ openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; - Note that alice is a member of the wheel and networkmanager groups, which allows her to use sudo to execute commands as root and to configure the network, respectively. Also note the SSH public key that allows remote logins with the corresponding private key. Users created in this way do not have a password by default, so they cannot log in via mechanisms that require a password. However, you can use the passwd program to set a password, which is retained across invocations of nixos-rebuild. + Note that alice is a member of the + wheel and networkmanager groups, which + allows her to use sudo to execute commands as + root and to configure the network, respectively. Also note + the SSH public key that allows remote logins with the corresponding private + key. Users created in this way do not have a password by default, so they + cannot log in via mechanisms that require a password. However, you can use + the passwd program to set a password, which is retained + across invocations of nixos-rebuild. - If you set to false, then the contents of /etc/passwd and /etc/group will be congruent to your NixOS configuration. For instance, if you remove a user from 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. 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. + If you set to false, then the + contents of /etc/passwd and /etc/group + will be congruent to your NixOS configuration. For instance, if you remove a + user from 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. 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 + A user ID (uid) is assigned automatically. You can also specify a uid + manually by adding uid = 1000; to the user specification. - Groups can be specified similarly. The following states that a group named students shall exist: + Groups can be specified similarly. The following states that a group named + students shall exist: .students.gid = 1000; - As with users, the group ID (gid) is optional and will be assigned automatically if it’s missing. + As with users, the group ID (gid) is optional and will be assigned + automatically if it’s missing. - In the imperative style, users and groups are managed by commands such as useradd, groupmod and so on. For instance, to create a user account named alice: + In the imperative style, users and groups are managed by commands such as + useradd, groupmod and so on. For + instance, to create a user account named alice: # useradd -m alice - To make all nix tools available to this new user use `su - USER` which opens a login shell (==shell that loads the profile) for given user. This will create the ~/.nix-defexpr symlink. So run: + To make all nix tools available to this new user use `su - USER` which opens + a login shell (==shell that loads the profile) for given user. This will + create the ~/.nix-defexpr symlink. So run: # su - alice -c "true" - The flag causes the creation of a home directory for the new user, which is generally what you want. The user does not have an initial password and therefore cannot log in. A password can be set using the passwd utility: + The flag causes the creation of a home directory for the + new user, which is generally what you want. The user does not have an initial + password and therefore cannot log in. A password can be set using the + passwd utility: # passwd alice Enter new UNIX password: *** @@ -50,6 +80,9 @@ Retype new UNIX password: *** A user can be deleted using userdel: # userdel -r alice - The flag deletes the user’s home directory. Accounts can be modified using usermod. Unix groups can be managed using groupadd, groupmod and groupdel. + The flag deletes the user’s home directory. Accounts + can be modified using usermod. Unix groups can be managed + using groupadd, groupmod and + groupdel. diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 2d47abd379d4..247d29d58314 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -6,7 +6,9 @@ Wireless Networks - For a desktop installation using NetworkManager (e.g., GNOME), you just have to make sure the user is in the networkmanager group and you can skip the rest of this section on wireless networks. + For a desktop installation using NetworkManager (e.g., GNOME), you just have + to make sure the user is in the networkmanager group and you can + skip the rest of this section on wireless networks. @@ -30,13 +32,17 @@ free.wifi = {}; # Public wireless network }; - Be aware that keys will be written to the nix store in plaintext! When no networks are set, it will default to using a configuration file at /etc/wpa_supplicant.conf. You should edit this file yourself to define wireless networks, WPA keys and so on (see + Be aware that keys will be written to the nix store in plaintext! When no + networks are set, it will default to using a configuration file at + /etc/wpa_supplicant.conf. You should edit this file + yourself to define wireless networks, WPA keys and so on (see wpa_supplicant.conf 5 ). - If you are using WPA2 you can generate pskRaw key using wpa_passphrase: + If you are using WPA2 you can generate pskRaw key using + wpa_passphrase: $ wpa_passphrase ESSID PSK network={ @@ -52,10 +58,12 @@ network={ }; } - or you can use it to directly generate the wpa_supplicant.conf: + or you can use it to directly generate the + wpa_supplicant.conf: # wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf - After you have edited the wpa_supplicant.conf, you need to restart the wpa_supplicant service. + After you have edited the wpa_supplicant.conf, you need to + restart the wpa_supplicant service. # systemctl restart wpa_supplicant.service diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 2d65ba479aab..f6f659b02afa 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -5,18 +5,23 @@ xml:id="sec-x11"> X Window System - The X Window System (X11) provides the basis of NixOS’ graphical user interface. It can be enabled as follows: + The X Window System (X11) provides the basis of NixOS’ graphical user + interface. It can be enabled as follows: = true; - The X server will automatically detect and use the appropriate video driver from a set of X.org drivers (such as vesa and intel). You can also specify a driver manually, e.g. + The X server will automatically detect and use the appropriate video driver + from a set of X.org drivers (such as vesa and + intel). You can also specify a driver manually, e.g. = [ "r128" ]; to enable X.org’s xf86-video-r128 driver. - You also need to enable at least one desktop or window manager. Otherwise, you can only log into a plain undecorated xterm window. Thus you should pick one or more of the following lines: + You also need to enable at least one desktop or window manager. Otherwise, + you can only log into a plain undecorated xterm window. + Thus you should pick one or more of the following lines: = true; = true; @@ -29,7 +34,9 @@ - NixOS’s default display manager (the program that provides a graphical login prompt and manages the X server) is LightDM. You can select an alternative one by picking one of the following lines: + NixOS’s default display manager (the program that + provides a graphical login prompt and manages the X server) is LightDM. You + can select an alternative one by picking one of the following lines: = true; = true; @@ -43,7 +50,8 @@ - The X server is started automatically at boot time. If you don’t want this to happen, you can set: + The X server is started automatically at boot time. If you don’t want this + to happen, you can set: = false; @@ -53,7 +61,8 @@ - On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, you should also set the following: + On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, + you should also set the following: = true; @@ -61,18 +70,23 @@ Auto-login - The x11 login screen can be skipped entirely, automatically logging you into your window manager and desktop environment when you boot your computer. + The x11 login screen can be skipped entirely, automatically logging you into + your window manager and desktop environment when you boot your computer. - This is especially helpful if you have disk encryption enabled. Since you already have to provide a password to decrypt your disk, entering a second password to login can be redundant. + This is especially helpful if you have disk encryption enabled. Since you + already have to provide a password to decrypt your disk, entering a second + password to login can be redundant. - To enable auto-login, you need to define your default window manager and desktop environment. If you wanted no desktop environment and i3 as your your window manager, you'd define: + To enable auto-login, you need to define your default window manager and + desktop environment. If you wanted no desktop environment and i3 as your your + window manager, you'd define: = "none"; = "i3"; - And, finally, to enable auto-login for a user johndoe: + And, finally, to enable auto-login for a user johndoe: = true; = "johndoe"; @@ -82,7 +96,9 @@ Proprietary NVIDIA drivers - NVIDIA provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows: + NVIDIA provides a proprietary driver for its graphics cards that has better + 3D performance than the X.org drivers. It is not enabled by default because + it’s not free software. You can enable it as follows: = [ "nvidia" ]; @@ -93,51 +109,76 @@ = [ "nvidiaLegacy304" ]; = [ "nvidiaLegacy173" ]; - You may need to reboot after enabling this driver to prevent a clash with other kernel modules. + You may need to reboot after enabling this driver to prevent a clash with + other kernel modules. Proprietary AMD drivers - AMD provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows: + AMD provides a proprietary driver for its graphics cards that has better 3D + performance than the X.org drivers. It is not enabled by default because + it’s not free software. You can enable it as follows: = [ "ati_unfree" ]; - You will need to reboot after enabling this driver to prevent a clash with other kernel modules. + You will need to reboot after enabling this driver to prevent a clash with + other kernel modules. - - For recent AMD GPUs you most likely want to keep either the defaults or "amdgpu" (both free). - + + For recent AMD GPUs you most likely want to keep either the defaults + or "amdgpu" (both free). + Touchpads - Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows: + Support for Synaptics touchpads (found in many laptops such as the Dell + Latitude series) can be enabled as follows: = true; - The driver has many options (see ). For instance, the following disables tap-to-click behavior: + The driver has many options (see ). For + instance, the following disables tap-to-click behavior: = false; - Note: the use of services.xserver.synaptics is deprecated since NixOS 17.09. + Note: the use of services.xserver.synaptics is deprecated + since NixOS 17.09. GTK/Qt themes - GTK themes can be installed either to user profile or system-wide (via environment.systemPackages). To make Qt 5 applications look similar to GTK2 ones, you can install qt5.qtbase.gtk package into your system environment. It should work for all Qt 5 library versions. + GTK themes can be installed either to user profile or system-wide (via + environment.systemPackages). To make Qt 5 applications + look similar to GTK2 ones, you can install qt5.qtbase.gtk + package into your system environment. It should work for all Qt 5 library + versions. Custom XKB layouts - It is possible to install custom XKB keyboard layouts using the option . As a first example, we are going to create a layout based on the basic US layout, with an additional layer to type some greek symbols by pressing the right-alt key. + It is possible to install custom + + XKB + + keyboard layouts using the option + . + As a first example, we are going to create a layout based on the basic US + layout, with an additional layer to type some greek symbols by pressing the + right-alt key. - To do this we are going to create a us-greek file with a xkb_symbols section. + To do this we are going to create a us-greek file + with a xkb_symbols section. xkb_symbols "us-greek" @@ -153,7 +194,8 @@ xkb_symbols "us-greek" }; - To install the layout, the filepath, a description and the list of languages must be given: + To install the layout, the filepath, a description and the list of + languages must be given: .us-greek = { @@ -163,18 +205,32 @@ xkb_symbols "us-greek" } - - The name should match the one given to the xkb_symbols block. - + + The name should match the one given to the + xkb_symbols block. + - The layout should now be installed and ready to use: try it by running setxkbmap us-greek and type <alt>+a. To change the default the usual option can still be used. + The layout should now be installed and ready to use: try it by + running setxkbmap us-greek and type + <alt>+a. To change the default the usual + + option can still be used. - A layout can have several other components besides xkb_symbols, for example we will define new keycodes for some multimedia key and bind these to some symbol. + A layout can have several other components besides + xkb_symbols, for example we will define new + keycodes for some multimedia key and bind these to some symbol. - Use the xev utility from pkgs.xorg.xev to find the codes of the keys of interest, then create a media-key file to hold the keycodes definitions + Use the xev utility from + pkgs.xorg.xev to find the codes of the keys of + interest, then create a media-key file to hold + the keycodes definitions xkb_keycodes "media" @@ -184,7 +240,7 @@ xkb_keycodes "media" } - Now use the newly define keycodes in media-sym: + Now use the newly define keycodes in media-sym: xkb_symbols "media" @@ -195,7 +251,7 @@ xkb_symbols "media" } - As before, to install the layout do + As before, to install the layout do .media = { @@ -206,22 +262,37 @@ xkb_symbols "media" }; - - The function pkgs.writeText <filename> <content> can be useful if you prefer to keep the layout definitions inside the NixOS configuration. - + + The function pkgs.writeText <filename> <content> + can be useful if you prefer to keep the layout definitions + inside the NixOS configuration. + - Unfortunately, the Xorg server does not (currently) support setting a keymap directly but relies instead on XKB rules to select the matching components (keycodes, types, ...) of a layout. This means that components other than symbols won't be loaded by default. As a workaround, you can set the keymap using setxkbmap at the start of the session with: + Unfortunately, the Xorg server does not (currently) support setting a + keymap directly but relies instead on XKB rules to select the matching + components (keycodes, types, ...) of a layout. This means that components + other than symbols won't be loaded by default. As a workaround, you + can set the keymap using setxkbmap at the start of the + session with: = "setxkbmap -keycodes media"; - If you are manually starting the X server, you should set the argument -xkbdir /etc/X11/xkb, otherwise X won't find your layout files. For example with xinit run -$ xinit -- -xkbdir /etc/X11/xkb + If you are manually starting the X server, you should set the argument + -xkbdir /etc/X11/xkb, otherwise X won't find your layout files. + For example with xinit run + $ xinit -- -xkbdir /etc/X11/xkb - To learn how to write layouts take a look at the XKB documentation . More example layouts can also be found here . + To learn how to write layouts take a look at the XKB + + documentation + . More example layouts can also be found + + here + . - + diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 7a93a452fd9d..6ac99c6b2bee 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -14,7 +14,8 @@ - Optionally, compton can be enabled for nice graphical effects, some example settings: + Optionally, compton can be enabled for nice graphical + effects, some example settings: services.compton = { enable = true; @@ -26,7 +27,9 @@ - Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your . + Some Xfce programs are not installed automatically. To install them manually + (system wide), put them into your + . Thunar Volume Support @@ -41,17 +44,25 @@ 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. + 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). + 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. + 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 diff --git a/nixos/doc/manual/development/assertions.xml b/nixos/doc/manual/development/assertions.xml index c7d5b960aa6b..32f90cf2e7c4 100644 --- a/nixos/doc/manual/development/assertions.xml +++ b/nixos/doc/manual/development/assertions.xml @@ -6,11 +6,18 @@ Warnings and Assertions - When configuration problems are detectable in a module, it is a good idea to write an assertion or warning. Doing so provides clear feedback to the user and prevents errors after the build. + When configuration problems are detectable in a module, it is a good idea to + write an assertion or warning. Doing so provides clear feedback to the user + and prevents errors after the build. - Although Nix has the abort and builtins.trace functions to perform such tasks, they are not ideally suited for NixOS modules. Instead of these functions, you can declare your warnings and assertions using the NixOS module system. + Although Nix has the abort and + builtins.trace + functions + to perform such tasks, they are not ideally suited for NixOS modules. Instead + of these functions, you can declare your warnings and assertions using the + NixOS module system.
@@ -41,7 +48,12 @@ Assertions - This example, extracted from the syslogd module shows how to use assertions. Since there can only be one active syslog daemon at a time, an assertion is useful to prevent such a broken system from being built. + This example, extracted from the + + syslogd module shows how to use + assertions. Since there can only be one active syslog + daemon at a time, an assertion is useful to prevent such a broken system + from being built. diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml index a4bb18656e00..56a596baed00 100644 --- a/nixos/doc/manual/development/building-nixos.xml +++ b/nixos/doc/manual/development/building-nixos.xml @@ -5,17 +5,22 @@ xml:id="sec-building-cd"> Building Your Own NixOS CD - Building a NixOS CD is as easy as configuring your own computer. The idea is to use another module which will replace your configuration.nix to configure the system that would be installed on the CD. + Building a NixOS CD is as easy as configuring your own computer. The idea is + to use another module which will replace your + configuration.nix to configure the system that would be + installed on the CD. - Default CD/DVD configurations are available inside nixos/modules/installer/cd-dvd. + Default CD/DVD configurations are available inside + nixos/modules/installer/cd-dvd. $ git clone https://github.com/NixOS/nixpkgs.git $ cd nixpkgs/nixos $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix - Before burning your CD/DVD, you can check the content of the image by mounting anywhere like suggested by the following command: + Before burning your CD/DVD, you can check the content of the image by + mounting anywhere like suggested by the following command: # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml index e05a1342b7aa..88369fb891b3 100644 --- a/nixos/doc/manual/development/building-parts.xml +++ b/nixos/doc/manual/development/building-parts.xml @@ -5,11 +5,14 @@ xml:id="sec-building-parts"> Building Specific Parts of NixOS - With the command nix-build, you can build specific parts of your NixOS configuration. This is done as follows: + With the command nix-build, you can build specific parts + of your NixOS configuration. This is done as follows: $ cd /path/to/nixpkgs/nixos $ nix-build -A config.option - where option is a NixOS option with type “derivation” (i.e. something that can be built). Attributes of interest include: + where option is a NixOS option with type + “derivation” (i.e. something that can be built). Attributes of interest + include: @@ -17,7 +20,10 @@ - The top-level option that builds the entire NixOS system. Everything else in your configuration is indirectly pulled in by this option. This is what nixos-rebuild builds and what /run/current-system points to afterwards. + The top-level option that builds the entire NixOS system. Everything else + in your configuration is indirectly pulled in by this option. This is + what nixos-rebuild builds and what + /run/current-system points to afterwards. A shortcut to build this is: @@ -42,7 +48,8 @@ - A tree of symlinks that form the static parts of /etc. + A tree of symlinks that form the static parts of + /etc. @@ -55,7 +62,9 @@ - The initial ramdisk and kernel of the system. This allows a quick way to test whether the kernel and the initial ramdisk boot correctly, by using QEMU’s and options: + The initial ramdisk and kernel of the system. This allows a quick way to + test whether the kernel and the initial ramdisk boot correctly, by using + QEMU’s and options: $ nix-build -A config.system.build.initialRamdisk -o initrd $ nix-build -A config.system.build.kernel -o kernel @@ -86,18 +95,24 @@ - This builds the unit with the specified name. Note that since unit names contain dots (e.g. httpd.service), you need to put them between quotes, like this: + This builds the unit with the specified name. Note that since unit names + contain dots (e.g. httpd.service), you need to put + them between quotes, like this: $ nix-build -A 'config.systemd.units."httpd.service".unit' - You can also test individual units, without rebuilding the whole system, by putting them in /run/systemd/system: + You can also test individual units, without rebuilding the whole system, + by putting them in /run/systemd/system: $ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ /run/systemd/system/tmp-httpd.service # systemctl daemon-reload # systemctl start tmp-httpd.service - Note that the unit must not have the same name as any unit in /etc/systemd/system since those take precedence over /run/systemd/system. That’s why the unit is installed as tmp-httpd.service here. + Note that the unit must not have the same name as any unit in + /etc/systemd/system since those take precedence over + /run/systemd/system. That’s why the unit is + installed as tmp-httpd.service here. diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml index 0d57681783e2..1c6a5671eda8 100644 --- a/nixos/doc/manual/development/importing-modules.xml +++ b/nixos/doc/manual/development/importing-modules.xml @@ -6,7 +6,8 @@ Importing Modules - Sometimes NixOS modules need to be used in configuration but exist outside of Nixpkgs. These modules can be imported: + Sometimes NixOS modules need to be used in configuration but exist outside of + Nixpkgs. These modules can be imported: @@ -24,7 +25,9 @@ - The environment variable NIXOS_EXTRA_MODULE_PATH is an absolute path to a NixOS module that is included alongside the Nixpkgs NixOS modules. Like any NixOS module, this module can import additional modules: + The environment variable NIXOS_EXTRA_MODULE_PATH is an + absolute path to a NixOS module that is included alongside the Nixpkgs NixOS + modules. Like any NixOS module, this module can import additional modules: diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml index fd15bd3638fd..3d019a4987e1 100644 --- a/nixos/doc/manual/development/meta-attributes.xml +++ b/nixos/doc/manual/development/meta-attributes.xml @@ -6,12 +6,18 @@ Meta Attributes - Like Nix packages, NixOS modules can declare meta-attributes to provide extra information. Module meta attributes are defined in the meta.nix special module. + Like Nix packages, NixOS modules can declare meta-attributes to provide extra + information. Module meta attributes are defined in the + meta.nix + special module. - meta is a top level attribute like options and config. Available meta-attributes are maintainers and doc. + meta is a top level attribute like + options and config. Available + meta-attributes are maintainers and + doc. @@ -45,8 +51,11 @@ - doc points to a valid DocBook file containing the module documentation. Its contents is automatically added to . Changes to a module documentation have to be checked to not break building the NixOS manual: + doc points to a valid DocBook file containing the module + documentation. Its contents is automatically added to + . Changes to a module documentation + have to be checked to not break building the NixOS manual: $ nix-build nixos/release.nix -A manual diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index aedc40e93a6d..2695082e3867 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -5,8 +5,13 @@ xml:id="sec-nixos-tests"> NixOS Tests - When you add some feature to NixOS, you should write a test for it. NixOS tests are kept in the directory nixos/tests, and are executed (using Nix) by a testing framework that automatically starts one or more virtual machines containing the NixOS system(s) required for the test. + When you add some feature to NixOS, you should write a test for it. NixOS + tests are kept in the directory + nixos/tests, + and are executed (using Nix) by a testing framework that automatically starts + one or more virtual machines containing the NixOS system(s) required for the + test. diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index d6fb3f8f687d..eee81bf64263 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -6,7 +6,9 @@ Option Declarations - An option declaration specifies the name, type and description of a NixOS configuration option. It is invalid to define an option that hasn’t been declared in any module. An option declaration generally looks like this: + An option declaration specifies the name, type and description of a NixOS + configuration option. It is invalid to define an option that hasn’t been + declared in any module. An option declaration generally looks like this: options = { name = mkOption { @@ -17,8 +19,13 @@ options = { }; }; - The attribute names within the name attribute path must be camel cased in general but should, as an exception, match the package attribute name when referencing a Nixpkgs package. For example, the option services.nix-serve.bindAddress references the nix-serve Nixpkgs package. + The attribute names within the name attribute path + must be camel cased in general but should, as an exception, match the + + package attribute name when referencing a Nixpkgs package. For + example, the option services.nix-serve.bindAddress + references the nix-serve Nixpkgs package. @@ -30,7 +37,9 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri - The type of the option (see ). It may be omitted, but that’s not advisable since it may lead to errors that are hard to diagnose. + The type of the option (see ). It may + be omitted, but that’s not advisable since it may lead to errors that + are hard to diagnose. @@ -40,7 +49,10 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri - The default value used if no value is defined by any module. A default is not required; but if a default is not given, then users of the module will have to define the value of the option, otherwise an error will be thrown. + The default value used if no value is defined by any module. A default is + not required; but if a default is not given, then users of the module + will have to define the value of the option, otherwise an error will be + thrown. @@ -60,7 +72,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri - A textual description of the option, in DocBook format, that will be included in the NixOS manual. + A textual description of the option, in DocBook format, that will be + included in the NixOS manual. @@ -71,15 +84,22 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri Extensible Option 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 enum and submodules and any composed forms of them. + 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 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 enable options. + 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, sddm, gdm ...). + 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, sddm, gdm ...). @@ -87,12 +107,14 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri - Managing the display managers independently by adding an enable option to every display manager module backend. (NixOS) + Managing the display managers independently by adding an enable option to + every display manager module backend. (NixOS) - Managing the display managers in the central module by adding an option to select which display manager backend to use. + Managing the display managers in the central module by adding an option + to select which display manager backend to use. @@ -103,22 +125,37 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri - 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 each backend enable option. As a result, this restriction has to be done explicitely by adding assertions in each display manager backend module. + 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 each backend + enable option. As a result, this restriction has to be + done explicitely by adding assertions in each display manager backend + module. - On the other hand, managing the display managers backends in the central module will require to change the central module option every time a new backend is added or removed. + On the other hand, managing the display managers backends in the 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 (, ), 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. + 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. @@ -147,11 +184,16 @@ services.xserver.displayManager.enable = mkOption { - The placeholder declaration is a standard mkOption declaration, but it is important that extensible option declarations only use the type argument. + 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" ]) or with types; listOf (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/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml index 883778c7eb96..50a705d0cb8e 100644 --- a/nixos/doc/manual/development/option-def.xml +++ b/nixos/doc/manual/development/option-def.xml @@ -6,26 +6,33 @@ Option Definitions - Option definitions are generally straight-forward bindings of values to option names, like + Option definitions are generally straight-forward bindings of values to + option names, like config = { services.httpd.enable = true; }; - However, sometimes you need to wrap an option definition or set of option definitions in a property to achieve certain effects: + However, sometimes you need to wrap an option definition or set of option + definitions in a property to achieve certain effects: Delaying Conditionals - If a set of option definitions is conditional on the value of another option, you may need to use mkIf. Consider, for instance: + If a set of option definitions is conditional on the value of another + option, you may need to use mkIf. Consider, for instance: config = if config.services.httpd.enable then { environment.systemPackages = [ ... ]; ... } else {}; - This definition will cause Nix to fail with an “infinite recursion” error. Why? Because the value of depends on the value being constructed here. After all, you could also write the clearly circular and contradictory: + This definition will cause Nix to fail with an “infinite recursion” + error. Why? Because the value of + depends on the value being + constructed here. After all, you could also write the clearly circular and + contradictory: config = if config.services.httpd.enable then { services.httpd.enable = false; @@ -40,7 +47,9 @@ config = mkIf config.services.httpd.enable { ... }; - The special function mkIf causes the evaluation of the conditional to be “pushed down” into the individual definitions, as if you had written: + The special function mkIf causes the evaluation of the + conditional to be “pushed down” into the individual definitions, as if + you had written: config = { environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; @@ -53,18 +62,27 @@ config = { Setting Priorities - A module can override the definitions of an option in other modules by setting a priority. All option definitions that do not have the lowest priority value are discarded. By default, option definitions have priority 1000. You can specify an explicit priority by using mkOverride, e.g. + A module can override the definitions of an option in other modules by + setting a priority. All option definitions that do not + have the lowest priority value are discarded. By default, option definitions + have priority 1000. You can specify an explicit priority by using + mkOverride, e.g. services.openssh.enable = mkOverride 10 false; - This definition causes all other definitions with priorities above 10 to be discarded. The function mkForce is equal to mkOverride 50. + This definition causes all other definitions with priorities above 10 to be + discarded. The function mkForce is equal to + mkOverride 50. Merging Configurations - In conjunction with mkIf, it is sometimes useful for a module to return multiple sets of option definitions, to be merged together as if they were declared in separate modules. This can be done using mkMerge: + In conjunction with mkIf, it is sometimes useful for a + module to return multiple sets of option definitions, to be merged together + as if they were declared in separate modules. This can be done using + mkMerge: config = mkMerge [ # Unconditional stuff. diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 7cd26e4c937d..8fcbb627342b 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -6,14 +6,18 @@ Options Types - Option types are a way to put constraints on the values a module option can take. Types are also responsible of how values are merged in case of multiple value definitions. + Option types are a way to put constraints on the values a module option can + take. Types are also responsible of how values are merged in case of multiple + value definitions.
Basic Types - Basic types are the simplest available types in the module system. Basic types include multiple string types that mainly differ in how definition merging is handled. + Basic types are the simplest available types in the module system. Basic + types include multiple string types that mainly differ in how definition + merging is handled. @@ -33,7 +37,8 @@ - A boolean, its values can be true or false. + A boolean, its values can be true or + false. @@ -43,7 +48,9 @@ - A filesystem path, defined as anything that when coerced to a string starts with a slash. Even if derivations can be considered as path, the more specific types.package should be preferred. + A filesystem path, defined as anything that when coerced to a string + starts with a slash. Even if derivations can be considered as path, the + more specific types.package should be preferred. @@ -80,7 +87,12 @@ - Signed integers with a fixed length (8, 16 or 32 bits). They go from −2n/2 to 2n/2−1 respectively (e.g. −128 to 127 for 8 bits). + Signed integers with a fixed length (8, 16 or 32 bits). They go from + −2n/2 + to + 2n/2−1 + respectively (e.g. −128 to + 127 for 8 bits). @@ -100,7 +112,12 @@ - Unsigned integers with a fixed length (8, 16 or 32 bits). They go from 0 to 2n−1 respectively (e.g. 0 to 255 for 8 bits). + Unsigned integers with a fixed length (8, 16 or 32 bits). They go from + 0 to + + 2n−1 + respectively (e.g. 0 to + 255 for 8 bits). @@ -120,7 +137,8 @@ - A port number. This type is an alias to types.ints.u16. + A port number. This type is an alias to + types.ints.u16. @@ -147,7 +165,8 @@ - A string. Multiple definitions are concatenated with a new line "\n". + A string. Multiple definitions are concatenated with a new line + "\n". @@ -157,7 +176,8 @@ - A string. Multiple definitions are concatenated with a comma ",". + A string. Multiple definitions are concatenated with a comma + ",". @@ -167,7 +187,8 @@ - A string. Multiple definitions are concatenated with a collon ":". + A string. Multiple definitions are concatenated with a collon + ":". @@ -177,7 +198,9 @@ - A string matching a specific regular expression. Multiple definitions cannot be merged. The regular expression is processed using builtins.match. + A string matching a specific regular expression. Multiple definitions + cannot be merged. The regular expression is processed using + builtins.match. @@ -198,7 +221,9 @@ - One element of the list l, e.g. types.enum [ "left" "right" ]. Multiple definitions cannot be merged. + One element of the list l, e.g. + types.enum [ "left" "right" ]. Multiple definitions + cannot be merged. @@ -208,7 +233,8 @@ - A string with a custom separator sep, e.g. types.separatedString "|". + A string with a custom separator sep, e.g. + types.separatedString "|". @@ -218,7 +244,9 @@ - An integer between lowest and highest (both inclusive). Useful for creating types like types.port. + An integer between lowest and + highest (both inclusive). Useful for creating + types like types.port. @@ -228,7 +256,11 @@ - A set of sub options o. o can be an attribute set or a function returning an attribute set. Submodules are used in composed types to create modular options. Submodule are detailed in o. + o can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. Submodule are detailed in + . @@ -240,7 +272,9 @@ Composed Types - Composed types are types that take a type as parameter. listOf int and either int str are examples of composed types. + Composed types are types that take a type as parameter. listOf + int and either int str are examples of composed + types. @@ -250,7 +284,8 @@ - A list of t type, e.g. types.listOf int. Multiple definitions are merged with list concatenation. + A list of t type, e.g. types.listOf + int. Multiple definitions are merged with list concatenation. @@ -260,7 +295,9 @@ - An attribute set of where all the values are of t type. Multiple definitions result in the joined attribute set. + An attribute set of where all the values are of + t type. Multiple definitions result in the + joined attribute set. @@ -270,7 +307,8 @@ - An attribute set or a list of t type. Multiple definitions are merged according to the value. + An attribute set or a list of t type. Multiple + definitions are merged according to the value. @@ -280,7 +318,8 @@ - null or type t. Multiple definitions are merged according to type t. + null or type t. Multiple + definitions are merged according to type t. @@ -290,7 +329,8 @@ - Ensures that type t cannot be merged. It is used to ensure option definitions are declared only once. + Ensures that type t cannot be merged. It is + used to ensure option definitions are declared only once. @@ -300,7 +340,9 @@ - Type t1 or type t2, e.g. with types; either int str. Multiple definitions cannot be merged. + Type t1 or type t2, + e.g. with types; either int str. Multiple definitions + cannot be merged. @@ -310,7 +352,9 @@ - Type t1 or type t2 and so forth, e.g. with types; oneOf [ int str bool ]. Multiple definitions cannot be merged. + Type t1 or type t2 and so forth, + e.g. with types; oneOf [ int str bool ]. Multiple definitions + cannot be merged. @@ -320,7 +364,12 @@ - Type to or type from which will be coerced to type to using function f which takes an argument of type from and return a value of type to. Can be used to preserve backwards compatibility of an option if its type was changed. + Type to or type + from which will be coerced to type + to using function f + which takes an argument of type from and + return a value of type to. Can be used to + preserve backwards compatibility of an option if its type was changed. @@ -331,15 +380,22 @@ Submodule - submodule is a very powerful type that defines a set of sub-options that are handled like a separate module. + submodule is a very powerful type that defines a set of + sub-options that are handled like a separate module. - It takes a parameter o, that should be a set, or a function returning a set with an options key defining the sub-options. Submodule option definitions are type-checked accordingly to the options declarations. Of course, you can nest submodule option definitons for even higher modularity. + It takes a parameter o, that should be a set, or + a function returning a set with an options key defining + the sub-options. Submodule option definitions are type-checked accordingly + to the options declarations. Of course, you can nest + submodule option definitons for even higher modularity. - The option set can be defined directly () or as reference (). + The option set can be defined directly + () or as reference + (). @@ -382,7 +438,12 @@ options.mod = mkOption { - The submodule type is especially interesting when used with composed types like attrsOf or listOf. When composed with listOf (), submodule allows multiple definitions of the submodule option set (). + The submodule type is especially interesting when used + with composed types like attrsOf or + listOf. When composed with listOf + (), + submodule allows multiple definitions of the submodule + option set (). @@ -413,7 +474,10 @@ config.mod = [ - When composed with attrsOf (), submodule allows multiple named definitions of the submodule option set (). + When composed with attrsOf + (), + submodule allows multiple named definitions of the + submodule option set (). @@ -446,7 +510,8 @@ config.mod.two = { foo = 2; bar = "two"; }; Extending types - Types are mainly characterized by their check and merge functions. + Types are mainly characterized by their check and + merge functions. @@ -456,8 +521,13 @@ config.mod.two = { foo = 2; bar = "two"; }; - The function to type check the value. Takes a value as parameter and return a boolean. It is possible to extend a type check with the addCheck function (), or to fully override the check function (). + The function to type check the value. Takes a value as parameter and + return a boolean. It is possible to extend a type check with the + addCheck function + (), or to fully + override the check function + (). Adding a type check @@ -485,7 +555,11 @@ nixThings = mkOption { - Function to merge the options values when multiple values are set. The function takes two parameters, loc the option path as a list of strings, and defs the list of defined values as a list. It is possible to override a type merge function for custom needs. + Function to merge the options values when multiple values are set. The + function takes two parameters, loc the option path as + a list of strings, and defs the list of defined values + as a list. It is possible to override a type merge function for custom + needs. @@ -496,8 +570,12 @@ nixThings = mkOption { Custom Types - Custom types can be created with the mkOptionType function. As type creation includes some more complex topics such as submodule handling, it is recommended to get familiar with types.nix code before creating a new type. + Custom types can be created with the mkOptionType + function. As type creation includes some more complex topics such as + submodule handling, it is recommended to get familiar with + types.nix + code before creating a new type. @@ -521,7 +599,8 @@ nixThings = mkOption { - Description of the type used in documentation. Give information of the type and any of its arguments. + Description of the type used in documentation. Give information of the + type and any of its arguments. @@ -531,7 +610,10 @@ nixThings = mkOption { - A function to type check the definition value. Takes the definition value as a parameter and returns a boolean indicating the type check result, true for success and false for failure. + A function to type check the definition value. Takes the definition value + as a parameter and returns a boolean indicating the type check result, + true for success and false for + failure. @@ -550,7 +632,8 @@ nixThings = mkOption { - The option path as a list of strings, e.g. ["boot" "loader "grub" "enable"]. + The option path as a list of strings, e.g. ["boot" "loader + "grub" "enable"]. @@ -560,7 +643,12 @@ nixThings = mkOption { - The list of sets of defined value and file where the value was defined, e.g. [ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } ]. The merge function should return the merged value or throw an error in case the values are impossible or not meant to be merged. + The list of sets of defined value and + file where the value was defined, e.g. [ { + file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } + ]. The merge function should return the + merged value or throw an error in case the values are impossible or + not meant to be merged. @@ -573,7 +661,13 @@ nixThings = mkOption { - For composed types that can take a submodule as type parameter, this function generate sub-options documentation. It takes the current option prefix as a list and return the set of sub-options. Usually defined in a recursive manner by adding a term to the prefix, e.g. prefix: elemType.getSubOptions (prefix ++ ["prefix"]) where "prefix" is the newly added prefix. + For composed types that can take a submodule as type parameter, this + function generate sub-options documentation. It takes the current option + prefix as a list and return the set of sub-options. Usually defined in a + recursive manner by adding a term to the prefix, e.g. prefix: + elemType.getSubOptions (prefix ++ + ["prefix"]) where + "prefix" is the newly added prefix. @@ -583,7 +677,11 @@ nixThings = mkOption { - For composed types that can take a submodule as type parameter, this function should return the type parameters submodules. If the type parameter is called elemType, the function should just recursively look into submodules by returning elemType.getSubModules;. + For composed types that can take a submodule as type parameter, this + function should return the type parameters submodules. If the type + parameter is called elemType, the function should just + recursively look into submodules by returning + elemType.getSubModules;. @@ -593,7 +691,14 @@ nixThings = mkOption { - For composed types that can take a submodule as type parameter, this function can be used to substitute the parameter of a submodule type. It takes a module as parameter and return the type with the submodule options substituted. It is usually defined as a type function call with a recursive call to substSubModules, e.g for a type composedType that take an elemtype type parameter, this function should be defined as m: composedType (elemType.substSubModules m). + For composed types that can take a submodule as type parameter, this + function can be used to substitute the parameter of a submodule type. It + takes a module as parameter and return the type with the submodule + options substituted. It is usually defined as a type function call with a + recursive call to substSubModules, e.g for a type + composedType that take an elemtype + type parameter, this function should be defined as m: + composedType (elemType.substSubModules m). @@ -603,7 +708,9 @@ nixThings = mkOption { - A function to merge multiple type declarations. Takes the type to merge functor as parameter. A null return value means that type cannot be merged. + A function to merge multiple type declarations. Takes the type to merge + functor as parameter. A null return + value means that type cannot be merged. @@ -618,7 +725,8 @@ nixThings = mkOption { - Note: There is a generic defaultTypeMerge that work with most of value and composed types. + Note: There is a generic defaultTypeMerge that work + with most of value and composed types. @@ -628,7 +736,8 @@ nixThings = mkOption { - An attribute set representing the type. It is used for type operations and has the following keys: + An attribute set representing the type. It is used for type operations + and has the following keys: @@ -657,7 +766,10 @@ nixThings = mkOption { - Holds the value parameter for value types. The types that have a payload are the enum, separatedString and submodule types. + Holds the value parameter for value types. The types that have a + payload are the enum, + separatedString and submodule + types. @@ -667,7 +779,9 @@ nixThings = mkOption { - A binary operation that can merge the payloads of two same types. Defined as a function that take two payloads as parameters and return the payloads merged. + A binary operation that can merge the payloads of two same types. + Defined as a function that take two payloads as parameters and return + the payloads merged. diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index 8cc4490ff540..1cdec64f69b0 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -17,12 +17,15 @@ - Send an email to the nix-devel mailinglist as a warning about upcoming beta "feature freeze" in a month. + Send an email to the nix-devel mailinglist as a warning about upcoming + beta "feature freeze" in a month. - Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline. Any issue or Pull Request targeting the release should be included in the release milestone. + Discuss with Eelco Dolstra and the community (via IRC, ML) about what + will reach the deadline. Any issue or Pull Request targeting the release + should be included in the release milestone. @@ -34,32 +37,42 @@ - Create an issue for tracking Zero Hydra Failures progress. ZHF is an effort to get build failures down to zero. + Create + an issue for tracking Zero Hydra Failures progress. ZHF is an effort to + get build failures down to zero. - git tag -a -s -m "Release 17.09-beta" 17.09-beta && git push --tags + git tag -a -s -m "Release 17.09-beta" 17.09-beta + && git push --tags - From the master branch run git checkout -B release-17.09. + From the master branch run git checkout -B + release-17.09. - Make sure a channel is created at http://nixos.org/channels/. + + Make sure a channel is created at http://nixos.org/channels/. - Bump the system.defaultChannel attribute in nixos/modules/misc/version.nix + + Bump the system.defaultChannel attribute in + nixos/modules/misc/version.nix - Update versionSuffix in nixos/release.nix, use git log --format=%an|wc -l to get the commit count + + Update versionSuffix in + nixos/release.nix, use git log + --format=%an|wc -l to get the commit count @@ -69,32 +82,44 @@ - Pick a new name for the unstable branch. + + Pick a new name for the unstable branch. - Create a new release notes file for the upcoming release + 1, in this case rl-1803.xml. + Create a new release notes file for the upcoming release + 1, in this + case rl-1803.xml. - Create two Hydra jobsets: release-17.09 and release-17.09-small with stableBranch set to false. + Create two Hydra jobsets: release-17.09 and release-17.09-small with + stableBranch set to false. - Remove attributes that we know we will not be able to support, especially if there is a stable alternative. E.g. Check that our Linux kernels' projected end-of-life are after our release projected end-of-life + Remove attributes that we know we will not be able to support, + especially if there is a stable alternative. E.g. Check that our + Linux kernels' + + projected end-of-life are after our release projected + end-of-life - Edit changelog at nixos/doc/manual/release-notes/rl-1709.xml (double check desktop versions are noted) + Edit changelog at + nixos/doc/manual/release-notes/rl-1709.xml (double + check desktop versions are noted) - Get all new NixOS modules git diff release-17.03..release-17.09 nixos/modules/module-list.nix|grep ^+ + Get all new NixOS modules git diff + release-17.03..release-17.09 nixos/modules/module-list.nix|grep + ^+ @@ -113,7 +138,8 @@ - Monitor the master branch for bugfixes and minor updates and cherry-pick them to the release branch. + Monitor the master branch for bugfixes and minor updates and cherry-pick + them to the release branch. @@ -130,17 +156,21 @@ - Release Nix (currently only Eelco Dolstra can do that). Make sure fallback is updated. + Release Nix (currently only Eelco Dolstra can do that). + + Make sure fallback is updated. - Update README.md with new stable NixOS version information. + + Update README.md with new stable NixOS version information. - Change stableBranch to true and wait for channel to update. + Change stableBranch to true and wait for channel to + update. @@ -157,27 +187,34 @@ - Update "Chapter 4. Upgrading NixOS" section of the manual to match new stable release version. + Update "Chapter 4. Upgrading NixOS" section of the manual to match + new stable release version. - Update http://nixos.org/nixos/download.html and http://nixos.org/nixos/manual in https://github.com/NixOS/nixos-org-configurations + Update http://nixos.org/nixos/download.html and + http://nixos.org/nixos/manual in + https://github.com/NixOS/nixos-org-configurations - Get number of commits for the release: git log release-14.04..release-14.12 --format=%an|wc -l + Get number of commits for the release: git log + release-14.04..release-14.12 --format=%an|wc -l - Commits by contributor: git log release-14.04..release-14.12 --format=%an|sort|uniq -c|sort -rn + Commits by contributor: git log release-14.04..release-14.12 + --format=%an|sort|uniq -c|sort -rn - Send an email to nix-dev to announce the release with above information. Best to check how previous email was formulated to see what needs to be included. + Send an email to nix-dev to announce the release with above information. + Best to check how previous email was formulated to see what needs to be + included. @@ -185,45 +222,26 @@
Release Management Team - - For each release there are two release managers. After each release the release manager having managed two releases steps down and the release management team of the last release appoints a new release manager. + For each release there are two release managers. After each release the + release manager having managed two releases steps down and the release + management team of the last release appoints a new release manager. - - This makes sure a release management team always consists of one release manager who already has managed one release and one release manager being introduced to their role, making it easier to pass on knowledge and experience. + This makes sure a release management team always consists of one release + manager who already has managed one release and one release manager being + introduced to their role, making it easier to pass on knowledge and + experience. - A release manager's role and responsibilities are: - - - - manage the release process - - - - - start discussions about features and changes for a given release - - - - - create a roadmap - - - - - release in cooperation with Eelco Dolstra - - - - - decide which bug fixes, features, etc... get backported after a release - - + manage the release process + start discussions about features and changes for a given release + create a roadmap + release in cooperation with Eelco Dolstra + decide which bug fixes, features, etc... get backported after a release
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml index 9940143de8e4..7b103c36d907 100644 --- a/nixos/doc/manual/development/replace-modules.xml +++ b/nixos/doc/manual/development/replace-modules.xml @@ -6,15 +6,27 @@ Replace Modules - Modules that are imported can also be disabled. The option declarations and config implementation of a disabled module will be ignored, allowing another to take it's place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release. + Modules that are imported can also be disabled. The option declarations and + config implementation of a disabled module will be ignored, allowing another + to take it's place. This can be used to import a set of modules from another + channel while keeping the rest of the system on a stable release. - disabledModules is a top level attribute like imports, options and config. It contains a list of modules that will be disabled. This can either be the full path to the module or a string with the filename relative to the modules path (eg. <nixpkgs/nixos/modules> for nixos). + disabledModules is a top level attribute like + imports, options and + config. It contains a list of modules that will be + disabled. This can either be the full path to the module or a string with the + filename relative to the modules path (eg. <nixpkgs/nixos/modules> for + nixos). - This example will replace the existing postgresql module with the version defined in the nixos-unstable channel while keeping the rest of the modules and packages from the original nixos channel. This only overrides the module definition, this won't use postgresql from nixos-unstable unless explicitly configured to do so. + This example will replace the existing postgresql module with the version + defined in the nixos-unstable channel while keeping the rest of the modules + and packages from the original nixos channel. This only overrides the module + definition, this won't use postgresql from nixos-unstable unless explicitly + configured to do so. @@ -34,7 +46,9 @@ - This example shows how to define a custom module as a replacement for an existing module. Importing this module will disable the original module without having to know it's implementation details. + This example shows how to define a custom module as a replacement for an + existing module. Importing this module will disable the original module + without having to know it's implementation details. diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml index e4ded136ca66..e390d62fde2f 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -6,7 +6,8 @@ Running Tests interactively - The test itself can be run interactively. This is particularly useful when developing or debugging a test: + The test itself can be run interactively. This is particularly useful when + developing or debugging a test: $ nix-build nixos/tests/login.nix -A driver $ ./result/bin/nixos-test-driver @@ -20,7 +21,10 @@ starting VDE switch for network 1 > $machine->succeed("touch /tmp/foo") > print($machine->succeed("pwd")) # Show stdout of command - The function testScript executes the entire test script and drops you back into the test driver command line upon its completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script). + The function testScript executes the entire test script + and drops you back into the test driver command line upon its completion. + This allows you to inspect the state of the VMs after the test (e.g. to debug + the test script). @@ -29,10 +33,12 @@ starting VDE switch for network 1 $ nix-build nixos/tests/login.nix -A driver $ ./result/bin/nixos-run-vms - The script nixos-run-vms starts the virtual machines defined by test. + The script nixos-run-vms starts the virtual machines + defined by test. - The machine state is kept across VM restarts in /tmp/vm-state-machinename. + The machine state is kept across VM restarts in + /tmp/vm-state-machinename.
diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml index 7d81be9b1c6a..13ae1ed93699 100644 --- a/nixos/doc/manual/development/running-nixos-tests.xml +++ b/nixos/doc/manual/development/running-nixos-tests.xml @@ -6,8 +6,11 @@ Running Tests - You can run tests using nix-build. For example, to run the test login.nix, you just do: + You can run tests using nix-build. For example, to run the + test + login.nix, + you just do: $ nix-build '<nixpkgs/nixos/tests/login.nix>' @@ -21,7 +24,11 @@ machine: QEMU running (pid 8841) … 6 out of 6 tests succeeded - After building/downloading all required dependencies, this will perform a build that starts a QEMU/KVM virtual machine containing a NixOS system. The virtual machine mounts the Nix store of the host; this makes VM creation very fast, as no disk image needs to be created. Afterwards, you can view a pretty-printed log of the test: + After building/downloading all required dependencies, this will perform a + build that starts a QEMU/KVM virtual machine containing a NixOS system. The + virtual machine mounts the Nix store of the host; this makes VM creation very + fast, as no disk image needs to be created. Afterwards, you can view a + pretty-printed log of the test: $ firefox result/log.html diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 71441feb1ff7..3c30c782746d 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -5,47 +5,77 @@ xml:id="sec-getting-sources"> Getting the Sources - By default, NixOS’s nixos-rebuild command uses the NixOS and Nixpkgs sources provided by the nixos channel (kept in /nix/var/nix/profiles/per-user/root/channels/nixos). To modify NixOS, however, you should check out the latest sources from Git. This is as follows: + By default, NixOS’s nixos-rebuild command uses the NixOS + and Nixpkgs sources provided by the nixos channel (kept in + /nix/var/nix/profiles/per-user/root/channels/nixos). To + modify NixOS, however, you should check out the latest sources from Git. This + is as follows: $ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs $ git remote add channels https://github.com/NixOS/nixpkgs-channels $ git remote update channels - This will check out the latest Nixpkgs sources to ./nixpkgs the NixOS sources to ./nixpkgs/nixos. (The NixOS source tree lives in a subdirectory of the Nixpkgs repository.) The remote channels refers to a read-only repository that tracks the Nixpkgs/NixOS channels (see for more information about channels). Thus, the Git branch channels/nixos-17.03 will contain the latest built and tested version available in the nixos-17.03 channel. + This will check out the latest Nixpkgs sources to + ./nixpkgs the NixOS sources to + ./nixpkgs/nixos. (The NixOS source tree lives in a + subdirectory of the Nixpkgs repository.) The remote + channels refers to a read-only repository that tracks the + Nixpkgs/NixOS channels (see for more + information about channels). Thus, the Git branch + channels/nixos-17.03 will contain the latest built and + tested version available in the nixos-17.03 channel. - It’s often inconvenient to develop directly on the master branch, since if somebody has just committed (say) a change to GCC, then the binary cache may not have caught up yet and you’ll have to rebuild everything from source. So you may want to create a local branch based on your current NixOS version: + It’s often inconvenient to develop directly on the master branch, since if + somebody has just committed (say) a change to GCC, then the binary cache may + not have caught up yet and you’ll have to rebuild everything from source. + So you may want to create a local branch based on your current NixOS version: $ nixos-version 17.09pre104379.6e0b727 (Hummingbird) $ git checkout -b local 6e0b727 - Or, to base your local branch on the latest version available in a NixOS channel: + Or, to base your local branch on the latest version available in a NixOS + channel: $ git remote update channels $ git checkout -b local channels/nixos-17.03 - (Replace nixos-17.03 with the name of the channel you want to use.) You can use git merge or git rebase to keep your local branch in sync with the channel, e.g. + (Replace nixos-17.03 with the name of the channel you want + to use.) You can use git merge or git + rebase to keep your local branch in sync with the channel, e.g. $ git remote update channels $ git merge channels/nixos-17.03 - You can use git cherry-pick to copy commits from your local branch to the upstream branch. + You can use git cherry-pick to copy commits from your + local branch to the upstream branch. - If you want to rebuild your system using your (modified) sources, you need to tell nixos-rebuild about them using the flag: + If you want to rebuild your system using your (modified) sources, you need to + tell nixos-rebuild about them using the + flag: # nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs - If you want nix-env to use the expressions in /my/sources, use nix-env -f /my/sources/nixpkgs, or change the default by adding a symlink in ~/.nix-defexpr: + If you want nix-env to use the expressions in + /my/sources, use nix-env -f + /my/sources/nixpkgs, or change the + default by adding a symlink in ~/.nix-defexpr: $ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs - You may want to delete the symlink ~/.nix-defexpr/channels_root to prevent root’s NixOS channel from clashing with your own tree (this may break the command-not-found utility though). If you want to go back to the default state, you may just remove the ~/.nix-defexpr directory completely, log out and log in again and it should have been recreated with a link to the root channels. + You may want to delete the symlink + ~/.nix-defexpr/channels_root to prevent root’s NixOS + channel from clashing with your own tree (this may break the + command-not-found utility though). If you want to go back to the default + state, you may just remove the ~/.nix-defexpr directory + completely, log out and log in again and it should have been recreated with a + link to the root channels. + nixos-rebuild reconfigure a NixOS machine + - nixos-rebuild + nixos-rebuild - + - + - + - + - + - + - + - + @@ -54,33 +56,34 @@ - + - + - + - + - + builder-spec + - + - + @@ -90,67 +93,56 @@ - - path + + path - - - - - - - - - - + + + + - - - - - - - - - - number + + + + + number - - - - - - - - - - + + + + - - - - - - - - - - + + + + + Description + - This command updates the system so that it corresponds to the configuration specified in /etc/nixos/configuration.nix. Thus, every time you modify /etc/nixos/configuration.nix or any NixOS module, you must run nixos-rebuild to make the changes take effect. It builds the new system in /nix/store, runs its activation script, and stop and (re)starts any system services if needed. Please note that user services need to be started manually as they aren't detected by the activation script at the moment. + This command updates the system so that it corresponds to the configuration + specified in /etc/nixos/configuration.nix. Thus, every + time you modify /etc/nixos/configuration.nix or any + NixOS module, you must run nixos-rebuild to make the + changes take effect. It builds the new system in + /nix/store, runs its activation script, and stop and + (re)starts any system services if needed. Please note that user services need + to be started manually as they aren't detected by the activation script at the moment. + - This command has one required argument, which specifies the desired operation. It must be one of the following: + This command has one required argument, which specifies the desired + operation. It must be one of the following: + @@ -158,64 +150,91 @@ - Build and activate the new configuration, and make it the boot default. That is, the configuration is added to the GRUB boot menu as the default menu entry, so that subsequent reboots will boot the system into the new configuration. Previous configurations activated with nixos-rebuild switch or nixos-rebuild boot remain available in the GRUB menu. + Build and activate the new configuration, and make it the boot default. + That is, the configuration is added to the GRUB boot menu as the default + menu entry, so that subsequent reboots will boot the system into the new + configuration. Previous configurations activated with + nixos-rebuild switch or nixos-rebuild + boot remain available in the GRUB menu. + - Build the new configuration and make it the boot default (as with nixos-rebuild switch), but do not activate it. That is, the system continues to run the previous configuration until the next reboot. + Build the new configuration and make it the boot default (as with + nixos-rebuild switch), but do not activate it. That + is, the system continues to run the previous configuration until the + next reboot. + - Build and activate the new configuration, but do not add it to the GRUB boot menu. Thus, if you reboot the system (or if it crashes), you will automatically revert to the default configuration (i.e. the configuration resulting from the last call to nixos-rebuild switch or nixos-rebuild boot). + Build and activate the new configuration, but do not add it to the GRUB + boot menu. Thus, if you reboot the system (or if it crashes), you will + automatically revert to the default configuration (i.e. the + configuration resulting from the last call to nixos-rebuild + switch or nixos-rebuild boot). + - Build the new configuration, but neither activate it nor add it to the GRUB boot menu. It leaves a symlink named result in the current directory, which points to the output of the top-level “system” derivation. This is essentially the same as doing + Build the new configuration, but neither activate it nor add it to the + GRUB boot menu. It leaves a symlink named result in + the current directory, which points to the output of the top-level + “system” derivation. This is essentially the same as doing $ nix-build /path/to/nixpkgs/nixos -A system - Note that you do not need to be root to run nixos-rebuild build. + Note that you do not need to be root to run + nixos-rebuild build. + - Show what store paths would be built or downloaded by any of the operations above, but otherwise do nothing. + Show what store paths would be built or downloaded by any of the + operations above, but otherwise do nothing. + - Build the new configuration, but instead of activating it, show what changes would be performed by the activation (i.e. by nixos-rebuild test). For instance, this command will print which systemd units would be restarted. The list of changes is not guaranteed to be complete. + Build the new configuration, but instead of activating it, show what + changes would be performed by the activation (i.e. by + nixos-rebuild test). For instance, this command will + print which systemd units would be restarted. The list of changes is not + guaranteed to be complete. + @@ -226,49 +245,80 @@ + - Build a script that starts a NixOS virtual machine with the desired configuration. It leaves a symlink result in the current directory that points (under result/bin/run-hostname-vm) at the script that starts the VM. Thus, to test a NixOS configuration in a virtual machine, you should do the following: + Build a script that starts a NixOS virtual machine with the desired + configuration. It leaves a symlink result in the + current directory that points (under + result/bin/run-hostname-vm) + at the script that starts the VM. Thus, to test a NixOS configuration in + a virtual machine, you should do the following: $ nixos-rebuild build-vm $ ./result/bin/run-*-vm + - The VM is implemented using the qemu package. For best performance, you should load the kvm-intel or kvm-amd kernel modules to get hardware virtualisation. + The VM is implemented using the qemu package. For + best performance, you should load the kvm-intel or + kvm-amd kernel modules to get hardware + virtualisation. + - The VM mounts the Nix store of the host through the 9P file system. The host Nix store is read-only, so Nix commands that modify the Nix store will not work in the VM. This includes commands such as nixos-rebuild; to change the VM’s configuration, you must halt the VM and re-run the commands above. + The VM mounts the Nix store of the host through the 9P file system. The + host Nix store is read-only, so Nix commands that modify the Nix store + will not work in the VM. This includes commands such as + nixos-rebuild; to change the VM’s configuration, + you must halt the VM and re-run the commands above. + - The VM has its own ext3 root file system, which is automatically created when the VM is first started, and is persistent across reboots of the VM. It is stored in ./hostname.qcow2. + The VM has its own ext3 root file system, which is + automatically created when the VM is first started, and is persistent + across reboots of the VM. It is stored in + ./hostname.qcow2. + - Like , but boots using the regular boot loader of your configuration (e.g., GRUB 1 or 2), rather than booting directly into the kernel and initial ramdisk of the system. This allows you to test whether the boot loader works correctly. However, it does not guarantee that your NixOS configuration will boot successfully on the host hardware (i.e., after running nixos-rebuild switch), because the hardware and boot loader configuration in the VM are different. The boot loader is installed on an automatically generated virtual disk containing a /boot partition, which is mounted read-only in the VM. + Like , but boots using the regular boot loader + of your configuration (e.g., GRUB 1 or 2), rather than booting directly + into the kernel and initial ramdisk of the system. This allows you to + test whether the boot loader works correctly. However, it does not + guarantee that your NixOS configuration will boot successfully on the + host hardware (i.e., after running nixos-rebuild + switch), because the hardware and boot loader configuration in + the VM are different. The boot loader is installed on an automatically + generated virtual disk containing a /boot + partition, which is mounted read-only in the VM. + Options This command accepts the following options: + @@ -280,56 +330,84 @@ + - Causes the boot loader to be (re)installed on the device specified by the relevant configuration options. + Causes the boot loader to be (re)installed on the device specified by the + relevant configuration options. + - Normally, nixos-rebuild first builds the nixUnstable attribute in Nixpkgs, and uses the resulting instance of the Nix package manager to build the new system configuration. This is necessary if the NixOS modules use features not provided by the currently installed version of Nix. This option disables building a new Nix. + Normally, nixos-rebuild first builds the + nixUnstable attribute in Nixpkgs, and uses the + resulting instance of the Nix package manager to build the new system + configuration. This is necessary if the NixOS modules use features not + provided by the currently installed version of Nix. This option disables + building a new Nix. + - Equivalent to . This option is useful if you call nixos-rebuild frequently (e.g. if you’re hacking on a NixOS module). + Equivalent to + . This option is useful if you call + nixos-rebuild frequently (e.g. if you’re hacking on + a NixOS module). + - Instead of building a new configuration as specified by /etc/nixos/configuration.nix, roll back to the previous configuration. (The previous configuration is defined as the one before the “current” generation of the Nix profile /nix/var/nix/profiles/system.) + Instead of building a new configuration as specified by + /etc/nixos/configuration.nix, roll back to the + previous configuration. (The previous configuration is defined as the one + before the “current” generation of the Nix profile + /nix/var/nix/profiles/system.) + builder-spec - Allow ad-hoc remote builders for building the new system. This requires the user executing nixos-rebuild (usually root) to be configured as a trusted user in the Nix daemon. This can be achieved by using the nix.trustedUsers NixOS option. Examples values for that option are described in the Remote builds chapter in the Nix manual, (i.e. --builders "ssh://bigbrother x86_64-linux"). By specifying an empty string existing builders specified in /etc/nix/machines can be ignored: --builders "" for example when they are not reachable due to network connectivity. + Allow ad-hoc remote builders for building the new system. This requires + the user executing nixos-rebuild (usually root) to be + configured as a trusted user in the Nix daemon. This can be achieved by + using the nix.trustedUsers NixOS option. Examples + values for that option are described in the Remote builds + chapter in the Nix manual, (i.e. --builders + "ssh://bigbrother x86_64-linux"). By specifying an empty string + existing builders specified in /etc/nix/machines can + be ignored: --builders "" for example when they are + not reachable due to network connectivity. + @@ -339,56 +417,97 @@ - Instead of using the Nix profile /nix/var/nix/profiles/system to keep track of the current and previous system configurations, use /nix/var/nix/profiles/system-profiles/name. When you use GRUB 2, for every system profile created with this flag, NixOS will create a submenu named “NixOS - Profile 'name'” in GRUB’s boot menu, containing the current and previous configurations of this profile. + Instead of using the Nix profile + /nix/var/nix/profiles/system to keep track of the + current and previous system configurations, use + /nix/var/nix/profiles/system-profiles/name. + When you use GRUB 2, for every system profile created with this flag, + NixOS will create a submenu named “NixOS - Profile + 'name'” in GRUB’s boot menu, containing + the current and previous configurations of this profile. - For instance, if you want to test a configuration file named test.nix without affecting the default system profile, you would do: + For instance, if you want to test a configuration file named + test.nix without affecting the default system + profile, you would do: $ nixos-rebuild switch -p test -I nixos-config=./test.nix - The new configuration will appear in the GRUB 2 submenu “NixOS - Profile 'test'”. + The new configuration will appear in the GRUB 2 submenu “NixOS - + Profile 'test'”. + - Instead of building the new configuration locally, use the specified host to perform the build. The host needs to be accessible with ssh, and must be able to perform Nix builds. If the option is not set, the build will be copied back to the local machine when done. + Instead of building the new configuration locally, use the specified host + to perform the build. The host needs to be accessible with ssh, and must + be able to perform Nix builds. If the option + is not set, the build will be copied back + to the local machine when done. - Note that, if is not specified, Nix will be built both locally and remotely. This is because the configuration will always be evaluated locally even though the building might be performed remotely. + Note that, if is not specified, Nix will + be built both locally and remotely. This is because the configuration + will always be evaluated locally even though the building might be + performed remotely. - You can include a remote user name in the host name (user@host). You can also set ssh options by defining the NIX_SSHOPTS environment variable. + You can include a remote user name in the host name + (user@host). You can also set ssh options by + defining the NIX_SSHOPTS environment variable. + - Specifies the NixOS target host. By setting this to something other than localhost, the system activation will happen on the remote host instead of the local machine. The remote host needs to be accessible over ssh, and for the commands , and you need root access. + Specifies the NixOS target host. By setting this to something other than + localhost, the system activation will happen + on the remote host instead of the local machine. The remote host needs to + be accessible over ssh, and for the commands , + and you need root access. + - If is not explicitly specified, will implicitly be set to the same value as . So, if you only specify both building and activation will take place remotely (and no build artifacts will be copied to the local machine). + If is not explicitly specified, + will implicitly be set to the same value as + . So, if you only specify + both building and activation will take + place remotely (and no build artifacts will be copied to the local + machine). + - You can include a remote user name in the host name (user@host). You can also set ssh options by defining the NIX_SSHOPTS environment variable. + You can include a remote user name in the host name + (user@host). You can also set ssh options by + defining the NIX_SSHOPTS environment variable. + - In addition, nixos-rebuild accepts various Nix-related flags, including / , , , and / . See the Nix manual for details. + In addition, nixos-rebuild accepts various Nix-related + flags, including / , + , , + and / + . See the Nix manual for details. + Environment + @@ -396,25 +515,31 @@ - Path to the main NixOS configuration module. Defaults to /etc/nixos/configuration.nix. + Path to the main NixOS configuration module. Defaults to + /etc/nixos/configuration.nix. + NIX_SSHOPTS - Additional options to be passed to ssh on the command line. + Additional options to be passed to ssh on the command + line. + Files + + /run/current-system @@ -425,18 +550,22 @@ + /nix/var/nix/profiles/system - The Nix profile that contains the current and previous system configurations. Used to generate the GRUB boot menu. + The Nix profile that contains the current and previous system + configurations. Used to generate the GRUB boot menu. + + Bugs diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml index a7ea69cfca07..e9ad8bddcace 100644 --- a/nixos/doc/manual/man-nixos-version.xml +++ b/nixos/doc/manual/man-nixos-version.xml @@ -25,7 +25,8 @@ Description - This command shows the version of the currently active NixOS configuration. For example: + This command shows the version of the currently active NixOS configuration. + For example: $ nixos-version 16.03.1011.6317da4 (Emu) @@ -37,7 +38,8 @@ - The NixOS release, indicating the year and month in which it was released (e.g. March 2016). + The NixOS release, indicating the year and month in which it was + released (e.g. March 2016). @@ -47,7 +49,12 @@ - The number of commits in the Nixpkgs Git repository between the start of the release branch and the commit from which this version was built. This ensures that NixOS versions are monotonically increasing. It is git when the current NixOS configuration was built from a checkout of the Nixpkgs Git repository rather than from a NixOS channel. + The number of commits in the Nixpkgs Git repository between the start of + the release branch and the commit from which this version was built. + This ensures that NixOS versions are monotonically increasing. It is + git when the current NixOS configuration was built + from a checkout of the Nixpkgs Git repository rather than from a NixOS + channel. @@ -57,7 +64,8 @@ - The first 7 characters of the commit in the Nixpkgs Git repository from which this version was built. + The first 7 characters of the commit in the Nixpkgs Git repository from + which this version was built. @@ -67,7 +75,9 @@ - The code name of the NixOS release. The first letter of the code name indicates that this is the N'th stable NixOS release; for example, Emu is the fifth release. + The code name of the NixOS release. The first letter of the code name + indicates that this is the N'th stable NixOS release; for example, Emu + is the fifth release. @@ -89,7 +99,8 @@ - Show the full SHA1 hash of the Git commit from which this configuration was built, e.g. + Show the full SHA1 hash of the Git commit from which this configuration + was built, e.g. $ nixos-version --hash 6317da40006f6bc2480c6781999c52d88dde2acf diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 9f7260b24954..12f52e1997c8 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -11,17 +11,26 @@ Preface - This manual describes how to install, use and extend NixOS, a Linux distribution based on the purely functional package management system Nix. + This manual describes how to install, use and extend NixOS, a Linux + distribution based on the purely functional package management system Nix. - If you encounter problems, please report them on the Discourse or on the #nixos channel on Freenode. Bugs should be reported in NixOS’ GitHub issue tracker. + If you encounter problems, please report them on the + Discourse or + on the + #nixos channel on Freenode. Bugs should be + reported in + NixOS’ + GitHub issue tracker. - Commands prefixed with # have to be run as root, either requiring to login as root user or temporarily switching to it using sudo for example. + Commands prefixed with # have to be run as root, either + requiring to login as root user or temporarily switching to it using + sudo for example. diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 820ba05bb503..02b591477214 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -5,7 +5,8 @@ xml:id="ch-release-notes"> Release Notes - This section lists the release notes for each stable version of NixOS and current unstable revision. + This section lists the release notes for each stable version of NixOS and + current unstable revision. diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml index 26dc5bb252e0..8d8cea4303a3 100644 --- a/nixos/doc/manual/release-notes/rl-1404.xml +++ b/nixos/doc/manual/release-notes/rl-1404.xml @@ -6,16 +6,23 @@ Release 14.04 (“Baboon”, 2014/04/30) - This is the second stable release branch of NixOS. In addition to numerous new and upgraded packages and modules, this release has the following highlights: + This is the second stable release branch of NixOS. In addition to numerous + new and upgraded packages and modules, this release has the following + highlights: - Installation on UEFI systems is now supported. See for details. + Installation on UEFI systems is now supported. See + for details. - Systemd has been updated to version 212, which has numerous improvements. NixOS now automatically starts systemd user instances when you log in. You can define global user units through the options. + Systemd has been updated to version 212, which has + numerous + improvements. NixOS now automatically starts systemd user instances + when you log in. You can define global user units through the + options. @@ -40,28 +47,47 @@ - Nix has been updated to 1.7 (details). - NixOS now supports fully declarative management of users and groups. If you set to false, then the contents of /etc/passwd and /etc/group will be congruent to your NixOS configuration. For instance, if you remove a user from 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. If is true (the default), then behaviour is unchanged from NixOS 13.10. + NixOS now supports fully declarative management of users and groups. If + you set to false, + then the contents of /etc/passwd and + /etc/group will be + congruent + to your NixOS configuration. For instance, if you remove a user from + 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. If + is true (the + default), then behaviour is unchanged from NixOS 13.10. - NixOS now has basic container support, meaning you can easily run a NixOS instance as a container in a NixOS host system. These containers are suitable for testing and experimentation but not production use, since they’re not fully isolated from the host. See for details. + NixOS now has basic container support, meaning you can easily run a NixOS + instance as a container in a NixOS host system. These containers are + suitable for testing and experimentation but not production use, since + they’re not fully isolated from the host. See + for details. - Systemd units provided by packages can now be overridden from the NixOS configuration. For instance, if a package foo provides systemd units, you can say: + Systemd units provided by packages can now be overridden from the NixOS + configuration. For instance, if a package foo provides + systemd units, you can say: systemd.packages = [ pkgs.foo ]; - to enable those units. You can then set or override unit options in the usual way, e.g. + to enable those units. You can then set or override unit options in the + usual way, e.g. systemd.services.foo.wantedBy = [ "multi-user.target" ]; systemd.services.foo.serviceConfig.MemoryLimit = "512M"; @@ -72,11 +98,14 @@ systemd.services.foo.serviceConfig.MemoryLimit = "512M"; - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: - Nixpkgs no longer exposes unfree packages by default. If your NixOS configuration requires unfree packages from Nixpkgs, you need to enable support for them explicitly by setting: + Nixpkgs no longer exposes unfree packages by default. If your NixOS + configuration requires unfree packages from Nixpkgs, you need to enable + support for them explicitly by setting: nixpkgs.config.allowUnfree = true; @@ -89,7 +118,8 @@ error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix: - The Adobe Flash player is no longer enabled by default in the Firefox and Chromium wrappers. To enable it, you must set: + The Adobe Flash player is no longer enabled by default in the Firefox and + Chromium wrappers. To enable it, you must set: nixpkgs.config.allowUnfree = true; nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox @@ -99,7 +129,8 @@ nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium - The firewall is now enabled by default. If you don’t want this, you need to disable it explicitly: + The firewall is now enabled by default. If you don’t want this, you need + to disable it explicitly: networking.firewall.enable = false; @@ -107,22 +138,40 @@ networking.firewall.enable = false; - The option has been renamed to . + The option has been renamed to + . - The mysql55 service has been merged into the mysql service, which no longer sets a default for the option . + The mysql55 service has been merged into the + mysql service, which no longer sets a default for the + option . - Package variants are now differentiated by suffixing the name, rather than the version. For instance, sqlite-3.8.4.3-interactive is now called sqlite-interactive-3.8.4.3. This ensures that nix-env -i sqlite is unambiguous, and that nix-env -u won’t “upgrade” sqlite to sqlite-interactive or vice versa. Notably, this change affects the Firefox wrapper (which provides plugins), as it is now called firefox-wrapper. So when using nix-env, you should do nix-env -e firefox; nix-env -i firefox-wrapper if you want to keep using the wrapper. This change does not affect declarative package management, since attribute names like pkgs.firefoxWrapper were already unambiguous. + Package variants are now differentiated by suffixing the name, rather than + the version. For instance, sqlite-3.8.4.3-interactive + is now called sqlite-interactive-3.8.4.3. This + ensures that nix-env -i sqlite is unambiguous, and that + nix-env -u won’t “upgrade” + sqlite to sqlite-interactive or vice + versa. Notably, this change affects the Firefox wrapper (which provides + plugins), as it is now called firefox-wrapper. So when + using nix-env, you should do nix-env -e + firefox; nix-env -i firefox-wrapper if you want to keep using + the wrapper. This change does not affect declarative package management, + since attribute names like pkgs.firefoxWrapper were + already unambiguous. - The symlink /etc/ca-bundle.crt is gone. Programs should instead use the environment variable OPENSSL_X509_CERT_FILE (which points to /etc/ssl/certs/ca-bundle.crt). + The symlink /etc/ca-bundle.crt is gone. Programs + should instead use the environment variable + OPENSSL_X509_CERT_FILE (which points to + /etc/ssl/certs/ca-bundle.crt). diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml index af17e166322d..139f61c2a550 100644 --- a/nixos/doc/manual/release-notes/rl-1412.xml +++ b/nixos/doc/manual/release-notes/rl-1412.xml @@ -6,16 +6,19 @@ Release 14.12 (“Caterpillar”, 2014/12/30) - In addition to numerous new and upgraded packages, this release has the following highlights: + In addition to numerous new and upgraded packages, this release has the + following highlights: - Systemd has been updated to version 217, which has numerous improvements. + Systemd has been updated to version 217, which has numerous + improvements. - Nix has been updated to 1.8. + + Nix has been updated to 1.8. @@ -35,7 +38,13 @@ - If is enabled (the default), changes made to the declaration of a user or group will be correctly realised when running nixos-rebuild. For instance, removing a user specification from configuration.nix will cause the actual user account to be deleted. If is disabled, it is no longer necessary to specify UIDs or GIDs; if omitted, they are allocated dynamically. + If is enabled (the default), changes + made to the declaration of a user or group will be correctly realised when + running nixos-rebuild. For instance, removing a user + specification from configuration.nix will cause the + actual user account to be deleted. If + is disabled, it is no longer necessary to specify UIDs or GIDs; if + omitted, they are allocated dynamically. @@ -353,12 +362,18 @@ - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: - The default version of Apache httpd is now 2.4. If you use the option to pass literal Apache configuration text, you may need to update it — see Apache’s documentation for details. If you wish to continue to use httpd 2.2, add the following line to your NixOS configuration: + The default version of Apache httpd is now 2.4. If you use the + option to pass literal Apache configuration + text, you may need to update it — see + Apache’s + documentation for details. If you wish to continue to use httpd + 2.2, add the following line to your NixOS configuration: services.httpd.package = pkgs.apacheHttpd_2_2; @@ -366,57 +381,85 @@ services.httpd.package = pkgs.apacheHttpd_2_2; - PHP 5.3 has been removed because it is no longer supported by the PHP project. A migration guide is available. + PHP 5.3 has been removed because it is no longer supported by the PHP + project. A migration + guide is available. - The host side of a container virtual Ethernet pair is now called ve-container-name rather than c-container-name. + The host side of a container virtual Ethernet pair is now called + ve-container-name rather + than c-container-name. - GNOME 3.10 support has been dropped. The default GNOME version is now 3.12. + GNOME 3.10 support has been dropped. The default GNOME version is now + 3.12. - VirtualBox has been upgraded to 4.3.20 release. Users may be required to run rm -rf /tmp/.vbox*. The line imports = [ <nixpkgs/nixos/modules/programs/virtualbox.nix> ] is no longer necessary, use services.virtualboxHost.enable = true instead. + VirtualBox has been upgraded to 4.3.20 release. Users may be required to + run rm -rf /tmp/.vbox*. The line imports = [ + <nixpkgs/nixos/modules/programs/virtualbox.nix> ] is no + longer necessary, use services.virtualboxHost.enable = + true instead. - Also, hardening mode is now enabled by default, which means that unless you want to use USB support, you no longer need to be a member of the vboxusers group. + Also, hardening mode is now enabled by default, which means that unless + you want to use USB support, you no longer need to be a member of the + vboxusers group. - Chromium has been updated to 39.0.2171.65. is now enabled by default. chromium*Wrapper packages no longer exist, because upstream removed NSAPI support. chromium-stable has been renamed to chromium. + Chromium has been updated to 39.0.2171.65. + is now enabled by default. + chromium*Wrapper packages no longer exist, because + upstream removed NSAPI support. chromium-stable has + been renamed to chromium. - Python packaging documentation is now part of nixpkgs manual. To override the python packages available to a custom python you now use pkgs.pythonFull.buildEnv.override instead of pkgs.pythonFull.override. + Python packaging documentation is now part of nixpkgs manual. To override + the python packages available to a custom python you now use + pkgs.pythonFull.buildEnv.override instead of + pkgs.pythonFull.override. - boot.resumeDevice = "8:6" is no longer supported. Most users will want to leave it undefined, which takes the swap partitions automatically. There is an evaluation assertion to ensure that the string starts with a slash. + boot.resumeDevice = "8:6" is no longer supported. Most + users will want to leave it undefined, which takes the swap partitions + automatically. There is an evaluation assertion to ensure that the string + starts with a slash. - The system-wide default timezone for NixOS installations changed from CET to UTC. To choose a different timezone for your system, configure time.timeZone in configuration.nix. A fairly complete list of possible values for that setting is available at CET to UTC. To choose a different + timezone for your system, configure time.timeZone in + configuration.nix. A fairly complete list of possible + values for that setting is available at + . - GNU screen has been updated to 4.2.1, which breaks the ability to connect to sessions created by older versions of screen. + GNU screen has been updated to 4.2.1, which breaks the ability to connect + to sessions created by older versions of screen. - The Intel GPU driver was updated to the 3.x prerelease version (used by most distributions) and supports DRI3 now. + The Intel GPU driver was updated to the 3.x prerelease version (used by + most distributions) and supports DRI3 now. diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 5e162c3f0f73..5c4d99701785 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -6,23 +6,42 @@ Release 15.09 (“Dingo”, 2015/09/30) - In addition to numerous new and upgraded packages, this release has the following highlights: + In addition to numerous new and upgraded packages, this release has the + following highlights: - The Haskell packages infrastructure has been re-designed from the ground up ("Haskell NG"). NixOS now distributes the latest version of every single package registered on Hackage -- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the User's Guide to the Haskell Infrastructure. Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single LTS Haskell release since version 0.0 as well as the most recent Stackage Nightly snapshot. The announcement "Full Stackage Support in Nixpkgs" gives additional details. + The Haskell packages + infrastructure has been re-designed from the ground up ("Haskell + NG"). NixOS now distributes the latest version of every single package + registered on + Hackage -- well + in excess of 8,000 Haskell packages. Detailed instructions on how to use + that infrastructure can be found in the + User's + Guide to the Haskell Infrastructure. Users migrating from an earlier + release may find helpful information below, in the list of + backwards-incompatible changes. Furthermore, we distribute 51(!) additional + Haskell package sets that provide every single + LTS Haskell release + since version 0.0 as well as the most recent + Stackage Nightly + snapshot. The announcement + "Full + Stackage Support in Nixpkgs" gives additional details. - Nix has been updated to version 1.10, which among other improvements enables cryptographic signatures on binary caches for improved security. + Nix has been updated to version 1.10, which among other improvements + enables cryptographic signatures on binary caches for improved security. @@ -31,7 +50,8 @@ system.autoUpgrade.enable = true; - This will cause the system to periodically check for updates in your current channel and run nixos-rebuild. + This will cause the system to periodically check for updates in your + current channel and run nixos-rebuild. @@ -51,7 +71,8 @@ system.autoUpgrade.enable = true; - KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10. + KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and + Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10. @@ -403,61 +424,93 @@ system.autoUpgrade.enable = true; - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: - sshd no longer supports DSA and ECDSA host keys by default. If you have existing systems with such host keys and want to continue to use them, please set + sshd no longer supports DSA and ECDSA host keys by + default. If you have existing systems with such host keys and want to + continue to use them, please set system.stateVersion = "14.12"; - The new option ensures that certain configuration changes that could break existing systems (such as the sshd host key setting) will maintain compatibility with the specified NixOS release. NixOps sets the state version of existing deployments automatically. + The new option ensures that certain + configuration changes that could break existing systems (such as the + sshd host key setting) will maintain compatibility with + the specified NixOS release. NixOps sets the state version of existing + deployments automatically. - cron is no longer enabled by default, unless you have a non-empty . To force cron to be enabled, set . + cron is no longer enabled by default, unless you have a + non-empty . To force + cron to be enabled, set . - Nix now requires binary caches to be cryptographically signed. If you have unsigned binary caches that you want to continue to use, you should set . + Nix now requires binary caches to be cryptographically signed. If you have + unsigned binary caches that you want to continue to use, you should set + . - Steam now doesn't need root rights to work. Instead of using *-steam-chrootenv, you should now just run steam. steamChrootEnv package was renamed to steam, and old steam package -- to steamOriginal. + Steam now doesn't need root rights to work. Instead of using + *-steam-chrootenv, you should now just run + steam. steamChrootEnv package was + renamed to steam, and old steam + package -- to steamOriginal. - CMPlayer has been renamed to bomi upstream. Package cmplayer was accordingly renamed to bomi + CMPlayer has been renamed to bomi upstream. Package + cmplayer was accordingly renamed to + bomi - Atom Shell has been renamed to Electron upstream. Package atom-shell was accordingly renamed to electron + Atom Shell has been renamed to Electron upstream. Package + atom-shell was accordingly renamed to + electron - Elm is not released on Hackage anymore. You should now use elmPackages.elm which contains the latest Elm platform. + Elm is not released on Hackage anymore. You should now use + elmPackages.elm which contains the latest Elm platform. - The CUPS printing service has been updated to version 2.0.2. Furthermore its systemd service has been renamed to cups.service. + The CUPS printing service has been updated to version + 2.0.2. Furthermore its systemd service has been renamed + to cups.service. - Local printers are no longer shared or advertised by default. This behavior can be changed by enabling or respectively. + Local printers are no longer shared or advertised by default. This + behavior can be changed by enabling + or + respectively. - The VirtualBox host and guest options have been named more consistently. They can now found in instead of and instead of . + The VirtualBox host and guest options have been named more consistently. + They can now found in + instead of and + instead of + . - Also, there now is support for the vboxsf file system using the configuration attribute. An example of how this can be used in a configuration: + Also, there now is support for the vboxsf file system + using the configuration attribute. An example + of how this can be used in a configuration: fileSystems."/shiny" = { device = "myshinysharedfolder"; @@ -468,7 +521,15 @@ fileSystems."/shiny" = { - "nix-env -qa" no longer discovers Haskell packages by name. The only packages visible in the global scope are ghc, cabal-install, and stack, but all other packages are hidden. The reason for this inconvenience is the sheer size of the Haskell package set. Name-based lookups are expensive, and most nix-env -qa operations would become much slower if we'd add the entire Hackage database into the top level attribute set. Instead, the list of Haskell packages can be displayed by running: + "nix-env -qa" no longer discovers Haskell + packages by name. The only packages visible in the global scope are + ghc, cabal-install, and + stack, but all other packages are hidden. The reason + for this inconvenience is the sheer size of the Haskell package set. + Name-based lookups are expensive, and most nix-env -qa + operations would become much slower if we'd add the entire Hackage + database into the top level attribute set. Instead, the list of Haskell + packages can be displayed by running: nix-env -f "<nixpkgs>" -qaP -A haskellPackages @@ -480,56 +541,91 @@ nix-env -f "<nixpkgs>" -qaP -A haskellPackages nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc - Installing Haskell libraries this way, however, is no longer supported. See the next item for more details. + Installing Haskell libraries this way, however, is no + longer supported. See the next item for more details. - Previous versions of NixOS came with a feature called ghc-wrapper, a small script that allowed GHC to transparently pick up on libraries installed in the user's profile. This feature has been deprecated; ghc-wrapper was removed from the distribution. The proper way to register Haskell libraries with the compiler now is the haskellPackages.ghcWithPackages function. The User's Guide to the Haskell Infrastructure provides more information about this subject. + Previous versions of NixOS came with a feature called + ghc-wrapper, a small script that allowed GHC to + transparently pick up on libraries installed in the user's profile. This + feature has been deprecated; ghc-wrapper was removed + from the distribution. The proper way to register Haskell libraries with + the compiler now is the haskellPackages.ghcWithPackages + function. The + User's + Guide to the Haskell Infrastructure provides more information about + this subject. - All Haskell builds that have been generated with version 1.x of the cabal2nix utility are now invalid and need to be re-generated with a current version of cabal2nix to function. The most recent version of this tool can be installed by running nix-env -i cabal2nix. + All Haskell builds that have been generated with version 1.x of the + cabal2nix utility are now invalid and need to be + re-generated with a current version of cabal2nix to + function. The most recent version of this tool can be installed by running + nix-env -i cabal2nix. - The haskellPackages set in Nixpkgs used to have a function attribute called extension that users could override in their ~/.nixpkgs/config.nix files to configure additional attributes, etc. That function still exists, but it's now called overrides. + The haskellPackages set in Nixpkgs used to have a + function attribute called extension that users could + override in their ~/.nixpkgs/config.nix files to + configure additional attributes, etc. That function still exists, but it's + now called overrides. - The OpenBLAS library has been updated to version 0.2.14. Support for the x86_64-darwin platform was added. Dynamic architecture detection was enabled; OpenBLAS now selects microarchitecture-optimized routines at runtime, so optimal performance is achieved without the need to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages which use an optimized BLAS or LAPACK implementation. + The OpenBLAS library has been updated to version + 0.2.14. Support for the + x86_64-darwin platform was added. Dynamic architecture + detection was enabled; OpenBLAS now selects microarchitecture-optimized + routines at runtime, so optimal performance is achieved without the need + to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages + which use an optimized BLAS or LAPACK implementation. - The phpfpm is now using the default PHP version (pkgs.php) instead of PHP 5.4 (pkgs.php54). + The phpfpm is now using the default PHP version + (pkgs.php) instead of PHP 5.4 + (pkgs.php54). - The locate service no longer indexes the Nix store by default, preventing packages with potentially numerous versions from cluttering the output. Indexing the store can be activated by setting . + The locate service no longer indexes the Nix store by + default, preventing packages with potentially numerous versions from + cluttering the output. Indexing the store can be activated by setting + . - The Nix expression search path (NIX_PATH) no longer contains /etc/nixos/nixpkgs by default. You can override NIX_PATH by setting . + The Nix expression search path (NIX_PATH) no longer + contains /etc/nixos/nixpkgs by default. You can + override NIX_PATH by setting . - Python 2.6 has been marked as broken (as it no longer receives security updates from upstream). + Python 2.6 has been marked as broken (as it no longer receives security + updates from upstream). - Any use of module arguments such as pkgs to access library functions, or to define imports attributes will now lead to an infinite loop at the time of the evaluation. + Any use of module arguments such as pkgs to access + library functions, or to define imports attributes will + now lead to an infinite loop at the time of the evaluation. - In case of an infinite loop, use the --show-trace command line argument and read the line just above the error message. + In case of an infinite loop, use the --show-trace + command line argument and read the line just above the error message. $ nixos-rebuild build --show-trace … @@ -538,7 +634,9 @@ infinite recursion encountered - Any use of pkgs.lib, should be replaced by lib, after adding it as argument of the module. The following module + Any use of pkgs.lib, should be replaced by + lib, after adding it as argument of the module. The + following module { config, pkgs, ... }: @@ -566,7 +664,9 @@ with lib; - When pkgs is used to download other projects to import their modules, and only in such cases, it should be replaced by (import <nixpkgs> {}). The following module + When pkgs is used to download other projects to import + their modules, and only in such cases, it should be replaced by + (import <nixpkgs> {}). The following module { config, pkgs, ... }: @@ -606,25 +706,43 @@ in - The nixos and nixpkgs channels were unified, so one can use nix-env -iA nixos.bash instead of nix-env -iA nixos.pkgs.bash. See the commit for details. + The nixos and nixpkgs channels were unified, so one + can use nix-env -iA nixos.bash + instead of nix-env -iA nixos.pkgs.bash. See + the + commit for details. - Users running an SSH server who worry about the quality of their /etc/ssh/moduli file with respect to the vulnerabilities discovered in the Diffie-Hellman key exchange can now replace OpenSSH's default version with one they generated themselves using the new option. + Users running an SSH server who worry about the quality of their + /etc/ssh/moduli file with respect to the + vulnerabilities + discovered in the Diffie-Hellman key exchange can now replace + OpenSSH's default version with one they generated themselves using the new + option. - A newly packaged TeX Live 2015 is provided in pkgs.texlive, split into 6500 nix packages. For basic user documentation see the source. Beware of an issue when installing a too large package set. The plan is to deprecate and maybe delete the original TeX packages until the next release. + A newly packaged TeX Live 2015 is provided in + pkgs.texlive, split into 6500 nix packages. For basic + user documentation see + the + source. Beware of + an + issue when installing a too large package set. The plan is to + deprecate and maybe delete the original TeX packages until the next + release. - on all Python interpreters is now available for nix-shell interoperability. + on all Python interpreters is now available + for nix-shell interoperability. diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 94808b360764..9b512c4b1e58 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -6,14 +6,17 @@ Release 16.03 (“Emu”, 2016/03/31) - In addition to numerous new and upgraded packages, this release has the following highlights: + In addition to numerous new and upgraded packages, this release has the + following highlights: - Systemd 229, bringing numerous improvements over 217. + Systemd 229, bringing + numerous + improvements over 217. @@ -23,8 +26,11 @@ - GCC 5.3 (was 4.9). Note that GCC 5 changes the C++ ABI in an incompatible way; this may cause problems if you try to link objects compiled with different versions of GCC. + GCC 5.3 (was 4.9). Note that GCC 5 + changes + the C++ ABI in an incompatible way; this may cause problems if you + try to link objects compiled with different versions of GCC. @@ -39,10 +45,20 @@ - Improved support for ensuring bitwise reproducible builds. For example, stdenv now sets the environment variable SOURCE_DATE_EPOCH to a deterministic value, and Nix has gained an option to repeat a build a number of times to test determinism. An ongoing project, the goal of exact reproducibility is to allow binaries to be verified independently (e.g., a user might only trust binaries that appear in three independent binary caches). + Improved support for ensuring + bitwise + reproducible builds. For example, stdenv now sets + the environment variable + SOURCE_DATE_EPOCH + to a deterministic value, and Nix has + gained + an option to repeat a build a number of times to test determinism. + An ongoing project, the goal of exact reproducibility is to allow binaries + to be verified independently (e.g., a user might only trust binaries that + appear in three independent binary caches). @@ -319,38 +335,56 @@ - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: - We no longer produce graphical ISO images and VirtualBox images for i686-linux. A minimal ISO image is still provided. + We no longer produce graphical ISO images and VirtualBox images for + i686-linux. A minimal ISO image is still provided. - Firefox and similar browsers are now wrapped by default. The package and attribute names are plain firefox or midori, etc. Backward-compatibility attributes were set up, but note that nix-env -u will not update your current firefox-with-plugins; you have to uninstall it and install firefox instead. + Firefox and similar browsers are now wrapped by + default. The package and attribute names are plain + firefox or midori, etc. + Backward-compatibility attributes were set up, but note that + nix-env -u will not update your + current firefox-with-plugins; you have to uninstall it + and install firefox instead. - wmiiSnap has been replaced with wmii_hg, but services.xserver.windowManager.wmii.enable has been updated respectively so this only affects you if you have explicitly installed wmiiSnap. + wmiiSnap has been replaced with + wmii_hg, but + services.xserver.windowManager.wmii.enable has been + updated respectively so this only affects you if you have explicitly + installed wmiiSnap. - jobs NixOS option has been removed. It served as compatibility layer between Upstart jobs and SystemD services. All services have been rewritten to use systemd.services + jobs NixOS option has been removed. It served as + compatibility layer between Upstart jobs and SystemD services. All services + have been rewritten to use systemd.services - wmiimenu is removed, as it has been removed by the developers upstream. Use wimenu from the wmii-hg package. + wmiimenu is removed, as it has been removed by the + developers upstream. Use wimenu from the + wmii-hg package. - Gitit is no longer automatically added to the module list in NixOS and as such there will not be any manual entries for it. You will need to add an import statement to your NixOS configuration in order to use it, e.g. + Gitit is no longer automatically added to the module list in NixOS and as + such there will not be any manual entries for it. You will need to add an + import statement to your NixOS configuration in order to use it, e.g. ]; @@ -361,7 +395,10 @@ - nginx does not accept flags for enabling and disabling modules anymore. Instead it accepts modules argument, which is a list of modules to be built in. All modules now reside in nginxModules set. Example configuration: + nginx does not accept flags for enabling and disabling + modules anymore. Instead it accepts modules argument, + which is a list of modules to be built in. All modules now reside in + nginxModules set. Example configuration: - s3sync is removed, as it hasn't been developed by upstream for 4 years and only runs with ruby 1.8. For an actively-developer alternative look at tarsnap and others. + s3sync is removed, as it hasn't been developed by + upstream for 4 years and only runs with ruby 1.8. For an actively-developer + alternative look at tarsnap and others. - ruby_1_8 has been removed as it's not supported from upstream anymore and probably contains security issues. + ruby_1_8 has been removed as it's not supported from + upstream anymore and probably contains security issues. - tidy-html5 package is removed. Upstream only provided (lib)tidy5 during development, and now they went back to (lib)tidy to work as a drop-in replacement of the original package that has been unmaintained for years. You can (still) use the html-tidy package, which got updated to a stable release from this new upstream. + tidy-html5 package is removed. Upstream only provided + (lib)tidy5 during development, and now they went back to + (lib)tidy to work as a drop-in replacement of the + original package that has been unmaintained for years. You can (still) use + the html-tidy package, which got updated to a stable + release from this new upstream. - extraDeviceOptions argument is removed from bumblebee package. Instead there are now two separate arguments: extraNvidiaDeviceOptions and extraNouveauDeviceOptions for setting extra X11 options for nvidia and nouveau drivers, respectively. + extraDeviceOptions argument is removed from + bumblebee package. Instead there are now two separate + arguments: extraNvidiaDeviceOptions and + extraNouveauDeviceOptions for setting extra X11 options + for nvidia and nouveau drivers, respectively. - The Ctrl+Alt+Backspace key combination no longer kills the X server by default. There's a new option allowing to enable the combination again. + The Ctrl+Alt+Backspace key combination no longer kills + the X server by default. There's a new option + allowing to enable + the combination again. - emacsPackagesNg now contains all packages from the ELPA, MELPA, and MELPA Stable repositories. + emacsPackagesNg now contains all packages from the ELPA, + MELPA, and MELPA Stable repositories. - Data directory for Postfix MTA server is moved from /var/postfix to /var/lib/postfix. Old configurations are migrated automatically. service.postfix module has also received many improvements, such as correct directories' access rights, new aliasFiles and mapFiles options and more. + Data directory for Postfix MTA server is moved from + /var/postfix to /var/lib/postfix. + Old configurations are migrated automatically. + service.postfix module has also received many + improvements, such as correct directories' access rights, new + aliasFiles and mapFiles options and + more. - Filesystem options should now be configured as a list of strings, not a comma-separated string. The old style will continue to work, but print a warning, until the 16.09 release. An example of the new style: + Filesystem options should now be configured as a list of strings, not a + comma-separated string. The old style will continue to work, but print a + warning, until the 16.09 release. An example of the new style: fileSystems."/example" = { device = "/dev/sdc"; @@ -418,20 +479,44 @@ fileSystems."/example" = { - CUPS, installed by services.printing module, now has its data directory in /var/lib/cups. Old configurations from /etc/cups are moved there automatically, but there might be problems. Also configuration options services.printing.cupsdConf and services.printing.cupsdFilesConf were removed because they had been allowing one to override configuration variables required for CUPS to work at all on NixOS. For most use cases, services.printing.extraConf and new option services.printing.extraFilesConf should be enough; if you encounter a situation when they are not, please file a bug. + CUPS, installed by services.printing module, now has its + data directory in /var/lib/cups. Old configurations + from /etc/cups are moved there automatically, but + there might be problems. Also configuration options + services.printing.cupsdConf and + services.printing.cupsdFilesConf were removed because + they had been allowing one to override configuration variables required for + CUPS to work at all on NixOS. For most use cases, + services.printing.extraConf and new option + services.printing.extraFilesConf should be enough; if + you encounter a situation when they are not, please file a bug. - There are also Gutenprint improvements; in particular, a new option services.printing.gutenprint is added to enable automatic updating of Gutenprint PPMs; it's greatly recommended to enable it instead of adding gutenprint to the drivers list. + There are also Gutenprint improvements; in particular, a new option + services.printing.gutenprint is added to enable + automatic updating of Gutenprint PPMs; it's greatly recommended to enable + it instead of adding gutenprint to the + drivers list. - services.xserver.vaapiDrivers has been removed. Use hardware.opengl.extraPackages{,32} instead. You can also specify VDPAU drivers there. + services.xserver.vaapiDrivers has been removed. Use + hardware.opengl.extraPackages{,32} instead. You can also + specify VDPAU drivers there. - programs.ibus moved to i18n.inputMethod.ibus. The option programs.ibus.plugins changed to i18n.inputMethod.ibus.engines and the option to enable ibus changed from programs.ibus.enable to i18n.inputMethod.enabled. i18n.inputMethod.enabled should be set to the used input method name, "ibus" for ibus. An example of the new style: + programs.ibus moved to + i18n.inputMethod.ibus. The option + programs.ibus.plugins changed to + i18n.inputMethod.ibus.engines and the option to enable + ibus changed from programs.ibus.enable to + i18n.inputMethod.enabled. + i18n.inputMethod.enabled should be set to the used input + method name, "ibus" for ibus. An example of the new + style: i18n.inputMethod.enabled = "ibus"; i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ]; @@ -445,17 +530,26 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ]; - services.udev.extraRules option now writes rules to 99-local.rules instead of 10-local.rules. This makes all the user rules apply after others, so their results wouldn't be overriden by anything else. + services.udev.extraRules option now writes rules to + 99-local.rules instead of + 10-local.rules. This makes all the user rules apply + after others, so their results wouldn't be overriden by anything else. - Large parts of the services.gitlab module has been been rewritten. There are new configuration options available. The stateDir option was renamned to statePath and the satellitesDir option was removed. Please review the currently available options. + Large parts of the services.gitlab module has been been + rewritten. There are new configuration options available. The + stateDir option was renamned to + statePath and the satellitesDir + option was removed. Please review the currently available options. - The option no longer interpret the dollar sign ($) as a shell variable, as such it should not be escaped anymore. Thus the following zone data: + The option no longer + interpret the dollar sign ($) as a shell variable, as such it should not be + escaped anymore. Thus the following zone data: \$ORIGIN example.com. @@ -473,7 +567,9 @@ $TTL 1800 - service.syncthing.dataDir options now has to point to exact folder where syncthing is writing to. Example configuration should look something like: + service.syncthing.dataDir options now has to point to + exact folder where syncthing is writing to. Example configuration should + look something like: services.syncthing = { @@ -485,24 +581,45 @@ services.syncthing = { - networking.firewall.allowPing is now enabled by default. Users are encouraged to configure an appropriate rate limit for their machines using the Kernel interface at /proc/sys/net/ipv4/icmp_ratelimit and /proc/sys/net/ipv6/icmp/ratelimit or using the firewall itself, i.e. by setting the NixOS option networking.firewall.pingLimit. + networking.firewall.allowPing is now enabled by default. + Users are encouraged to configure an appropriate rate limit for their + machines using the Kernel interface at + /proc/sys/net/ipv4/icmp_ratelimit and + /proc/sys/net/ipv6/icmp/ratelimit or using the + firewall itself, i.e. by setting the NixOS option + networking.firewall.pingLimit. - Systems with some broadcom cards used to result into a generated config that is no longer accepted. If you get errors like + Systems with some broadcom cards used to result into a generated config + that is no longer accepted. If you get errors like error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created - you should either re-run nixos-generate-config or manually replace "${config.boot.kernelPackages.broadcom_sta}" by config.boot.kernelPackages.broadcom_sta in your /etc/nixos/hardware-configuration.nix. More discussion is on the github issue. + you should either re-run nixos-generate-config or + manually replace + "${config.boot.kernelPackages.broadcom_sta}" by + config.boot.kernelPackages.broadcom_sta in your + /etc/nixos/hardware-configuration.nix. More discussion + is on the + github issue. - The services.xserver.startGnuPGAgent option has been removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no longer requires (or even supports) the "start everything as a child of the agent" scheme we've implemented in NixOS for older versions. To configure the gpg-agent for your X session, add the following code to ~/.bashrc or some file that’s sourced when your shell is started: + The services.xserver.startGnuPGAgent option has been + removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new + approach no longer requires (or even supports) the "start everything as a + child of the agent" scheme we've implemented in NixOS for older versions. + To configure the gpg-agent for your X session, add the following code to + ~/.bashrc or some file that’s sourced when your + shell is started: GPG_TTY=$(tty) export GPG_TTY - If you want to use gpg-agent for SSH, too, add the following to your session initialization (e.g. displayManager.sessionCommands) + If you want to use gpg-agent for SSH, too, add the following to your + session initialization (e.g. + displayManager.sessionCommands) gpg-connect-agent /bye unset SSH_AGENT_PID @@ -512,11 +629,15 @@ export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh" enable-ssh-support - is included in your ~/.gnupg/gpg-agent.conf. You will need to use ssh-add to re-add your ssh keys. If gpg’s automatic transformation of the private keys to the new format fails, you will need to re-import your private keyring as well: + is included in your ~/.gnupg/gpg-agent.conf. You will + need to use ssh-add to re-add your ssh keys. If gpg’s + automatic transformation of the private keys to the new format fails, you + will need to re-import your private keyring as well: gpg --import ~/.gnupg/secring.gpg - The gpg-agent(1) man page has more details about this subject, i.e. in the "EXAMPLES" section. + The gpg-agent(1) man page has more details about this + subject, i.e. in the "EXAMPLES" section. @@ -540,7 +661,9 @@ gpg --import ~/.gnupg/secring.gpg - Input method support was improved. New NixOS modules (fcitx, nabi and uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus engines (hangul and m17n) have been added. + Input method support was improved. New NixOS modules (fcitx, nabi and + uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus + engines (hangul and m17n) have been added. diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 95e8fe3abcbc..4a2343edc970 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -6,36 +6,48 @@ Release 16.09 (“Flounder”, 2016/09/30) - In addition to numerous new and upgraded packages, this release has the following highlights: + In addition to numerous new and upgraded packages, this release has the + following highlights: - Many NixOS configurations and Nix packages now use significantly less disk space, thanks to the extensive work on closure size reduction. For example, the closure size of a minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in 16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB. + Many NixOS configurations and Nix packages now use significantly less disk + space, thanks to the + extensive + work on closure size reduction. For example, the closure size of a + minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in + 16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB. - To improve security, packages are now built using various hardening features. See the Nixpkgs manual for more information. + To improve security, packages are now + built + using various hardening features. See the Nixpkgs manual for more + information. Support for PXE netboot. See for documentation. + linkend="sec-booting-from-pxe" /> + for documentation. - X.org server 1.18. If you use the ati_unfree driver, 1.17 is still used due to an ABI incompatibility. + X.org server 1.18. If you use the ati_unfree driver, + 1.17 is still used due to an ABI incompatibility. - This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default Linux kernel remains 4.4. + This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default + Linux kernel remains 4.4. @@ -53,71 +65,122 @@ - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: - A large number of packages have been converted to use the multiple outputs feature of Nix to greatly reduce the amount of required disk space, as mentioned above. This may require changes to any custom packages to make them build again; see the relevant chapter in the Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions related to multiple-output packages were changed late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.) + A large number of packages have been converted to use the multiple outputs + feature of Nix to greatly reduce the amount of required disk space, as + mentioned above. This may require changes to any custom packages to make + them build again; see the relevant chapter in the Nixpkgs manual for more + information. (Additional caveat to packagers: some packaging conventions + related to multiple-output packages + were + changed late (August 2016) in the release cycle and differ from the + initial introduction of multiple outputs.) - Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided haskell.packages.lts-x_y package sets still exist in name to aviod breaking user code, but these package sets don't actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will drop those old names entirely. The motivation for this change has been discussed at length on the nix-dev mailing list and in Github issue #14897. Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in another nix-dev article. + Previous versions of Nixpkgs had support for all versions of the LTS + Haskell package set. That support has been dropped. The previously provided + haskell.packages.lts-x_y package sets still exist in + name to aviod breaking user code, but these package sets don't actually + contain the versions mandated by the corresponding LTS release. Instead, + our package set it loosely based on the latest available LTS release, i.e. + LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will + drop those old names entirely. + The + motivation for this change has been discussed at length on the + nix-dev mailing list and in + Github + issue #14897. Development strategies for Haskell hackers who want to + rely on Nix and NixOS have been described in + another + nix-dev article. - Shell aliases for systemd sub-commands were dropped: start, stop, restart, status. + Shell aliases for systemd sub-commands + were + dropped: start, stop, + restart, status. - Redis now binds to 127.0.0.1 only instead of listening to all network interfaces. This is the default behavior of Redis 3.2 + Redis now binds to 127.0.0.1 only instead of listening to all network + interfaces. This is the default behavior of Redis 3.2 - /var/empty is now immutable. Activation script runs chattr +i to forbid any modifications inside the folder. See the pull request for what bugs this caused. + /var/empty is now immutable. Activation script runs + chattr +i to forbid any modifications inside the folder. + See the + pull request for what bugs this caused. - Gitlab's maintainance script gitlab-runner was removed and split up into the more clearer gitlab-run and gitlab-rake scripts, because gitlab-runner is a component of Gitlab CI. + Gitlab's maintainance script gitlab-runner was removed + and split up into the more clearer gitlab-run and + gitlab-rake scripts, because + gitlab-runner is a component of Gitlab CI. - services.xserver.libinput.accelProfile default changed from flat to adaptive, as per official documentation. + services.xserver.libinput.accelProfile default changed + from flat to adaptive, as per + + official documentation. - fonts.fontconfig.ultimate.rendering was removed because our presets were obsolete for some time. New presets are hardcoded into FreeType; you can select a preset via fonts.fontconfig.ultimate.preset. You can customize those presets via ordinary environment variables, using environment.variables. + fonts.fontconfig.ultimate.rendering was removed because + our presets were obsolete for some time. New presets are hardcoded into + FreeType; you can select a preset via + fonts.fontconfig.ultimate.preset. You can customize + those presets via ordinary environment variables, using + environment.variables. - The audit service is no longer enabled by default. Use security.audit.enable = true to explicitly enable it. + The audit service is no longer enabled by default. Use + security.audit.enable = true to explicitly enable it. - pkgs.linuxPackages.virtualbox now contains only the kernel modules instead of the VirtualBox user space binaries. If you want to reference the user space binaries, you have to use the new pkgs.virtualbox instead. + pkgs.linuxPackages.virtualbox now contains only the + kernel modules instead of the VirtualBox user space binaries. If you want + to reference the user space binaries, you have to use the new + pkgs.virtualbox instead. - goPackages was replaced with separated Go applications in appropriate nixpkgs categories. Each Go package uses its own dependency set. There's also a new go2nix tool introduced to generate a Go package definition from its Go source automatically. + goPackages was replaced with separated Go applications + in appropriate nixpkgs categories. Each Go package uses + its own dependency set. There's also a new go2nix tool + introduced to generate a Go package definition from its Go source + automatically. - services.mongodb.extraConfig configuration format was changed to YAML. + services.mongodb.extraConfig configuration format was + changed to YAML. @@ -134,42 +197,70 @@ - Revamped grsecurity/PaX support. There is now only a single general-purpose distribution kernel and the configuration interface has been streamlined. Desktop users should be able to simply set + Revamped grsecurity/PaX support. There is now only a single general-purpose + distribution kernel and the configuration interface has been streamlined. + Desktop users should be able to simply set security.grsecurity.enable = true - to get a reasonably secure system without having to sacrifice too much functionality. + to get a reasonably secure system without having to sacrifice too much + functionality. - Special filesystems, like /proc, /run and others, now have the same mount options as recommended by systemd and are unified across different places in NixOS. Mount options are updated during nixos-rebuild switch if possible. One benefit from this is improved security — most such filesystems are now mounted with noexec, nodev and/or nosuid options. + Special filesystems, like /proc, /run + and others, now have the same mount options as recommended by systemd and + are unified across different places in NixOS. Mount options are updated + during nixos-rebuild switch if possible. One benefit + from this is improved security — most such filesystems are now mounted + with noexec, nodev and/or + nosuid options. - The reverse path filter was interfering with DHCPv4 server operation in the past. An exception for DHCPv4 and a new option to log packets that were dropped due to the reverse path filter was added (networking.firewall.logReversePathDrops) for easier debugging. + The reverse path filter was interfering with DHCPv4 server operation in the + past. An exception for DHCPv4 and a new option to log packets that were + dropped due to the reverse path filter was added + (networking.firewall.logReversePathDrops) for easier + debugging. - Containers configuration within containers.<name>.config is now properly typed and checked. In particular, partial configurations are merged correctly. + Containers configuration within + containers.<name>.config is + now + properly typed and checked. In particular, partial configurations + are merged correctly. - The directory container setuid wrapper programs, /var/setuid-wrappers, is now updated atomically to prevent failures if the switch to a new configuration is interrupted. + The directory container setuid wrapper programs, + /var/setuid-wrappers, + is now + updated atomically to prevent failures if the switch to a new configuration + is interrupted. - services.xserver.startGnuPGAgent has been removed due to GnuPG 2.1.x bump. See how to achieve similar behavior. You might need to pkill gpg-agent after the upgrade to prevent a stale agent being in the way. + services.xserver.startGnuPGAgent has been removed due to + GnuPG 2.1.x bump. See + + how to achieve similar behavior. You might need to pkill + gpg-agent after the upgrade to prevent a stale agent being in the + way. - Declarative users could share the uid due to the bug in the script handling conflict resolution. + + Declarative users could share the uid due to the bug in the script handling + conflict resolution. diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 49c364a103ae..14b31b232e90 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -13,24 +13,29 @@ Highlights - In addition to numerous new and upgraded packages, this release has the following highlights: + In addition to numerous new and upgraded packages, this release has the + following highlights: - Nixpkgs is now extensible through overlays. See the Nixpkgs manual for more information. + Nixpkgs is now extensible through overlays. See the + Nixpkgs + manual for more information. - This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The default Linux kernel is 4.9 and Nix is at 1.11.8. + This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The + default Linux kernel is 4.9 and Nix is at 1.11.8. - The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed + The default desktop environment now is KDE's Plasma 5. KDE 4 has been + removed @@ -40,24 +45,35 @@ - X.org server uses branch 1.19. Due to ABI incompatibilities, ati_unfree keeps forcing 1.17 and amdgpu-pro starts forcing 1.18. + X.org server uses branch 1.19. Due to ABI incompatibilities, + ati_unfree keeps forcing 1.17 and + amdgpu-pro starts forcing 1.18. - Cross compilation has been rewritten. See the nixpkgs manual for details. The most obvious breaking change is that in derivations there is no .nativeDrv nor .crossDrv are now cross by default, not native. + Cross compilation has been rewritten. See the nixpkgs manual for details. + The most obvious breaking change is that in derivations there is no + .nativeDrv nor .crossDrv are now + cross by default, not native. - The overridePackages function has been rewritten to be replaced by overlays + The overridePackages function has been rewritten to be + replaced by + + overlays - Packages in nixpkgs can be marked as insecure through listed vulnerabilities. See the Nixpkgs manual for more information. + Packages in nixpkgs can be marked as insecure through listed + vulnerabilities. See the + Nixpkgs + manual for more information. @@ -496,64 +512,92 @@ Backward Incompatibilities - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: - Derivations have no .nativeDrv nor .crossDrv and are now cross by default, not native. + Derivations have no .nativeDrv nor + .crossDrv and are now cross by default, not native. - stdenv.overrides is now expected to take self and super arguments. See lib.trivial.extends for what those parameters represent. + stdenv.overrides is now expected to take + self and super arguments. See + lib.trivial.extends for what those parameters + represent. - ansible now defaults to ansible version 2 as version 1 has been removed due to a serious vulnerability unpatched by upstream. + ansible now defaults to ansible version 2 as version 1 + has been removed due to a serious + + vulnerability unpatched by upstream. - gnome alias has been removed along with gtk, gtkmm and several others. Now you need to use versioned attributes, like gnome3. + gnome alias has been removed along with + gtk, gtkmm and several others. Now + you need to use versioned attributes, like gnome3. - The attribute name of the Radicale daemon has been changed from pythonPackages.radicale to radicale. + The attribute name of the Radicale daemon has been changed from + pythonPackages.radicale to radicale. - The stripHash bash function in stdenv changed according to its documentation; it now outputs the stripped name to stdout instead of putting it in the variable strippedName. + The stripHash bash function in + stdenv changed according to its documentation; it now + outputs the stripped name to stdout instead of putting + it in the variable strippedName. - PHP now scans for extra configuration .ini files in /etc/php.d instead of /etc. This prevents accidentally loading non-PHP .ini files that may be in /etc. + PHP now scans for extra configuration .ini files in /etc/php.d instead of + /etc. This prevents accidentally loading non-PHP .ini files that may be in + /etc. - 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 + 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. service.parsoid.interwikis is now called service.parsoid.wikis and is a list of either API URLs or attribute sets as specified in parsoid's documentation. + Parsoid service now uses YAML configuration format. + service.parsoid.interwikis is now called + service.parsoid.wikis and is a list of either API URLs + or attribute sets as specified in parsoid's documentation. - Ntpd was replaced by systemd-timesyncd as the default service to synchronize system time with a remote NTP server. The old behavior can be restored by setting services.ntp.enable to true. Upstream time servers for all NTP implementations are now configured using networking.timeServers. + Ntpd was replaced by + systemd-timesyncd as the default service to synchronize + system time with a remote NTP server. The old behavior can be restored by + setting services.ntp.enable to true. + Upstream time servers for all NTP implementations are now configured using + networking.timeServers. - service.nylon is now declared using named instances. As an example: + service.nylon is now declared using named instances. As + an example: services.nylon = { enable = true; @@ -576,8 +620,11 @@ - overridePackages function no longer exists. It is replaced by overlays. For example, the following code: + overridePackages function no longer exists. It is + replaced by + + overlays. For example, the following code: let pkgs = import <nixpkgs> {}; @@ -595,42 +642,72 @@ in - Autoloading connection tracking helpers is now disabled by default. This default was also changed in the Linux kernel and is considered insecure if not configured properly in your firewall. If you need connection tracking helpers (i.e. for active FTP) please enable networking.firewall.autoLoadConntrackHelpers and tune networking.firewall.connectionTrackingModules to suit your needs. + Autoloading connection tracking helpers is now disabled by default. This + default was also changed in the Linux kernel and is considered insecure if + not configured properly in your firewall. If you need connection tracking + helpers (i.e. for active FTP) please enable + networking.firewall.autoLoadConntrackHelpers and tune + networking.firewall.connectionTrackingModules to suit + your needs. - 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. + 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. - Iputils no longer provide ping6 and traceroute6. The functionality of these tools has been integrated into ping and traceroute respectively. To enforce an address family the new flags -4 and -6 have been added. One notable incompatibility is that specifying an interface (for link-local IPv6 for instance) is no longer done with the -I flag, but by encoding the interface into the address (ping fe80::1%eth0). + Iputils no longer provide ping6 and traceroute6. The functionality of + these tools has been integrated into ping and traceroute respectively. To + enforce an address family the new flags -4 and + -6 have been added. One notable incompatibility is that + specifying an interface (for link-local IPv6 for instance) is no longer + done with the -I flag, but by encoding the interface + into the address (ping fe80::1%eth0). - The socket handling of the services.rmilter module has been fixed and refactored. As rmilter doesn't support binding to more than one socket, the options bindUnixSockets and bindInetSockets have been replaced by services.rmilter.bindSocket.*. The default is still a unix socket in /run/rmilter/rmilter.sock. Refer to the options documentation for more information. + The socket handling of the services.rmilter module has + been fixed and refactored. As rmilter doesn't support binding to more than + one socket, the options bindUnixSockets and + bindInetSockets have been replaced by + services.rmilter.bindSocket.*. The default is still a + unix socket in /run/rmilter/rmilter.sock. Refer to the + options documentation for more information. - The fetch* functions no longer support md5, please use sha256 instead. + The fetch* functions no longer support md5, please use + sha256 instead. - The dnscrypt-proxy module interface has been streamlined around the option. Where possible, legacy option declarations are mapped to but will emit warnings. The has been outright removed: to use an unlisted resolver, use the option. + The dnscrypt-proxy module interface has been streamlined around the + option. Where possible, legacy option + declarations are mapped to but will emit + warnings. The has been outright removed: to + use an unlisted resolver, use the option. - torbrowser now stores local state under ~/.local/share/tor-browser by default. Any browser profile data from the old location, ~/.torbrowser4, must be migrated manually. + torbrowser now stores local state under + ~/.local/share/tor-browser by default. Any browser + profile data from the old location, ~/.torbrowser4, + must be migrated manually. - The ihaskell, monetdb, offlineimap and sitecopy services have been removed. + The ihaskell, monetdb, offlineimap and sitecopy services have been + removed. @@ -646,12 +723,18 @@ in - 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. + 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. + 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. @@ -661,37 +744,53 @@ in - The Python 2.7 interpreter does not use modules anymore. Instead, all CPython interpreters now include the whole standard library except for `tkinter`, which is available in the Python package set. + The Python 2.7 interpreter does not use modules anymore. Instead, all + CPython interpreters now include the whole standard library except for + `tkinter`, which is available in the Python package set. - Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. Minor modifications had to be made to the interpreters in order to generate deterministic bytecode. This has security implications and is relevant for those using Python in a nix-shell. See the Nixpkgs manual for details. + Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly. + Minor modifications had to be made to the interpreters in order to + generate deterministic bytecode. This has security implications and is + relevant for those using Python in a nix-shell. See the + Nixpkgs manual for details. - The Python package sets now use a fixed-point combinator and the sets are available as attributes of the interpreters. + The Python package sets now use a fixed-point combinator and the sets are + available as attributes of the interpreters. - The Python function buildPythonPackage has been improved and can be used to build from Setuptools source, Flit source, and precompiled Wheels. + The Python function buildPythonPackage has been + improved and can be used to build from Setuptools source, Flit source, and + precompiled Wheels. - When adding new or updating current Python libraries, the expressions should be put in separate files in pkgs/development/python-modules and called from python-packages.nix. + When adding new or updating current Python libraries, the expressions + should be put in separate files in + pkgs/development/python-modules and called from + python-packages.nix. - The dnscrypt-proxy service supports synchronizing the list of public resolvers without working DNS resolution. This fixes issues caused by the resolver list becoming outdated. It also improves the viability of DNSCrypt only configurations. + The dnscrypt-proxy service supports synchronizing the list of public + resolvers without working DNS resolution. This fixes issues caused by the + resolver list becoming outdated. It also improves the viability of + DNSCrypt only configurations. - Containers using bridged networking no longer lose their connection after changes to the host networking. + Containers using bridged networking no longer lose their connection after + changes to the host networking. @@ -701,12 +800,16 @@ in - The bind DNS utilities (e.g. dig) have been split into their own output and are now also available in pkgs.dnsutils and it is no longer necessary to pull in all of bind to use them. + The bind DNS utilities (e.g. dig) have been split into their own output + and are now also available in pkgs.dnsutils and it is + no longer necessary to pull in all of bind to use them. - Per-user configuration was moved from ~/.nixpkgs to ~/.config/nixpkgs. The former is still valid for config.nix for backwards compatibility. + Per-user configuration was moved from ~/.nixpkgs to + ~/.config/nixpkgs. The former is still valid for + config.nix for backwards compatibility. diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index ff70bb663a00..795c51d2923d 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -13,23 +13,30 @@ Highlights - In addition to numerous new and upgraded packages, this release has the following highlights: + In addition to numerous new and upgraded packages, this release has the + following highlights: - The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE Applications to 17.08.1 and KDE Frameworks to 5.37. + The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE + Applications to 17.08.1 and KDE Frameworks to 5.37. - The user handling now keeps track of deallocated UIDs/GIDs. When a user or group is revived, this allows it to be allocated the UID/GID it had before. A consequence is that UIDs and GIDs are no longer reused. + The user handling now keeps track of deallocated UIDs/GIDs. When a user or + group is revived, this allows it to be allocated the UID/GID it had + before. A consequence is that UIDs and GIDs are no longer reused. - The module option now causes the first head specified in this list to be set as the primary head. Apart from that, it's now possible to also set additional options by using an attribute set, for example: + The module option now causes + the first head specified in this list to be set as the primary head. Apart + from that, it's now possible to also set additional options by using an + attribute set, for example: { services.xserver.xrandrHeads = [ "HDMI-0" @@ -43,21 +50,36 @@ ]; } - This will set the DVI-0 output to be the primary head, even though HDMI-0 is the first head in the list. + This will set the DVI-0 output to be the primary head, + even though HDMI-0 is the first head in the list. - The handling of SSL in the services.nginx module has been cleaned up, renaming the misnamed enableSSL to onlySSL which reflects its original intention. This is not to be used with the already existing forceSSL which creates a second non-SSL virtual host redirecting to the SSL virtual host. This by chance had worked earlier due to specific implementation details. In case you had specified both please remove the enableSSL option to keep the previous behaviour. + The handling of SSL in the services.nginx module has + been cleaned up, renaming the misnamed enableSSL to + onlySSL which reflects its original intention. This is + not to be used with the already existing forceSSL which + creates a second non-SSL virtual host redirecting to the SSL virtual host. + This by chance had worked earlier due to specific implementation details. + In case you had specified both please remove the + enableSSL option to keep the previous behaviour. - Another addSSL option has been introduced to configure both a non-SSL virtual host and an SSL virtual host with the same configuration. + Another addSSL option has been introduced to configure + both a non-SSL virtual host and an SSL virtual host with the same + configuration. - Options to configure resolver options and upstream blocks have been introduced. See their information for further details. + Options to configure resolver options and + upstream blocks have been introduced. See their + information for further details. - The port option has been replaced by a more generic listen option which makes it possible to specify multiple addresses, ports and SSL configs dependant on the new SSL handling mentioned above. + The port option has been replaced by a more generic + listen option which makes it possible to specify + multiple addresses, ports and SSL configs dependant on the new SSL + handling mentioned above. @@ -446,31 +468,47 @@ Backward Incompatibilities - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: - In an Qemu-based virtualization environment, the network interface names changed from i.e. enp0s3 to ens3. + In an Qemu-based virtualization environment, the + network interface names changed from i.e. enp0s3 to + ens3. - This is due to a kernel configuration change. The new naming is consistent with those of other Linux distributions with systemd. See #29197 for more information. + This is due to a kernel configuration change. The new naming is consistent + with those of other Linux distributions with systemd. See + #29197 + for more information. - A machine is affected if the virt-what tool either returns qemu or kvm and has interface names used in any part of its NixOS configuration, in particular if a static network configuration with networking.interfaces is used. + A machine is affected if the virt-what tool either + returns qemu or kvm + and has interface names used in any part of its NixOS + configuration, in particular if a static network configuration with + networking.interfaces is used. Before rebooting affected machines, please ensure: - Change the interface names in your NixOS configuration. The first interface will be called ens3, the second one ens8 and starting from there incremented by 1. + Change the interface names in your NixOS configuration. The first + interface will be called ens3, the second one + ens8 and starting from there incremented by 1. - After changing the interface names, rebuild your system with nixos-rebuild boot to activate the new configuration after a reboot. If you switch to the new configuration right away you might lose network connectivity! If using nixops, deploy with nixops deploy --force-reboot. + After changing the interface names, rebuild your system with + nixos-rebuild boot to activate the new configuration + after a reboot. If you switch to the new configuration right away you + might lose network connectivity! If using nixops, + deploy with nixops deploy --force-reboot. @@ -478,59 +516,88 @@ - The following changes apply if the stateVersion is changed to 17.09 or higher. For stateVersion = "17.03" or lower the old behavior is preserved. + The following changes apply if the stateVersion is + changed to 17.09 or higher. For stateVersion = "17.03" + or lower the old behavior is preserved. - The postgres default version was changed from 9.5 to 9.6. + The postgres default version was changed from 9.5 to + 9.6. - The postgres superuser name has changed from root to postgres to more closely follow what other Linux distributions are doing. + The postgres superuser name has changed from + root to postgres to more closely + follow what other Linux distributions are doing. - The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example. + The postgres default dataDir has + changed from /var/db/postgres to + /var/lib/postgresql/$psqlSchema where $psqlSchema is + 9.6 for example. - The mysql default dataDir has changed from /var/mysql to /var/lib/mysql. + The mysql default dataDir has + changed from /var/mysql to + /var/lib/mysql. - Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found here . It is also possible to use the newer version by setting the package to radicale2, which is done automatically when stateVersion is 17.09 or higher. The extraArgs option has been added to allow passing the data migration arguments specified in the instructions; see the radicale.nix NixOS test for an example migration. + Radicale's default package has changed from 1.x to 2.x. Instructions to + migrate can be found here + . It is also possible to use the newer version by setting the + package to radicale2, which is + done automatically when stateVersion is 17.09 or + higher. The extraArgs option has been added to allow + passing the data migration arguments specified in the instructions; see + the + radicale.nix + NixOS test for an example migration. - The aiccu package was removed. This is due to SixXS sunsetting its IPv6 tunnel. + The aiccu package was removed. This is due to SixXS + sunsetting its IPv6 + tunnel. - The fanctl package and fan module have been removed due to the developers not upstreaming their iproute2 patches and lagging with compatibility to recent iproute2 versions. + The fanctl package and fan module + have been removed due to the developers not upstreaming their iproute2 + patches and lagging with compatibility to recent iproute2 versions. - Top-level idea package collection was renamed. All JetBrains IDEs are now at jetbrains. + Top-level idea package collection was renamed. All + JetBrains IDEs are now at jetbrains. - flexget's state database cannot be upgraded to its new internal format, requiring removal of any existing db-config.sqlite which will be automatically recreated. + flexget's state database cannot be upgraded to its new + internal format, requiring removal of any existing + db-config.sqlite which will be automatically recreated. - The ipfs service now doesn't ignore the dataDir option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with + The ipfs service now doesn't ignore the + dataDir option anymore. If you've ever set this option + to anything other than the default you'll have to either unset it (so the + default gets used) or migrate the old data manually with dataDir=<valueOfDataDir> mv /var/lib/ipfs/.ipfs/* $dataDir @@ -540,66 +607,107 @@ rmdir /var/lib/ipfs/.ipfs - The caddy service was previously using an extra .caddy directory in the data directory specified with the dataDir option. The contents of the .caddy directory are now expected to be in the dataDir. + The caddy service was previously using an extra + .caddy directory in the data directory specified with + the dataDir option. The contents of the + .caddy directory are now expected to be in the + dataDir. - The ssh-agent user service is not started by default anymore. Use programs.ssh.startAgent to enable it if needed. There is also a new programs.gnupg.agent module that creates a gpg-agent user service. It can also serve as a SSH agent if enableSSHSupport is set. + The ssh-agent user service is not started by default + anymore. Use programs.ssh.startAgent to enable it if + needed. There is also a new programs.gnupg.agent module + that creates a gpg-agent user service. It can also + serve as a SSH agent if enableSSHSupport is set. - The services.tinc.networks.<name>.listenAddress option had a misleading name that did not correspond to its behavior. It now correctly defines the ip to listen for incoming connections on. To keep the previous behaviour, use services.tinc.networks.<name>.bindToAddress instead. Refer to the description of the options for more details. + The services.tinc.networks.<name>.listenAddress + option had a misleading name that did not correspond to its behavior. It + now correctly defines the ip to listen for incoming connections on. To + keep the previous behaviour, use + services.tinc.networks.<name>.bindToAddress + instead. Refer to the description of the options for more details. - tlsdate package and module were removed. This is due to the project being dead and not building with openssl 1.1. + tlsdate package and module were removed. This is due to + the project being dead and not building with openssl 1.1. - wvdial package and module were removed. This is due to the project being dead and not building with openssl 1.1. + wvdial package and module were removed. This is due to + the project being dead and not building with openssl 1.1. - cc-wrapper's setup-hook now exports a number of environment variables corresponding to binutils binaries, (e.g. LD, STRIP, RANLIB, etc). This is done to prevent packages' build systems guessing, which is harder to predict, especially when cross-compiling. However, some packages have broken due to this—their build systems either not supporting, or claiming to support without adequate testing, taking such environment variables as parameters. + cc-wrapper's setup-hook now exports a number of + environment variables corresponding to binutils binaries, (e.g. + LD, STRIP, RANLIB, etc). This + is done to prevent packages' build systems guessing, which is harder to + predict, especially when cross-compiling. However, some packages have + broken due to this—their build systems either not supporting, or + claiming to support without adequate testing, taking such environment + variables as parameters. - services.firefox.syncserver now runs by default as a non-root user. To accomodate this change, the default sqlite database location has also been changed. Migration should work automatically. Refer to the description of the options for more details. + services.firefox.syncserver now runs by default as a + non-root user. To accomodate this change, the default sqlite database + location has also been changed. Migration should work automatically. Refer + to the description of the options for more details. - The compiz window manager and package was removed. The system support had been broken for several years. + The compiz window manager and package was removed. The + system support had been broken for several years. - Touchpad support should now be enabled through libinput as synaptics is now deprecated. See the option services.xserver.libinput.enable. + Touchpad support should now be enabled through libinput + as synaptics is now deprecated. See the option + services.xserver.libinput.enable. - grsecurity/PaX support has been dropped, following upstream's decision to cease free support. See upstream's announcement for more information. No complete replacement for grsecurity/PaX is available presently. + grsecurity/PaX support has been dropped, following upstream's decision to + cease free support. See + + upstream's announcement for more information. No complete + replacement for grsecurity/PaX is available presently. - services.mysql now has declarative configuration of databases and users with the ensureDatabases and ensureUsers options. + services.mysql now has declarative configuration of + databases and users with the ensureDatabases and + ensureUsers options. - These options will never delete existing databases and users, especially not when the value of the options are changed. + These options will never delete existing databases and users, especially + not when the value of the options are changed. - The MySQL users will be identified using Unix socket authentication. This authenticates the Unix user with the same name only, and that without the need for a password. + The MySQL users will be identified using + + Unix socket authentication. This authenticates the Unix user with + the same name only, and that without the need for a password. - If you have previously created a MySQL root user with a password, you will need to add root user for unix socket authentication before using the new options. This can be done by running the following SQL script: + If you have previously created a MySQL root user + with a password, you will need to add + root user for unix socket authentication before using + the new options. This can be done by running the following SQL script: CREATE USER 'root'@'%' IDENTIFIED BY ''; GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; @@ -612,38 +720,55 @@ FLUSH PRIVILEGES; - services.mysqlBackup now works by default without any user setup, including for users other than mysql. + services.mysqlBackup now works by default without any + user setup, including for users other than mysql. - By default, the mysql user is no longer the user which performs the backup. Instead a system account mysqlbackup is used. + By default, the mysql user is no longer the user which + performs the backup. Instead a system account + mysqlbackup is used. - The mysqlBackup service is also now using systemd timers instead of cron. + The mysqlBackup service is also now using systemd + timers instead of cron. - Therefore, the services.mysqlBackup.period option no longer exists, and has been replaced with services.mysqlBackup.calendar, which is in the format of services.mysqlBackup.period option no + longer exists, and has been replaced with + services.mysqlBackup.calendar, which is in the format + of + systemd.time(7). - If you expect to be sent an e-mail when the backup fails, consider using a script which monitors the systemd journal for errors. Regretfully, at present there is no built-in functionality for this. + If you expect to be sent an e-mail when the backup fails, consider using a + script which monitors the systemd journal for errors. Regretfully, at + present there is no built-in functionality for this. - You can check that backups still work by running systemctl start mysql-backup then systemctl status mysql-backup. + You can check that backups still work by running systemctl start + mysql-backup then systemctl status + mysql-backup. - Templated systemd services e.g container@name are now handled currectly when switching to a new configuration, resulting in them being reloaded. + Templated systemd services e.g container@name are now + handled currectly when switching to a new configuration, resulting in them + being reloaded. - Steam: the newStdcpp parameter was removed and should not be needed anymore. + Steam: the newStdcpp parameter was removed and should + not be needed anymore. - Redis has been updated to version 4 which mandates a cluster mass-restart, due to changes in the network handling, in order to ensure compatibility with networks NATing traffic. + Redis has been updated to version 4 which mandates a cluster mass-restart, + due to changes in the network handling, in order to ensure compatibility + with networks NATing traffic. @@ -659,28 +784,46 @@ FLUSH PRIVILEGES; - Modules can now be disabled by using disabledModules, allowing another to take it's place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release. + Modules can now be disabled by using + + disabledModules, allowing another to take it's place. This can be + used to import a set of modules from another channel while keeping the + rest of the system on a stable release. - Updated to FreeType 2.7.1, including a new TrueType engine. The new engine replaces the Infinality engine which was the default in NixOS. The default font rendering settings are now provided by fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults are less invasive and provide rendering that is more consistent with other systems and hopefully with each font designer's intent. Some system-wide configuration has been removed from the Fontconfig NixOS module where user Fontconfig settings are available. + Updated to FreeType 2.7.1, including a new TrueType engine. The new engine + replaces the Infinality engine which was the default in NixOS. The default + font rendering settings are now provided by fontconfig-penultimate, + replacing fontconfig-ultimate; the new defaults are less invasive and + provide rendering that is more consistent with other systems and hopefully + with each font designer's intent. Some system-wide configuration has been + removed from the Fontconfig NixOS module where user Fontconfig settings + are available. - ZFS/SPL have been updated to 0.7.0, zfsUnstable, splUnstable have therefore been removed. + ZFS/SPL have been updated to 0.7.0, zfsUnstable, + splUnstable have therefore been removed. - The option now allows the value null in addition to timezone strings. This value allows changing the timezone of a system imperatively using timedatectl set-timezone. The default timezone is still UTC. + The option now allows the value + null in addition to timezone strings. This value allows + changing the timezone of a system imperatively using timedatectl + set-timezone. The default timezone is still UTC. - Nixpkgs overlays may now be specified with a file as well as a directory. The value of <nixpkgs-overlays> may be a file, and ~/.config/nixpkgs/overlays.nix can be used instead of the ~/.config/nixpkgs/overlays directory. + Nixpkgs overlays may now be specified with a file as well as a directory. + The value of <nixpkgs-overlays> may be a file, and + ~/.config/nixpkgs/overlays.nix can be used instead of + the ~/.config/nixpkgs/overlays directory. See the overlays chapter of the Nixpkgs manual for more details. @@ -688,48 +831,67 @@ FLUSH PRIVILEGES; - Definitions for /etc/hosts can now be specified declaratively with networking.hosts. + Definitions for /etc/hosts can now be specified + declaratively with networking.hosts. - Two new options have been added to the installer loader, in addition to the default having changed. The kernel log verbosity has been lowered to the upstream default for the default options, in order to not spam the console when e.g. joining a network. + Two new options have been added to the installer loader, in addition to + the default having changed. The kernel log verbosity has been lowered to + the upstream default for the default options, in order to not spam the + console when e.g. joining a network. - This therefore leads to adding a new debug option to set the log level to the previous verbose mode, to make debugging easier, but still accessible easily. + This therefore leads to adding a new debug option to + set the log level to the previous verbose mode, to make debugging easier, + but still accessible easily. - Additionally a copytoram option has been added, which makes it possible to remove the install medium after booting. This allows tethering from your phone after booting from it. + Additionally a copytoram option has been added, which + makes it possible to remove the install medium after booting. This allows + tethering from your phone after booting from it. - services.gitlab-runner.configOptions has been added to specify the configuration of gitlab-runners declaratively. + services.gitlab-runner.configOptions has been added to + specify the configuration of gitlab-runners declaratively. - services.jenkins.plugins has been added to install plugins easily, this can be generated with jenkinsPlugins2nix. + services.jenkins.plugins has been added to install + plugins easily, this can be generated with jenkinsPlugins2nix. - services.postfix.config has been added to specify the main.cf with NixOS options. Additionally other options have been added to the postfix module and has been improved further. + services.postfix.config has been added to specify the + main.cf with NixOS options. Additionally other options have been added to + the postfix module and has been improved further. - The GitLab package and module have been updated to the latest 10.0 release. + The GitLab package and module have been updated to the latest 10.0 + release. - The systemd-boot boot loader now lists the NixOS version, kernel version and build date of all bootable generations. + The systemd-boot boot loader now lists the NixOS + version, kernel version and build date of all bootable generations. - The dnscrypt-proxy service now defaults to using a random upstream resolver, selected from the list of public non-logging resolvers with DNSSEC support. Existing configurations can be migrated to this mode of operation by omitting the option or setting it to "random". + The dnscrypt-proxy service now defaults to using a random upstream + resolver, selected from the list of public non-logging resolvers with + DNSSEC support. Existing configurations can be migrated to this mode of + operation by omitting the + option or setting it + to "random". diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 2e39b990d9e9..c14679eea071 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -13,7 +13,8 @@ Highlights - In addition to numerous new and upgraded packages, this release has the following highlights: + In addition to numerous new and upgraded packages, this release has the + following highlights: @@ -24,36 +25,48 @@ - Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn't NixOS, really). Binaries for aarch64-linux are available, but no channel exists yet, as it's waiting for some test fixes, etc. + Platform support: x86_64-linux and x86_64-darwin since release time (the + latter isn't NixOS, really). Binaries for aarch64-linux are available, but + no channel exists yet, as it's waiting for some test fixes, etc. - Nix now defaults to 2.0; see its release notes. + Nix now defaults to 2.0; see its + release + notes. - Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> 7, systemd: 234 -> 237. + Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> + 7, systemd: 234 -> 237. - Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 -> 5.12. + Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 + -> 5.12. - MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes have been made to the infrastructure involved: + MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. + While upgrading a few changes have been made to the infrastructure + involved: - libmysql has been deprecated, please use mysql.connector-c instead, a compatibility passthru has been added to the MySQL packages. + libmysql has been deprecated, please use + mysql.connector-c instead, a compatibility passthru + has been added to the MySQL packages. - The mysql57 package has a new static output containing the static libraries including libmysqld.a + The mysql57 package has a new + static output containing the static libraries + including libmysqld.a @@ -390,7 +403,8 @@ Backward Incompatibilities - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: @@ -401,26 +415,39 @@ - Dollar signs in options under are passed verbatim to Postfix, which will interpret them as the beginning of a parameter expression. This was already true for string-valued options in the previous release, but not for list-valued options. If you need to pass literal dollar signs through Postfix, double them. + Dollar signs in options under are passed + verbatim to Postfix, which will interpret them as the beginning of a + parameter expression. This was already true for string-valued options in + the previous release, but not for list-valued options. If you need to pass + literal dollar signs through Postfix, double them. - The postage package (for web-based PostgreSQL administration) has been renamed to pgmanage. The corresponding module has also been renamed. To migrate please rename all options to . + The postage package (for web-based PostgreSQL + administration) has been renamed to pgmanage. The + corresponding module has also been renamed. To migrate please rename all + options to + . - Package attributes starting with a digit have been prefixed with an underscore sign. This is to avoid quoting in the configuration and other issues with command-line tools like nix-env. The change affects the following packages: + Package attributes starting with a digit have been prefixed with an + underscore sign. This is to avoid quoting in the configuration and other + issues with command-line tools like nix-env. The change + affects the following packages: - 2048-in-terminal → _2048-in-terminal + 2048-in-terminal → + _2048-in-terminal - 90secondportraits → _90secondportraits + 90secondportraits → + _90secondportraits @@ -438,77 +465,134 @@ - The OpenSSH service no longer enables support for DSA keys by default, which could cause a system lock out. Update your keys or, unfavorably, re-enable DSA support manually. + The OpenSSH service no longer enables support for + DSA keys by default, which could cause a system lock out. Update your keys + or, unfavorably, re-enable DSA support manually. - DSA support was deprecated in OpenSSH 7.0, due to it being too weak. To re-enable support, add PubkeyAcceptedKeyTypes +ssh-dss to the end of your . + DSA support was + deprecated in + OpenSSH 7.0, due to it being too weak. To re-enable support, add + PubkeyAcceptedKeyTypes +ssh-dss to the end of your + . - After updating the keys to be stronger, anyone still on a pre-17.03 version is safe to jump to 17.03, as vetted here. + After updating the keys to be stronger, anyone still on a pre-17.03 + version is safe to jump to 17.03, as vetted + here. - The openssh package now includes Kerberos support by default; the openssh_with_kerberos package is now a deprecated alias. If you do not want Kerberos support, you can do openssh.override { withKerberos = false; }. Note, this also applies to the openssh_hpn package. + The openssh package now includes Kerberos support by + default; the openssh_with_kerberos package is now a + deprecated alias. If you do not want Kerberos support, you can do + openssh.override { withKerberos = false; }. Note, this + also applies to the openssh_hpn package. - cc-wrapper has been split in two; there is now also a bintools-wrapper. The most commonly used files in nix-support are now split between the two wrappers. Some commonly used ones, like nix-support/dynamic-linker, are duplicated for backwards compatability, even though they rightly belong only in bintools-wrapper. Other more obscure ones are just moved. + cc-wrapper has been split in two; there is now also a + bintools-wrapper. The most commonly used files in + nix-support are now split between the two wrappers. + Some commonly used ones, like + nix-support/dynamic-linker, are duplicated for + backwards compatability, even though they rightly belong only in + bintools-wrapper. Other more obscure ones are just + moved. - The propagation logic has been changed. The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual. + The propagation logic has been changed. The new logic, along with new + types of dependencies that go with, is thoroughly documented in the + "Specifying dependencies" section of the "Standard Environment" chapter of + the nixpkgs manual. - The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. In practice, that means that many propagatedNativeBuildInputs should instead be propagatedBuildInputs. Thankfully, that was and is the least used type of dependency. Also, it means that some propagatedBuildInputs should instead be depsTargetTargetPropagated. Other types dependencies should be unaffected. + The old logic isn't but is easy to describe: dependencies were propagated + as the same type of dependency no matter what. In practice, that means + that many propagatedNativeBuildInputs should instead + be propagatedBuildInputs. Thankfully, that was and is + the least used type of dependency. Also, it means that some + propagatedBuildInputs should instead be + depsTargetTargetPropagated. Other types dependencies + should be unaffected. - lib.addPassthru drv passthru is removed. Use lib.extendDerivation true passthru drv instead. + lib.addPassthru drv passthru is removed. Use + lib.extendDerivation true passthru drv instead. - The memcached service no longer accept dynamic socket paths via . Unix sockets can be still enabled by and will be accessible at /run/memcached/memcached.sock. + The memcached service no longer accept dynamic socket + paths via . Unix sockets can be + still enabled by and + will be accessible at /run/memcached/memcached.sock. - The hardware.amdHybridGraphics.disable option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports. + The hardware.amdHybridGraphics.disable option was + removed for lack of a maintainer. If you still need this module, you may + wish to include a copy of it from an older version of nixos in your + imports. - The merging of config options for services.postfix.config was buggy. Previously, if other options in the Postfix module like services.postfix.useSrs were set and the user set config options that were also set by such options, the resulting config wouldn't include all options that were needed. They are now merged correctly. If config options need to be overridden, lib.mkForce or lib.mkOverride can be used. + The merging of config options for + services.postfix.config was buggy. Previously, if other + options in the Postfix module like + services.postfix.useSrs were set and the user set + config options that were also set by such options, the resulting config + wouldn't include all options that were needed. They are now merged + correctly. If config options need to be overridden, + lib.mkForce or lib.mkOverride can be + used. - The following changes apply if the stateVersion is changed to 18.03 or higher. For stateVersion = "17.09" or lower the old behavior is preserved. + The following changes apply if the stateVersion is + changed to 18.03 or higher. For stateVersion = "17.09" + or lower the old behavior is preserved. - matrix-synapse uses postgresql by default instead of sqlite. Migration instructions can be found here . + matrix-synapse uses postgresql by default instead of + sqlite. Migration instructions can be found + + here . - The jid package has been removed, due to maintenance overhead of a go package having non-versioned dependencies. + The jid package has been removed, due to maintenance + overhead of a go package having non-versioned dependencies. - When using (enabled by default in GNOME), it now handles all input devices, not just touchpads. As a result, you might need to re-evaluate any custom Xorg configuration. In particular, Option "XkbRules" "base" may result in broken keyboard layout. + When using (enabled by default + in GNOME), it now handles all input devices, not just touchpads. As a + result, you might need to re-evaluate any custom Xorg configuration. In + particular, Option "XkbRules" "base" may result in + broken keyboard layout. - The attic package was removed. A maintained fork called Borg should be used instead. Migration instructions can be found here. + The attic package was removed. A maintained fork called + Borg should be used + instead. Migration instructions can be found + here. @@ -517,32 +601,52 @@ - The package pkgs.piwik was renamed to pkgs.matomo. + The package pkgs.piwik was renamed to + pkgs.matomo. - The service services.piwik was renamed to services.matomo. + The service services.piwik was renamed to + services.matomo. - The data directory /var/lib/piwik was renamed to /var/lib/matomo. All files will be moved automatically on first startup, but you might need to adjust your backup scripts. + The data directory /var/lib/piwik was renamed to + /var/lib/matomo. All files will be moved + automatically on first startup, but you might need to adjust your + backup scripts. - The default for the nginx configuration changed from piwik.${config.networking.hostName} to matomo.${config.networking.hostName}.${config.networking.domain} if is set, matomo.${config.networking.hostName} if it is not set. If you change your , remember you'll need to update the trustedHosts[] array in /var/lib/matomo/config/config.ini.php as well. + The default for the nginx configuration + changed from piwik.${config.networking.hostName} to + matomo.${config.networking.hostName}.${config.networking.domain} + if is set, + matomo.${config.networking.hostName} if it is not + set. If you change your , remember you'll + need to update the trustedHosts[] array in + /var/lib/matomo/config/config.ini.php as well. - The piwik user was renamed to matomo. The service will adjust ownership automatically for files in the data directory. If you use unix socket authentication, remember to give the new matomo user access to the database and to change the username to matomo in the [database] section of /var/lib/matomo/config/config.ini.php. + The piwik user was renamed to + matomo. The service will adjust ownership + automatically for files in the data directory. If you use unix socket + authentication, remember to give the new matomo user + access to the database and to change the username to + matomo in the [database] section + of /var/lib/matomo/config/config.ini.php. - If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean, but this is neither enforced nor required. + If you named your database `piwik`, you might want to rename it to + `matomo` to keep things clean, but this is neither enforced nor + required. @@ -550,43 +654,59 @@ - nodejs-4_x is end-of-life. nodejs-4_x, nodejs-slim-4_x and nodePackages_4_x are removed. + nodejs-4_x is end-of-life. + nodejs-4_x, nodejs-slim-4_x and + nodePackages_4_x are removed. - The pump.io NixOS module was removed. It is now maintained as an external module. + The pump.io NixOS module was removed. It is now + maintained as an + external + module. - The Prosody XMPP server has received a major update. The following modules were renamed: + The Prosody XMPP server has received a major update. The following modules + were renamed: - is now + is now + - is now + is now + - Many new modules are now core modules, most notably and . + Many new modules are now core modules, most notably + and + . - The better-performing libevent backend is now enabled by default. + The better-performing libevent backend is now enabled + by default. - withCommunityModules now passes through the modules to . Use withOnlyInstalledCommunityModules for modules that should not be enabled directly, e.g lib_ldap. + withCommunityModules now passes through the modules to + . Use + withOnlyInstalledCommunityModules for modules that + should not be enabled directly, e.g lib_ldap. - All prometheus exporter modules are now defined as submodules. The exporters are configured using services.prometheus.exporters. + All prometheus exporter modules are now defined as submodules. The + exporters are configured using + services.prometheus.exporters. @@ -602,17 +722,24 @@ - ZNC option now defaults to true. That means that old configuration is not overwritten by default when update to the znc options are made. + ZNC option now defaults to + true. That means that old configuration is not + overwritten by default when update to the znc options are made. - The option has been added for wireless networks with WPA-Enterprise authentication. There is also a new option to directly configure wpa_supplicant and to connect to hidden networks. + The option + has been added for wireless networks with WPA-Enterprise authentication. + There is also a new option to directly + configure wpa_supplicant and to + connect to hidden networks. - In the module the following options have been removed: + In the module the + following options have been removed: @@ -640,22 +767,34 @@ - To assign static addresses to an interface the options and should be used instead. The options and have been renamed to respectively. The new options and have been added to set up static routing. + To assign static addresses to an interface the options + and should + be used instead. The options and + have been renamed to + respectively. The new options + and have been + added to set up static routing. - The option is now 127.0.0.1 by default. Previously the default behaviour was to listen on all interfaces. + The option is now + 127.0.0.1 by default. Previously the default behaviour + was to listen on all interfaces. - services.btrfs.autoScrub has been added, to periodically check btrfs filesystems for data corruption. If there's a correct copy available, it will automatically repair corrupted blocks. + services.btrfs.autoScrub has been added, to + periodically check btrfs filesystems for data corruption. If there's a + correct copy available, it will automatically repair corrupted blocks. - displayManager.lightdm.greeters.gtk.clock-format. has been added, the clock format string (as expected by strftime, e.g. %H:%M) to use with the lightdm gtk greeter panel. + displayManager.lightdm.greeters.gtk.clock-format. has + been added, the clock format string (as expected by strftime, e.g. + %H:%M) to use with the lightdm gtk greeter panel. If set to null the default clock format is used. @@ -663,10 +802,17 @@ - displayManager.lightdm.greeters.gtk.indicators has been added, a list of allowed indicator modules to use with the lightdm gtk greeter panel. + displayManager.lightdm.greeters.gtk.indicators has been + added, a list of allowed indicator modules to use with the lightdm gtk + greeter panel. - Built-in indicators include ~a11y, ~language, ~session, ~power, ~clock, ~host, ~spacer. Unity indicators can be represented by short name (e.g. sound, power), service file name, or absolute path. + Built-in indicators include ~a11y, + ~language, ~session, + ~power, ~clock, + ~host, ~spacer. Unity indicators can + be represented by short name (e.g. sound, + power), service file name, or absolute path. If set to null the default indicators are used. @@ -688,12 +834,20 @@ - The NixOS test driver supports user services declared by systemd.user.services. The methods waitForUnit, getUnitInfo, startJob and stopJob provide an optional $user argument for that purpose. + The NixOS test driver supports user services declared by + systemd.user.services. The methods + waitForUnit, getUnitInfo, + startJob and stopJob provide an + optional $user argument for that purpose. - Enabling bash completion on NixOS, programs.bash.enableCompletion, will now also enable completion for the Nix command line tools by installing the nix-bash-completions package. + Enabling bash completion on NixOS, + programs.bash.enableCompletion, will now also enable + completion for the Nix command line tools by installing the + nix-bash-completions + package. diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index df53c6f9dd92..3f10b26223dd 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -13,7 +13,8 @@ Highlights - In addition to numerous new and upgraded packages, this release has the following notable updates: + In addition to numerous new and upgraded packages, this release has the + following notable updates: @@ -24,22 +25,28 @@ - Platform support: x86_64-linux and x86_64-darwin as always. Support for aarch64-linux is as with the previous releases, not equivalent to the x86-64-linux release, but with efforts to reach parity. + Platform support: x86_64-linux and x86_64-darwin as always. Support for + aarch64-linux is as with the previous releases, not equivalent to the + x86-64-linux release, but with efforts to reach parity. - Nix has been updated to 2.1; see its release notes. + Nix has been updated to 2.1; see its + release + notes. - Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7 (unchanged), systemd: 237 → 239. + Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7 + (unchanged), systemd: 237 → 239. - Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12 → 5.13. + Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12 + → 5.13. @@ -51,7 +58,8 @@ - Support for wrapping binaries using firejail has been added through programs.firejail.wrappedBinaries. + Support for wrapping binaries using firejail has been + added through programs.firejail.wrappedBinaries. For example @@ -66,12 +74,17 @@ programs.firejail = { }; - This will place firefox and mpv binaries in the global path wrapped by firejail. + This will place firefox and mpv + binaries in the global path wrapped by firejail. - User channels are now in the default NIX_PATH, allowing users to use their personal nix-channel defined channels in nix-build and nix-shell commands, as well as in imports like import <mychannel>. + User channels are now in the default NIX_PATH, allowing + users to use their personal nix-channel defined + channels in nix-build and nix-shell + commands, as well as in imports like import + <mychannel>. For example @@ -101,31 +114,52 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - The services.cassandra module has been reworked and was rewritten from scratch. The service has succeeding tests for the versions 2.1, 2.2, 3.0 and 3.11 of Apache Cassandra. + The services.cassandra module has been reworked and was + rewritten from scratch. The service has succeeding tests for the versions + 2.1, 2.2, 3.0 and 3.11 of + Apache + Cassandra. - There is a new services.foundationdb module for deploying FoundationDB clusters. + There is a new services.foundationdb module for + deploying + FoundationDB + clusters. - When enabled the iproute2 will copy the files expected by ip route (e.g., rt_tables) in /etc/iproute2. This allows to write aliases for routing tables for instance. + When enabled the iproute2 will copy the files expected + by ip route (e.g., rt_tables) in + /etc/iproute2. This allows to write aliases for + routing tables for instance. - services.strongswan-swanctl is a modern replacement for services.strongswan. You can use either one of them to setup IPsec VPNs but not both at the same time. + services.strongswan-swanctl is a modern replacement for + services.strongswan. You can use either one of them to + setup IPsec VPNs but not both at the same time. - services.strongswan-swanctl uses the swanctl command which uses the modern vici Versatile IKE Configuration Interface. The deprecated ipsec command used in services.strongswan is using the legacy stroke configuration interface. + services.strongswan-swanctl uses the + swanctl + command which uses the modern + vici + Versatile IKE Configuration Interface. The deprecated + ipsec command used in + services.strongswan is using the legacy + stroke + configuration interface. - The new services.elasticsearch-curator service periodically curates or manages, your Elasticsearch indices and snapshots. + The new services.elasticsearch-curator service + periodically curates or manages, your Elasticsearch indices and snapshots. @@ -436,32 +470,38 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' Backward Incompatibilities - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: - Some licenses that were incorrectly not marked as unfree now are. This is the case for: + Some licenses that were incorrectly not marked as unfree now are. This is + the case for: - cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike 2.0 + cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike + 2.0 - cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike 2.5 + cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike + 2.5 - cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike 3.0 + cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike + 3.0 - cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike 4.0 + cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike + 4.0 @@ -479,71 +519,128 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - The deprecated services.cassandra module has seen a complete rewrite. (See above.) + The deprecated services.cassandra module has seen a + complete rewrite. (See above.) - lib.strict is removed. Use builtins.seq instead. + lib.strict is removed. Use + builtins.seq instead. - The clementine package points now to the free derivation. clementineFree is removed now and clementineUnfree points to the package which is bundled with the unfree libspotify package. + The clementine package points now to the free + derivation. clementineFree is removed now and + clementineUnfree points to the package which is bundled + with the unfree libspotify package. - The netcat package is now taken directly from OpenBSD's libressl, instead of relying on Debian's fork. The new version should be very close to the old version, but there are some minor differences. Importantly, flags like -b, -q, -C, and -Z are no longer accepted by the nc command. + The netcat package is now taken directly from OpenBSD's + libressl, instead of relying on Debian's fork. The new + version should be very close to the old version, but there are some minor + differences. Importantly, flags like -b, -q, -C, and -Z are no longer + accepted by the nc command. - The services.docker-registry.extraConfig object doesn't contain environment variables anymore. Instead it needs to provide an object structure that can be mapped onto the YAML configuration defined in the docker/distribution docs. + The services.docker-registry.extraConfig object doesn't + contain environment variables anymore. Instead it needs to provide an + object structure that can be mapped onto the YAML configuration defined in + the + docker/distribution docs. - gnucash has changed from version 2.4 to 3.x. If you've been using gnucash (version 2.4) instead of gnucash26 (version 2.6) you must open your Gnucash data file(s) with gnucash26 and then save them to upgrade the file format. Then you may use your data file(s) with Gnucash 3.x. See the upgrade documentation. Gnucash 2.4 is still available under the attribute gnucash24. + gnucash has changed from version 2.4 to 3.x. If you've + been using gnucash (version 2.4) instead of + gnucash26 (version 2.6) you must open your Gnucash data + file(s) with gnucash26 and then save them to upgrade + the file format. Then you may use your data file(s) with Gnucash 3.x. See + the upgrade + documentation. + Gnucash 2.4 is still available under the attribute + gnucash24. - services.munge now runs as user (and group) munge instead of root. Make sure the key file is accessible to the daemon. + services.munge now runs as user (and group) + munge instead of root. Make sure the key file is + accessible to the daemon. - dockerTools.buildImage now uses null as default value for tag, which indicates that the nix output hash will be used as tag. + dockerTools.buildImage now uses null + as default value for tag, which indicates that the nix + output hash will be used as tag. - The ELK stack: elasticsearch, logstash and kibana has been upgraded from 2.* to 6.3.*. The 2.* versions have been unsupported since last year so they have been removed. You can still use the 5.* versions under the names elasticsearch5, logstash5 and kibana5. + The ELK stack: elasticsearch, + logstash and kibana has been + upgraded from 2.* to 6.3.*. The 2.* versions have been + unsupported since + last year so they have been removed. You can still use the 5.* + versions under the names elasticsearch5, + logstash5 and kibana5. - The elastic beats: filebeat, heartbeat, metricbeat and packetbeat have had the same treatment: they now target 6.3.* as well. The 5.* versions are available under the names: filebeat5, heartbeat5, metricbeat5 and packetbeat5 + The elastic beats: filebeat, + heartbeat, metricbeat and + packetbeat have had the same treatment: they now target + 6.3.* as well. The 5.* versions are available under the names: + filebeat5, heartbeat5, + metricbeat5 and packetbeat5 - The ELK-6.3 stack now comes with X-Pack by default. Since X-Pack is licensed under the Elastic License the ELK packages now have an unfree license. To use them you need to specify allowUnfree = true; in your nixpkgs configuration. + The ELK-6.3 stack now comes with + X-Pack by + default. Since X-Pack is licensed under the + Elastic + License the ELK packages now have an unfree license. To use them + you need to specify allowUnfree = true; in your nixpkgs + configuration. - Fortunately there is also a free variant of the ELK stack without X-Pack. The packages are available under the names: elasticsearch-oss, logstash-oss and kibana-oss. + Fortunately there is also a free variant of the ELK stack without X-Pack. + The packages are available under the names: + elasticsearch-oss, logstash-oss and + kibana-oss. - Options boot.initrd.luks.devices.name.yubikey.ramfsMountPoint boot.initrd.luks.devices.name.yubikey.storage.mountPoint were removed. luksroot.nix module never supported more than one YubiKey at a time anyway, hence those options never had any effect. You should be able to remove them from your config without any issues. + Options + boot.initrd.luks.devices.name.yubikey.ramfsMountPoint + boot.initrd.luks.devices.name.yubikey.storage.mountPoint + were removed. luksroot.nix module never supported more + than one YubiKey at a time anyway, hence those options never had any + effect. You should be able to remove them from your config without any + issues. - stdenv.system and system in nixpkgs now refer to the host platform instead of the build platform. For native builds this is not change, let alone a breaking one. For cross builds, it is a breaking change, and stdenv.buildPlatform.system can be used instead for the old behavior. They should be using that anyways for clarity. + stdenv.system and system in nixpkgs + now refer to the host platform instead of the build platform. For native + builds this is not change, let alone a breaking one. For cross builds, it + is a breaking change, and stdenv.buildPlatform.system + can be used instead for the old behavior. They should be using that + anyways for clarity. - Groups kvm and render are introduced now, as systemd requires them. + Groups kvm and render are introduced + now, as systemd requires them. @@ -559,69 +656,92 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - dockerTools.pullImage relies on image digest instead of image tag to download the image. The sha256 of a pulled image has to be updated. + dockerTools.pullImage relies on image digest instead of + image tag to download the image. The sha256 of a pulled + image has to be updated. - lib.attrNamesToStr has been deprecated. Use more specific concatenation (lib.concat(Map)StringsSep) instead. + lib.attrNamesToStr has been deprecated. Use more + specific concatenation (lib.concat(Map)StringsSep) + instead. - lib.addErrorContextToAttrs has been deprecated. Use builtins.addErrorContext directly. + lib.addErrorContextToAttrs has been deprecated. Use + builtins.addErrorContext directly. - lib.showVal has been deprecated. Use lib.traceSeqN instead. + lib.showVal has been deprecated. Use + lib.traceSeqN instead. - lib.traceXMLVal has been deprecated. Use lib.traceValFn builtins.toXml instead. + lib.traceXMLVal has been deprecated. Use + lib.traceValFn builtins.toXml instead. - lib.traceXMLValMarked has been deprecated. Use lib.traceValFn (x: str + builtins.toXML x) instead. + lib.traceXMLValMarked has been deprecated. Use + lib.traceValFn (x: str + builtins.toXML x) instead. - The pkgs argument to NixOS modules can now be set directly using nixpkgs.pkgs. Previously, only the system, config and overlays arguments could be used to influence pkgs. + The pkgs argument to NixOS modules can now be set + directly using nixpkgs.pkgs. Previously, only the + system, config and + overlays arguments could be used to influence + pkgs. - A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example: + A NixOS system can now be constructed more easily based on a preexisting + invocation of Nixpkgs. For example: inherit (pkgs.nixos { boot.loader.grub.enable = false; fileSystems."/".device = "/dev/xvda1"; }) toplevel kernel initialRamdisk manual; - This benefits evaluation performance, lets you write Nixpkgs packages that depend on NixOS images and is consistent with a deployment architecture that would be centered around Nixpkgs overlays. + This benefits evaluation performance, lets you write Nixpkgs packages that + depend on NixOS images and is consistent with a deployment architecture + that would be centered around Nixpkgs overlays. - lib.traceValIfNot has been deprecated. Use if/then/else and lib.traceValSeq instead. + lib.traceValIfNot has been deprecated. Use + if/then/else and lib.traceValSeq + instead. - lib.traceCallXml has been deprecated. Please complain if you use the function regularly. + lib.traceCallXml has been deprecated. Please complain + if you use the function regularly. - The attribute lib.nixpkgsVersion has been deprecated in favor of lib.version. Please refer to the discussion in NixOS/nixpkgs#39416 for further reference. + The attribute lib.nixpkgsVersion has been deprecated in + favor of lib.version. Please refer to the discussion in + NixOS/nixpkgs#39416 + for further reference. - lib.recursiveUpdateUntil was not acting according to its specification. It has been fixed to act according to the docstring, and a test has been added. + lib.recursiveUpdateUntil was not acting according to + its specification. It has been fixed to act according to the docstring, + and a test has been added. @@ -635,7 +755,9 @@ inherit (pkgs.nixos { - Puts the generated Diffie-Hellman parameters into the Nix store instead of managing them in a stateful manner in /var/lib/dhparams. + Puts the generated Diffie-Hellman parameters into the Nix store instead + of managing them in a stateful manner in + /var/lib/dhparams. @@ -645,20 +767,27 @@ inherit (pkgs.nixos { - The default bit size to use for the generated Diffie-Hellman parameters. + The default bit size to use for the generated Diffie-Hellman + parameters. - The path to the actual generated parameter files should now be queried using config.security.dhparams.params.name.path because it might be either in the Nix store or in a directory configured by . + The path to the actual generated parameter files should now be queried + using + config.security.dhparams.params.name.path + because it might be either in the Nix store or in a directory configured + by . For developers: - Module implementers should not set a specific bit size in order to let users configure it by themselves if they want to have a different bit size than the default (2048). + Module implementers should not set a specific bit size in order to let + users configure it by themselves if they want to have a different bit + size than the default (2048). An example usage of this would be: @@ -677,82 +806,126 @@ inherit (pkgs.nixos { - networking.networkmanager.useDnsmasq has been deprecated. Use networking.networkmanager.dns instead. + networking.networkmanager.useDnsmasq has been + deprecated. Use networking.networkmanager.dns instead. - The Kubernetes package has been bumped to major version 1.11. Please consult the release notes for details on new features and api changes. + The Kubernetes package has been bumped to major version 1.11. Please + consult the + release + notes for details on new features and api changes. - The option services.kubernetes.apiserver.admissionControl was renamed to services.kubernetes.apiserver.enableAdmissionPlugins. + The option + services.kubernetes.apiserver.admissionControl was + renamed to + services.kubernetes.apiserver.enableAdmissionPlugins. - Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS) Therefore; public service port for the dashboard has changed to 443 (container port 8443) and scheme to https. + Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS) + Therefore; public service port for the dashboard has changed to 443 + (container port 8443) and scheme to https. - The option services.kubernetes.apiserver.address was renamed to services.kubernetes.apiserver.bindAddress. Note that the default value has changed from 127.0.0.1 to 0.0.0.0. + The option services.kubernetes.apiserver.address was + renamed to services.kubernetes.apiserver.bindAddress. + Note that the default value has changed from 127.0.0.1 to 0.0.0.0. - The option services.kubernetes.apiserver.publicAddress was not used and thus has been removed. + The option services.kubernetes.apiserver.publicAddress + was not used and thus has been removed. - The option services.kubernetes.addons.dashboard.enableRBAC was renamed to services.kubernetes.addons.dashboard.rbac.enable. + The option + services.kubernetes.addons.dashboard.enableRBAC was + renamed to + services.kubernetes.addons.dashboard.rbac.enable. - The Kubernetes Dashboard now has only minimal RBAC permissions by default. If dashboard cluster-admin rights are desired, set services.kubernetes.addons.dashboard.rbac.clusterAdmin to true. On existing clusters, in order for the revocation of privileges to take effect, the current ClusterRoleBinding for kubernetes-dashboard must be manually removed: kubectl delete clusterrolebinding kubernetes-dashboard + The Kubernetes Dashboard now has only minimal RBAC permissions by default. + If dashboard cluster-admin rights are desired, set + services.kubernetes.addons.dashboard.rbac.clusterAdmin + to true. On existing clusters, in order for the revocation of privileges + to take effect, the current ClusterRoleBinding for kubernetes-dashboard + must be manually removed: kubectl delete clusterrolebinding + kubernetes-dashboard - The programs.screen module provides allows to configure /etc/screenrc, however the module behaved fairly counterintuitive as the config exists, but the package wasn't available. Since 18.09 pkgs.screen will be added to environment.systemPackages. + The programs.screen module provides allows to configure + /etc/screenrc, however the module behaved fairly + counterintuitive as the config exists, but the package wasn't available. + Since 18.09 pkgs.screen will be added to + environment.systemPackages. - The module now uses WPA2 by default. + The module now uses WPA2 by + default. - s6Dns, s6Networking, s6LinuxUtils and s6PortableUtils renamed to s6-dns, s6-networking, s6-linux-utils and s6-portable-utils respectively. + s6Dns, s6Networking, + s6LinuxUtils and s6PortableUtils + renamed to s6-dns, s6-networking, + s6-linux-utils and s6-portable-utils + respectively. - The module option is now defaulted to true. + The module option is now defaulted to + true. - The config activation script of nixos-rebuild now reloads all user units for each authenticated user. + The config activation script of nixos-rebuild now + reloads + all user units for each authenticated user. - The default display manager is now LightDM. To use SLiM set services.xserver.displayManager.slim.enable to true. + The default display manager is now LightDM. To use SLiM set + services.xserver.displayManager.slim.enable to + true. - NixOS option descriptions are now automatically broken up into individual paragraphs if the text contains two consecutive newlines, so it's no longer necessary to use </para><para> to start a new paragraph. + NixOS option descriptions are now automatically broken up into individual + paragraphs if the text contains two consecutive newlines, so it's no + longer necessary to use </para><para> to start a + new paragraph. - Top-level buildPlatform, hostPlatform, and targetPlatform in Nixpkgs are deprecated. Please use their equivalents in stdenv instead: stdenv.buildPlatform, stdenv.hostPlatform, and stdenv.targetPlatform. + Top-level buildPlatform, + hostPlatform, and targetPlatform in + Nixpkgs are deprecated. Please use their equivalents in + stdenv instead: + stdenv.buildPlatform, + stdenv.hostPlatform, and + stdenv.targetPlatform. diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index e270519932b8..8ff1681d3b4a 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -13,7 +13,8 @@ Highlights - In addition to numerous new and upgraded packages, this release has the following highlights: + In addition to numerous new and upgraded packages, this release has the + following highlights: @@ -24,36 +25,53 @@ - The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6. + The default Python 3 interpreter is now CPython 3.7 instead of CPython + 3.6. - Added the Pantheon desktop environment. It can be enabled through services.xserver.desktopManager.pantheon.enable. + Added the Pantheon desktop environment. It can be enabled through + services.xserver.desktopManager.pantheon.enable. - By default, services.xserver.desktopManager.pantheon enables LightDM as a display manager, as pantheon's screen locking implementation relies on it. + By default, services.xserver.desktopManager.pantheon + enables LightDM as a display manager, as pantheon's screen locking + implementation relies on it. - Because of that it is recommended to leave LightDM enabled. If you'd like to disable it anyway, set to false and enable your preferred display manager. + Because of that it is recommended to leave LightDM enabled. If you'd like + to disable it anyway, set + to + false and enable your preferred display manager. - Also note that Pantheon's LightDM greeter is not enabled by default, because it has numerous issues in NixOS and isn't optimal for use here yet. + Also note that Pantheon's LightDM greeter is not enabled by default, + because it has numerous issues in NixOS and isn't optimal for use here + yet. - A major refactoring of the Kubernetes module has been completed. Refactorings primarily focus on decoupling components and enhancing security. Two-way TLS and RBAC has been enabled by default for all components, which slightly changes the way the module is configured. See: for details. + A major refactoring of the Kubernetes module has been completed. + Refactorings primarily focus on decoupling components and enhancing + security. Two-way TLS and RBAC has been enabled by default for all + components, which slightly changes the way the module is configured. See: + for details. - - There is now a set of options for , which allows to restrict services into a - chroot - 2 ed environment that only contains the store paths from the runtime closure of the service. - + + There is now a set of options for + , which allows to restrict services + into a + chroot + 2 + ed environment that only contains the store paths from + the runtime closure of the service. + @@ -77,7 +95,12 @@ - There is a new security.googleOsLogin module for using OS Login to manage SSH access to Google Compute Engine instances, which supersedes the imperative and broken google-accounts-daemon used in nixos/modules/virtualisation/google-compute-config.nix. + There is a new security.googleOsLogin module for using + OS + Login to manage SSH access to Google Compute Engine instances, + which supersedes the imperative and broken + google-accounts-daemon used in + nixos/modules/virtualisation/google-compute-config.nix. @@ -87,7 +110,10 @@ - There is a new services.cockroachdb module for running CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, available on x86_64-linux and aarch64-linux. + There is a new services.cockroachdb module for running + CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, + available on x86_64-linux and + aarch64-linux. @@ -100,7 +126,11 @@ - The PAM module for Duo Security has been enabled for use. One can configure it using the options along with the corresponding PAM option in . + The PAM module for Duo + Security has been enabled for use. One can configure it using the + options along with the corresponding PAM + option in + . @@ -114,7 +144,8 @@ Backward Incompatibilities - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: @@ -125,131 +156,233 @@ - For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but supports using Nix 1.11 by setting nix.package = pkgs.nix1;. If this option is set to a Nix 1.11 package, you will need to either unset the option or upgrade it to Nix 2.0. + For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but + supports using Nix 1.11 by setting nix.package = + pkgs.nix1;. If this option is set to a Nix 1.11 package, you + will need to either unset the option or upgrade it to Nix 2.0. - For users of NixOS 17.09, you will first need to upgrade Nix by setting nix.package = pkgs.nixStable2; and run nixos-rebuild switch as the root user. + For users of NixOS 17.09, you will first need to upgrade Nix by setting + nix.package = pkgs.nixStable2; and run + nixos-rebuild switch as the root + user. - For users of a daemon-less Nix installation on Linux or macOS, you can upgrade Nix by running curl https://nixos.org/nix/install | sh, or prior to doing a channel update, running nix-env -iA nix. + For users of a daemon-less Nix installation on Linux or macOS, you can + upgrade Nix by running curl https://nixos.org/nix/install | + sh, or prior to doing a channel update, running + nix-env -iA nix. - If you have already run a channel update and Nix is no longer able to evaluate Nixpkgs, the error message printed should provide adequate directions for upgrading Nix. + If you have already run a channel update and Nix is no longer able to + evaluate Nixpkgs, the error message printed should provide adequate + directions for upgrading Nix. - For users of the Nix daemon on macOS, you can upgrade Nix by running sudo -i sh -c 'nix-channel --update && nix-env -iA nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl start org.nixos.nix-daemon. + For users of the Nix daemon on macOS, you can upgrade Nix by running + sudo -i sh -c 'nix-channel --update && nix-env -iA + nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl + start org.nixos.nix-daemon. - The buildPythonPackage function now sets strictDeps = true to help distinguish between native and non-native dependencies in order to improve cross-compilation compatibility. Note however that this may break user expressions. + The buildPythonPackage function now sets + strictDeps = true to help distinguish between native + and non-native dependencies in order to improve cross-compilation + compatibility. Note however that this may break user expressions. - The buildPythonPackage function now sets LANG = C.UTF-8 to enable Unicode support. The glibcLocales package is no longer needed as a build input. + The buildPythonPackage function now sets LANG + = C.UTF-8 to enable Unicode support. The + glibcLocales package is no longer needed as a build + input. - The Syncthing state and configuration data has been moved from services.syncthing.dataDir to the newly defined services.syncthing.configDir, which default to /var/lib/syncthing/.config/syncthing. This change makes possible to share synced directories using ACLs without Syncthing resetting the permission on every start. + The Syncthing state and configuration data has been moved from + services.syncthing.dataDir to the newly defined + services.syncthing.configDir, which default to + /var/lib/syncthing/.config/syncthing. This change makes + possible to share synced directories using ACLs without Syncthing + resetting the permission on every start. - The ntp module now has sane default restrictions. If you're relying on the previous defaults, which permitted all queries and commands from all firewall-permitted sources, you can set services.ntp.restrictDefault and services.ntp.restrictSource to []. + The ntp module now has sane default restrictions. If + you're relying on the previous defaults, which permitted all queries and + commands from all firewall-permitted sources, you can set + services.ntp.restrictDefault and + services.ntp.restrictSource to []. - Package rabbitmq_server is renamed to rabbitmq-server. + Package rabbitmq_server is renamed to + rabbitmq-server. - The light module no longer uses setuid binaries, but udev rules. As a consequence users of that module have to belong to the video group in order to use the executable (i.e. users.users.yourusername.extraGroups = ["video"];). + The light module no longer uses setuid binaries, but + udev rules. As a consequence users of that module have to belong to the + video group in order to use the executable (i.e. + users.users.yourusername.extraGroups = ["video"];). - Buildbot now supports Python 3 and its packages have been moved to pythonPackages. The options and can be used to select the Python 2 or 3 version of the package. + Buildbot now supports Python 3 and its packages have been moved to + pythonPackages. The options + and + can be used to select + the Python 2 or 3 version of the package. - Options services.znc.confOptions.networks.name.userName and services.znc.confOptions.networks.name.modulePackages were removed. They were never used for anything and can therefore safely be removed. + Options + services.znc.confOptions.networks.name.userName + and + services.znc.confOptions.networks.name.modulePackages + were removed. They were never used for anything and can therefore safely + be removed. - Package wasm has been renamed proglodyte-wasm. The package wasm will be pointed to ocamlPackages.wasm in 19.09, so make sure to update your configuration if you want to keep proglodyte-wasm + Package wasm has been renamed + proglodyte-wasm. The package wasm + will be pointed to ocamlPackages.wasm in 19.09, so make + sure to update your configuration if you want to keep + proglodyte-wasm - When the nixpkgs.pkgs option is set, NixOS will no longer ignore the nixpkgs.overlays option. The old behavior can be recovered by setting nixpkgs.overlays = lib.mkForce [];. + When the nixpkgs.pkgs option is set, NixOS will no + longer ignore the nixpkgs.overlays option. The old + behavior can be recovered by setting nixpkgs.overlays = + lib.mkForce [];. - OpenSMTPD has been upgraded to version 6.4.0p1. This release makes backwards-incompatible changes to the configuration file format. See man smtpd.conf for more information on the new file format. + OpenSMTPD has been upgraded to version 6.4.0p1. This release makes + backwards-incompatible changes to the configuration file format. See + man smtpd.conf for more information on the new file + format. - The versioned postgresql have been renamed to use underscore number seperators. For example, postgresql96 has been renamed to postgresql_9_6. + The versioned postgresql have been renamed to use + underscore number seperators. For example, postgresql96 + has been renamed to postgresql_9_6. - Package consul-ui and passthrough consul.ui have been removed. The package consul now uses upstream releases that vendor the UI into the binary. See #48714 for details. + Package consul-ui and passthrough + consul.ui have been removed. The package + consul now uses upstream releases that vendor the UI + into the binary. See + #48714 + for details. - Slurm introduces the new option services.slurm.stateSaveLocation, which is now set to /var/spool/slurm by default (instead of /var/spool). Make sure to move all files to the new directory or to set the option accordingly. + Slurm introduces the new option + services.slurm.stateSaveLocation, which is now set to + /var/spool/slurm by default (instead of + /var/spool). Make sure to move all files to the new + directory or to set the option accordingly. - The slurmctld now runs as user slurm instead of root. If you want to keep slurmctld running as root, set services.slurm.user = root. + The slurmctld now runs as user slurm instead of + root. If you want to keep slurmctld running as + root, set services.slurm.user = + root. - The options services.slurm.nodeName and services.slurm.partitionName are now sets of strings to correctly reflect that fact that each of these options can occour more than once in the configuration. + The options services.slurm.nodeName and + services.slurm.partitionName are now sets of strings to + correctly reflect that fact that each of these options can occour more + than once in the configuration. - The solr package has been upgraded from 4.10.3 to 7.5.0 and has undergone some major changes. The services.solr module has been updated to reflect these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading. + The solr package has been upgraded from 4.10.3 to 7.5.0 + and has undergone some major changes. The services.solr + module has been updated to reflect these changes. Please review + http://lucene.apache.org/solr/ carefully before upgrading. - Package ckb is renamed to ckb-next, and options hardware.ckb.* are renamed to hardware.ckb-next.*. + Package ckb is renamed to ckb-next, + and options hardware.ckb.* are renamed to + hardware.ckb-next.*. - The option services.xserver.displayManager.job.logToFile which was previously set to true when using the display managers lightdm, sddm or xpra has been reset to the default value (false). + The option + services.xserver.displayManager.job.logToFile which was + previously set to true when using the display managers + lightdm, sddm or + xpra has been reset to the default value + (false). - Network interface indiscriminate NixOS firewall options (networking.firewall.allow*) are now preserved when also setting interface specific rules such as networking.firewall.interfaces.en0.allow*. These rules continue to use the pseudo device "default" (networking.firewall.interfaces.default.*), and assigning to this pseudo device will override the (networking.firewall.allow*) options. + Network interface indiscriminate NixOS firewall options + (networking.firewall.allow*) are now preserved when + also setting interface specific rules such as + networking.firewall.interfaces.en0.allow*. These rules + continue to use the pseudo device "default" + (networking.firewall.interfaces.default.*), and + assigning to this pseudo device will override the + (networking.firewall.allow*) options. - The nscd service now disables all caching of passwd and group databases by default. This was interferring with the correct functioning of the libnss_systemd.so module which is used by systemd to manage uids and usernames in the presence of DynamicUser= in systemd services. This was already the default behaviour in presence of services.sssd.enable = true because nscd caching would interfere with sssd in unpredictable ways as well. Because we're using nscd not for caching, but for convincing glibc to find NSS modules in the nix store instead of an absolute path, we have decided to disable caching globally now, as it's usually not the behaviour the user wants and can lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the issue of dns lookups failing in the presence of an unreliable network. + The nscd service now disables all caching of + passwd and group databases by + default. This was interferring with the correct functioning of the + libnss_systemd.so module which is used by + systemd to manage uids and usernames in the presence of + DynamicUser= in systemd services. This was already the + default behaviour in presence of services.sssd.enable = + true because nscd caching would interfere with + sssd in unpredictable ways as well. Because we're using + nscd not for caching, but for convincing glibc to find NSS modules in the + nix store instead of an absolute path, we have decided to disable caching + globally now, as it's usually not the behaviour the user wants and can + lead to surprising behaviour. Furthermore, negative caching of host + lookups is also disabled now by default. This should fix the issue of dns + lookups failing in the presence of an unreliable network. - If the old behaviour is desired, this can be restored by setting the services.nscd.config option with the desired caching parameters. + If the old behaviour is desired, this can be restored by setting the + services.nscd.config option with the desired caching + parameters. services.nscd.config = '' @@ -283,65 +416,124 @@ shared hosts yes ''; - See #50316 for details. + See + #50316 + for details. - GitLab Shell previously used the nix store paths for the gitlab-shell command in its authorized_keys file, which might stop working after garbage collection. To circumvent that, we regenerated that file on each startup. As gitlab-shell has now been changed to use /var/run/current-system/sw/bin/gitlab-shell, this is not necessary anymore, but there might be leftover lines with a nix store path. Regenerate the authorized_keys file via sudo -u git -H gitlab-rake gitlab:shell:setup in that case. + GitLab Shell previously used the nix store paths for the + gitlab-shell command in its + authorized_keys file, which might stop working after + garbage collection. To circumvent that, we regenerated that file on each + startup. As gitlab-shell has now been changed to use + /var/run/current-system/sw/bin/gitlab-shell, this is + not necessary anymore, but there might be leftover lines with a nix store + path. Regenerate the authorized_keys file via + sudo -u git -H gitlab-rake gitlab:shell:setup in that + case. - The pam_unix account module is now loaded with its control field set to required instead of sufficient, so that later PAM account modules that might do more extensive checks are being executed. Previously, the whole account module verification was exited prematurely in case a nss module provided the account name to pam_unix. The LDAP and SSSD NixOS modules already add their NSS modules when enabled. In case your setup breaks due to some later PAM account module previosuly shadowed, or failing NSS lookups, please file a bug. You can get back the old behaviour by manually setting + The pam_unix account module is now loaded with its + control field set to required instead of + sufficient, so that later PAM account modules that + might do more extensive checks are being executed. Previously, the whole + account module verification was exited prematurely in case a nss module + provided the account name to pam_unix. The LDAP and + SSSD NixOS modules already add their NSS modules when enabled. In case + your setup breaks due to some later PAM account module previosuly + shadowed, or failing NSS lookups, please file a bug. You can get back the + old behaviour by manually setting .text]]> . - The pam_unix password module is now loaded with its control field set to sufficient instead of required, so that password managed only by later PAM password modules are being executed. Previously, for example, changing an LDAP account's password through PAM was not possible: the whole password module verification was exited prematurely by pam_unix, preventing pam_ldap to manage the password as it should. + The pam_unix password module is now loaded with its + control field set to sufficient instead of + required, so that password managed only by later PAM + password modules are being executed. Previously, for example, changing an + LDAP account's password through PAM was not possible: the whole password + module verification was exited prematurely by pam_unix, + preventing pam_ldap to manage the password as it + should. - fish has been upgraded to 3.0. It comes with a number of improvements and backwards incompatible changes. See the fish release notes for more information. + fish has been upgraded to 3.0. It comes with a number + of improvements and backwards incompatible changes. See the + fish + release + notes for more information. - The ibus-table input method has had a change in config format, which causes all previous settings to be lost. See this commit message for details. + The ibus-table input method has had a change in config format, which + causes all previous settings to be lost. See + this + commit message for details. - NixOS module system type types.optionSet and lib.mkOption argument options are deprecated. Use types.submodule instead. (#54637) + NixOS module system type types.optionSet and + lib.mkOption argument options are + deprecated. Use types.submodule instead. + (#54637) - matrix-synapse has been updated to version 0.99. It will no longer generate a self-signed certificate on first launch and will be the last version to accept self-signed certificates. As such, it is now recommended to use a proper certificate verified by a root CA (for example Let's Encrypt). The new manual chapter on Matrix contains a working example of using nginx as a reverse proxy in front of matrix-synapse, using Let's Encrypt certificates. + matrix-synapse has been updated to version 0.99. It + will no + longer generate a self-signed certificate on first launch and will + be + the + last version to accept self-signed certificates. As such, it is now + recommended to use a proper certificate verified by a root CA (for example + Let's Encrypt). The new manual + chapter on Matrix contains a working example of using nginx as a + reverse proxy in front of matrix-synapse, using Let's + Encrypt certificates. - mailutils now works by default when sendmail is not in a setuid wrapper. As a consequence, the sendmailPath argument, having lost its main use, has been removed. + mailutils now works by default when + sendmail is not in a setuid wrapper. As a consequence, + the sendmailPath argument, having lost its main use, + has been removed. - graylog has been upgraded from version 2.* to 3.*. Some setups making use of extraConfig (especially those exposing Graylog via reverse proxies) need to be updated as upstream removed/replaced some settings. See Upgrading Graylog for details. + graylog has been upgraded from version 2.* to 3.*. Some + setups making use of extraConfig (especially those exposing Graylog via + reverse proxies) need to be updated as upstream removed/replaced some + settings. See + Upgrading + Graylog for details. - The option users.ldap.bind.password was renamed to users.ldap.bind.passwordFile, and needs to be readable by the nslcd user. Same applies to the new users.ldap.daemon.rootpwmodpwFile option. + The option users.ldap.bind.password was renamed to users.ldap.bind.passwordFile, + and needs to be readable by the nslcd user. + Same applies to the new users.ldap.daemon.rootpwmodpwFile option. - - nodejs-6_x is end-of-life. nodejs-6_x, nodejs-slim-6_x and nodePackages_6_x are removed. - + + nodejs-6_x is end-of-life. + nodejs-6_x, nodejs-slim-6_x and + nodePackages_6_x are removed. + @@ -356,122 +548,214 @@ - The module gained the option which determines the used Matomo version. + The module gained the option + which determines the used Matomo + version. - The Matomo module now also comes with the systemd service matomo-archive-processing.service and a timer that automatically triggers archive processing every hour. This means that you can safely disable browser triggers for Matomo archiving at Administration > System > General Settings. + The Matomo module now also comes with the systemd service + matomo-archive-processing.service and a timer that + automatically triggers archive processing every hour. This means that you + can safely + + disable browser triggers for Matomo archiving at + Administration > System > General Settings. - Additionally, you can enable to delete old visitor logs at Administration > System > Privacy, but make sure that you run systemctl start matomo-archive-processing.service at least once without errors if you have already collected data before, so that the reports get archived before the source data gets deleted. + Additionally, you can enable to + + delete old visitor logs at Administration > System > + Privacy, but make sure that you run systemctl start + matomo-archive-processing.service at least once without errors + if you have already collected data before, so that the reports get + archived before the source data gets deleted. - composableDerivation along with supporting library functions has been removed. + composableDerivation along with supporting library + functions has been removed. - The deprecated truecrypt package has been removed and truecrypt attribute is now an alias for veracrypt. VeraCrypt is backward-compatible with TrueCrypt volumes. Note that cryptsetup also supports loading TrueCrypt volumes. + The deprecated truecrypt package has been removed and + truecrypt attribute is now an alias for + veracrypt. VeraCrypt is backward-compatible with + TrueCrypt volumes. Note that cryptsetup also supports + loading TrueCrypt volumes. - The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. This change is made in accordance with Kubernetes making CoreDNS the official default starting from Kubernetes v1.11. Please beware that upgrading DNS-addon on existing clusters might induce minor downtime while the DNS-addon terminates and re-initializes. Also note that the DNS-service now runs with 2 pod replicas by default. The desired number of replicas can be configured using: . + The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. This + change is made in accordance with Kubernetes making CoreDNS the official + default starting from + Kubernetes + v1.11. Please beware that upgrading DNS-addon on existing clusters + might induce minor downtime while the DNS-addon terminates and + re-initializes. Also note that the DNS-service now runs with 2 pod + replicas by default. The desired number of replicas can be configured + using: . - The quassel-webserver package and module was removed from nixpkgs due to the lack of maintainers. + The quassel-webserver package and module was removed from nixpkgs due to + the lack of maintainers. - The manual gained a new chapter on self-hosting matrix-synapse and riot-web , the most prevalent server and client implementations for the Matrix federated communication network. + The manual gained a new chapter on + self-hosting matrix-synapse and + riot-web , the most prevalent server and client + implementations for the + Matrix federated + communication network. - The astah-community package was removed from nixpkgs due to it being discontinued and the downloads not being available anymore. + The astah-community package was removed from nixpkgs due to it being + discontinued and the downloads not being available anymore. - The httpd service now saves log files with a .log file extension by default for easier integration with the logrotate service. + The httpd service now saves log files with a .log file extension by + default for easier integration with the logrotate service. - The owncloud server packages and httpd subservice module were removed from nixpkgs due to the lack of maintainers. + The owncloud server packages and httpd subservice module were removed from + nixpkgs due to the lack of maintainers. - It is possible now to uze ZRAM devices as general purpose ephemeral block devices, not only as swap. Using more than 1 device as ZRAM swap is no longer recommended, but is still possible by setting zramSwap.swapDevices explicitly. + It is possible now to uze ZRAM devices as general purpose ephemeral block + devices, not only as swap. Using more than 1 device as ZRAM swap is no + longer recommended, but is still possible by setting + zramSwap.swapDevices explicitly. ZRAM algorithm can be changed now. - Changes to ZRAM algorithm are applied during nixos-rebuild switch, so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively, use nixos-rebuild boot; reboot. + Changes to ZRAM algorithm are applied during nixos-rebuild + switch, so make sure you have enough swap space on disk to + survive ZRAM device rebuild. Alternatively, use nixos-rebuild + boot; reboot. - Flat volumes are now disabled by default in hardware.pulseaudio. This has been done to prevent applications, which are unaware of this feature, setting their volumes to 100% on startup causing harm to your audio hardware and potentially your ears. + Flat volumes are now disabled by default in + hardware.pulseaudio. This has been done to prevent + applications, which are unaware of this feature, setting their volumes to + 100% on startup causing harm to your audio hardware and potentially your + ears. - With this change application specific volumes are relative to the master volume which can be adjusted independently, whereas before they were absolute; meaning that in effect, it scaled the device-volume with the volume of the loudest application. + With this change application specific volumes are relative to the master + volume which can be adjusted independently, whereas before they were + absolute; meaning that in effect, it scaled the device-volume with the + volume of the loudest application. - The ndppd module now supports all config options provided by the current upstream version as service options. Additionally the ndppd package doesn't contain the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. + The + ndppd + module now supports all config + options provided by the current upstream version as service + options. Additionally the ndppd package doesn't contain + the systemd unit configuration from upstream anymore, the unit is + completely configured by the NixOS module now. - New installs of NixOS will default to the Redmine 4.x series unless otherwise specified in services.redmine.package while existing installs of NixOS will default to the Redmine 3.x series. + New installs of NixOS will default to the Redmine 4.x series unless + otherwise specified in services.redmine.package while + existing installs of NixOS will default to the Redmine 3.x series. - The Grafana module now supports declarative datasource and dashboard provisioning. + The Grafana module now + supports declarative + datasource + and dashboard provisioning. - The use of insecure ports on kubernetes has been deprecated. Thus options: services.kubernetes.apiserver.port and services.kubernetes.controllerManager.port has been renamed to .insecurePort, and default of both options has changed to 0 (disabled). + The use of insecure ports on kubernetes has been deprecated. Thus options: + services.kubernetes.apiserver.port and + services.kubernetes.controllerManager.port has been + renamed to .insecurePort, and default of both options + has changed to 0 (disabled). - Note that the default value of services.kubernetes.apiserver.bindAddress has changed from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be accessible from outside the master node itself. If the apiserver insecurePort is enabled, it is strongly recommended to only bind on the loopback interface. See: services.kubernetes.apiserver.insecurebindAddress. + Note that the default value of + services.kubernetes.apiserver.bindAddress has changed + from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be accessible from + outside the master node itself. If the apiserver insecurePort is enabled, + it is strongly recommended to only bind on the loopback interface. See: + services.kubernetes.apiserver.insecurebindAddress. - The option services.kubernetes.apiserver.allowPrivileged and services.kubernetes.kubelet.allowPrivileged now defaults to false. Disallowing privileged containers on the cluster. + The option + services.kubernetes.apiserver.allowPrivileged and + services.kubernetes.kubelet.allowPrivileged now + defaults to false. Disallowing privileged containers on the cluster. - The kubernetes module does no longer add the kubernetes package to environment.systemPackages implicitly. + The kubernetes module does no longer add the kubernetes package to + environment.systemPackages implicitly. - The intel driver has been removed from the default list of X.org video drivers. The modesetting driver should take over automatically, it is better maintained upstream and has less problems with advanced X11 features. This can lead to a change in the output names used by xrandr. Some performance regressions on some GPU models might happen. Some OpenCL and VA-API applications might also break (Beignet seems to provide OpenCL support with modesetting driver, too). Kernel mode setting API does not support backlight control, so xbacklight tool will not work; backlight level can be controlled directly via /sys/ or with brightnessctl. Users who need this functionality more than multi-output XRandR are advised to add `intel` to `videoDrivers` and report an issue (or provide additional details in an existing one) + The intel driver has been removed from the default list + of X.org video + drivers. The modesetting driver should take over + automatically, it is better maintained upstream and has less problems with + advanced X11 features. This can lead to a change in the output names used + by xrandr. Some performance regressions on some GPU + models might happen. Some OpenCL and VA-API applications might also break + (Beignet seems to provide OpenCL support with + modesetting driver, too). Kernel mode setting API does + not support backlight control, so xbacklight tool will + not work; backlight level can be controlled directly via + /sys/ or with brightnessctl. Users + who need this functionality more than multi-output XRandR are advised to + add `intel` to `videoDrivers` and report an issue (or provide additional + details in an existing one) - Openmpi has been updated to version 4.0.0, which removes some deprecated MPI-1 symbols. This may break some older applications that still rely on those symbols. An upgrade guide can be found here. + Openmpi has been updated to version 4.0.0, which removes some deprecated + MPI-1 symbols. This may break some older applications that still rely on + those symbols. An upgrade guide can be found + here. - The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by default. You can set the protocols used by the nginx service using . + The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by + default. You can set the protocols used by the nginx service using + . diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 0a3f7aadd54d..4d9229becc97 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -13,18 +13,14 @@ Highlights - In addition to numerous new and upgraded packages, this release has the following highlights: + In addition to numerous new and upgraded packages, this release has the + following highlights: - Support is planned until the end of April 2020, handing over to 20.03. - - - - - Core version changes: gcc: 7 -> 8, systemd: 239 -> 243. + End of support is planned for end of April 2020, handing over to 20.03. @@ -38,155 +34,85 @@ - - The binfmt module is now easier to use. Additional systems can be added through . For instance, boot.binfmt.emulatedSystems = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ]; will set up binfmt interpreters for each of those listed systems. + + The binfmt module is now easier to use. Additional systems can + be added through . + For instance, boot.binfmt.emulatedSystems = [ + "wasm32-wasi" "x86_64-windows" "aarch64-linux" ]; will + set up binfmt interpreters for each of those listed systems. + + + + + The installer now uses a less privileged nixos user whereas before we logged in as root. + To gain root privileges use sudo -i without a password. - The installer now uses a less privileged nixos user whereas before we logged in as root. To gain root privileges use sudo -i without a password. + We've updated to Xfce 4.14, which brings a new module . + If you'd like to upgrade, please switch from the module as it + will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support + and it isn't recommended to use + and simultaneously or to downgrade from Xfce 4.14 after upgrading. - We've updated to Xfce 4.14, which brings a new module . If you'd like to upgrade, please switch from the module as it will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support and it isn't recommended to use and simultaneously or to downgrade from Xfce 4.14 after upgrading. + The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages + like games. + + This can be achieved with the following options which the desktop manager default enables, excluding games. + + + + + + With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually + disable options or use which only excluded the optional applications. + is now unguarded, it can exclude any package installed with + in the GNOME 3 module. - The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages like games. - - - This can be achieved with the following options which the desktop manager default enables, excluding games. - - - - - - - - - - - - - - - - - - - - - - - With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually disable options or use which only excluded the optional applications. is now unguarded, it can exclude any package installed with in the GNOME 3 module. + Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications + to match as close as possible to a default reference GNOME 3 experience. - - - - Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications to match as close as possible to a default reference GNOME 3 experience. - - The following changes were enacted in - + + The following changes were enacted in + Applications removed from defaults: - - - accerciser - - - - - dconf-editor - - - - - evolution - - - - - gnome-documents - - - - - gnome-nettool - - - - - gnome-power-manager - - - - - gnome-todo - - - - - gnome-tweaks - - - - - gnome-usage - - - - - gucharmap - - - - - nautilus-sendto - - - - - vinagre - - + accerciser + dconf-editor + evolution + gnome-documents + gnome-nettool + gnome-power-manager + gnome-todo + gnome-tweaks + gnome-usage + gucharmap + nautilus-sendto + vinagre Applications added to defaults: - - - cheese - - - - - geary - - + cheese + geary - The following changes were enacted in - + + The following changes were enacted in + Applications added to defaults: - - - gnome-color-manager - - - - - orca - - + gnome-color-manager + orca Services enabled: - - - - - + @@ -201,462 +127,51 @@ The following new services were added since the last release: - - - - The new hardware.printers module allows to declaratively configure CUPS printers via the ensurePrinters and ensureDefaultPrinter options. ensurePrinters will never delete existing printers, but will make sure that the given printers are configured as declared. - - - - - There is a new and module for the program of the same name. If you previously had system-config-printer enabled through some other means you should migrate to using one of these modules. - - - If you're a user of the following desktopManager modules no action is needed: - - - - - - - - - - - - - - - - - - - - - - - Note Mate uses programs.system-config-printer as it doesn't use it as a service, but its graphical interface directly. - - - - - - - ./config/xdg/portal.nix - - - - - ./config/locale.nix - - - - - ./config/malloc.nix - - - - - ./config/qt5.nix - - - - - ./config/resolvconf.nix - - - - - ./config/vte.nix - - - - - ./hardware/device-tree.nix - - - - - ./hardware/logitech.nix - - - - - ./hardware/openrazer.nix - - - - - ./misc/nixops-autoluks.nix - - - - - ./programs/captive-browser.nix - - - - - ./programs/clickshare.nix - - - - - ./programs/evince.nix - - - - - ./programs/file-roller.nix - - - - - ./programs/fuse.nix - - - - - ./programs/gnome-disks.nix - - - - - ./programs/gnome-documents.nix - - - - - ./programs/gnome-terminal.nix - - - - - ./programs/gpaste.nix - - - - - ./programs/seahorse.nix - - - - - ./programs/system-config-printer.nix - - - - - ./programs/tsm-client.nix - - - - - ./programs/usbtop.nix - - - - - ./programs/waybar.nix - - - - - ./programs/x2goserver.nix - - - - - ./programs/zmap.nix - - - - - ./services/audio/jack.nix - - - - - ./services/audio/roon-server.nix - - - - - ./services/audio/snapserver.nix - - - - - ./services/audio/spotifyd.nix - - - - - ./services/backup/duplicity.nix - - - - - ./services/backup/postgresql-wal-receiver.nix - - - - - ./services/backup/tsm.nix - - - - - ./services/desktops/blueman.nix - - - - - ./services/desktops/deepin/deepin.nix - - - - - ./services/desktops/gvfs.nix - - - - - ./services/desktops/gnome3/glib-networking.nix - - - - - ./services/desktops/gnome3/gnome-settings-daemon.nix - - - - - ./services/desktops/system-config-printer.nix - - - - - ./services/hardware/sane_extra_backends/dsseries.nix - - - - - ./services/hardware/throttled.nix - - - - - ./services/mail/mailcatcher.nix - - - - - ./services/mail/mailman.nix - - - - - ./services/misc/dwm-status.nix - - - - - ./services/misc/ethminer.nix - - - - - ./services/misc/greenclip.nix - - - - - ./services/misc/jellyfin.nix - - - - - ./services/misc/metabase.nix - - - - - ./services/misc/paperless.nix - - - - - ./services/misc/tautulli.nix - - - - - ./services/misc/tiddlywiki.nix - - - - - ./services/monitoring/loki.nix - - - - - ./services/monitoring/thanos.nix - - - - - ./services/monitoring/zabbix-proxy.nix - - - - - ./services/networking/bitcoind.nix - - - - - ./services/networking/coredns.nix - - - - - ./services/networking/jormungandr.nix - - - - - ./services/networking/mtprotoproxy.nix - - - - - ./services/networking/ofono.nix - - - - - ./services/networking/quicktun.nix - - - - - ./services/networking/syncplay.nix - - - - - ./services/networking/tedicross.nix - - - - - ./services/networking/thelounge.nix - - - - - ./services/networking/tox-node.nix - - - - - ./services/networking/wg-quick.nix - - - - - ./services/security/bitwarden_rs/default.nix - - - - - ./services/torrent/magnetico.nix - - - - - ./services/web-apps/cryptpad.nix - - - - - ./services/web-apps/documize.nix - - - - - ./services/web-apps/limesurvey.nix - - - - - ./services/web-apps/mediawiki.nix - - - - - ./services/web-apps/miniflux.nix - - - - - ./services/web-apps/moodle.nix - - - - - ./services/web-apps/wordpress.nix - - - - - ./services/web-apps/zabbix.nix - - - - - ./services/web-servers/darkhttpd.nix - - - - - ./services/web-servers/unit/default.nix - - - - - ./services/x11/extra-layouts.nix - - - - - ./services/x11/clight.nix - - - - - ./services/x11/hardware/cmt.nix - - - - - ./virtualisation/anbox.nix - - - - - ./virtualisation/docker-containers.nix - - - - - ./virtualisation/railcar.nix - - - + + + + + ./programs/dwm-status.nix + + + + + The new hardware.printers module allows to declaratively configure CUPS printers + via the ensurePrinters and + ensureDefaultPrinter options. + ensurePrinters will never delete existing printers, + but will make sure that the given printers are configured as declared. + + + + + There is a new and module + for the program of the same name. If you previously had system-config-printer enabled through some other + means you should migrate to using one of these modules. + + + If you're a user of the following desktopManager modules no action is needed: + + + + + + + + + + + + + Note Mate uses programs.system-config-printer as it doesn't + use it as a service, but its graphical interface directly. + + + + + +
Backward Incompatibilities - When upgrading from a previous release, please be aware of the following incompatible changes: + When upgrading from a previous release, please be aware of the following + incompatible changes: - Buildbot no longer supports Python 2, as support was dropped upstream in version 2.0.0. Configurations may need to be modified to make them compatible with Python 3. + Buildbot no longer supports Python 2, as support was dropped upstream in + version 2.0.0. Configurations may need to be modified to make them + compatible with Python 3. - PostgreSQL now uses /run/postgresql as its socket directory instead of /tmp. So if you run an application like eg. Nextcloud, where you need to use the Unix socket path as the database host name, you need to change it accordingly. + PostgreSQL now uses + /run/postgresql as its socket + directory instead of /tmp. So + if you run an application like eg. Nextcloud, where you need to use + the Unix socket path as the database host name, you need to change it + accordingly. @@ -688,207 +211,278 @@ - The options and have been removed because the alertmanager service is now using systemd's DynamicUser mechanism which obviates these options. + The options and + have been removed + because the alertmanager service is now using systemd's + DynamicUser mechanism which obviates these options. - The NetworkManager systemd unit was renamed back from network-manager.service to NetworkManager.service for better compatibility with other applications expecting this name. The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. + The NetworkManager systemd unit was renamed back from network-manager.service to + NetworkManager.service for better compatibility with other applications expecting this name. + The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. - The and options were removed as they are managed internally by the nzbget. The option hadn't actually been used by the module for some time and so was removed as cleanup. + The and + options were removed as they are managed internally by the nzbget. The + option hadn't actually been used by + the module for some time and so was removed as cleanup. - The option was removed, as it was only used by the wordpress apache-httpd service to wait for mysql to have started up. This can be accomplished by either describing a dependency on mysql.service (preferred) or waiting for the (hardcoded) /run/mysqld/mysql.sock file to appear. + The option was removed, as it was only used by the wordpress + apache-httpd service to wait for mysql to have started up. + This can be accomplished by either describing a dependency on mysql.service (preferred) + or waiting for the (hardcoded) /run/mysqld/mysql.sock file to appear. - The module has been removed, see instead for a free software fork of Emby. See the Jellyfin documentation: Migrating from Emby to Jellyfin + The module has been removed, see + instead for a free software fork of Emby. + + See the Jellyfin documentation: + + Migrating from Emby to Jellyfin + + + + + + IPv6 Privacy Extensions are now enabled by default for undeclared + interfaces. The previous behaviour was quite misleading — even though + the default value for + was + true, undeclared interfaces would not prefer temporary + addresses. Now, interfaces not mentioned in the config will prefer + temporary addresses. EUI64 addresses can still be set as preferred by + explicitly setting the option to false for the + interface in question. - IPv6 Privacy Extensions are now enabled by default for undeclared interfaces. The previous behaviour was quite misleading — even though the default value for was true, undeclared interfaces would not prefer temporary addresses. Now, interfaces not mentioned in the config will prefer temporary addresses. EUI64 addresses can still be set as preferred by explicitly setting the option to false for the interface in question. + Since Bittorrent Sync was superseded by Resilio Sync in 2016, the + bittorrentSync, bittorrentSync14, + and bittorrentSync16 packages have been removed in + favor of resilio-sync. + + + The corresponding module, has been + replaced by the module. - Since Bittorrent Sync was superseded by Resilio Sync in 2016, the bittorrentSync, bittorrentSync14, and bittorrentSync16 packages have been removed in favor of resilio-sync. + The httpd service no longer attempts to start the postgresql service. If you have come to depend + on this behaviour then you can preserve the behavior with the following configuration: + systemd.services.httpd.after = [ "postgresql.service" ]; - The corresponding module, has been replaced by the module. + The option has been + marked as deprecated. You may still use this feature, but it will be + removed in a future release of NixOS. You are encouraged to convert any + httpd subservices you may have written to a full NixOS module. + + + Most of the httpd subservices packaged with NixOS have been replaced with + full NixOS modules including LimeSurvey, WordPress, and Zabbix. These + modules can be enabled using the , + , , + and options. - The httpd service no longer attempts to start the postgresql service. If you have come to depend on this behaviour then you can preserve the behavior with the following configuration: systemd.services.httpd.after = [ "postgresql.service" ]; - - - The option has been marked as deprecated. You may still use this feature, but it will be removed in a future release of NixOS. You are encouraged to convert any httpd subservices you may have written to a full NixOS module. - - - Most of the httpd subservices packaged with NixOS have been replaced with full NixOS modules including LimeSurvey, WordPress, and Zabbix. These modules can be enabled using the , , , and options. + The option + was renamed to + (capital L). This follows + + upstreams renaming + of the setting. - The option was renamed to (capital L). This follows upstreams renaming of the setting. + As of this release the NixOps feature autoLuks is deprecated. It no longer works + with our systemd version without manual intervention. + + + Whenever the usage of the module is detected the evaluation will fail with a message + explaining why and how to deal with the situation. + + + A new knob named nixops.enableDeprecatedAutoLuks + has been introduced to disable the eval failure and to acknowledge the notice was received and read. + If you plan on using the feature please note that it might break with subsequent updates. + + + Make sure you set the _netdev option for each of the file systems referring to block + devices provided by the autoLuks module. Not doing this might render the system in a + state where it doesn't boot anymore. + + + If you are actively using the autoLuks module please let us know in + issue #62211. - As of this release the NixOps feature autoLuks is deprecated. It no longer works with our systemd version without manual intervention. - - - Whenever the usage of the module is detected the evaluation will fail with a message explaining why and how to deal with the situation. - - - A new knob named nixops.enableDeprecatedAutoLuks has been introduced to disable the eval failure and to acknowledge the notice was received and read. If you plan on using the feature please note that it might break with subsequent updates. - - - Make sure you set the _netdev option for each of the file systems referring to block devices provided by the autoLuks module. Not doing this might render the system in a state where it doesn't boot anymore. - - - If you are actively using the autoLuks module please let us know in issue #62211. + The setopt declarations will be evaluated at the end of /etc/zshrc, so any code in , + and may break if it relies on those options being set. - The setopt declarations will be evaluated at the end of /etc/zshrc, so any code in , and may break if it relies on those options being set. + The prometheus-nginx-exporter package now uses the offical exporter provided by NGINX Inc. + Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, + have a look at the official repo. - The prometheus-nginx-exporter package now uses the offical exporter provided by NGINX Inc. Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, have a look at the official repo. + The shibboleth-sp package has been updated to version 3. + It is largely backward compatible, for further information refer to the + release notes + and upgrade guide. + + Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped. + + + + + By default, prometheus exporters are now run with DynamicUser enabled. + Exporters that need a real user, now run under a seperate user and group which follow the pattern <exporter-name>-exporter, instead of the previous default nobody and nogroup. + Only some exporters are affected by the latter, namely the exporters dovecot, node, postfix and varnish. + + + + + The ibus-qt package is not installed by default anymore when is set to ibus. + If IBus support in Qt 4.x applications is required, add the ibus-qt package to your manually. + + + + + The CUPS Printing service now uses socket-based activation by + default, only starting when needed. The previous behavior can + be restored by setting + to + false. + + + + + The module has been removed from nixpkgs due to lack of maintainer. + + + + + The module has been removed from nixpkgs due to lack of maintainer. + + + + + Squid 3 has been removed and the derivation now refers to Squid 4. + + + + + The option has been replaced by + . The new option allows setting extra + configuration while being better type-checked and mergeable. + - The shibboleth-sp package has been updated to version 3. It is largely backward compatible, for further information refer to the release notes and upgrade guide. - - - Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped. - - - - - By default, prometheus exporters are now run with DynamicUser enabled. Exporters that need a real user, now run under a seperate user and group which follow the pattern <exporter-name>-exporter, instead of the previous default nobody and nogroup. Only some exporters are affected by the latter, namely the exporters dovecot, node, postfix and varnish. - - - - - The ibus-qt package is not installed by default anymore when is set to ibus. If IBus support in Qt 4.x applications is required, add the ibus-qt package to your manually. - - - - - The CUPS Printing service now uses socket-based activation by default, only starting when needed. The previous behavior can be restored by setting to false. - - - - - The module has been removed from nixpkgs due to lack of maintainer. - - - - - The module has been removed from nixpkgs due to lack of maintainer. - - - - - Squid 3 has been removed and the derivation now refers to Squid 4. - - - - - The option has been replaced by . The new option allows setting extra configuration while being better type-checked and mergeable. - - - - - No service depends on keys.target anymore which is a systemd target that indicates if all NixOps keys were successfully uploaded. Instead, <key-name>-key.service should be used to define a dependency of a key in a service. The full issue behind the keys.target dependency is described at NixOS/nixpkgs#67265. + No service depends on keys.target anymore which is a systemd + target that indicates if all NixOps keys were successfully uploaded. + Instead, <key-name>-key.service should be used to define + a dependency of a key in a service. The full issue behind the keys.target + dependency is described at NixOS/nixpkgs#67265. The following services are affected by this: - - - services.dovecot2 - - - - - services.nsd - - - - - services.softether - - - - - services.strongswan - - - - - services.strongswan-swanctl - - - - - services.httpd - - + services.dovecot2 + services.nsd + services.softether + services.strongswan + services.strongswan-swanctl + services.httpd + + + The option has been replaced by a read-only option for each certificate you define. This will be + a subdirectory of /var/lib/acme. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example, + the option will use this directory option to find the certs for the virtual host. + + + and options have been removed. To execute a service before certificates + are provisioned or renewed add a RequiredBy=acme-${cert}.service to any service. + + + Furthermore, the acme module will not automatically add a dependency on lighttpd.service anymore. If you are using certficates provided by letsencrypt + for lighttpd, then you should depend on the certificate service acme-${cert}.service> manually. + + + For nginx, the dependencies are still automatically managed when is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, + instead of depending on the catch-all acme-certificates.target. This target unit was also removed from the codebase. + This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal + ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at + NixOS/nixpkgs#60180. + + + + + The old deprecated emacs package sets have been dropped. + What used to be called emacsPackagesNg is now simply called emacsPackages. + + + + + is now disabled by default if stateVersion is 19.09 or higher. + Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to + have any desktopManager enabled default. + + - The option has been replaced by a read-only option for each certificate you define. This will be a subdirectory of /var/lib/acme. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example, the option will use this directory option to find the certs for the virtual host. - - - and options have been removed. To execute a service before certificates are provisioned or renewed add a RequiredBy=acme-${cert}.service to any service. - - - Furthermore, the acme module will not automatically add a dependency on lighttpd.service anymore. If you are using certficates provided by letsencrypt for lighttpd, then you should depend on the certificate service acme-${cert}.service> manually. - - - For nginx, the dependencies are still automatically managed when is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all acme-certificates.target. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at NixOS/nixpkgs#60180. + The WeeChat plugin pkgs.weechatScripts.weechat-xmpp has been removed as it doesn't receive + any updates from upstream and depends on outdated Python2-based modules. - The old deprecated emacs package sets have been dropped. What used to be called emacsPackagesNg is now simply called emacsPackages. + Old unsupported versions (logstash5, + kibana5, + filebeat5, + heartbeat5, + metricbeat5, + packetbeat5) of the ELK-stack and Elastic beats have been removed. - The WeeChat plugin pkgs.weechatScripts.weechat-xmpp has been removed as it doesn't receive any updates from upstream and depends on outdated Python2-based modules. + For NixOS 19.03, both Prometheus 1 and 2 were available to allow for + a seamless transition from version 1 to 2 with existing setups. + Because Prometheus 1 is no longer developed, it was removed. + Prometheus 2 is now configured with services.prometheus. - - Old unsupported versions (logstash5, kibana5, filebeat5, heartbeat5, metricbeat5, packetbeat5) of the ELK-stack and Elastic beats have been removed. - - - - - For NixOS 19.03, both Prometheus 1 and 2 were available to allow for a seamless transition from version 1 to 2 with existing setups. Because Prometheus 1 is no longer developed, it was removed. Prometheus 2 is now configured with services.prometheus. - - - - - Citrix Receiver (citrix_receiver) has been dropped in favor of Citrix Workspace (citrix_workspace). - + + Citrix Receiver (citrix_receiver) has been dropped in favor of Citrix Workspace + (citrix_workspace). + @@ -918,6 +512,12 @@ is set to /var/lib/gitlab/state, gitlab and all parent directories must be owned by either root or the user specified in . + + The option is unsupported in combination with + in anticipation of defaulting to it by default. + It has to be set to false and enabled per + interface with + @@ -930,14 +530,6 @@ The nodejs-11_x package has been removed as it's EOLed by upstream. - - - The option is unsupported in combination with - in anticipation of defaulting to it by default. - It has to be set to false and enabled per - interface with - - Because of the systemd upgrade, @@ -962,74 +554,122 @@ - The module gained an option named which makes the generated + The module gained an option named + which makes the + generated configuration.nix - 5 manual page include all options from all NixOS modules included in a given configuration.nix configuration file. Currently, it is set to false by default as enabling it frequently prevents evaluation. But the plan is to eventually have it set to true by default. Please set it to true now in your configuration.nix and fix all the bugs it uncovers. + 5 manual page include all options + from all NixOS modules included in a given + configuration.nix configuration file. Currently, it is + set to false by default as enabling it frequently + prevents evaluation. But the plan is to eventually have it set to + true by default. Please set it to + true now in your configuration.nix + and fix all the bugs it uncovers. - The vlc package gained support for Chromecast streaming, enabled by default. TCP port 8010 must be open for it to work, so something like networking.firewall.allowedTCPPorts = [ 8010 ]; may be required in your configuration. Also consider enabling Accelerated Video Playback for better transcoding performance. + The vlc package gained support for Chromecast + streaming, enabled by default. TCP port 8010 must be open for it to work, + so something like networking.firewall.allowedTCPPorts = [ 8010 + ]; may be required in your configuration. Also consider enabling + + Accelerated Video Playback for better transcoding performance. - The following changes apply if the stateVersion is changed to 19.09 or higher. For stateVersion = "19.03" or lower the old behavior is preserved. + The following changes apply if the stateVersion is + changed to 19.09 or higher. For stateVersion = "19.03" + or lower the old behavior is preserved. - solr.package defaults to pkgs.solr_8. + solr.package defaults to + pkgs.solr_8. - The hunspellDicts.fr-any dictionary now ships with fr_FR.{aff,dic} which is linked to fr-toutesvariantes.{aff,dic}. + The hunspellDicts.fr-any dictionary now ships with fr_FR.{aff,dic} + which is linked to fr-toutesvariantes.{aff,dic}. - The mysql service now runs as mysql user. Previously, systemd did execute it as root, and mysql dropped privileges itself. This includes ExecStartPre= and ExecStartPost= phases. To accomplish that, runtime and data directory setup was delegated to RuntimeDirectory and tmpfiles. + The mysql service now runs as mysql + user. Previously, systemd did execute it as root, and mysql dropped privileges + itself. + This includes ExecStartPre= and + ExecStartPost= phases. + To accomplish that, runtime and data directory setup was delegated to + RuntimeDirectory and tmpfiles. - With the upgrade to systemd version 242 the systemd-timesyncd service is no longer using DynamicUser=yes. In order for the upgrade to work we rely on an activation script to move the state from the old to the new directory. The older directory (prior 19.09) was /var/lib/private/systemd/timesync. + With the upgrade to systemd version 242 the systemd-timesyncd + service is no longer using DynamicUser=yes. In order for the + upgrade to work we rely on an activation script to move the state from the old + to the new directory. The older directory (prior 19.09) was + /var/lib/private/systemd/timesync. - As long as the system.config.stateVersion is below 19.09 the state folder will migrated to its proper location (/var/lib/systemd/timesync), if required. + As long as the system.config.stateVersion is below + 19.09 the state folder will migrated to its proper location + (/var/lib/systemd/timesync), if required. - The package avahi is now built to look up service definitions from /etc/avahi/services instead of its output directory in the nix store. Accordingly the module now supports custom service definitions via , which are then placed in the aforementioned directory. See - avahi.service - 5 for more information on custom service definitions. + The package avahi is now built to look up service + definitions from /etc/avahi/services instead of its + output directory in the nix store. Accordingly the module + now supports custom service definitions via + , which are then placed + in the aforementioned directory. See + avahi.service5 + for more information on custom service definitions. - Since version 0.1.19, cargo-vendor honors package includes that are specified in the Cargo.toml file of Rust crates. rustPlatform.buildRustPackage uses cargo-vendor to collect and build dependent crates. Since this change in cargo-vendor changes the set of vendored files for most Rust packages, the hash that use used to verify the dependencies, cargoSha256, also changes. + Since version 0.1.19, cargo-vendor honors package + includes that are specified in the Cargo.toml + file of Rust crates. rustPlatform.buildRustPackage uses + cargo-vendor to collect and build dependent crates. + Since this change in cargo-vendor changes the set of + vendored files for most Rust packages, the hash that use used to verify + the dependencies, cargoSha256, also changes. - The cargoSha256 hashes of all in-tree derivations that use buildRustPackage have been updated to reflect this change. However, third-party derivations that use buildRustPackage may have to be updated as well. + The cargoSha256 hashes of all in-tree derivations that + use buildRustPackage have been updated to reflect this + change. However, third-party derivations that use + buildRustPackage may have to be updated as well. - The consul package was upgraded past version 1.5, so its deprecated legacy UI is no longer available. + The consul package was upgraded past version 1.5, + so its deprecated legacy UI is no longer available. - The default resample-method for PulseAudio has been changed from the upstream default speex-float-1 to speex-float-5. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this so you'll need to set back to speex-float-1. + The default resample-method for PulseAudio has been changed from the upstream default speex-float-1 + to speex-float-5. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this + so you'll need to set back to speex-float-1. - The phabricator package and associated httpd.extraSubservice, as well as the phd service have been removed from nixpkgs due to lack of maintainer. + The phabricator package and associated httpd.extraSubservice, as well as the + phd service have been removed from nixpkgs due to lack of maintainer. @@ -1044,7 +684,8 @@ - The foswiki package and associated httpd.extraSubservice have been removed from nixpkgs due to lack of maintainer. + The foswiki package and associated httpd.extraSubservice have been removed + from nixpkgs due to lack of maintainer. @@ -1054,126 +695,158 @@ - It's now possible to change configuration in services.nextcloud after the initial deploy since all config parameters are persisted in an additional config file generated by the module. Previously core configuration like database parameters were set using their imperative installer after creating /var/lib/nextcloud. + It's now possible to change configuration in + services.nextcloud after the initial deploy + since all config parameters are persisted in an additional config file generated by the module. + Previously core configuration like database parameters were set using their imperative + installer after creating /var/lib/nextcloud. - There exists now lib.forEach, which is like map, but with arguments flipped. When mapping function body spans many lines (or has nested maps), it is often hard to follow which list is modified. + There exists now lib.forEach, which is like map, but with + arguments flipped. When mapping function body spans many lines (or has nested + maps), it is often hard to follow which list is modified. - Previous solution to this problem was either to use lib.flip map idiom or extract that anonymous mapping function to a named one. Both can still be used but lib.forEach is preferred over lib.flip map. + Previous solution to this problem was either to use lib.flip map + idiom or extract that anonymous mapping function to a named one. Both can still be used + but lib.forEach is preferred over lib.flip map. - The /etc/sysctl.d/nixos.conf file containing all the options set via boot.kernel.sysctl was moved to /etc/sysctl.d/60-nixos.conf, as - sysctl.d - 5 recommends prefixing all filenames in /etc/sysctl.d with a two-digit number and a dash to simplify the ordering of the files. + The /etc/sysctl.d/nixos.conf file containing all the options set via + boot.kernel.sysctl was moved to + /etc/sysctl.d/60-nixos.conf, as + sysctl.d5 + recommends prefixing all filenames in /etc/sysctl.d with a + two-digit number and a dash to simplify the ordering of the files. - We now install the sysctl snippets shipped with systemd. - + We now install the sysctl snippets shipped with systemd. + + This enables: + + Loose reverse path filtering + + + Source route filtering + + - This enables: + fq_codel as a packet scheduler (this helps to fight bufferbloat) - - - Loose reverse path filtering - - - - - Source route filtering - - - - - fq_codel as a packet scheduler (this helps to fight bufferbloat) - - - - This also configures the kernel to pass coredumps to systemd-coredump, and restricts the SysRq key combinations to the sync command only. These sysctl snippets can be found in /etc/sysctl.d/50-*.conf, and overridden via boot.kernel.sysctl (which will place the parameters in /etc/sysctl.d/60-nixos.conf). + + + This also configures the kernel to pass core dumps to systemd-coredump, + and restricts the SysRq key combinations to the sync command only. + These sysctl snippets can be found in /etc/sysctl.d/50-*.conf, + and overridden via boot.kernel.sysctl + (which will place the parameters in /etc/sysctl.d/60-nixos.conf). + + + + + Core dumps are now processed by systemd-coredump + by default. systemd-coredump behaviour can + still be modified via + . To stick to the + old behaviour (having the kernel dump to a file called + core in the working directory), without piping + it through systemd-coredump, set + to + false. - Coredumps are now acquired by systemd-coredump by default. systemd-coredump behaviour can still be modified via . To stick to the old behaviour (having the kernel dump to a file called core in the working directory), without piping it through systemd-coredump, set to "core". + systemd.packages option now also supports generators and + shutdown scripts. Old systemd.generator-packages option has + been removed. - systemd.packages option now also supports generators and shutdown scripts. Old systemd.generator-packages option has been removed. + The rmilter package was removed with associated module and options due deprecation by upstream developer. + Use rspamd in proxy mode instead. - The rmilter package was removed with associated module and options due deprecation by upstream developer. Use rspamd in proxy mode instead. + systemd cgroup accounting via the + systemd.enableCgroupAccounting + option is now enabled by default. It now also enables the more recent Block IO and IP accounting + features. - systemd cgroup accounting via the systemd.enableCgroupAccounting option is now enabled by default. It now also enables the more recent Block IO and IP accounting features. + We no longer enable custom font rendering settings with by default. + The defaults from fontconfig are sufficient. - We no longer enable custom font rendering settings with by default. The defaults from fontconfig are sufficient. - - - - - The crashplan package and the crashplan service have been removed from nixpkgs due to crashplan shutting down the service, while the crashplansb package and crashplan-small-business service have been removed from nixpkgs due to lack of maintainer. + The crashplan package and the + crashplan service have been removed from nixpkgs due to + crashplan shutting down the service, while the crashplansb + package and crashplan-small-business service have been + removed from nixpkgs due to lack of maintainer. - The redis module was hardcoded to use the redis user, /run/redis as runtime directory and /var/lib/redis as state directory. Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP), because this features causes major performance problems for Redis, e.g. (https://redis.io/topics/latency). + The redis module was hardcoded to use the redis user, + /run/redis as runtime directory and + /var/lib/redis as state directory. + Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP), + because this features causes major performance problems for Redis, + e.g. (https://redis.io/topics/latency). Using adds a default emoji font noto-fonts-emoji. - - Users of the following options will have this enabled by default: - + Users of the following options will have this enabled by default: - - - + - - - + - - - + - - - + - - The altcoins categorization of packages has been removed. You now access these packages at the top level, ie. nix-shell -p dogecoin instead of nix-shell -p altcoins.dogecoin, etc. - + + The altcoins categorization of packages has + been removed. You now access these packages at the top level, + ie. nix-shell -p dogecoin instead of + nix-shell -p altcoins.dogecoin, etc. + - - Ceph has been upgraded to v14.2.1. See the release notes for details. The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module. Note: There's been some issues with python-cherrypy, which is used by the dashboard and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch. - - - - - pkgs.weechat is now compiled against pkgs.python3. Weechat also recommends to use Python3 in their docs. - - + + Ceph has been upgraded to v14.2.1. + See the release notes for details. + The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module. + Note: There's been some issues with python-cherrypy, which is used by the dashboard + and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch. + + + + + pkgs.weechat is now compiled against pkgs.python3. + Weechat also recommends to use Python3 + in their docs. + +
diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index 830ef88d6d9a..117482fb0d57 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -5,7 +5,11 @@ xml:id="module-services-input-methods"> Input Methods - Input methods are an operating system component that allows any data, such as keyboard strokes or mouse movements, to be received as input. In this way users can enter characters and symbols not found on their input devices. Using an input method is obligatory for any language that has more graphemes than there are keys on the keyboard. + Input methods are an operating system component that allows any data, such as + keyboard strokes or mouse movements, to be received as input. In this way + users can enter characters and symbols not found on their input devices. + Using an input method is obligatory for any language that has more graphemes + than there are keys on the keyboard. The following input methods are available in NixOS: @@ -36,7 +40,8 @@ IBus - IBus is an Intelligent Input Bus. It provides full featured and user friendly input method user interface. + IBus is an Intelligent Input Bus. It provides full featured and user + friendly input method user interface. @@ -51,7 +56,8 @@ i18n.inputMethod = { - i18n.inputMethod.ibus.engines is optional and can be used to add extra IBus engines. + i18n.inputMethod.ibus.engines is optional and can be used + to add extra IBus engines. @@ -61,7 +67,8 @@ i18n.inputMethod = { - Anthy (ibus-engines.anthy): Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. + Anthy (ibus-engines.anthy): Anthy is a system for + Japanese input method. It converts Hiragana text to Kana Kanji mixed text. @@ -71,22 +78,28 @@ i18n.inputMethod = { - m17n (ibus-engines.m17n): m17n is an input method that uses input methods and corresponding icons in the m17n database. + m17n (ibus-engines.m17n): m17n is an input method that + uses input methods and corresponding icons in the m17n database. - mozc (ibus-engines.mozc): A Japanese input method from Google. + mozc (ibus-engines.mozc): A Japanese input method from + Google. - Table (ibus-engines.table): An input method that load tables of input methods. + Table (ibus-engines.table): An input method that load + tables of input methods. - table-others (ibus-engines.table-others): Various table-based input methods. To use this, and any other table-based input methods, it must appear in the list of engines along with table. For example: + table-others (ibus-engines.table-others): Various + table-based input methods. To use this, and any other table-based input + methods, it must appear in the list of engines along with + table. For example: ibus.engines = with pkgs.ibus-engines; [ table table-others ]; @@ -95,13 +108,22 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ]; - To use any input method, the package must be added in the configuration, as shown above, and also (after running nixos-rebuild) the input method must be added from IBus' preference dialog. + To use any input method, the package must be added in the configuration, as + shown above, and also (after running nixos-rebuild) the + input method must be added from IBus' preference dialog. Troubleshooting - If IBus works in some applications but not others, a likely cause of this is that IBus is depending on a different version of glib to what the applications are depending on. This can be checked by running nix-store -q --requisites <path> | grep glib, where <path> is the path of either IBus or an application in the Nix store. The glib packages must match exactly. If they do not, uninstalling and reinstalling the application is a likely fix. + If IBus works in some applications but not others, a likely cause of this + is that IBus is depending on a different version of glib + to what the applications are depending on. This can be checked by running + nix-store -q --requisites <path> | grep glib, + where <path> is the path of either IBus or an + application in the Nix store. The glib packages must + match exactly. If they do not, uninstalling and reinstalling the + application is a likely fix. @@ -109,7 +131,8 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ]; Fcitx - Fcitx is an input method framework with extension support. It has three built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. + Fcitx is an input method framework with extension support. It has three + built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. @@ -124,7 +147,8 @@ i18n.inputMethod = { - i18n.inputMethod.fcitx.engines is optional and can be used to add extra Fcitx engines. + i18n.inputMethod.fcitx.engines is optional and can be + used to add extra Fcitx engines. @@ -134,12 +158,15 @@ i18n.inputMethod = { - Anthy (fcitx-engines.anthy): Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text. + Anthy (fcitx-engines.anthy): Anthy is a system for + Japanese input method. It converts Hiragana text to Kana Kanji mixed text. - Chewing (fcitx-engines.chewing): Chewing is an intelligent Zhuyin input method. It is one of the most popular input methods among Traditional Chinese Unix users. + Chewing (fcitx-engines.chewing): Chewing is an + intelligent Zhuyin input method. It is one of the most popular input + methods among Traditional Chinese Unix users. @@ -154,17 +181,20 @@ i18n.inputMethod = { - m17n (fcitx-engines.m17n): m17n is an input method that uses input methods and corresponding icons in the m17n database. + m17n (fcitx-engines.m17n): m17n is an input method that + uses input methods and corresponding icons in the m17n database. - mozc (fcitx-engines.mozc): A Japanese input method from Google. + mozc (fcitx-engines.mozc): A Japanese input method from + Google. - table-others (fcitx-engines.table-others): Various table-based input methods. + table-others (fcitx-engines.table-others): Various + table-based input methods. @@ -173,7 +203,9 @@ i18n.inputMethod = { Nabi - Nabi is an easy to use Korean X input method. It allows you to enter phonetic Korean characters (hangul) and pictographic Korean characters (hanja). + Nabi is an easy to use Korean X input method. It allows you to enter + phonetic Korean characters (hangul) and pictographic Korean characters + (hanja). @@ -190,7 +222,8 @@ i18n.inputMethod = { Uim - Uim (short for "universal input method") is a multilingual input method framework. Applications can use it through so-called bridges. + Uim (short for "universal input method") is a multilingual input method + framework. Applications can use it through so-called bridges. @@ -204,7 +237,8 @@ i18n.inputMethod = { - Note: The option can be used to choose uim toolbar. + Note: The option can be + used to choose uim toolbar. diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml index 871abddca4c3..c63201628dbd 100644 --- a/nixos/modules/programs/digitalbitbox/doc.xml +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -8,25 +8,37 @@ Digital Bitbox is a hardware wallet and second-factor authenticator. - The digitalbitbox programs module may be installed by setting programs.digitalbitbox to true in a manner similar to + The digitalbitbox programs module may be installed by + setting programs.digitalbitbox to true + in a manner similar to = true; - and bundles the digitalbitbox package (see ), which contains the dbb-app and dbb-cli binaries, along with the hardware module (see ) which sets up the necessary udev rules to access the device. + and bundles the digitalbitbox package (see + ), which contains the + dbb-app and dbb-cli binaries, along + with the hardware module (see + ) which sets up the + necessary udev rules to access the device. - Enabling the digitalbitbox module is pretty much the easiest way to get a Digital Bitbox device working on your system. + Enabling the digitalbitbox module is pretty much the easiest way to get a + Digital Bitbox device working on your system. - For more information, see . + For more information, see + .
Package - The binaries, dbb-app (a GUI tool) and dbb-cli (a CLI tool), are available through the digitalbitbox package which could be installed as follows: + The binaries, dbb-app (a GUI tool) and + dbb-cli (a CLI tool), are available through the + digitalbitbox package which could be installed as + follows: = [ pkgs.digitalbitbox @@ -38,14 +50,17 @@ Hardware - The digitalbitbox hardware package enables the udev rules for Digital Bitbox devices and may be installed as follows: + The digitalbitbox hardware package enables the udev rules for Digital Bitbox + devices and may be installed as follows: = true; - In order to alter the udev rules, one may provide different values for the udevRule51 and udevRule52 attributes by means of overriding as follows: + In order to alter the udev rules, one may provide different values for the + udevRule51 and udevRule52 attributes + by means of overriding as follows: programs.digitalbitbox = { enable = true; diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml index a0370f90a41f..8fc8c22c6d76 100644 --- a/nixos/modules/programs/plotinus.xml +++ b/nixos/modules/programs/plotinus.xml @@ -5,19 +5,24 @@ xml:id="module-program-plotinus"> Plotinus - Source: modules/programs/plotinus.nix + Source: + modules/programs/plotinus.nix - Upstream documentation: + Upstream documentation: + Plotinus is a searchable command palette in every modern GTK application. - When in a GTK 3 application and Plotinus is enabled, you can press Ctrl+Shift+P to open the command palette. The command palette provides a searchable list of of all menu items in the application. + When in a GTK 3 application and Plotinus is enabled, you can press + Ctrl+Shift+P to open the command palette. The command + palette provides a searchable list of of all menu items in the application. - To enable Plotinus, add the following to your configuration.nix: + To enable Plotinus, add the following to your + configuration.nix: = true; diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml index c5202d818c9f..568c2de65576 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -5,13 +5,18 @@ xml:id="module-programs-zsh-ohmyzsh"> Oh my ZSH - oh-my-zsh is a framework to manage your ZSH configuration including completion scripts for several CLI tools or custom prompt themes. + oh-my-zsh is a + framework to manage your ZSH + configuration including completion scripts for several CLI tools or custom + prompt themes.
Basic usage - The module uses the oh-my-zsh package with all available features. The initial setup using Nix expressions is fairly similar to the configuration format of oh-my-zsh. + The module uses the oh-my-zsh package with all available + features. The initial setup using Nix expressions is fairly similar to the + configuration format of oh-my-zsh. { programs.zsh.ohMyZsh = { @@ -21,18 +26,25 @@ }; } - For a detailed explanation of these arguments please refer to the oh-my-zsh docs. + For a detailed explanation of these arguments please refer to the + oh-my-zsh + docs. - The expression generates the needed configuration and writes it into your /etc/zshrc. + The expression generates the needed configuration and writes it into your + /etc/zshrc.
Custom additions - Sometimes third-party or custom scripts such as a modified theme may be needed. oh-my-zsh provides the ZSH_CUSTOM environment variable for this which points to a directory with additional scripts. + Sometimes third-party or custom scripts such as a modified theme may be + needed. oh-my-zsh provides the + ZSH_CUSTOM + environment variable for this which points to a directory with additional + scripts. @@ -48,11 +60,16 @@ Custom environments - There are several extensions for oh-my-zsh packaged in nixpkgs. One of them is nix-zsh-completions which bundles completion scripts and a plugin for oh-my-zsh. + There are several extensions for oh-my-zsh packaged in + nixpkgs. One of them is + nix-zsh-completions + which bundles completion scripts and a plugin for + oh-my-zsh. - Rather than using a single mutable path for ZSH_CUSTOM, it's also possible to generate this path from a list of Nix packages: + Rather than using a single mutable path for ZSH_CUSTOM, + it's also possible to generate this path from a list of Nix packages: { pkgs, ... }: { @@ -62,34 +79,53 @@ ]; } - Internally a single store path will be created using buildEnv. Please refer to the docs of buildEnv for further reference. + Internally a single store path will be created using + buildEnv. Please refer to the docs of + buildEnv + for further reference. - Please keep in mind that this is not compatible with programs.zsh.ohMyZsh.custom as it requires an immutable store path while custom shall remain mutable! An evaluation failure will be thrown if both custom and customPkgs are set. + Please keep in mind that this is not compatible with + programs.zsh.ohMyZsh.custom as it requires an immutable + store path while custom shall remain mutable! An + evaluation failure will be thrown if both custom and + customPkgs are set.
Package your own customizations - If third-party customizations (e.g. new themes) are supposed to be added to oh-my-zsh there are several pitfalls to keep in mind: + If third-party customizations (e.g. new themes) are supposed to be added to + oh-my-zsh there are several pitfalls to keep in mind: - To comply with the default structure of ZSH the entire output needs to be written to $out/share/zsh. + To comply with the default structure of ZSH the entire + output needs to be written to $out/share/zsh. - Completion scripts are supposed to be stored at $out/share/zsh/site-functions. This directory is part of the fpath and the package should be compatible with pure ZSH setups. The module will automatically link the contents of site-functions to completions directory in the proper store path. + Completion scripts are supposed to be stored at + $out/share/zsh/site-functions. This directory is part + of the + fpath + and the package should be compatible with pure ZSH + setups. The module will automatically link the contents of + site-functions to completions directory in the proper + store path. - The plugins directory needs the structure pluginname/pluginname.plugin.zsh as structured in the upstream repo. + The plugins directory needs the structure + pluginname/pluginname.plugin.zsh as structured in the + upstream + repo. diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 182d6e0cd516..9d0a1995e0ff 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -5,13 +5,19 @@ xml:id="module-security-acme"> SSL/TLS Certificates with ACME - NixOS supports automatic domain validation & certificate retrieval and renewal using the ACME protocol. This is currently only implemented by and for Let's Encrypt. The alternative ACME client simp_le is used under the hood. + NixOS supports automatic domain validation & certificate retrieval and + renewal using the ACME protocol. This is currently only implemented by and + for Let's Encrypt. The alternative ACME client simp_le is + used under the hood.
Prerequisites - You need to have a running HTTP server for verification. The server must have a webroot defined that can serve .well-known/acme-challenge. This directory must be writeable by the user that will run the ACME client. + You need to have a running HTTP server for verification. The server must + have a webroot defined that can serve + .well-known/acme-challenge. This directory must be + writeable by the user that will run the ACME client. @@ -39,7 +45,9 @@ http { Configuring - To enable ACME certificate retrieval & renewal for a certificate for foo.example.com, add the following in your configuration.nix: + To enable ACME certificate retrieval & renewal for a certificate for + foo.example.com, add the following in your + configuration.nix: ."foo.example.com" = { webroot = "/var/www/challenges"; @@ -49,18 +57,26 @@ http { - The private key key.pem and certificate fullchain.pem will be put into /var/lib/acme/foo.example.com. + The private key key.pem and certificate + fullchain.pem will be put into + /var/lib/acme/foo.example.com. - - Refer to for all available configuration options for the security.acme module. + Refer to for all available configuration + options for the security.acme + module.
Using ACME certificates in Nginx - NixOS supports fetching ACME certificates for you by setting enableACME = true; in a virtualHost config. We first create self-signed placeholder certificates in place of the real ACME certs. The placeholder certs are overwritten when the ACME certs arrive. For foo.example.com the config would look like. + NixOS supports fetching ACME certificates for you by setting + enableACME + = true; in a virtualHost config. We first create self-signed + placeholder certificates in place of the real ACME certs. The placeholder + certs are overwritten when the ACME certs arrive. For + foo.example.com the config would look like. diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml index 979d0215ab34..5a17cb1da412 100644 --- a/nixos/modules/security/hidepid.xml +++ b/nixos/modules/security/hidepid.xml @@ -9,13 +9,18 @@ = true; - ensures that access to process information is restricted to the owning user. This implies, among other things, that command-line arguments remain private. Unless your deployment relies on unprivileged users being able to inspect the process information of other users, this option should be safe to enable. + ensures that access to process information is restricted to the owning user. + This implies, among other things, that command-line arguments remain private. + Unless your deployment relies on unprivileged users being able to inspect the + process information of other users, this option should be safe to enable. - Members of the proc group are exempt from process information hiding. + Members of the proc group are exempt from process + information hiding. - To allow a service foo to run without process information hiding, set + To allow a service foo to run without process + information hiding, set systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index 33adfee35260..b0b1ebeab45f 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -5,10 +5,12 @@ xml:id="module-services-foundationdb"> FoundationDB - Source: modules/services/databases/foundationdb.nix + Source: + modules/services/databases/foundationdb.nix - Upstream documentation: + Upstream documentation: + Maintainer: Austin Seipp @@ -17,13 +19,15 @@ Available version(s): 5.1.x, 5.2.x, 6.0.x - FoundationDB (or "FDB") is an open source, distributed, transactional key-value store. + FoundationDB (or "FDB") is an open source, distributed, transactional + key-value store.
Configuring and basic setup - To enable FoundationDB, add the following to your configuration.nix: + To enable FoundationDB, add the following to your + configuration.nix: services.foundationdb.enable = true; services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x @@ -31,11 +35,18 @@ services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x - The option is required, and must always be specified. Due to the fact FoundationDB network protocols and on-disk storage formats may change between (major) versions, and upgrades must be explicitly handled by the user, you must always manually specify this yourself so that the NixOS module will use the proper version. Note that minor, bugfix releases are always compatible. + The option is required, and + must always be specified. Due to the fact FoundationDB network protocols and + on-disk storage formats may change between (major) versions, and upgrades + must be explicitly handled by the user, you must always manually specify + this yourself so that the NixOS module will use the proper version. Note + that minor, bugfix releases are always compatible. - After running nixos-rebuild, you can verify whether FoundationDB is running by executing fdbcli (which is added to ): + After running nixos-rebuild, you can verify whether + FoundationDB is running by executing fdbcli (which is + added to ): $ sudo -u foundationdb fdbcli Using cluster file `/etc/foundationdb/fdb.cluster'. @@ -66,7 +77,11 @@ Cluster: - You can also write programs using the available client libraries. For example, the following Python program can be run in order to grab the cluster status, as a quick example. (This example uses nix-shell shebang support to automatically supply the necessary Python modules). + You can also write programs using the available client libraries. For + example, the following Python program can be run in order to grab the + cluster status, as a quick example. (This example uses + nix-shell shebang support to automatically supply the + necessary Python modules). a@link> cat fdb-status.py #! /usr/bin/env nix-shell @@ -96,56 +111,91 @@ FoundationDB available: True - FoundationDB is run under the foundationdb user and group by default, but this may be changed in the NixOS configuration. The systemd unit foundationdb.service controls the fdbmonitor process. + FoundationDB is run under the foundationdb user and group + by default, but this may be changed in the NixOS configuration. The systemd + unit foundationdb.service controls the + fdbmonitor process. - By default, the NixOS module for FoundationDB creates a single SSD-storage based database for development and basic usage. This storage engine is designed for SSDs and will perform poorly on HDDs; however it can handle far more data than the alternative "memory" engine and is a better default choice for most deployments. (Note that you can change the storage backend on-the-fly for a given FoundationDB cluster using fdbcli.) + By default, the NixOS module for FoundationDB creates a single SSD-storage + based database for development and basic usage. This storage engine is + designed for SSDs and will perform poorly on HDDs; however it can handle far + more data than the alternative "memory" engine and is a better default + choice for most deployments. (Note that you can change the storage backend + on-the-fly for a given FoundationDB cluster using + fdbcli.) - Furthermore, only 1 server process and 1 backup agent are started in the default configuration. See below for more on scaling to increase this. + Furthermore, only 1 server process and 1 backup agent are started in the + default configuration. See below for more on scaling to increase this. - FoundationDB stores all data for all server processes under /var/lib/foundationdb. You can override this using , e.g. + FoundationDB stores all data for all server processes under + /var/lib/foundationdb. You can override this using + , e.g. services.foundationdb.dataDir = "/data/fdb"; - Similarly, logs are stored under /var/log/foundationdb by default, and there is a corresponding as well. + Similarly, logs are stored under /var/log/foundationdb + by default, and there is a corresponding + as well.
Scaling processes and backup agents - Scaling the number of server processes is quite easy; simply specify to be the number of FoundationDB worker processes that should be started on the machine. + Scaling the number of server processes is quite easy; simply specify + to be the number of + FoundationDB worker processes that should be started on the machine. - FoundationDB worker processes typically require 4GB of RAM per-process at minimum for good performance, so this option is set to 1 by default since the maximum amount of RAM is unknown. You're advised to abide by this restriction, so pick a number of processes so that each has 4GB or more. + FoundationDB worker processes typically require 4GB of RAM per-process at + minimum for good performance, so this option is set to 1 by default since + the maximum amount of RAM is unknown. You're advised to abide by this + restriction, so pick a number of processes so that each has 4GB or more. - A similar option exists in order to scale backup agent processes, . Backup agents are not as performance/RAM sensitive, so feel free to experiment with the number of available backup processes. + A similar option exists in order to scale backup agent processes, + . Backup agents are + not as performance/RAM sensitive, so feel free to experiment with the number + of available backup processes.
Clustering - FoundationDB on NixOS works similarly to other Linux systems, so this section will be brief. Please refer to the full FoundationDB documentation for more on clustering. + FoundationDB on NixOS works similarly to other Linux systems, so this + section will be brief. Please refer to the full FoundationDB documentation + for more on clustering. - FoundationDB organizes clusters using a set of coordinators, which are just specially-designated worker processes. By default, every installation of FoundationDB on NixOS will start as its own individual cluster, with a single coordinator: the first worker process on localhost. + FoundationDB organizes clusters using a set of + coordinators, which are just specially-designated + worker processes. By default, every installation of FoundationDB on NixOS + will start as its own individual cluster, with a single coordinator: the + first worker process on localhost. - Coordinators are specified globally using the /etc/foundationdb/fdb.cluster file, which all servers and client applications will use to find and join coordinators. Note that this file can not be managed by NixOS so easily: FoundationDB is designed so that it will rewrite the file at runtime for all clients and nodes when cluster coordinators change, with clients transparently handling this without intervention. It is fundamentally a mutable file, and you should not try to manage it in any way in NixOS. + Coordinators are specified globally using the + /etc/foundationdb/fdb.cluster file, which all servers and + client applications will use to find and join coordinators. Note that this + file can not be managed by NixOS so easily: + FoundationDB is designed so that it will rewrite the file at runtime for all + clients and nodes when cluster coordinators change, with clients + transparently handling this without intervention. It is fundamentally a + mutable file, and you should not try to manage it in any way in NixOS. @@ -166,7 +216,9 @@ services.foundationdb.dataDir = "/data/fdb"; - A node must already be a member of the cluster in order to properly be promoted to a coordinator, so you must always add it first if you wish to promote it. + A node must already be a member of the cluster in order to properly be + promoted to a coordinator, so you must always add it first if you wish to + promote it. @@ -181,26 +233,37 @@ services.foundationdb.dataDir = "/data/fdb"; - Copy the /etc/foundationdb/fdb.cluster file from this server to all the other servers. Restart FoundationDB on all of these other servers, so they join the cluster. + Copy the /etc/foundationdb/fdb.cluster file from this + server to all the other servers. Restart FoundationDB on all of these + other servers, so they join the cluster. - All of these servers are now connected and working together in the cluster, under the chosen coordinator. + All of these servers are now connected and working together in the + cluster, under the chosen coordinator. - At this point, you can add as many nodes as you want by just repeating the above steps. By default there will still be a single coordinator: you can use fdbcli to change this and add new coordinators. + At this point, you can add as many nodes as you want by just repeating the + above steps. By default there will still be a single coordinator: you can + use fdbcli to change this and add new coordinators. - As a convenience, FoundationDB can automatically assign coordinators based on the redundancy mode you wish to achieve for the cluster. Once all the nodes have been joined, simply set the replication policy, and then issue the coordinators auto command + As a convenience, FoundationDB can automatically assign coordinators based + on the redundancy mode you wish to achieve for the cluster. Once all the + nodes have been joined, simply set the replication policy, and then issue + the coordinators auto command - For example, assuming we have 3 nodes available, we can enable double redundancy mode, then auto-select coordinators. For double redundancy, 3 coordinators is ideal: therefore FoundationDB will make every node a coordinator automatically: + For example, assuming we have 3 nodes available, we can enable double + redundancy mode, then auto-select coordinators. For double redundancy, 3 + coordinators is ideal: therefore FoundationDB will make + every node a coordinator automatically: @@ -209,33 +272,58 @@ services.foundationdb.dataDir = "/data/fdb"; - This will transparently update all the servers within seconds, and appropriately rewrite the fdb.cluster file, as well as informing all client processes to do the same. + This will transparently update all the servers within seconds, and + appropriately rewrite the fdb.cluster file, as well as + informing all client processes to do the same.
Client connectivity - By default, all clients must use the current fdb.cluster file to access a given FoundationDB cluster. This file is located by default in /etc/foundationdb/fdb.cluster on all machines with the FoundationDB service enabled, so you may copy the active one from your cluster to a new node in order to connect, if it is not part of the cluster. + By default, all clients must use the current fdb.cluster + file to access a given FoundationDB cluster. This file is located by default + in /etc/foundationdb/fdb.cluster on all machines with the + FoundationDB service enabled, so you may copy the active one from your + cluster to a new node in order to connect, if it is not part of the cluster.
Client authorization and TLS - By default, any user who can connect to a FoundationDB process with the correct cluster configuration can access anything. FoundationDB uses a pluggable design to transport security, and out of the box it supports a LibreSSL-based plugin for TLS support. This plugin not only does in-flight encryption, but also performs client authorization based on the given endpoint's certificate chain. For example, a FoundationDB server may be configured to only accept client connections over TLS, where the client TLS certificate is from organization Acme Co in the Research and Development unit. + By default, any user who can connect to a FoundationDB process with the + correct cluster configuration can access anything. FoundationDB uses a + pluggable design to transport security, and out of the box it supports a + LibreSSL-based plugin for TLS support. This plugin not only does in-flight + encryption, but also performs client authorization based on the given + endpoint's certificate chain. For example, a FoundationDB server may be + configured to only accept client connections over TLS, where the client TLS + certificate is from organization Acme Co in the + Research and Development unit. - Configuring TLS with FoundationDB is done using the options in order to control the peer verification string, as well as the certificate and its private key. + Configuring TLS with FoundationDB is done using the + options in order to control the + peer verification string, as well as the certificate and its private key. - Note that the certificate and its private key must be accessible to the FoundationDB user account that the server runs under. These files are also NOT managed by NixOS, as putting them into the store may reveal private information. + Note that the certificate and its private key must be accessible to the + FoundationDB user account that the server runs under. These files are also + NOT managed by NixOS, as putting them into the store may reveal private + information. - After you have a key and certificate file in place, it is not enough to simply set the NixOS module options -- you must also configure the fdb.cluster file to specify that a given set of coordinators use TLS. This is as simple as adding the suffix :tls to your cluster coordinator configuration, after the port number. For example, assuming you have a coordinator on localhost with the default configuration, simply specifying: + After you have a key and certificate file in place, it is not enough to + simply set the NixOS module options -- you must also configure the + fdb.cluster file to specify that a given set of + coordinators use TLS. This is as simple as adding the suffix + :tls to your cluster coordinator configuration, after the + port number. For example, assuming you have a coordinator on localhost with + the default configuration, simply specifying: @@ -250,19 +338,36 @@ XXXXXX:XXXXXX@127.0.0.1:4500:tls Backups and Disaster Recovery - The usual rules for doing FoundationDB backups apply on NixOS as written in the FoundationDB manual. However, one important difference is the security profile for NixOS: by default, the foundationdb systemd unit uses Linux namespaces to restrict write access to the system, except for the log directory, data directory, and the /etc/foundationdb/ directory. This is enforced by default and cannot be disabled. + The usual rules for doing FoundationDB backups apply on NixOS as written in + the FoundationDB manual. However, one important difference is the security + profile for NixOS: by default, the foundationdb systemd + unit uses Linux namespaces to restrict write access to + the system, except for the log directory, data directory, and the + /etc/foundationdb/ directory. This is enforced by default + and cannot be disabled. - However, a side effect of this is that the fdbbackup command doesn't work properly for local filesystem backups: FoundationDB uses a server process alongside the database processes to perform backups and copy the backups to the filesystem. As a result, this process is put under the restricted namespaces above: the backup process can only write to a limited number of paths. + However, a side effect of this is that the fdbbackup + command doesn't work properly for local filesystem backups: FoundationDB + uses a server process alongside the database processes to perform backups + and copy the backups to the filesystem. As a result, this process is put + under the restricted namespaces above: the backup process can only write to + a limited number of paths. - In order to allow flexible backup locations on local disks, the FoundationDB NixOS module supports a option. This option takes a list of paths, and adds them to the systemd unit, allowing the processes inside the service to write (and read) the specified directories. + In order to allow flexible backup locations on local disks, the FoundationDB + NixOS module supports a + option. This + option takes a list of paths, and adds them to the systemd unit, allowing + the processes inside the service to write (and read) the specified + directories. - For example, to create backups in /opt/fdb-backups, first set up the paths in the module options: + For example, to create backups in /opt/fdb-backups, first + set up the paths in the module options: @@ -270,7 +375,11 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; - Restart the FoundationDB service, and it will now be able to write to this directory (even if it does not yet exist.) Note: this path must exist before restarting the unit. Otherwise, systemd will not include it in the private FoundationDB namespace (and it will not add it dynamically at runtime). + Restart the FoundationDB service, and it will now be able to write to this + directory (even if it does not yet exist.) Note: this path + must exist before restarting the unit. Otherwise, + systemd will not include it in the private FoundationDB namespace (and it + will not add it dynamically at runtime). @@ -286,13 +395,17 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; Known limitations - The FoundationDB setup for NixOS should currently be considered beta. FoundationDB is not new software, but the NixOS compilation and integration has only undergone fairly basic testing of all the available functionality. + The FoundationDB setup for NixOS should currently be considered beta. + FoundationDB is not new software, but the NixOS compilation and integration + has only undergone fairly basic testing of all the available functionality. - There is no way to specify individual parameters for individual fdbserver processes. Currently, all server processes inherit all the global fdbmonitor settings. + There is no way to specify individual parameters for individual + fdbserver processes. Currently, all server processes + inherit all the global fdbmonitor settings. @@ -311,14 +424,20 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; Options - NixOS's FoundationDB module allows you to configure all of the most relevant configuration options for fdbmonitor, matching it quite closely. A complete list of options for the FoundationDB module may be found here. You should also read the FoundationDB documentation as well. + NixOS's FoundationDB module allows you to configure all of the most relevant + configuration options for fdbmonitor, matching it quite + closely. A complete list of options for the FoundationDB module may be found + here. You should + also read the FoundationDB documentation as well.
Full documentation - FoundationDB is a complex piece of software, and requires careful administration to properly use. Full documentation for administration can be found here: . + FoundationDB is a complex piece of software, and requires careful + administration to properly use. Full documentation for administration can be + found here: .
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index dc1bfb125a75..72d4a8249a32 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -7,10 +7,12 @@ - Source: modules/services/databases/postgresql.nix + Source: + modules/services/databases/postgresql.nix - Upstream documentation: + Upstream documentation: + @@ -21,12 +23,18 @@ Configuring - To enable PostgreSQL, add the following to your configuration.nix: + To enable PostgreSQL, add the following to your + configuration.nix: = true; = pkgs.postgresql_11; - Note that you are required to specify the desired version of PostgreSQL (e.g. pkgs.postgresql_11). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for such as the most recent release of PostgreSQL. + Note that you are required to specify the desired version of PostgreSQL + (e.g. pkgs.postgresql_11). Since upgrading your + PostgreSQL version requires a database dump and reload (see below), NixOS + cannot provide a default value for + such as the most recent + release of PostgreSQL. - By default, PostgreSQL stores its databases in /var/lib/postgresql/$psqlSchema. You can override this using , e.g. + By default, PostgreSQL stores its databases in + /var/lib/postgresql/$psqlSchema. You can override this using + , e.g. = "/data/postgresql"; @@ -60,14 +70,18 @@ Type "help" for help. Options - A complete list of options for the PostgreSQL module may be found here. + A complete list of options for the PostgreSQL module may be found + here.
Plugins - Plugins collection for each PostgreSQL version can be accessed with .pkgs. For example, for pkgs.postgresql_11 package, its plugin collection is accessed by pkgs.postgresql_11.pkgs: + Plugins collection for each PostgreSQL version can be accessed with + .pkgs. For example, for + pkgs.postgresql_11 package, its plugin collection is + accessed by pkgs.postgresql_11.pkgs: $ nix repl '<nixpkgs>' @@ -84,9 +98,8 @@ postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga ... - - To add plugins via NixOS configuration, set services.postgresql.extraPlugins: + To add plugins via NixOS configuration, set services.postgresql.extraPlugins: = pkgs.postgresql_11; = with pkgs.postgresql_11.pkgs; [ @@ -95,9 +108,10 @@ postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga ]; - - You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function .withPackages. For example, creating a custom PostgreSQL package in an overlay can look like: + You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using + function .withPackages. For example, creating a custom + PostgreSQL package in an overlay can look like: self: super: { postgresql_custom = self.postgresql_11.withPackages (ps: [ @@ -107,9 +121,8 @@ self: super: { } - - Here's a recipe on how to override a particular plugin through an overlay: + Here's a recipe on how to override a particular plugin through an overlay: self: super: { postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // { diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml index 3b2ccd12cf59..8f080b250228 100644 --- a/nixos/modules/services/desktops/flatpak.xml +++ b/nixos/modules/services/desktops/flatpak.xml @@ -5,33 +5,44 @@ xml:id="module-services-flatpak"> Flatpak - Source: modules/services/desktop/flatpak.nix + Source: + modules/services/desktop/flatpak.nix - Upstream documentation: + Upstream documentation: + - Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux. + Flatpak is a system for building, distributing, and running sandboxed desktop + applications on Linux. - To enable Flatpak, add the following to your configuration.nix: + To enable Flatpak, add the following to your + configuration.nix: = true; - For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your configuration.nix: + For the sandboxed apps to work correctly, desktop integration portals need to + be installed. If you run GNOME, this will be handled automatically for you; + in other cases, you will need to add something like the following to your + configuration.nix: = [ pkgs.xdg-desktop-portal-gtk ]; - Then, you will need to add a repository, for example, Flathub, either using the following commands: + Then, you will need to add a repository, for example, + Flathub, + either using the following commands: $ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo $ flatpak update - or by opening the repository file in GNOME Software. + or by opening the + repository + file in GNOME Software. Finally, you can search and install programs: diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 0213b8971c25..03483f69fa2f 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -12,26 +12,41 @@ Adam Hoese @adisbladis --> - Emacs is an extensible, customizable, self-documenting real-time display editor — and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming language with extensions to support text editing. + Emacs is an + extensible, customizable, self-documenting real-time display editor — and + more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. - Emacs runs within a graphical desktop environment using the X Window System, but works equally well on a text terminal. Under macOS, a "Mac port" edition is available, which uses Apple's native GUI frameworks. + Emacs runs within a graphical desktop environment using the X Window System, + but works equally well on a text terminal. Under + macOS, a "Mac port" edition is available, which + uses Apple's native GUI frameworks. - Nixpkgs provides a superior environment for running Emacs. It's simple to create custom builds by overriding the default packages. Chaotic collections of Emacs Lisp code and extensions can be brought under control using declarative package management. NixOS even provides a systemd user service for automatically starting the Emacs daemon. + Nixpkgs provides a superior environment for + running Emacs. It's simple to create custom builds + by overriding the default packages. Chaotic collections of Emacs Lisp code + and extensions can be brought under control using declarative package + management. NixOS even provides a + systemd user service for automatically starting the Emacs + daemon.
Installing <application>Emacs</application> - Emacs can be installed in the normal way for Nix (see ). In addition, a NixOS service can be enabled. + Emacs can be installed in the normal way for Nix (see + ). In addition, a NixOS + service can be enabled.
The Different Releases of Emacs - Nixpkgs defines several basic Emacs packages. The following are attributes belonging to the pkgs set: + Nixpkgs defines several basic Emacs packages. + The following are attributes belonging to the pkgs set: @@ -42,8 +57,10 @@ - The latest stable version of Emacs 25 using the GTK 2 widget toolkit. + The latest stable version of Emacs 25 using the + GTK 2 + widget toolkit. @@ -66,7 +83,8 @@ - Emacs 25 with the "Mac port" patches, providing a more native look and feel under macOS. + Emacs 25 with the "Mac port" patches, providing a more native look and + feel under macOS. @@ -74,7 +92,12 @@ - If those aren't suitable, then the following imitation Emacs editors are also available in Nixpkgs: Zile, mg, Yi, jmacs. + If those aren't suitable, then the following imitation Emacs editors are + also available in Nixpkgs: + Zile, + mg, + Yi, + jmacs.
@@ -82,20 +105,36 @@ Adding Packages to Emacs - Emacs includes an entire ecosystem of functionality beyond text editing, including a project planner, mail and news reader, debugger interface, calendar, and more. + Emacs includes an entire ecosystem of functionality beyond text editing, + including a project planner, mail and news reader, debugger interface, + calendar, and more. - Most extensions are gotten with the Emacs packaging system (package.el) from Emacs Lisp Package Archive (ELPA), MELPA, MELPA Stable, and Org ELPA. Nixpkgs is regularly updated to mirror all these archives. + Most extensions are gotten with the Emacs packaging system + (package.el) from + Emacs Lisp Package Archive + (ELPA), + MELPA, + MELPA Stable, and + Org ELPA. Nixpkgs is + regularly updated to mirror all these archives. - Under NixOS, you can continue to use package-list-packages and package-install to install packages. You can also declare the set of Emacs packages you need using the derivations from Nixpkgs. The rest of this section discusses declarative installation of Emacs packages through nixpkgs. + Under NixOS, you can continue to use + package-list-packages and + package-install to install packages. You can also + declare the set of Emacs packages you need using the derivations from + Nixpkgs. The rest of this section discusses declarative installation of + Emacs packages through nixpkgs. - The first step to declare the list of packages you want in your Emacs installation is to create a dedicated derivation. This can be done in a dedicated emacs.nix file such as: + The first step to declare the list of packages you want in your Emacs + installation is to create a dedicated derivation. This can be done in a + dedicated emacs.nix file such as: Nix expression to build Emacs with packages (<filename>emacs.nix</filename>) @@ -137,27 +176,36 @@ in - The first non-comment line in this file ({ pkgs ? ... }) indicates that the whole file represents a function. + The first non-comment line in this file ({ pkgs ? ... + }) indicates that the whole file represents a function. - The let expression below defines a myEmacs binding pointing to the current stable version of Emacs. This binding is here to separate the choice of the Emacs binary from the specification of the required packages. + The let expression below defines a + myEmacs binding pointing to the current stable + version of Emacs. This binding is here to separate the choice of the + Emacs binary from the specification of the required packages. - This generates an emacsWithPackages function. It takes a single argument: a function from a package set to a list of packages (the packages that will be available in Emacs). + This generates an emacsWithPackages function. It + takes a single argument: a function from a package set to a list of + packages (the packages that will be available in Emacs). - The rest of the file specifies the list of packages to install. In the example, two packages (magit and zerodark-theme) are taken from MELPA stable. + The rest of the file specifies the list of packages to install. In the + example, two packages (magit and + zerodark-theme) are taken from MELPA stable. - Two packages (undo-tree and zoom-frm) are taken from MELPA. + Two packages (undo-tree and + zoom-frm) are taken from MELPA. @@ -167,14 +215,17 @@ in - notmuch is taken from a nixpkgs derivation which contains an Emacs mode. + notmuch is taken from a nixpkgs derivation which + contains an Emacs mode. - The result of this configuration will be an emacs command which launches Emacs with all of your chosen packages in the load-path. + The result of this configuration will be an emacs + command which launches Emacs with all of your chosen packages in the + load-path. @@ -183,17 +234,23 @@ in $ nix-build emacs.nix $ ./result/bin/emacs -q - and then typing M-x package-initialize. Check that you can use all the packages you want in this Emacs instance. For example, try switching to the zerodark theme through M-x load-theme <RET> zerodark <RET> y. + and then typing M-x package-initialize. Check that you + can use all the packages you want in this Emacs instance. For example, try + switching to the zerodark theme through M-x load-theme <RET> + zerodark <RET> y. - A few popular extensions worth checking out are: auctex, company, edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile, and yasnippet. + A few popular extensions worth checking out are: auctex, company, + edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile, + and yasnippet. - The list of available packages in the various ELPA repositories can be seen with the following commands: + The list of available packages in the various ELPA repositories can be seen + with the following commands: Querying Emacs packages " -qaP -A emacsPackages.orgPackages - If you are on NixOS, you can install this particular Emacs for all users by adding it to the list of system packages (see ). Simply modify your file configuration.nix to make it contain: + If you are on NixOS, you can install this particular Emacs for all users by + adding it to the list of system packages (see + ). Simply modify your file + configuration.nix to make it contain: Custom Emacs in <filename>configuration.nix</filename> " -qaP -A emacsPackages.orgPackages - In this case, the next nixos-rebuild switch will take care of adding your emacs to the PATH environment variable (see ). + In this case, the next nixos-rebuild switch will take + care of adding your emacs to the PATH + environment variable (see ). - If you are not on NixOS or want to install this particular Emacs only for yourself, you can do so by adding it to your ~/.config/nixpkgs/config.nix (see Nixpkgs manual): + If you are not on NixOS or want to install this particular Emacs only for + yourself, you can do so by adding it to your + ~/.config/nixpkgs/config.nix (see + Nixpkgs + manual): Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename> - In this case, the next nix-env -f '<nixpkgs>' -iA myemacs will take care of adding your emacs to the PATH environment variable. + In this case, the next nix-env -f '<nixpkgs>' -iA + myemacs will take care of adding your emacs to the + PATH environment variable.
@@ -251,7 +319,12 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides Advanced Emacs Configuration - If you want, you can tweak the Emacs package itself from your emacs.nix. For example, if you want to have a GTK 3-based Emacs instead of the default GTK 2-based binary and remove the automatically generated emacs.desktop (useful is you only use emacsclient), you can change your file emacs.nix in this way: + If you want, you can tweak the Emacs package itself from your + emacs.nix. For example, if you want to have a + GTK 3-based Emacs instead of the default GTK 2-based binary and remove the + automatically generated emacs.desktop (useful is you + only use emacsclient), you can change your file + emacs.nix in this way: @@ -275,7 +348,8 @@ in [...] - After building this file as shown in , you will get an GTK 3-based Emacs binary pre-loaded with your favorite packages. + After building this file as shown in , you + will get an GTK 3-based Emacs binary pre-loaded with your favorite packages.
@@ -283,18 +357,23 @@ in [...] Running Emacs as a Service - NixOS provides an optional systemd service which launches Emacs daemon with the user's login session. + NixOS provides an optional + systemd service which launches + + Emacs daemon with the user's login session. - Source: modules/services/editors/emacs.nix + Source: + modules/services/editors/emacs.nix
Enabling the Service - To install and enable the systemd user service for Emacs daemon, add the following to your configuration.nix: + To install and enable the systemd user service for Emacs + daemon, add the following to your configuration.nix: = true; = import /home/cassou/.emacs.d { pkgs = pkgs; }; @@ -302,11 +381,16 @@ in [...] - The services.emacs.package option allows a custom derivation to be used, for example, one created by emacsWithPackages. + The services.emacs.package option allows a custom + derivation to be used, for example, one created by + emacsWithPackages. - Ensure that the Emacs server is enabled for your user's Emacs configuration, either by customizing the server-mode variable, or by adding (server-start) to ~/.emacs.d/init.el. + Ensure that the Emacs server is enabled for your user's Emacs + configuration, either by customizing the server-mode + variable, or by adding (server-start) to + ~/.emacs.d/init.el. @@ -324,7 +408,9 @@ in [...] Starting the client - Ensure that the emacs server is enabled, either by customizing the server-mode variable, or by adding (server-start) to ~/.emacs. + Ensure that the emacs server is enabled, either by customizing the + server-mode variable, or by adding + (server-start) to ~/.emacs. @@ -343,15 +429,23 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal - If is true, the EDITOR variable will be set to a wrapper script which launches emacsclient. + If is + true, the EDITOR variable will be set + to a wrapper script which launches emacsclient. - Any setting of EDITOR in the shell config files will override services.emacs.defaultEditor. To make sure EDITOR refers to the Emacs wrapper script, remove any existing EDITOR assignment from .profile, .bashrc, .zshenv or any other shell config file. + Any setting of EDITOR in the shell config files will + override services.emacs.defaultEditor. To make sure + EDITOR refers to the Emacs wrapper script, remove any + existing EDITOR assignment from + .profile, .bashrc, + .zshenv or any other shell config file. - If you have formed certain bad habits when editing files, these can be corrected with a shell alias to the wrapper script: + If you have formed certain bad habits when editing files, these can be + corrected with a shell alias to the wrapper script: alias vi=$EDITOR
@@ -360,7 +454,10 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal Per-User Enabling of the Service - In general, systemd user services are globally enabled by symlinks in /etc/systemd/user. In the case where Emacs daemon is not wanted for all users, it is possible to install the service but not globally enable it: + In general, systemd user services are globally enabled + by symlinks in /etc/systemd/user. In the case where + Emacs daemon is not wanted for all users, it is possible to install the + service but not globally enable it: = false; = true; @@ -368,9 +465,11 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal - To enable the systemd user service for just the currently logged in user, run: + To enable the systemd user service for just the + currently logged in user, run: systemctl --user enable emacs - This will add the symlink ~/.config/systemd/user/emacs.service. + This will add the symlink + ~/.config/systemd/user/emacs.service.
@@ -378,7 +477,8 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal Configuring Emacs - The Emacs init file should be changed to load the extension packages at startup: + The Emacs init file should be changed to load the extension packages at + startup: Package initialization in <filename>.emacs</filename> - After the declarative emacs package configuration has been tested, previously downloaded packages can be cleaned up by removing ~/.emacs.d/elpa (do make a backup first, in case you forgot a package). + After the declarative emacs package configuration has been tested, + previously downloaded packages can be cleaned up by removing + ~/.emacs.d/elpa (do make a backup first, in case you + forgot a package).