git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'master' into staging-next
commit415b29939b01ca13f4667d5ffa8ede8ed262b0ee authorVladimír Čunát <v@cunat.cz> dateSun 22 Sep 2019, 09:37 (7 years ago) parent22d7eb7f51c0f6
349 files changed+7852−3769
doc/languages-frameworks/gnome.xml+1−11 maintainers/maintainer-list.nix+1−1 nixos/doc/manual/administration/boot-problems.xml+26−6 nixos/doc/manual/administration/cleaning-store.xml+24−8 nixos/doc/manual/administration/container-networking.xml+21−5 nixos/doc/manual/administration/containers.xml+16−3 nixos/doc/manual/administration/control-groups.xml+27−6 nixos/doc/manual/administration/declarative-containers.xml+25−6 nixos/doc/manual/administration/imperative-containers.xml+45−12 nixos/doc/manual/administration/logging.xml+15−4 nixos/doc/manual/administration/maintenance-mode.xml+3−1 nixos/doc/manual/administration/network-problems.xml+11−2 nixos/doc/manual/administration/rebooting.xml+8−3 nixos/doc/manual/administration/rollback.xml+12−3 nixos/doc/manual/administration/running.xml+2−1 nixos/doc/manual/administration/service-mgmt.xml+21−5 nixos/doc/manual/administration/store-corruption.xml+13−4 nixos/doc/manual/administration/troubleshooting.xml+2−1 nixos/doc/manual/administration/user-sessions.xml+12−3 nixos/doc/manual/configuration/abstractions.xml+36−12 nixos/doc/manual/configuration/ad-hoc-network-config.xml+4−1 nixos/doc/manual/configuration/ad-hoc-packages.xml+21−5 nixos/doc/manual/configuration/adding-custom-packages.xml+17−6 nixos/doc/manual/configuration/config-file.xml+57−14 nixos/doc/manual/configuration/config-syntax.xml+12−2 nixos/doc/manual/configuration/configuration.xml+5−1 nixos/doc/manual/configuration/customizing-packages.xml+46−8 nixos/doc/manual/configuration/declarative-packages.xml+17−6 nixos/doc/manual/configuration/file-systems.xml+24−4 nixos/doc/manual/configuration/firewall.xml+11−4 nixos/doc/manual/configuration/ipv4-config.xml+11−4 nixos/doc/manual/configuration/ipv6-config.xml+9−4 nixos/doc/manual/configuration/kubernetes.xml+62−12 nixos/doc/manual/configuration/linux-kernel.xml+44−15 nixos/doc/manual/configuration/luks-file-systems.xml+9−3 nixos/doc/manual/configuration/matrix.xml+65−8 nixos/doc/manual/configuration/modularity.xml+50−13 nixos/doc/manual/configuration/network-manager.xml+17−5 nixos/doc/manual/configuration/networking.xml+2−1 nixos/doc/manual/configuration/package-mgmt.xml+10−3 nixos/doc/manual/configuration/profiles.xml+10−3 nixos/doc/manual/configuration/profiles/all-hardware.xml+8−2 nixos/doc/manual/configuration/profiles/base.xml+5−1 nixos/doc/manual/configuration/profiles/clone-config.xml+8−2 nixos/doc/manual/configuration/profiles/demo.xml+5−1 nixos/doc/manual/configuration/profiles/docker-container.xml+6−1 nixos/doc/manual/configuration/profiles/graphical.xml+9−2 nixos/doc/manual/configuration/profiles/hardened.xml+11−3 nixos/doc/manual/configuration/profiles/headless.xml+5−1 nixos/doc/manual/configuration/profiles/installation-device.xml+19−6 nixos/doc/manual/configuration/profiles/minimal.xml+7−1 nixos/doc/manual/configuration/profiles/qemu-guest.xml+5−2 nixos/doc/manual/configuration/ssh.xml+5−2 nixos/doc/manual/configuration/summary.xml+6−2 nixos/doc/manual/configuration/user-mgmt.xml+43−10 nixos/doc/manual/configuration/wireless.xml+13−5 nixos/doc/manual/configuration/x-windows.xml+111−40 nixos/doc/manual/configuration/xfce.xml+16−5 nixos/doc/manual/development/assertions.xml+15−3 nixos/doc/manual/development/building-nixos.xml+8−3 nixos/doc/manual/development/building-parts.xml+23−8 nixos/doc/manual/development/importing-modules.xml+5−2 nixos/doc/manual/development/meta-attributes.xml+14−5 nixos/doc/manual/development/nixos-tests.xml+7−2 nixos/doc/manual/development/option-declarations.xml+61−19 nixos/doc/manual/development/option-def.xml+26−8 nixos/doc/manual/development/option-types.xml+161−47 nixos/doc/manual/development/releases.xml+72−54 nixos/doc/manual/development/replace-modules.xml+18−4 nixos/doc/manual/development/running-nixos-tests-interactively.xml+10−4 nixos/doc/manual/development/running-nixos-tests.xml+10−3 nixos/doc/manual/development/sources.xml+39−9 nixos/doc/manual/development/testing-installer.xml+4−2 nixos/doc/manual/development/writing-documentation.xml+56−18 nixos/doc/manual/development/writing-modules.xml+56−13 nixos/doc/manual/development/writing-nixos-tests.xml+84−29 nixos/doc/manual/installation/changing-config.xml+40−13 nixos/doc/manual/installation/installation.xml+2−1 nixos/doc/manual/installation/installing-behind-a-proxy.xml+11−4 nixos/doc/manual/installation/installing-from-other-distro.xml+112−40 nixos/doc/manual/installation/installing-pxe.xml+20−5 nixos/doc/manual/installation/installing-usb.xml+12−3 nixos/doc/manual/installation/installing-virtualbox-guest.xml+22−7 nixos/doc/manual/installation/installing.xml+177−53 nixos/doc/manual/installation/obtaining.xml+29−9 nixos/doc/manual/installation/upgrading.xml+65−17 nixos/doc/manual/man-configuration.xml+4−1 nixos/doc/manual/man-nixos-build-vms.xml+29−12 nixos/doc/manual/man-nixos-enter.xml+15−7 nixos/doc/manual/man-nixos-generate-config.xml+49−15 nixos/doc/manual/man-nixos-install.xml+67−28 nixos/doc/manual/man-nixos-option.xml+17−10 nixos/doc/manual/man-nixos-rebuild.xml+219−90 nixos/doc/manual/man-nixos-version.xml+17−6 nixos/doc/manual/manual.xml+15−6 nixos/doc/manual/release-notes/release-notes.xml+2−1 nixos/doc/manual/release-notes/rl-1404.xml+66−17 nixos/doc/manual/release-notes/rl-1412.xml+62−19 nixos/doc/manual/release-notes/rl-1509.xml+163−45 nixos/doc/manual/release-notes/rl-1603.xml+164−41 nixos/doc/manual/release-notes/rl-1609.xml+126−35 nixos/doc/manual/release-notes/rl-1703.xml+148−45 nixos/doc/manual/release-notes/rl-1709.xml+227−65 nixos/doc/manual/release-notes/rl-1803.xml+210−56 nixos/doc/manual/release-notes/rl-1809.xml+242−69 nixos/doc/manual/release-notes/rl-1903.xml+366−82 nixos/doc/manual/release-notes/rl-1909.xml+406−325 nixos/doc/manual/release-notes/rl-2003.xml+5−2 nixos/modules/i18n/input-method/default.xml+54−20 nixos/modules/installer/cd-dvd/sd-image.nix+3−1 nixos/modules/module-list.nix+1 nixos/modules/programs/digitalbitbox/doc.xml+24−9 nixos/modules/programs/plotinus.xml+9−4 nixos/modules/programs/zsh/oh-my-zsh.xml+49−13 nixos/modules/security/acme.xml+23−7 nixos/modules/security/hidepid.xml+8−3 nixos/modules/services/audio/spotifyd.nix+1−1 nixos/modules/services/databases/foundationdb.xml+158−39 nixos/modules/services/databases/postgresql.xml+26−13 nixos/modules/services/desktops/flatpak.xml+18−7 nixos/modules/services/editors/emacs.xml+170−51 nixos/modules/services/hardware/trezord.xml+8−2 nixos/modules/services/misc/gitea.nix+1 nixos/modules/services/misc/gitlab.xml+26−8 nixos/modules/services/misc/taskserver/doc.xml+56−18 nixos/modules/services/misc/weechat.xml+16−5 nixos/modules/services/monitoring/prometheus/exporters.xml+39−12 nixos/modules/services/networking/dnscrypt-proxy.xml+11−3 nixos/modules/services/networking/networkmanager.nix−5 nixos/modules/services/web-apps/matomo-doc.xml+45−11 nixos/modules/services/web-apps/nextcloud.xml+41−14 nixos/modules/services/x11/desktop-managers/xfce4-14.nix+11−5 nixos/modules/services/x11/desktop-managers/xterm.nix+3−1 nixos/modules/virtualisation/cri-o.nix+106 pkgs/applications/audio/osmid/default.nix+37 pkgs/applications/audio/spotifyd/default.nix+6−4 pkgs/applications/blockchains/jormungandr/default.nix+3−2 pkgs/applications/editors/android-studio/default.nix+3−3 pkgs/applications/editors/jetbrains/common.nix+2 pkgs/applications/editors/jetbrains/default.nix+2−2 pkgs/applications/editors/neovim/neovim-remote.nix+2−2 pkgs/applications/editors/typora/default.nix+16−3 pkgs/applications/gis/grass/default.nix+4−4 pkgs/applications/graphics/gnome-photos/default.nix+1−1 pkgs/applications/graphics/mcomix/default.nix+1−1 pkgs/applications/misc/mysql-workbench/default.nix+2−2 pkgs/applications/misc/pdfsam-basic/default.nix+49 pkgs/applications/misc/xmind/default.nix+2 pkgs/applications/networking/browsers/chromium/common.nix+10−2 pkgs/applications/networking/browsers/chromium/default.nix+29−15 pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+373−373 pkgs/applications/networking/browsers/firefox/packages.nix+3−2 pkgs/applications/networking/cluster/terraform/default.nix+2−2 pkgs/applications/networking/dropbox/default.nix+1−1 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix+28 pkgs/applications/networking/instant-messengers/turses/default.nix+7−6 pkgs/applications/networking/remote/teamviewer/default.nix+1 pkgs/applications/networking/sync/onedrive/default.nix+35 pkgs/applications/office/kexi/default.nix+14−3 pkgs/applications/office/libreoffice/default.nix+2−2 pkgs/applications/office/libreoffice/still.nix+2−2 pkgs/applications/radio/tlf/default.nix+3−5 pkgs/applications/science/electronics/kicad/default.nix+2−2 pkgs/applications/science/logic/saw-tools/default.nix+1−2 pkgs/applications/science/math/glsurf/default.nix+2−2 pkgs/applications/science/math/qalculate-gtk/default.nix+2−2 pkgs/applications/science/programming/fdr/default.nix+3−4 pkgs/applications/video/kodi/default.nix+2−2 pkgs/applications/virtualization/firecracker/default.nix+3−3 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+10−16 pkgs/data/fonts/cascadia-code/default.nix+27 pkgs/data/fonts/vista-fonts/default.nix+2−3 pkgs/data/icons/papirus-maia-icon-theme/default.nix+36 pkgs/data/themes/arc/default.nix+2−2 pkgs/data/themes/yaru/default.nix+29 pkgs/desktops/deepin/dde-daemon/default.nix+1−1 pkgs/desktops/enlightenment/enlightenment.nix+18−14 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+1−1 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2−2 pkgs/desktops/xfce4-14/default.nix+2−5 pkgs/development/arduino/arduino-core/default.nix+1−1 pkgs/development/compilers/gcc/8/default.nix+6−1 pkgs/development/compilers/gcc/9/default.nix+6−1 pkgs/development/compilers/gerbil/build.nix+4−4 pkgs/development/compilers/hhvm/default.nix+2−2 pkgs/development/compilers/neko/default.nix+2−2 pkgs/development/compilers/openjdk/8.nix+2 pkgs/development/compilers/urweb/default.nix+4−4 pkgs/development/haskell-modules/configuration-nix.nix+1−1 pkgs/development/interpreters/perl/sw_vers.patch+1−1 pkgs/development/interpreters/php/default.nix+4−4 pkgs/development/java-modules/jogl/default.nix+3−6 pkgs/development/libraries/cpp-utilities/default.nix+2−2 pkgs/development/libraries/cppdb/default.nix+3−3 pkgs/development/libraries/expat/default.nix+3−3 pkgs/development/libraries/gdal/2.4.0.nix+2−2 pkgs/development/libraries/gdal/default.nix+2−2 pkgs/development/libraries/giflib/default.nix → pkgs/development/libraries/giflib/5.1.nix+5−11 pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch−49 pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix−20 pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix−32 pkgs/development/libraries/kdb/default.nix+2−2 pkgs/development/libraries/libagar/default.nix+3−3 pkgs/development/libraries/libdbi-drivers/default.nix+5−5 pkgs/development/libraries/libfido2/default.nix+2−2 pkgs/development/libraries/libgda/default.nix+3−3 pkgs/development/libraries/libgdiplus/default.nix+19−5 pkgs/development/libraries/libproxy/default.nix+1−1 pkgs/development/libraries/libqalculate/default.nix+2−2 pkgs/development/libraries/librdf/redland.nix+2−2 pkgs/development/libraries/mono-zeroconf/default.nix−25 pkgs/development/libraries/opendbx/default.nix+4−4 pkgs/development/libraries/openssl/default.nix+4−4 pkgs/development/libraries/poco/default.nix+3−3 pkgs/development/libraries/qt-3/default.nix+3−3 pkgs/development/libraries/qt-4.x/4.8/default.nix+3−3 pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh+1−1 pkgs/development/libraries/qt-5/modules/qtbase.nix+6−6 pkgs/development/libraries/tntdb/default.nix+2−2 pkgs/development/libraries/unixODBCDrivers/default.nix+6−11 pkgs/development/libraries/wt/default.nix+3−3 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix+4−4 pkgs/development/lisp-modules/shell.nix+2−2 pkgs/development/lua-modules/overrides.nix+3−3 pkgs/development/ocaml-modules/mysql/default.nix+2−2 pkgs/development/ocaml-modules/ocaml-protoc/default.nix+38 pkgs/development/ocaml-modules/optint/default.nix+9−19 pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix+18 pkgs/development/perl-modules/DBD-mysql/default.nix+2−2 pkgs/development/pure-modules/glpk/default.nix+3−3 pkgs/development/python-modules/Logbook/default.nix+3 pkgs/development/python-modules/algebraic-data-types/default.nix+28 pkgs/development/python-modules/aws-adfs/default.nix+5−5 pkgs/development/python-modules/cheroot/default.nix+3 pkgs/development/python-modules/cryptography/default.nix+1−10 pkgs/development/python-modules/csvs-to-sqlite/default.nix+4−4 pkgs/development/python-modules/h11/default.nix+3 pkgs/development/python-modules/ipykernel/default.nix+3 pkgs/development/python-modules/ledgerblue/default.nix+4−3 pkgs/development/python-modules/lxml/default.nix+1−1 pkgs/development/python-modules/mypy/default.nix+2−2 pkgs/development/python-modules/mysqlclient/default.nix+3−3 pkgs/development/python-modules/nbconvert/default.nix+3 pkgs/development/python-modules/nbformat/default.nix+3 pkgs/development/python-modules/nbval/default.nix+3 pkgs/development/python-modules/ncclient/default.nix+1−3 pkgs/development/python-modules/notebook/default.nix+3 pkgs/development/python-modules/picos/default.nix+36 pkgs/development/python-modules/portend/default.nix+3 pkgs/development/python-modules/pyopenssl/default.nix+1−2 pkgs/development/python-modules/python-engineio/default.nix+12−14 pkgs/development/python-modules/python-language-server/default.nix+2−2 pkgs/development/python-modules/pyzmq/default.nix+3 pkgs/development/python-modules/sentry-sdk/default.nix+3−1 pkgs/development/python-modules/trustme/default.nix+3 pkgs/development/python-modules/typed-ast/default.nix+7−5 pkgs/development/python-modules/uvicorn/default.nix+16−8 pkgs/development/python-modules/uvicorn/setup.patch−13 pkgs/development/python-modules/uvloop/darwin_sandbox.patch+28 pkgs/development/python-modules/uvloop/default.nix+5 pkgs/development/python-modules/websockets/default.nix+11−9 pkgs/development/r-modules/default.nix+2−2 pkgs/development/ruby-modules/gem-config/default.nix+3−3 pkgs/development/tools/ammonite/default.nix+15−14 pkgs/development/tools/analysis/flow/default.nix+2−2 pkgs/development/tools/analysis/tflint/default.nix+3−3 pkgs/development/tools/build-managers/redo-apenwarr/default.nix+3−3 pkgs/development/tools/misc/hydra-cli/default.nix+31 pkgs/development/tools/misc/patchelf/default.nix+4−15 pkgs/development/tools/misc/patchelf/unstable.nix+16−10 pkgs/development/tools/misc/sysbench/default.nix+2−2 pkgs/development/tools/misc/terraform-lsp/default.nix+2−2 pkgs/development/tools/misc/ycmd/default.nix+22−11 pkgs/development/tools/pgformatter/default.nix+2−2 pkgs/development/tools/tora/default.nix+3−3 pkgs/games/minecraft/default.nix+114−28 pkgs/games/minecraft/update.sh+7 pkgs/games/zod/default.nix+3−3 pkgs/misc/emulators/wine/sources.nix+5−5 pkgs/misc/vim-plugins/generated.nix+11 pkgs/misc/vim-plugins/overrides.nix+3−3 pkgs/misc/vim-plugins/vim-plugin-names+1 pkgs/os-specific/linux/firmware/fwupd/default.nix+3−3 pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.2.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.3.nix+2−2 pkgs/os-specific/linux/kexectools/default.nix+1−1 pkgs/servers/clickhouse/default.nix+2−2 pkgs/servers/computing/slurm/default.nix+2−2 pkgs/servers/freeradius/default.nix+3−3 pkgs/servers/http/h2o/default.nix+11−20 pkgs/servers/http/lighttpd/default.nix+3−3 pkgs/servers/mail/dovecot/default.nix+2−2 pkgs/servers/mail/exim/default.nix+6−6 pkgs/servers/mail/opensmtpd/extras.nix+3−3 pkgs/servers/mail/postfix/default.nix+3−3 pkgs/servers/mautrix-telegram/default.nix+2−2 pkgs/servers/monitoring/plugins/default.nix+2−2 pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix+27 pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix+93 pkgs/servers/monitoring/zabbix/proxy.nix+2−2 pkgs/servers/monitoring/zabbix/server.nix+2−2 pkgs/servers/openafs/1.8/module.nix+15−1 pkgs/servers/plex/raw.nix+2−2 pkgs/servers/sql/mariadb/connector-c/3_1.nix−6 pkgs/servers/sql/mariadb/connector-c/default.nix−54 pkgs/servers/sql/mariadb/default.nix+101 pkgs/servers/sql/mariadb/galera/25.nix−6 pkgs/servers/sql/mariadb/galera/default.nix−63 pkgs/servers/uwsgi/default.nix+2−2 pkgs/shells/liquidprompt/default.nix+32 pkgs/shells/zsh/oh-my-zsh/default.nix+3−3 pkgs/shells/zsh/zsh-completions/default.nix+3−3 pkgs/stdenv/adapters.nix−1 pkgs/tools/admin/nomachine-client/default.nix+6−6 pkgs/tools/backup/bareos/default.nix+4−4 pkgs/tools/backup/bup/default.nix+2−2 pkgs/tools/backup/mydumper/default.nix+2−2 pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch−90 pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch−83 pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch−220 pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch → pkgs/tools/filesystems/squashfs/4k-align.patch+31−20 pkgs/tools/filesystems/squashfs/darwin.patch+84−158 pkgs/tools/filesystems/squashfs/default.nix+5−11 pkgs/tools/graphics/zbar/default.nix+4−3 pkgs/tools/misc/shunit2/default.nix+32 pkgs/tools/misc/starship/default.nix+5−6 pkgs/tools/networking/croc/default.nix+3−3 pkgs/tools/networking/httpie/default.nix+4−4 pkgs/tools/networking/ip2unix/default.nix+2−2 pkgs/tools/networking/kea/default.nix+3−3 pkgs/tools/networking/mailutils/default.nix+4−4 pkgs/tools/networking/maxscale/default.nix+3−3 pkgs/tools/networking/modem-manager/default.nix+7 pkgs/tools/networking/network-manager/default.nix+5 pkgs/tools/security/thc-hydra/default.nix+2−2 pkgs/tools/security/tor/default.nix+2−2 pkgs/tools/system/collectd/default.nix+2−2 pkgs/tools/system/plan9port/builder.sh+1−1 pkgs/tools/system/rsyslog/default.nix+3−3 pkgs/top-level/aliases.nix+4−3 pkgs/top-level/all-packages.nix+36−24 pkgs/top-level/ocaml-packages.nix+4 pkgs/top-level/python-packages.nix+4 pkgs/top-level/release.nix+1−1
doc/languages-frameworks/gnome.xml+1−11
@@ -210,7 +210,7 @@ mkDerivation {
210210 dontWrapGApps = true;
211211
212212 # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
213− qtWrapperArgs = [
213+ qtWrapperArgs [
214214 "\${gappsWrapperArgs[@]}"
215215 ];
216216}
@@ -258,16 +258,6 @@ mkDerivation {
258258 </para>
259259 </listitem>
260260 </varlistentry>
261− <varlistentry xml:id="ssec-gnome-common-issues-weird-location">
262− <term>
263− I need to wrap a binary outside <filename>bin</filename> and <filename>libexec</filename> directories.
264− </term>
265− <listitem>
266− <para>
267− You can manually trigger the wrapping with <function>wrapGApp</function> in <literal>preFixup</literal> phase. It takes a path to a program as a first argument; the remaining arguments are passed directly to <function xlink:href="#fun-wrapProgram">wrapProgram</function> function.
268− </para>
269− </listitem>
270− </varlistentry>
271261 </variablelist>
272262 </section>
273263</section>
maintainers/maintainer-list.nix+1−1
@@ -693,7 +693,7 @@
693693 name = "Aycan iRiCAN";
694694 };
695695 babariviere = {
696− email = "babariviere@protonmail.com";
696+ email = "babathriviere@gmail.com";
697697 github = "babariviere";
698698 githubId = 12128029;
699699 name = "babariviere";
nixos/doc/manual/administration/boot-problems.xml+26−6
@@ -6,7 +6,12 @@
66 <title>Boot Problems</title>
77
88 <para>
9− 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 <literal>linux</literal>. The following are some useful kernel command line parameters that are recognised by the NixOS boot scripts or by systemd:
9+ If NixOS fails to boot, there are a number of kernel command line parameters
10+ that may help you to identify or fix the issue. You can add these parameters
11+ in the GRUB boot menu by pressing “e” to modify the selected boot entry
12+ and editing the line starting with <literal>linux</literal>. The following
13+ are some useful kernel command line parameters that are recognised by the
14+ NixOS boot scripts or by systemd:
1015 <variablelist>
1116 <varlistentry>
1217 <term>
@@ -14,7 +19,9 @@
1419 </term>
1520 <listitem>
1621 <para>
17− 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.
22+ Start a root shell if something goes wrong in stage 1 of the boot process
23+ (the initial ramdisk). This is disabled by default because there is no
24+ authentication for the root shell.
1825 </para>
1926 </listitem>
2027 </varlistentry>
@@ -24,7 +31,10 @@
2431 </term>
2532 <listitem>
2633 <para>
27− 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 <filename>/proc</filename> and <filename>/sys</filename>.
34+ Start an interactive shell in stage 1 before anything useful has been
35+ done. That is, no modules have been loaded and no file systems have been
36+ mounted, except for <filename>/proc</filename> and
37+ <filename>/sys</filename>.
2838 </para>
2939 </listitem>
3040 </varlistentry>
@@ -44,7 +54,11 @@
4454 </term>
4555 <listitem>
4656 <para>
47− Boot into rescue mode (a.k.a. single user mode). This will cause systemd to start nothing but the unit <literal>rescue.target</literal>, which runs <command>sulogin</command> 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.
57+ Boot into rescue mode (a.k.a. single user mode). This will cause systemd
58+ to start nothing but the unit <literal>rescue.target</literal>, which
59+ runs <command>sulogin</command> to prompt for the root password and start
60+ a root login shell. Exiting the shell causes the system to continue with
61+ the normal boot process.
4862 </para>
4963 </listitem>
5064 </varlistentry>
@@ -54,7 +68,8 @@
5468 </term>
5569 <listitem>
5670 <para>
57− Make systemd very verbose and send log messages to the console instead of the journal.
71+ Make systemd very verbose and send log messages to the console instead of
72+ the journal.
5873 </para>
5974 </listitem>
6075 </varlistentry>
@@ -65,6 +80,11 @@
6580 </para>
6681
6782 <para>
68− 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 <command>agetty</command> login prompts should appear eventually unless something is very wrong.)
83+ If no login prompts or X11 login screens appear (e.g. due to hanging
84+ dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start
85+ rescue mode (described above). (Also note that since most units have a
86+ 90-second timeout before systemd gives up on them, the
87+ <command>agetty</command> login prompts should appear eventually unless
88+ something is very wrong.)
6989 </para>
7090</section>
nixos/doc/manual/administration/cleaning-store.xml+24−8
@@ -5,22 +5,31 @@
55 xml:id="sec-nix-gc">
66 <title>Cleaning the Nix Store</title>
77 <para>
8− 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 (<filename>/nix/store</filename>). You should periodically run Nix’s <emphasis>garbage collector</emphasis> to remove old, unreferenced packages. This is easy:
8+ Nix has a purely functional model, meaning that packages are never upgraded
9+ in place. Instead new versions of packages end up in a different location in
10+ the Nix store (<filename>/nix/store</filename>). You should periodically run
11+ Nix’s <emphasis>garbage collector</emphasis> to remove old, unreferenced
12+ packages. This is easy:
913<screen>
1014<prompt>$ </prompt>nix-collect-garbage
1115</screen>
12− Alternatively, you can use a systemd unit that does the same in the background:
16+ Alternatively, you can use a systemd unit that does the same in the
17+ background:
1318<screen>
1419<prompt># </prompt>systemctl start nix-gc.service
1520</screen>
16− You can tell NixOS in <filename>configuration.nix</filename> to run this unit automatically at certain points in time, for instance, every night at 03:15:
21+ You can tell NixOS in <filename>configuration.nix</filename> to run this unit
22+ automatically at certain points in time, for instance, every night at 03:15:
1723<programlisting>
1824<xref linkend="opt-nix.gc.automatic"/> = true;
1925<xref linkend="opt-nix.gc.dates"/> = "03:15";
2026</programlisting>
2127 </para>
2228 <para>
23− 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:
29+ The commands above do not remove garbage collector roots, such as old system
30+ configurations. Thus they do not remove the ability to roll back to previous
31+ configurations. The following command deletes old roots, removing the ability
32+ to roll back to them:
2433<screen>
2534<prompt>$ </prompt>nix-collect-garbage -d
2635</screen>
@@ -28,20 +37,27 @@
2837<screen>
2938<prompt>$ </prompt>nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
3039</screen>
31− Note that NixOS system configurations are stored in the profile <filename>/nix/var/nix/profiles/system</filename>.
40+ Note that NixOS system configurations are stored in the profile
41+ <filename>/nix/var/nix/profiles/system</filename>.
3242 </para>
3343 <para>
34− 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.
44+ Another way to reclaim disk space (often as much as 40% of the size of the
45+ Nix store) is to run Nix’s store optimiser, which seeks out identical files
46+ in the store and replaces them with hard links to a single copy.
3547<screen>
3648<prompt>$ </prompt>nix-store --optimise
3749</screen>
38− Since this command needs to read the entire Nix store, it can take quite a while to finish.
50+ Since this command needs to read the entire Nix store, it can take quite a
51+ while to finish.
3952 </para>
4053 <section xml:id="sect-nixos-gc-boot-entries">
4154 <title>NixOS Boot Entries</title>
4255
4356 <para>
44− If your <filename>/boot</filename> partition runs out of space, after clearing old profiles you must rebuild your system with <literal>nixos-rebuild</literal> to update the <filename>/boot</filename> partition and clear space.
57+ If your <filename>/boot</filename> partition runs out of space, after
58+ clearing old profiles you must rebuild your system with
59+ <literal>nixos-rebuild</literal> to update the <filename>/boot</filename>
60+ partition and clear space.
4561 </para>
4662 </section>
4763</chapter>
nixos/doc/manual/administration/container-networking.xml+21−5
@@ -6,7 +6,10 @@
66 <title>Container Networking</title>
77
88 <para>
9− When you create a container using <literal>nixos-container create</literal>, it gets it own private IPv4 address in the range <literal>10.233.0.0/16</literal>. You can get the container’s IPv4 address as follows:
9+ When you create a container using <literal>nixos-container create</literal>,
10+ it gets it own private IPv4 address in the range
11+ <literal>10.233.0.0/16</literal>. You can get the container’s IPv4 address
12+ as follows:
1013<screen>
1114<prompt># </prompt>nixos-container show-ip foo
121510.233.4.2
@@ -17,21 +20,34 @@
1720 </para>
1821
1922 <para>
20− Networking is implemented using a pair of virtual Ethernet devices. The network interface in the container is called <literal>eth0</literal>, while the matching interface in the host is called <literal>ve-<replaceable>container-name</replaceable></literal> (e.g., <literal>ve-foo</literal>). The container has its own network namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary network configuration such as setting up firewall rules, without affecting or having access to the host’s network.
23+ Networking is implemented using a pair of virtual Ethernet devices. The
24+ network interface in the container is called <literal>eth0</literal>, while
25+ the matching interface in the host is called
26+ <literal>ve-<replaceable>container-name</replaceable></literal> (e.g.,
27+ <literal>ve-foo</literal>). The container has its own network namespace and
28+ the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary
29+ network configuration such as setting up firewall rules, without affecting or
30+ having access to the host’s network.
2131 </para>
2232
2333 <para>
24− 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:
34+ By default, containers cannot talk to the outside network. If you want that,
35+ you should set up Network Address Translation (NAT) rules on the host to
36+ rewrite container traffic to use your external IP address. This can be
37+ accomplished using the following configuration on the host:
2538<programlisting>
2639<xref linkend="opt-networking.nat.enable"/> = true;
2740<xref linkend="opt-networking.nat.internalInterfaces"/> = ["ve-+"];
2841<xref linkend="opt-networking.nat.externalInterface"/> = "eth0";
2942</programlisting>
30− where <literal>eth0</literal> should be replaced with the desired external interface. Note that <literal>ve-+</literal> is a wildcard that matches all container interfaces.
43+ where <literal>eth0</literal> should be replaced with the desired external
44+ interface. Note that <literal>ve-+</literal> is a wildcard that matches all
45+ container interfaces.
3146 </para>
3247
3348 <para>
34− If you are using Network Manager, you need to explicitly prevent it from managing container interfaces:
49+ If you are using Network Manager, you need to explicitly prevent it from
50+ managing container interfaces:
3551<programlisting>
3652networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
3753</programlisting>
nixos/doc/manual/administration/containers.xml+16−3
@@ -5,15 +5,28 @@
55 xml:id="ch-containers">
66 <title>Container Management</title>
77 <para>
8− NixOS allows you to easily run other NixOS instances as <emphasis>containers</emphasis>. 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.
8+ NixOS allows you to easily run other NixOS instances as
9+ <emphasis>containers</emphasis>. Containers are a light-weight approach to
10+ virtualisation that runs software in the container at the same speed as in
11+ the host system. NixOS containers share the Nix store of the host, making
12+ container creation very efficient.
913 </para>
1014 <warning>
1115 <para>
12− 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.
16+ Currently, NixOS containers are not perfectly isolated from the host system.
17+ This means that a user with root access to the container can do things that
18+ affect the host. So you should not give container root access to untrusted
19+ users.
1320 </para>
1421 </warning>
1522 <para>
16− NixOS containers can be created in two ways: imperatively, using the command <command>nixos-container</command>, and declaratively, by specifying them in your <filename>configuration.nix</filename>. The declarative approach implies that containers get upgraded along with your host system when you run <command>nixos-rebuild</command>, which is often not what you want. By contrast, in the imperative approach, containers are configured and updated independently from the host system.
23+ NixOS containers can be created in two ways: imperatively, using the command
24+ <command>nixos-container</command>, and declaratively, by specifying them in
25+ your <filename>configuration.nix</filename>. The declarative approach implies
26+ that containers get upgraded along with your host system when you run
27+ <command>nixos-rebuild</command>, which is often not what you want. By
28+ contrast, in the imperative approach, containers are configured and updated
29+ independently from the host system.
1730 </para>
1831 <xi:include href="imperative-containers.xml" />
1932 <xi:include href="declarative-containers.xml" />
nixos/doc/manual/administration/control-groups.xml+27−6
@@ -5,10 +5,16 @@
55 xml:id="sec-cgroups">
66 <title>Control Groups</title>
77 <para>
8− To keep track of the processes in a running system, systemd uses <emphasis>control groups</emphasis> (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.
8+ To keep track of the processes in a running system, systemd uses
9+ <emphasis>control groups</emphasis> (cgroups). A control group is a set of
10+ processes used to allocate resources such as CPU, memory or I/O bandwidth.
11+ There can be multiple control group hierarchies, allowing each kind of
12+ resource to be managed independently.
913 </para>
1014 <para>
11− The command <command>systemd-cgls</command> lists all control groups in the <literal>systemd</literal> hierarchy, which is what systemd uses to keep track of the processes belonging to each service or user session:
15+ The command <command>systemd-cgls</command> lists all control groups in the
16+ <literal>systemd</literal> hierarchy, which is what systemd uses to keep
17+ track of the processes belonging to each service or user session:
1218<screen>
1319<prompt>$ </prompt>systemd-cgls
1420├─user
@@ -26,19 +32,34 @@
2632 │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
2733 └─ <replaceable>...</replaceable>
2834</screen>
29− Similarly, <command>systemd-cgls cpu</command> 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 <literal>httpd.service</literal> cgroup cannot starve the CPU for one process in the <literal>postgresql.service</literal> 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 <filename>configuration.nix</filename>:
35+ Similarly, <command>systemd-cgls cpu</command> shows the cgroups in the CPU
36+ hierarchy, which allows per-cgroup CPU scheduling priorities. By default,
37+ every systemd service gets its own CPU cgroup, while all user sessions are in
38+ the top-level CPU cgroup. This ensures, for instance, that a thousand
39+ run-away processes in the <literal>httpd.service</literal> cgroup cannot
40+ starve the CPU for one process in the <literal>postgresql.service</literal>
41+ cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL
42+ process would get 1/1001 of the cgroup’s CPU time.) You can limit a
43+ service’s CPU share in <filename>configuration.nix</filename>:
3044<programlisting>
3145<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.CPUShares = 512;
3246</programlisting>
33− By default, every cgroup has 1024 CPU shares, so this will halve the CPU allocation of the <literal>httpd.service</literal> cgroup.
47+ By default, every cgroup has 1024 CPU shares, so this will halve the CPU
48+ allocation of the <literal>httpd.service</literal> cgroup.
3449 </para>
3550 <para>
36− There also is a <literal>memory</literal> 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 <filename>configuration.nix</filename>; for instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM (excluding swap):
51+ There also is a <literal>memory</literal> hierarchy that controls memory
52+ allocation limits; by default, all processes are in the top-level cgroup, so
53+ any service or session can exhaust all available memory. Per-cgroup memory
54+ limits can be specified in <filename>configuration.nix</filename>; for
55+ instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM
56+ (excluding swap):
3757<programlisting>
3858<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.MemoryLimit = "512M";
3959</programlisting>
4060 </para>
4161 <para>
42− The command <command>systemd-cgtop</command> shows a continuously updated list of all cgroups with their CPU and memory usage.
62+ The command <command>systemd-cgtop</command> shows a continuously updated
63+ list of all cgroups with their CPU and memory usage.
4364 </para>
4465</chapter>
nixos/doc/manual/administration/declarative-containers.xml+25−6
@@ -6,7 +6,10 @@
66 <title>Declarative Container Specification</title>
77
88 <para>
9− You can also specify containers and their configuration in the host’s <filename>configuration.nix</filename>. For example, the following specifies that there shall be a container named <literal>database</literal> running PostgreSQL:
9+ You can also specify containers and their configuration in the host’s
10+ <filename>configuration.nix</filename>. For example, the following specifies
11+ that there shall be a container named <literal>database</literal> running
12+ PostgreSQL:
1013<programlisting>
1114containers.database =
1215 { config =
@@ -16,11 +19,18 @@ containers.database =
1619 };
1720 };
1821</programlisting>
19− If you run <literal>nixos-rebuild switch</literal>, 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 <literal>containers.database.autoStart = true</literal> in its configuration.
22+ If you run <literal>nixos-rebuild switch</literal>, the container will be
23+ built. If the container was already running, it will be updated in place,
24+ without rebooting. The container can be configured to start automatically by
25+ setting <literal>containers.database.autoStart = true</literal> in its
26+ configuration.
2027 </para>
2128
2229 <para>
23− 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:
30+ By default, declarative containers share the network namespace of the host,
31+ meaning that they can listen on (privileged) ports. However, they cannot
32+ change the network configuration. You can give a container its own network as
33+ follows:
2434<programlisting>
2535containers.database = {
2636 <link linkend="opt-containers._name_.privateNetwork">privateNetwork</link> = true;
@@ -28,14 +38,23 @@ containers.database = {
2838 <link linkend="opt-containers._name_.localAddress">localAddress</link> = "192.168.100.11";
2939};
3040</programlisting>
31− This gives the container a private virtual Ethernet interface with IP address <literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet interface on the host with IP address <literal>192.168.100.10</literal>. (See the next section for details on container networking.)
41+ This gives the container a private virtual Ethernet interface with IP address
42+ <literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet
43+ interface on the host with IP address <literal>192.168.100.10</literal>. (See
44+ the next section for details on container networking.)
3245 </para>
3346
3447 <para>
35− To disable the container, just remove it from <filename>configuration.nix</filename> and run <literal>nixos-rebuild switch</literal>. Note that this will not delete the root directory of the container in <literal>/var/lib/containers</literal>. Containers can be destroyed using the imperative method: <literal>nixos-container destroy foo</literal>.
48+ To disable the container, just remove it from
49+ <filename>configuration.nix</filename> and run <literal>nixos-rebuild
50+ switch</literal>. Note that this will not delete the root directory of the
51+ container in <literal>/var/lib/containers</literal>. Containers can be
52+ destroyed using the imperative method: <literal>nixos-container destroy
53+ foo</literal>.
3654 </para>
3755
3856 <para>
39− Declarative containers can be started and stopped using the corresponding systemd service, e.g. <literal>systemctl start container@database</literal>.
57+ Declarative containers can be started and stopped using the corresponding
58+ systemd service, e.g. <literal>systemctl start container@database</literal>.
4059 </para>
4160</section>
nixos/doc/manual/administration/imperative-containers.xml+45−12
@@ -6,7 +6,9 @@
66 <title>Imperative Container Management</title>
77
88 <para>
9− We’ll cover imperative container management using <command>nixos-container</command> first. Be aware that container management is currently only possible as <literal>root</literal>.
9+ We’ll cover imperative container management using
10+ <command>nixos-container</command> first. Be aware that container management
11+ is currently only possible as <literal>root</literal>.
1012 </para>
1113
1214 <para>
@@ -14,14 +16,23 @@
1416<screen>
1517# nixos-container create foo
1618</screen>
17− This creates the container’s root directory in <filename>/var/lib/containers/foo</filename> and a small configuration file in <filename>/etc/containers/foo.conf</filename>. It also builds the container’s initial system configuration and stores it in <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can modify the initial configuration of the container on the command line. For instance, to create a container that has <command>sshd</command> running, with the given public key for <literal>root</literal>:
19+ This creates the container’s root directory in
20+ <filename>/var/lib/containers/foo</filename> and a small configuration file
21+ in <filename>/etc/containers/foo.conf</filename>. It also builds the
22+ container’s initial system configuration and stores it in
23+ <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can
24+ modify the initial configuration of the container on the command line. For
25+ instance, to create a container that has <command>sshd</command> running,
26+ with the given public key for <literal>root</literal>:
1827<screen>
1928# nixos-container create foo --config '
2029 <xref linkend="opt-services.openssh.enable"/> = true;
2130 <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
2231'
2332</screen>
24− By default the next free address in the <literal>10.233.0.0/16</literal> subnet will be chosen as container IP. This behavior can be altered by setting <literal>--host-address</literal> and <literal>--local-address</literal>:
33+ By default the next free address in the <literal>10.233.0.0/16</literal> subnet will be chosen
34+ as container IP. This behavior can be altered by setting <literal>--host-address</literal> and
35+ <literal>--local-address</literal>:
2536<screen>
2637# nixos-container create test --config-file test-container.nix \
2738 --local-address 10.235.1.2 --host-address 10.235.1.1
@@ -33,25 +44,35 @@
3344<screen>
3445# nixos-container start foo
3546</screen>
36− This command will return as soon as the container has booted and has reached <literal>multi-user.target</literal>. On the host, the container runs within a systemd unit called <literal>container@<replaceable>container-name</replaceable>.service</literal>. Thus, if something went wrong, you can get status info using <command>systemctl</command>:
47+ This command will return as soon as the container has booted and has reached
48+ <literal>multi-user.target</literal>. On the host, the container runs within
49+ a systemd unit called
50+ <literal>container@<replaceable>container-name</replaceable>.service</literal>.
51+ Thus, if something went wrong, you can get status info using
52+ <command>systemctl</command>:
3753<screen>
3854# systemctl status container@foo
3955</screen>
4056 </para>
4157
4258 <para>
43− If the container has started successfully, you can log in as root using the <command>root-login</command> operation:
59+ If the container has started successfully, you can log in as root using the
60+ <command>root-login</command> operation:
4461<screen>
4562# nixos-container root-login foo
4663[root@foo:~]#
4764</screen>
48− 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 <command>login</command> operation, which is available to all users on the host:
65+ Note that only root on the host can do this (since there is no
66+ authentication). You can also get a regular login prompt using the
67+ <command>login</command> operation, which is available to all users on the
68+ host:
4969<screen>
5070# nixos-container login foo
5171foo login: alice
5272Password: ***
5373</screen>
54− With <command>nixos-container run</command>, you can execute arbitrary commands in the container:
74+ With <command>nixos-container run</command>, you can execute arbitrary
75+ commands in the container:
5576<screen>
5677# nixos-container run foo -- uname -a
5778Linux 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
5980 </para>
6081
6182 <para>
62− There are several ways to change the configuration of the container. First, on the host, you can edit <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>, and run
83+ There are several ways to change the configuration of the container. First,
84+ on the host, you can edit
85+ <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
86+ and run
6387<screen>
6488# nixos-container update foo
6589</screen>
66− This will build and activate the new configuration. You can also specify a new configuration on the command line:
90+ This will build and activate the new configuration. You can also specify a
91+ new configuration on the command line:
6792<screen>
6893# nixos-container update foo --config '
6994 <xref linkend="opt-services.httpd.enable"/> = 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
7499# curl http://$(nixos-container show-ip foo)/
75100&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
76101</screen>
77− However, note that this will overwrite the container’s <filename>/etc/nixos/configuration.nix</filename>.
102+ However, note that this will overwrite the container’s
103+ <filename>/etc/nixos/configuration.nix</filename>.
78104 </para>
79105
80106 <para>
81− Alternatively, you can change the configuration from within the container itself by running <command>nixos-rebuild switch</command> inside the container. Note that the container by default does not have a copy of the NixOS channel, so you should run <command>nix-channel --update</command> first.
107+ Alternatively, you can change the configuration from within the container
108+ itself by running <command>nixos-rebuild switch</command> inside the
109+ container. Note that the container by default does not have a copy of the
110+ NixOS channel, so you should run <command>nix-channel --update</command>
111+ first.
82112 </para>
83113
84114 <para>
85− Containers can be stopped and started using <literal>nixos-container stop</literal> and <literal>nixos-container start</literal>, respectively, or by using <command>systemctl</command> on the container’s service unit. To destroy a container, including its file system, do
115+ Containers can be stopped and started using <literal>nixos-container
116+ stop</literal> and <literal>nixos-container start</literal>, respectively, or
117+ by using <command>systemctl</command> on the container’s service unit. To
118+ destroy a container, including its file system, do
86119<screen>
87120# nixos-container destroy foo
88121</screen>
nixos/doc/manual/administration/logging.xml+15−4
@@ -5,11 +5,18 @@
55 xml:id="sec-logging">
66 <title>Logging</title>
77 <para>
8− System-wide logging is provided by systemd’s <emphasis>journal</emphasis>, which subsumes traditional logging daemons such as syslogd and klogd. Log entries are kept in binary files in <filename>/var/log/journal/</filename>. The command <literal>journalctl</literal> allows you to see the contents of the journal. For example,
8+ System-wide logging is provided by systemd’s <emphasis>journal</emphasis>,
9+ which subsumes traditional logging daemons such as syslogd and klogd. Log
10+ entries are kept in binary files in <filename>/var/log/journal/</filename>.
11+ The command <literal>journalctl</literal> allows you to see the contents of
12+ the journal. For example,
913<screen>
1014<prompt>$ </prompt>journalctl -b
1115</screen>
12− shows all journal entries since the last reboot. (The output of <command>journalctl</command> is piped into <command>less</command> 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:
16+ shows all journal entries since the last reboot. (The output of
17+ <command>journalctl</command> is piped into <command>less</command> by
18+ default.) You can use various options and match operators to restrict output
19+ to messages of interest. For instance, to get all messages from PostgreSQL:
1320<screen>
1421<prompt>$ </prompt>journalctl -u postgresql.service
1522-- 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
1926Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET
2027Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections
2128</screen>
22− Or to get all messages since the last reboot that have at least a “critical” severity level:
29+ Or to get all messages since the last reboot that have at least a
30+ “critical” severity level:
2331<screen>
2432<prompt>$ </prompt>journalctl -b -p crit
2533Dec 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
2735</screen>
2836 </para>
2937 <para>
30− The system journal is readable by root and by users in the <literal>wheel</literal> and <literal>systemd-journal</literal> groups. All users have a private journal that can be read using <command>journalctl</command>.
38+ The system journal is readable by root and by users in the
39+ <literal>wheel</literal> and <literal>systemd-journal</literal> groups. All
40+ users have a private journal that can be read using
41+ <command>journalctl</command>.
3142 </para>
3243</chapter>
nixos/doc/manual/administration/maintenance-mode.xml+3−1
@@ -9,6 +9,8 @@
99 You can enter rescue mode by running:
1010<screen>
1111# systemctl rescue</screen>
12− 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.
12+ This will eventually give you a single-user root shell. Systemd will stop
13+ (almost) all system services. To get out of maintenance mode, just exit from
14+ the rescue shell.
1315 </para>
1416</section>
nixos/doc/manual/administration/network-problems.xml+11−2
@@ -6,11 +6,20 @@
66 <title>Network Problems</title>
77
88 <para>
9− Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a package from source into downloading it as a pre-built binary. That is, whenever a command like <command>nixos-rebuild</command> 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 <uri>https://cache.nixos.org/</uri>. 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 <option>--option use-binary-caches false</option>, e.g.
9+ Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a
10+ package from source into downloading it as a pre-built binary. That is,
11+ whenever a command like <command>nixos-rebuild</command> needs a path in the
12+ Nix store, Nix will try to download that path from the Internet rather than
13+ build it from source. The default binary cache is
14+ <uri>https://cache.nixos.org/</uri>. If this cache is unreachable, Nix
15+ operations may take a long time due to HTTP connection timeouts. You can
16+ disable the use of the binary cache by adding <option>--option
17+ use-binary-caches false</option>, e.g.
1018<screen>
1119# nixos-rebuild switch --option use-binary-caches false
1220</screen>
13− If you have an alternative binary cache at your disposal, you can use it instead:
21+ If you have an alternative binary cache at your disposal, you can use it
22+ instead:
1423<screen>
1524# nixos-rebuild switch --option binary-caches http://my-cache.example.org/
1625</screen>
nixos/doc/manual/administration/rebooting.xml+8−3
@@ -16,15 +16,20 @@
1616<screen>
1717# reboot
1818</screen>
19− which is equivalent to <command>systemctl reboot</command>. Alternatively, you can quickly reboot the system using <literal>kexec</literal>, which bypasses the BIOS by directly loading the new kernel into memory:
19+ which is equivalent to <command>systemctl reboot</command>. Alternatively,
20+ you can quickly reboot the system using <literal>kexec</literal>, which
21+ bypasses the BIOS by directly loading the new kernel into memory:
2022<screen>
2123# systemctl kexec
2224</screen>
2325 </para>
2426 <para>
25− The machine can be suspended to RAM (if supported) using <command>systemctl suspend</command>, and suspended to disk using <command>systemctl hibernate</command>.
27+ The machine can be suspended to RAM (if supported) using <command>systemctl
28+ suspend</command>, and suspended to disk using <command>systemctl
29+ hibernate</command>.
2630 </para>
2731 <para>
28− 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.
32+ These commands can be run by any user who is logged in locally, i.e. on a
33+ virtual console or in X11; otherwise, the user is asked for authentication.
2934 </para>
3035</chapter>
nixos/doc/manual/administration/rollback.xml+12−3
@@ -6,11 +6,19 @@
66 <title>Rolling Back Configuration Changes</title>
77
88 <para>
9− After running <command>nixos-rebuild</command> 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.
9+ After running <command>nixos-rebuild</command> to switch to a new
10+ configuration, you may find that the new configuration doesn’t work very
11+ well. In that case, there are several ways to return to a previous
12+ configuration.
1013 </para>
1114
1215 <para>
13− 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:
16+ First, the GRUB boot manager allows you to boot into any previous
17+ configuration that hasn’t been garbage-collected. These configurations can
18+ be found under the GRUB submenu “NixOS - All configurations”. This is
19+ especially useful if the new configuration fails to boot. After the system
20+ has booted, you can make the selected configuration the default for
21+ subsequent boots:
1422<screen>
1523# /run/current-system/bin/switch-to-configuration boot</screen>
1624 </para>
@@ -22,7 +30,8 @@
2230 This is equivalent to running:
2331<screen>
2432# /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>
25− where <replaceable>N</replaceable> is the number of the NixOS system configuration. To get a list of the available configurations, do:
33+ where <replaceable>N</replaceable> is the number of the NixOS system
34+ configuration. To get a list of the available configurations, do:
2635<screen>
2736<prompt>$ </prompt>ls -l /nix/var/nix/profiles/system-*-link
2837<replaceable>...</replaceable>
nixos/doc/manual/administration/running.xml+2−1
@@ -6,7 +6,8 @@
66 <title>Administration</title>
77 <partintro xml:id="ch-running-intro">
88 <para>
9− This chapter describes various aspects of managing a running NixOS system, such as how to use the <command>systemd</command> service manager.
9+ This chapter describes various aspects of managing a running NixOS system,
10+ such as how to use the <command>systemd</command> service manager.
1011 </para>
1112 </partintro>
1213 <xi:include href="service-mgmt.xml" />
nixos/doc/manual/administration/service-mgmt.xml+21−5
@@ -5,10 +5,21 @@
55 xml:id="sec-systemctl">
66 <title>Service Management</title>
77 <para>
8− 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 <literal>default.target</literal>; 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.
8+ In NixOS, all system services are started and monitored using the systemd
9+ program. Systemd is the “init” process of the system (i.e. PID 1), the
10+ parent of all other processes. It manages a set of so-called “units”,
11+ which can be things like system services (programs), but also mount points,
12+ swap files, devices, targets (groups of units) and more. Units can have
13+ complex dependencies; for instance, one unit can require that another unit
14+ must be successfully started before the first unit can be started. When the
15+ system boots, it starts a unit named <literal>default.target</literal>; the
16+ dependencies of this unit cause all system services to be started, file
17+ systems to be mounted, swap files to be activated, and so on.
918 </para>
1019 <para>
11− The command <command>systemctl</command> is the main way to interact with <command>systemd</command>. Without any arguments, it shows the status of active units:
20+ The command <command>systemctl</command> is the main way to interact with
21+ <command>systemd</command>. Without any arguments, it shows the status of
22+ active units:
1223<screen>
1324<prompt>$ </prompt>systemctl
1425-.mount loaded active mounted /
@@ -19,7 +30,8 @@ graphical.target loaded active active Graphical Interface
1930</screen>
2031 </para>
2132 <para>
22− You can ask for detailed status information about a unit, for instance, the PostgreSQL database service:
33+ You can ask for detailed status information about a unit, for instance, the
34+ PostgreSQL database service:
2335<screen>
2436<prompt>$ </prompt>systemctl status postgresql.service
2537postgresql.service - PostgreSQL Server
@@ -39,7 +51,9 @@ Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to
3951Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started
4052Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
4153</screen>
42− 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.
54+ Note that this shows the status of the unit (active and running), all the
55+ processes belonging to the service, as well as the most recent log messages
56+ from the service.
4357 </para>
4458 <para>
4559 Units can be stopped, started or restarted:
@@ -48,7 +62,9 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
4862# systemctl start postgresql.service
4963# systemctl restart postgresql.service
5064</screen>
51− 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).
65+ These operations are synchronous: they wait until the service has finished
66+ starting or stopping (or has failed). Starting a unit will cause the
67+ dependencies of that unit to be started as well (if necessary).
5268 </para>
5369<!-- - cgroups: each service and user session is a cgroup
5470
nixos/doc/manual/administration/store-corruption.xml+13−4
@@ -6,15 +6,23 @@
66 <title>Nix Store Corruption</title>
77
88 <para>
9− After a system crash, it’s possible for files in the Nix store to become corrupted. (For instance, the Ext4 file system has the tendency to replace un-synced files with zero bytes.) NixOS tries hard to prevent this from happening: it performs a <command>sync</command> before switching to a new configuration, and Nix’s database is fully transactional. If corruption still occurs, you may be able to fix it automatically.
9+ After a system crash, it’s possible for files in the Nix store to become
10+ corrupted. (For instance, the Ext4 file system has the tendency to replace
11+ un-synced files with zero bytes.) NixOS tries hard to prevent this from
12+ happening: it performs a <command>sync</command> before switching to a new
13+ configuration, and Nix’s database is fully transactional. If corruption
14+ still occurs, you may be able to fix it automatically.
1015 </para>
1116
1217 <para>
13− If the corruption is in a path in the closure of the NixOS system configuration, you can fix it by doing
18+ If the corruption is in a path in the closure of the NixOS system
19+ configuration, you can fix it by doing
1420<screen>
1521<prompt># </prompt>nixos-rebuild switch --repair
1622</screen>
17− This will cause Nix to check every path in the closure, and if its cryptographic hash differs from the hash recorded in Nix’s database, the path is rebuilt or redownloaded.
23+ This will cause Nix to check every path in the closure, and if its
24+ cryptographic hash differs from the hash recorded in Nix’s database, the
25+ path is rebuilt or redownloaded.
1826 </para>
1927
2028 <para>
@@ -22,6 +30,7 @@
2230<screen>
2331<prompt># </prompt>nix-store --verify --check-contents --repair
2432</screen>
25− Any corrupt paths will be redownloaded if they’re available in a binary cache; otherwise, they cannot be repaired.
33+ Any corrupt paths will be redownloaded if they’re available in a binary
34+ cache; otherwise, they cannot be repaired.
2635 </para>
2736</section>
nixos/doc/manual/administration/troubleshooting.xml+2−1
@@ -5,7 +5,8 @@
55 xml:id="ch-troubleshooting">
66 <title>Troubleshooting</title>
77 <para>
8− This chapter describes solutions to common problems you might encounter when you manage your NixOS system.
8+ This chapter describes solutions to common problems you might encounter when
9+ you manage your NixOS system.
910 </para>
1011 <xi:include href="boot-problems.xml" />
1112 <xi:include href="maintenance-mode.xml" />
nixos/doc/manual/administration/user-sessions.xml+12−3
@@ -5,7 +5,10 @@
55 xml:id="sec-user-sessions">
66 <title>User Sessions</title>
77 <para>
8− Systemd keeps track of all users who are logged into the system (e.g. on a virtual console or remotely via SSH). The command <command>loginctl</command> allows querying and manipulating user sessions. For instance, to list all user sessions:
8+ Systemd keeps track of all users who are logged into the system (e.g. on a
9+ virtual console or remotely via SSH). The command <command>loginctl</command>
10+ allows querying and manipulating user sessions. For instance, to list all
11+ user sessions:
912<screen>
1013<prompt>$ </prompt>loginctl
1114 SESSION UID USER SEAT
@@ -13,7 +16,10 @@
1316 c3 0 root seat0
1417 c4 500 alice
1518</screen>
16− This shows that two users are logged in locally, while another is logged in remotely. (“Seats” are essentially the combinations of displays and input devices attached to the system; usually, there is only one seat.) To get information about a session:
19+ This shows that two users are logged in locally, while another is logged in
20+ remotely. (“Seats” are essentially the combinations of displays and input
21+ devices attached to the system; usually, there is only one seat.) To get
22+ information about a session:
1723<screen>
1824<prompt>$ </prompt>loginctl session-status c3
1925c3 - root (0)
@@ -28,7 +34,10 @@ c3 - root (0)
2834 ├─10339 -bash
2935 └─10355 w3m nixos.org
3036</screen>
31− This shows that the user is logged in on virtual console 3. It also lists the processes belonging to this session. Since systemd keeps track of this, you can terminate a session in a way that ensures that all the session’s processes are gone:
37+ This shows that the user is logged in on virtual console 3. It also lists the
38+ processes belonging to this session. Since systemd keeps track of this, you
39+ can terminate a session in a way that ensures that all the session’s
40+ processes are gone:
3241<screen>
3342# loginctl terminate-session c3
3443</screen>
nixos/doc/manual/configuration/abstractions.xml+36−12
@@ -6,7 +6,8 @@
66 <title>Abstractions</title>
77
88 <para>
9− If you find yourself repeating yourself over and over, it’s time to abstract. Take, for instance, this Apache HTTP Server configuration:
9+ If you find yourself repeating yourself over and over, it’s time to
10+ abstract. Take, for instance, this Apache HTTP Server configuration:
1011<programlisting>
1112{
1213 <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -26,7 +27,9 @@
2627 ];
2728}
2829</programlisting>
29− It defines two virtual hosts with nearly identical configuration; the only difference is that the second one has SSL enabled. To prevent this duplication, we can use a <literal>let</literal>:
30+ It defines two virtual hosts with nearly identical configuration; the only
31+ difference is that the second one has SSL enabled. To prevent this
32+ duplication, we can use a <literal>let</literal>:
3033<programlisting>
3134let
3235 exampleOrgCommon =
@@ -47,11 +50,16 @@ in
4750 ];
4851}
4952</programlisting>
50− The <literal>let exampleOrgCommon = <replaceable>...</replaceable></literal> defines a variable named <literal>exampleOrgCommon</literal>. The <literal>//</literal> operator merges two attribute sets, so the configuration of the second virtual host is the set <literal>exampleOrgCommon</literal> extended with the SSL options.
53+ The <literal>let exampleOrgCommon = <replaceable>...</replaceable></literal>
54+ defines a variable named <literal>exampleOrgCommon</literal>. The
55+ <literal>//</literal> operator merges two attribute sets, so the
56+ configuration of the second virtual host is the set
57+ <literal>exampleOrgCommon</literal> extended with the SSL options.
5158 </para>
5259
5360 <para>
54− You can write a <literal>let</literal> wherever an expression is allowed. Thus, you also could have written:
61+ You can write a <literal>let</literal> wherever an expression is allowed.
62+ Thus, you also could have written:
5563<programlisting>
5664{
5765 <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -61,11 +69,16 @@ in
6169 ];
6270}
6371</programlisting>
64− but not <literal>{ let exampleOrgCommon = <replaceable>...</replaceable>; in <replaceable>...</replaceable>; }</literal> since attributes (as opposed to attribute values) are not expressions.
72+ but not <literal>{ let exampleOrgCommon = <replaceable>...</replaceable>; in
73+ <replaceable>...</replaceable>; }</literal> since attributes (as opposed to
74+ attribute values) are not expressions.
6575 </para>
6676
6777 <para>
68− <emphasis>Functions</emphasis> provide another method of abstraction. For instance, suppose that we want to generate lots of different virtual hosts, all with identical configuration except for the host name. This can be done as follows:
78+ <emphasis>Functions</emphasis> provide another method of abstraction. For
79+ instance, suppose that we want to generate lots of different virtual hosts,
80+ all with identical configuration except for the host name. This can be done
81+ as follows:
6982<programlisting>
7083{
7184 <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -83,11 +96,15 @@ in
8396 ];
8497}
8598</programlisting>
86− Here, <varname>makeVirtualHost</varname> is a function that takes a single argument <literal>name</literal> and returns the configuration for a virtual host. That function is then called for several names to produce the list of virtual host configurations.
99+ Here, <varname>makeVirtualHost</varname> is a function that takes a single
100+ argument <literal>name</literal> and returns the configuration for a virtual
101+ host. That function is then called for several names to produce the list of
102+ virtual host configurations.
87103 </para>
88104
89105 <para>
90− We can further improve on this by using the function <varname>map</varname>, which applies another function to every element in a list:
106+ We can further improve on this by using the function <varname>map</varname>,
107+ which applies another function to every element in a list:
91108<programlisting>
92109{
93110 <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -97,11 +114,15 @@ in
97114 [ "example.org" "example.com" "example.gov" "example.nl" ];
98115}
99116</programlisting>
100− (The function <literal>map</literal> is called a <emphasis>higher-order function</emphasis> because it takes another function as an argument.)
117+ (The function <literal>map</literal> is called a <emphasis>higher-order
118+ function</emphasis> because it takes another function as an argument.)
101119 </para>
102120
103121 <para>
104− What if you need more than one argument, for instance, if we want to use a different <literal>documentRoot</literal> for each virtual host? Then we can make <varname>makeVirtualHost</varname> a function that takes a <emphasis>set</emphasis> as its argument, like this:
122+ What if you need more than one argument, for instance, if we want to use a
123+ different <literal>documentRoot</literal> for each virtual host? Then we can
124+ make <varname>makeVirtualHost</varname> a function that takes a
125+ <emphasis>set</emphasis> as its argument, like this:
105126<programlisting>
106127{
107128 <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -119,7 +140,9 @@ in
119140 ];
120141}
121142</programlisting>
122− But in this case (where every root is a subdirectory of <filename>/sites</filename> named after the virtual host), it would have been shorter to define <varname>makeVirtualHost</varname> as
143+ But in this case (where every root is a subdirectory of
144+ <filename>/sites</filename> named after the virtual host), it would have been
145+ shorter to define <varname>makeVirtualHost</varname> as
123146<programlisting>
124147makeVirtualHost = name:
125148 { hostName = name;
@@ -127,6 +150,7 @@ makeVirtualHost = name:
127150 adminAddr = "alice@example.org";
128151 };
129152</programlisting>
130− Here, the construct <literal>${<replaceable>...</replaceable>}</literal> allows the result of an expression to be spliced into a string.
153+ Here, the construct <literal>${<replaceable>...</replaceable>}</literal>
154+ allows the result of an expression to be spliced into a string.
131155 </para>
132156</section>
nixos/doc/manual/configuration/ad-hoc-network-config.xml+4−1
@@ -6,7 +6,10 @@
66 <title>Ad-Hoc Configuration</title>
77
88 <para>
9− You can use <xref linkend="opt-networking.localCommands"/> to specify shell commands to be run at the end of <literal>network-setup.service</literal>. This is useful for doing network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address:
9+ You can use <xref linkend="opt-networking.localCommands"/> to specify shell
10+ commands to be run at the end of <literal>network-setup.service</literal>.
11+ This is useful for doing network configuration not covered by the existing
12+ NixOS modules. For instance, to statically configure an IPv6 address:
1013<programlisting>
1114<xref linkend="opt-networking.localCommands"/> =
1215 ''
nixos/doc/manual/configuration/ad-hoc-packages.xml+21−5
@@ -6,18 +6,33 @@
66 <title>Ad-Hoc Package Management</title>
77
88 <para>
9− With the command <command>nix-env</command>, you can install and uninstall packages from the command line. For instance, to install Mozilla Thunderbird:
9+ With the command <command>nix-env</command>, you can install and uninstall
10+ packages from the command line. For instance, to install Mozilla Thunderbird:
1011<screen>
1112<prompt>$ </prompt>nix-env -iA nixos.thunderbird</screen>
12− If you invoke this as root, the package is installed in the Nix profile <filename>/nix/var/nix/profiles/default</filename> and visible to all users of the system; otherwise, the package ends up in <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename> and is not visible to other users. The <option>-A</option> flag specifies the package by its attribute name; without it, the package is installed by matching against its package name (e.g. <literal>thunderbird</literal>). The latter is slower because it requires matching against all available Nix packages, and is ambiguous if there are multiple matching packages.
13+ If you invoke this as root, the package is installed in the Nix profile
14+ <filename>/nix/var/nix/profiles/default</filename> and visible to all users
15+ of the system; otherwise, the package ends up in
16+ <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
17+ and is not visible to other users. The <option>-A</option> flag specifies the
18+ package by its attribute name; without it, the package is installed by
19+ matching against its package name (e.g. <literal>thunderbird</literal>). The
20+ latter is slower because it requires matching against all available Nix
21+ packages, and is ambiguous if there are multiple matching packages.
1322 </para>
1423
1524 <para>
16− Packages come from the NixOS channel. You typically upgrade a package by updating to the latest version of the NixOS channel:
25+ Packages come from the NixOS channel. You typically upgrade a package by
26+ updating to the latest version of the NixOS channel:
1727<screen>
1828<prompt>$ </prompt>nix-channel --update nixos
1929</screen>
20− and then running <literal>nix-env -i</literal> again. Other packages in the profile are <emphasis>not</emphasis> affected; this is the crucial difference with the declarative style of package management, where running <command>nixos-rebuild switch</command> causes all packages to be updated to their current versions in the NixOS channel. You can however upgrade all packages for which there is a newer version by doing:
30+ and then running <literal>nix-env -i</literal> again. Other packages in the
31+ profile are <emphasis>not</emphasis> affected; this is the crucial difference
32+ with the declarative style of package management, where running
33+ <command>nixos-rebuild switch</command> causes all packages to be updated to
34+ their current versions in the NixOS channel. You can however upgrade all
35+ packages for which there is a newer version by doing:
2136<screen>
2237<prompt>$ </prompt>nix-env -u '*'
2338</screen>
@@ -38,7 +53,8 @@
3853 </para>
3954
4055 <para>
41− <command>nix-env</command> has many more flags. For details, see the <citerefentry>
56+ <command>nix-env</command> has many more flags. For details, see the
57+ <citerefentry>
4258 <refentrytitle>nix-env</refentrytitle>
4359 <manvolnum>1</manvolnum></citerefentry> manpage or the Nix manual.
4460 </para>
nixos/doc/manual/configuration/adding-custom-packages.xml+17−6
@@ -6,23 +6,33 @@
66 <title>Adding Custom Packages</title>
77
88 <para>
9− It’s possible that a package you need is not available in NixOS. In that case, you can do two things. First, you can clone the Nixpkgs repository, add the package to your clone, and (optionally) submit a patch or pull request to have it accepted into the main Nixpkgs repository. This is described in detail in the <link
10−xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. In short, you clone Nixpkgs:
9+ It’s possible that a package you need is not available in NixOS. In that
10+ case, you can do two things. First, you can clone the Nixpkgs repository, add
11+ the package to your clone, and (optionally) submit a patch or pull request to
12+ have it accepted into the main Nixpkgs repository. This is described in
13+ detail in the <link
14+xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs
15+ manual</link>. In short, you clone Nixpkgs:
1116<screen>
1217<prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs
1318<prompt>$ </prompt>cd nixpkgs
1419</screen>
15− Then you write and test the package as described in the Nixpkgs manual. Finally, you add it to <literal>environment.systemPackages</literal>, e.g.
20+ Then you write and test the package as described in the Nixpkgs manual.
21+ Finally, you add it to <literal>environment.systemPackages</literal>, e.g.
1622<programlisting>
1723<xref linkend="opt-environment.systemPackages"/> = [ pkgs.my-package ];
1824</programlisting>
19− and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs tree:
25+ and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs
26+ tree:
2027<screen>
2128# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>
2229 </para>
2330
2431 <para>
25− The second possibility is to add the package outside of the Nixpkgs tree. For instance, here is how you specify a build of the <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link> package directly in <filename>configuration.nix</filename>:
32+ The second possibility is to add the package outside of the Nixpkgs tree. For
33+ instance, here is how you specify a build of the
34+ <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link>
35+ package directly in <filename>configuration.nix</filename>:
2636<programlisting>
2737<xref linkend="opt-environment.systemPackages"/> =
2838 let
@@ -36,7 +46,8 @@ xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. In short, yo
3646 in
3747 [ my-hello ];
3848</programlisting>
39− Of course, you can also move the definition of <literal>my-hello</literal> into a separate Nix expression, e.g.
49+ Of course, you can also move the definition of <literal>my-hello</literal>
50+ into a separate Nix expression, e.g.
4051<programlisting>
4152<xref linkend="opt-environment.systemPackages"/> = [ (import ./my-hello.nix) ];
4253</programlisting>
nixos/doc/manual/configuration/config-file.xml+57−14
@@ -13,7 +13,15 @@
1313{ <replaceable>option definitions</replaceable>
1414}
1515</programlisting>
16− The first line (<literal>{ config, pkgs, ... }:</literal>) denotes that this is actually a function that takes at least the two arguments <varname>config</varname> and <varname>pkgs</varname>. (These are explained later.) The function returns a <emphasis>set</emphasis> of option definitions (<literal>{ <replaceable>...</replaceable> }</literal>). These definitions have the form <literal><replaceable>name</replaceable> = <replaceable>value</replaceable></literal>, where <replaceable>name</replaceable> is the name of an option and <replaceable>value</replaceable> is its value. For example,
16+ The first line (<literal>{ config, pkgs, ... }:</literal>) denotes that this
17+ is actually a function that takes at least the two arguments
18+ <varname>config</varname> and <varname>pkgs</varname>. (These are explained
19+ later.) The function returns a <emphasis>set</emphasis> of option definitions
20+ (<literal>{ <replaceable>...</replaceable> }</literal>). These definitions
21+ have the form <literal><replaceable>name</replaceable> =
22+ <replaceable>value</replaceable></literal>, where
23+ <replaceable>name</replaceable> is the name of an option and
24+ <replaceable>value</replaceable> is its value. For example,
1725<programlisting>
1826{ config, pkgs, ... }:
1927
@@ -22,11 +30,19 @@
2230 <xref linkend="opt-services.httpd.documentRoot"/> = "/webroot";
2331}
2432</programlisting>
25− defines a configuration with three option definitions that together enable the Apache HTTP Server with <filename>/webroot</filename> as the document root.
33+ defines a configuration with three option definitions that together enable
34+ the Apache HTTP Server with <filename>/webroot</filename> as the document
35+ root.
2636 </para>
2737
2838 <para>
29− Sets can be nested, and in fact dots in option names are shorthand for defining a set containing another set. For instance, <xref linkend="opt-services.httpd.enable"/> defines a set named <varname>services</varname> that contains a set named <varname>httpd</varname>, which in turn contains an option definition named <varname>enable</varname> with value <literal>true</literal>. This means that the example above can also be written as:
39+ Sets can be nested, and in fact dots in option names are shorthand for
40+ defining a set containing another set. For instance,
41+ <xref linkend="opt-services.httpd.enable"/> defines a set named
42+ <varname>services</varname> that contains a set named
43+ <varname>httpd</varname>, which in turn contains an option definition named
44+ <varname>enable</varname> with value <literal>true</literal>. This means that
45+ the example above can also be written as:
3046<programlisting>
3147{ config, pkgs, ... }:
3248
@@ -39,15 +55,22 @@
3955 };
4056}
4157</programlisting>
42− which may be more convenient if you have lots of option definitions that share the same prefix (such as <literal>services.httpd</literal>).
58+ which may be more convenient if you have lots of option definitions that
59+ share the same prefix (such as <literal>services.httpd</literal>).
4360 </para>
4461
4562 <para>
46− NixOS checks your option definitions for correctness. For instance, if you try to define an option that doesn’t exist (that is, doesn’t have a corresponding <emphasis>option declaration</emphasis>), <command>nixos-rebuild</command> will give an error like:
63+ NixOS checks your option definitions for correctness. For instance, if you
64+ try to define an option that doesn’t exist (that is, doesn’t have a
65+ corresponding <emphasis>option declaration</emphasis>),
66+ <command>nixos-rebuild</command> will give an error like:
4767<screen>
4868The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist.
4969</screen>
50− Likewise, values in option definitions must have a correct type. For instance, <option>services.httpd.enable</option> must be a Boolean (<literal>true</literal> or <literal>false</literal>). Trying to give it a value of another type, such as a string, will cause an error:
70+ Likewise, values in option definitions must have a correct type. For
71+ instance, <option>services.httpd.enable</option> must be a Boolean
72+ (<literal>true</literal> or <literal>false</literal>). Trying to give it a
73+ value of another type, such as a string, will cause an error:
5174<screen>
5275The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean.
5376</screen>
@@ -66,10 +89,12 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
6689<programlisting>
6790<xref linkend="opt-networking.hostName"/> = "dexter";
6891</programlisting>
69− Special characters can be escaped by prefixing them with a backslash (e.g. <literal>\"</literal>).
92+ Special characters can be escaped by prefixing them with a backslash
93+ (e.g. <literal>\"</literal>).
7094 </para>
7195 <para>
72− Multi-line strings can be enclosed in <emphasis>double single quotes</emphasis>, e.g.
96+ Multi-line strings can be enclosed in <emphasis>double single
97+ quotes</emphasis>, e.g.
7398<programlisting>
7499<xref linkend="opt-networking.extraHosts"/> =
75100 ''
@@ -77,7 +102,13 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
77102 10.0.0.1 server
78103 '';
79104</programlisting>
80− The main difference is that it strips from each line a number of spaces equal to the minimal indentation of the string as a whole (disregarding the indentation of empty lines), and that characters like <literal>"</literal> and <literal>\</literal> are not special (making it more convenient for including things like shell code). See more info about this in the Nix manual <link
105+ The main difference is that it strips from each line a number of spaces
106+ equal to the minimal indentation of the string as a whole (disregarding
107+ the indentation of empty lines), and that characters like
108+ <literal>"</literal> and <literal>\</literal> are not special (making it
109+ more convenient for including things like shell code). See more info
110+ about this in the Nix manual
111+ <link
81112 xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.
82113 </para>
83114 </listitem>
@@ -106,7 +137,12 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
106137<programlisting>
107138<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 60;
108139</programlisting>
109− (Note that here the attribute name <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in quotes to prevent it from being interpreted as a set named <literal>net</literal> containing a set named <literal>ipv4</literal>, and so on. This is because it’s not a NixOS option but the literal name of a Linux kernel setting.)
140+ (Note that here the attribute name
141+ <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in quotes to
142+ prevent it from being interpreted as a set named <literal>net</literal>
143+ containing a set named <literal>ipv4</literal>, and so on. This is
144+ because it’s not a NixOS option but the literal name of a Linux kernel
145+ setting.)
110146 </para>
111147 </listitem>
112148 </varlistentry>
@@ -116,7 +152,8 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
116152 </term>
117153 <listitem>
118154 <para>
119− Sets were introduced above. They are name/value pairs enclosed in braces, as in the option definition
155+ Sets were introduced above. They are name/value pairs enclosed in braces,
156+ as in the option definition
120157<programlisting>
121158<xref linkend="opt-fileSystems"/>."/boot" =
122159 { device = "/dev/sda1";
@@ -133,7 +170,8 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
133170 </term>
134171 <listitem>
135172 <para>
136− The important thing to note about lists is that list elements are separated by whitespace, like this:
173+ The important thing to note about lists is that list elements are
174+ separated by whitespace, like this:
137175<programlisting>
138176<xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
139177</programlisting>
@@ -150,7 +188,9 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
150188 </term>
151189 <listitem>
152190 <para>
153− Usually, the packages you need are already part of the Nix Packages collection, which is a set that can be accessed through the function argument <varname>pkgs</varname>. Typical uses:
191+ Usually, the packages you need are already part of the Nix Packages
192+ collection, which is a set that can be accessed through the function
193+ argument <varname>pkgs</varname>. Typical uses:
154194<programlisting>
155195<xref linkend="opt-environment.systemPackages"/> =
156196 [ pkgs.thunderbird
@@ -159,7 +199,10 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
159199
160200<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_10;
161201</programlisting>
162− The latter option definition changes the default PostgreSQL package used by NixOS’s PostgreSQL service to 10.x. For more information on packages, including how to add new ones, see <xref linkend="sec-custom-packages"/>.
202+ The latter option definition changes the default PostgreSQL package used
203+ by NixOS’s PostgreSQL service to 10.x. For more information on
204+ packages, including how to add new ones, see
205+ <xref linkend="sec-custom-packages"/>.
163206 </para>
164207 </listitem>
165208 </varlistentry>
nixos/doc/manual/configuration/config-syntax.xml+12−2
@@ -5,8 +5,18 @@
55 xml:id="sec-configuration-syntax">
66 <title>Configuration Syntax</title>
77 <para>
8− The NixOS configuration file <filename>/etc/nixos/configuration.nix</filename> is actually a <emphasis>Nix expression</emphasis>, which is the Nix package manager’s purely functional language for describing how to build packages and configurations. This means you have all the expressive power of that language at your disposal, including the ability to abstract over common patterns, which is very useful when managing complex systems. The syntax and semantics of the Nix language are fully described in the <link
9−xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual</link>, but here we give a short overview of the most important constructs useful in NixOS configuration files.
8+ The NixOS configuration file
9+ <filename>/etc/nixos/configuration.nix</filename> is actually a <emphasis>Nix
10+ expression</emphasis>, which is the Nix package manager’s purely functional
11+ language for describing how to build packages and configurations. This means
12+ you have all the expressive power of that language at your disposal,
13+ including the ability to abstract over common patterns, which is very useful
14+ when managing complex systems. The syntax and semantics of the Nix language
15+ are fully described in the
16+ <link
17+xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
18+ manual</link>, but here we give a short overview of the most important
19+ constructs useful in NixOS configuration files.
1020 </para>
1121 <xi:include href="config-file.xml" />
1222 <xi:include href="abstractions.xml" />
nixos/doc/manual/configuration/configuration.xml+5−1
@@ -6,7 +6,11 @@
66 <title>Configuration</title>
77 <partintro xml:id="ch-configuration-intro">
88 <para>
9− This chapter describes how to configure various aspects of a NixOS machine through the configuration file <filename>/etc/nixos/configuration.nix</filename>. As described in <xref linkend="sec-changing-config" />, changes to this file only take effect after you run <command>nixos-rebuild</command>.
9+ This chapter describes how to configure various aspects of a NixOS machine
10+ through the configuration file
11+ <filename>/etc/nixos/configuration.nix</filename>. As described in
12+ <xref linkend="sec-changing-config" />, changes to this file only take
13+ effect after you run <command>nixos-rebuild</command>.
1014 </para>
1115 </partintro>
1216 <xi:include href="config-syntax.xml" />
nixos/doc/manual/configuration/customizing-packages.xml+46−8
@@ -6,25 +6,47 @@
66 <title>Customising Packages</title>
77
88 <para>
9− Some packages in Nixpkgs have options to enable or disable optional functionality or change other aspects of the package. For instance, the Firefox wrapper package (which provides Firefox with a set of plugins such as the Adobe Flash player) has an option to enable the Google Talk plugin. It can be set in <filename>configuration.nix</filename> as follows: <filename> nixpkgs.config.firefox.enableGoogleTalkPlugin = true; </filename>
9+ Some packages in Nixpkgs have options to enable or disable optional
10+ functionality or change other aspects of the package. For instance, the
11+ Firefox wrapper package (which provides Firefox with a set of plugins such as
12+ the Adobe Flash player) has an option to enable the Google Talk plugin. It
13+ can be set in <filename>configuration.nix</filename> as follows: <filename>
14+ nixpkgs.config.firefox.enableGoogleTalkPlugin = true; </filename>
1015 </para>
1116
1217 <warning>
1318 <para>
14− Unfortunately, Nixpkgs currently lacks a way to query available configuration options.
19+ Unfortunately, Nixpkgs currently lacks a way to query available
20+ configuration options.
1521 </para>
1622 </warning>
1723
1824 <para>
19− Apart from high-level options, it’s possible to tweak a package in almost arbitrary ways, such as changing or disabling dependencies of a package. For instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2. If you want to build it against GTK 3, you can specify that as follows:
25+ Apart from high-level options, it’s possible to tweak a package in almost
26+ arbitrary ways, such as changing or disabling dependencies of a package. For
27+ instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2.
28+ If you want to build it against GTK 3, you can specify that as follows:
2029<programlisting>
2130<xref linkend="opt-environment.systemPackages"/> = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
2231</programlisting>
23− The function <varname>override</varname> performs the call to the Nix function that produces Emacs, with the original arguments amended by the set of arguments specified by you. So here the function argument <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, <xref linkend="opt-environment.systemPackages"/> would be a list with two elements.)
32+ The function <varname>override</varname> performs the call to the Nix
33+ function that produces Emacs, with the original arguments amended by the set
34+ of arguments specified by you. So here the function argument
35+ <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing
36+ Emacs to depend on GTK 3. (The parentheses are necessary because in Nix,
37+ function application binds more weakly than list construction, so without
38+ them, <xref linkend="opt-environment.systemPackages"/> would be a list with
39+ two elements.)
2440 </para>
2541
2642 <para>
27− Even greater customisation is possible using the function <varname>overrideAttrs</varname>. While the <varname>override</varname> mechanism above overrides the arguments of a package function, <varname>overrideAttrs</varname> allows changing the <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>. This permits changing any aspect of the package, such as the source code. For instance, if you want to override the source code of Emacs, you can say:
43+ Even greater customisation is possible using the function
44+ <varname>overrideAttrs</varname>. While the <varname>override</varname>
45+ mechanism above overrides the arguments of a package function,
46+ <varname>overrideAttrs</varname> allows changing the
47+ <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>.
48+ This permits changing any aspect of the package, such as the source code. For
49+ instance, if you want to override the source code of Emacs, you can say:
2850<programlisting>
2951<xref linkend="opt-environment.systemPackages"/> = [
3052 (pkgs.emacs.overrideAttrs (oldAttrs: {
@@ -33,16 +55,32 @@
3355 }))
3456];
3557</programlisting>
36− Here, <varname>overrideAttrs</varname> takes the Nix derivation specified by <varname>pkgs.emacs</varname> and produces a new derivation in which the original’s <literal>name</literal> and <literal>src</literal> attribute have been replaced by the given values by re-calling <literal>stdenv.mkDerivation</literal>. The original attributes are accessible via the function argument, which is conventionally named <varname>oldAttrs</varname>.
58+ Here, <varname>overrideAttrs</varname> takes the Nix derivation specified by
59+ <varname>pkgs.emacs</varname> and produces a new derivation in which the
60+ original’s <literal>name</literal> and <literal>src</literal> attribute
61+ have been replaced by the given values by re-calling
62+ <literal>stdenv.mkDerivation</literal>. The original attributes are
63+ accessible via the function argument, which is conventionally named
64+ <varname>oldAttrs</varname>.
3765 </para>
3866
3967 <para>
40− The overrides shown above are not global. They do not affect the original package; other packages in Nixpkgs continue to depend on the original rather than the customised package. This means that if another package in your system depends on the original package, you end up with two instances of the package. If you want to have everything depend on your customised instance, you can apply a <emphasis>global</emphasis> override as follows:
68+ The overrides shown above are not global. They do not affect the original
69+ package; other packages in Nixpkgs continue to depend on the original rather
70+ than the customised package. This means that if another package in your
71+ system depends on the original package, you end up with two instances of the
72+ package. If you want to have everything depend on your customised instance,
73+ you can apply a <emphasis>global</emphasis> override as follows:
4174<screen>
4275nixpkgs.config.packageOverrides = pkgs:
4376 { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
4477 };
4578</screen>
46− The effect of this definition is essentially equivalent to modifying the <literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in Nixpkgs that depends on <literal>emacs</literal> will be passed your customised instance. (However, the value <literal>pkgs.emacs</literal> in <varname>nixpkgs.config.packageOverrides</varname> refers to the original rather than overridden instance, to prevent an infinite recursion.)
79+ The effect of this definition is essentially equivalent to modifying the
80+ <literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in
81+ Nixpkgs that depends on <literal>emacs</literal> will be passed your
82+ customised instance. (However, the value <literal>pkgs.emacs</literal> in
83+ <varname>nixpkgs.config.packageOverrides</varname> refers to the original
84+ rather than overridden instance, to prevent an infinite recursion.)
4785 </para>
4886</section>
nixos/doc/manual/configuration/declarative-packages.xml+17−6
@@ -6,11 +6,17 @@
66 <title>Declarative Package Management</title>
77
88 <para>
9− With declarative package management, you specify which packages you want on your system by setting the option <xref linkend="opt-environment.systemPackages"/>. For instance, adding the following line to <filename>configuration.nix</filename> enables the Mozilla Thunderbird email application:
9+ With declarative package management, you specify which packages you want on
10+ your system by setting the option
11+ <xref linkend="opt-environment.systemPackages"/>. For instance, adding the
12+ following line to <filename>configuration.nix</filename> enables the Mozilla
13+ Thunderbird email application:
1014<programlisting>
1115<xref linkend="opt-environment.systemPackages"/> = [ pkgs.thunderbird ];
1216</programlisting>
13− The effect of this specification is that the Thunderbird package from Nixpkgs will be built or downloaded as part of the system when you run <command>nixos-rebuild switch</command>.
17+ The effect of this specification is that the Thunderbird package from Nixpkgs
18+ will be built or downloaded as part of the system when you run
19+ <command>nixos-rebuild switch</command>.
1420 </para>
1521
1622 <para>
@@ -20,15 +26,20 @@
2026nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded
2127<replaceable>...</replaceable>
2228</screen>
23− The first column in the output is the <emphasis>attribute name</emphasis>, such as <literal>nixos.thunderbird</literal>.
29+ The first column in the output is the <emphasis>attribute name</emphasis>,
30+ such as <literal>nixos.thunderbird</literal>.
2431 </para>
25−
2632 <para>
27− Note: the <literal>nixos</literal> prefix tells us that we want to get the package from the <literal>nixos</literal> channel and works only in CLI tools. In declarative configuration use <literal>pkgs</literal> prefix (variable).
33+ Note: the <literal>nixos</literal> prefix tells us that we want to get the
34+ package from the <literal>nixos</literal> channel and works only in CLI tools.
35+
36+ In declarative configuration use <literal>pkgs</literal> prefix (variable).
2837 </para>
2938
3039 <para>
31− To “uninstall” a package, simply remove it from <xref linkend="opt-environment.systemPackages"/> and run <command>nixos-rebuild switch</command>.
40+ To “uninstall” a package, simply remove it from
41+ <xref linkend="opt-environment.systemPackages"/> and run
42+ <command>nixos-rebuild switch</command>.
3243 </para>
3344
3445 <xi:include href="customizing-packages.xml" />
nixos/doc/manual/configuration/file-systems.xml+24−4
@@ -5,21 +5,41 @@
55 xml:id="ch-file-systems">
66 <title>File Systems</title>
77 <para>
8− You can define file systems using the <option>fileSystems</option> configuration option. For instance, the following definition causes NixOS to mount the Ext4 file system on device <filename>/dev/disk/by-label/data</filename> onto the mount point <filename>/data</filename>:
8+ You can define file systems using the <option>fileSystems</option>
9+ configuration option. For instance, the following definition causes NixOS to
10+ mount the Ext4 file system on device
11+ <filename>/dev/disk/by-label/data</filename> onto the mount point
12+ <filename>/data</filename>:
913<programlisting>
1014<xref linkend="opt-fileSystems"/>."/data" =
1115 { device = "/dev/disk/by-label/data";
1216 fsType = "ext4";
1317 };
1418</programlisting>
15− Mount points are created automatically if they don’t already exist. For <option><link linkend="opt-fileSystems._name__.device">device</link></option>, it’s best to use the topology-independent device aliases in <filename>/dev/disk/by-label</filename> and <filename>/dev/disk/by-uuid</filename>, as these don’t change if the topology changes (e.g. if a disk is moved to another IDE controller).
19+ Mount points are created automatically if they don’t already exist. For
20+ <option><link linkend="opt-fileSystems._name__.device">device</link></option>,
21+ it’s best to use the topology-independent device aliases in
22+ <filename>/dev/disk/by-label</filename> and
23+ <filename>/dev/disk/by-uuid</filename>, as these don’t change if the
24+ topology changes (e.g. if a disk is moved to another IDE controller).
1625 </para>
1726 <para>
18− You can usually omit the file system type (<option><link linkend="opt-fileSystems._name__.fsType">fsType</link></option>), since <command>mount</command> can usually detect the type and load the necessary kernel module automatically. However, if the file system is needed at early boot (in the initial ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal> or <literal>ext4</literal>, then it’s best to specify <option>fsType</option> to ensure that the kernel module is available.
27+ You can usually omit the file system type
28+ (<option><link linkend="opt-fileSystems._name__.fsType">fsType</link></option>),
29+ since <command>mount</command> can usually detect the type and load the
30+ necessary kernel module automatically. However, if the file system is needed
31+ at early boot (in the initial ramdisk) and is not <literal>ext2</literal>,
32+ <literal>ext3</literal> or <literal>ext4</literal>, then it’s best to
33+ specify <option>fsType</option> to ensure that the kernel module is
34+ available.
1935 </para>
2036 <note>
2137 <para>
22− System startup will fail if any of the filesystems fails to mount, dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding <literal><link linkend="opt-fileSystems._name__.options">options</link> = [ "nofail" ];</literal>.
38+ System startup will fail if any of the filesystems fails to mount, dropping
39+ you to the emergency shell. You can make a mount asynchronous and
40+ non-critical by adding
41+ <literal><link linkend="opt-fileSystems._name__.options">options</link> = [
42+ "nofail" ];</literal>.
2343 </para>
2444 </note>
2545 <xi:include href="luks-file-systems.xml" />
nixos/doc/manual/configuration/firewall.xml+11−4
@@ -6,15 +6,21 @@
66 <title>Firewall</title>
77
88 <para>
9− NixOS has a simple stateful firewall that blocks incoming connections and other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic. It is enabled by default. It can be disabled as follows:
9+ NixOS has a simple stateful firewall that blocks incoming connections and
10+ other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic.
11+ It is enabled by default. It can be disabled as follows:
1012<programlisting>
1113<xref linkend="opt-networking.firewall.enable"/> = false;
1214</programlisting>
13− If the firewall is enabled, you can open specific TCP ports to the outside world:
15+ If the firewall is enabled, you can open specific TCP ports to the outside
16+ world:
1417<programlisting>
1518<xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 443 ];
1619</programlisting>
17− Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is enabled (<option><xref linkend="opt-services.openssh.enable"/> = true</option>). UDP ports can be opened through <xref linkend="opt-networking.firewall.allowedUDPPorts"/>.
20+ Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is
21+ enabled (<option><xref linkend="opt-services.openssh.enable"/> =
22+ true</option>). UDP ports can be opened through
23+ <xref linkend="opt-networking.firewall.allowedUDPPorts"/>.
1824 </para>
1925
2026 <para>
@@ -25,6 +31,7 @@
2531 { from = 8000; to = 8010; }
2632];
2733</programlisting>
28− Similarly, UDP port ranges can be opened through <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
34+ Similarly, UDP port ranges can be opened through
35+ <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
2936 </para>
3037</section>
nixos/doc/manual/configuration/ipv4-config.xml+11−4
@@ -6,14 +6,17 @@
66 <title>IPv4 Configuration</title>
77
88 <para>
9− By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to automatically configure network interfaces. However, you can configure an interface manually as follows:
9+ By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to
10+ automatically configure network interfaces. However, you can configure an
11+ interface manually as follows:
1012<programlisting>
1113<link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ {
1214 address = "192.168.1.2";
1315 prefixLength = 24;
1416} ];
1517</programlisting>
16− Typically you’ll also want to set a default gateway and set of name servers:
18+ Typically you’ll also want to set a default gateway and set of name
19+ servers:
1720<programlisting>
1821<xref linkend="opt-networking.defaultGateway"/> = "192.168.1.1";
1922<xref linkend="opt-networking.nameservers"/> = [ "8.8.8.8" ];
@@ -22,7 +25,10 @@
2225
2326 <note>
2427 <para>
25− Statically configured interfaces are set up by the systemd service <replaceable>interface-name</replaceable><literal>-cfg.service</literal>. The default gateway and name server configuration is performed by <literal>network-setup.service</literal>.
28+ Statically configured interfaces are set up by the systemd service
29+ <replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
30+ The default gateway and name server configuration is performed by
31+ <literal>network-setup.service</literal>.
2632 </para>
2733 </note>
2834
@@ -31,6 +37,7 @@
3137<programlisting>
3238<xref linkend="opt-networking.hostName"/> = "cartman";
3339</programlisting>
34− The default host name is <literal>nixos</literal>. Set it to the empty string (<literal>""</literal>) to allow the DHCP server to provide the host name.
40+ The default host name is <literal>nixos</literal>. Set it to the empty string
41+ (<literal>""</literal>) to allow the DHCP server to provide the host name.
3542 </para>
3643</section>
nixos/doc/manual/configuration/ipv6-config.xml+9−4
@@ -6,21 +6,25 @@
66 <title>IPv6 Configuration</title>
77
88 <para>
9− IPv6 is enabled by default. Stateless address autoconfiguration is used to automatically assign IPv6 addresses to all interfaces. You can disable IPv6 support globally by setting:
9+ IPv6 is enabled by default. Stateless address autoconfiguration is used to
10+ automatically assign IPv6 addresses to all interfaces. You can disable IPv6
11+ support globally by setting:
1012<programlisting>
1113<xref linkend="opt-networking.enableIPv6"/> = false;
1214</programlisting>
1315 </para>
1416
1517 <para>
16− You can disable IPv6 on a single interface using a normal sysctl (in this example, we use interface <varname>eth0</varname>):
18+ You can disable IPv6 on a single interface using a normal sysctl (in this
19+ example, we use interface <varname>eth0</varname>):
1720<programlisting>
1821<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv6.conf.eth0.disable_ipv6" = true;
1922</programlisting>
2023 </para>
2124
2225 <para>
23− As with IPv4 networking interfaces are automatically configured via DHCPv6. You can configure an interface manually:
26+ As with IPv4 networking interfaces are automatically configured via DHCPv6.
27+ You can configure an interface manually:
2428<programlisting>
2529<link linkend="opt-networking.interfaces._name__.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ {
2630 address = "fe00:aa:bb:cc::2";
@@ -40,6 +44,7 @@
4044 </para>
4145
4246 <para>
43− See <xref linkend='sec-ipv4' /> for similar examples and additional information.
47+ See <xref linkend='sec-ipv4' /> for similar examples and additional
48+ information.
4449 </para>
4550</section>
nixos/doc/manual/configuration/kubernetes.xml+62−12
@@ -5,10 +5,12 @@
55 xml:id="sec-kubernetes">
66 <title>Kubernetes</title>
77 <para>
8− The NixOS Kubernetes module is a collective term for a handful of individual submodules implementing the Kubernetes cluster components.
8+ The NixOS Kubernetes module is a collective term for a handful of individual
9+ submodules implementing the Kubernetes cluster components.
910 </para>
1011 <para>
11− There are generally two ways of enabling Kubernetes on NixOS. One way is to enable and configure cluster components appropriately by hand:
12+ There are generally two ways of enabling Kubernetes on NixOS. One way is to
13+ enable and configure cluster components appropriately by hand:
1214<programlisting>
1315services.kubernetes = {
1416 apiserver.enable = true;
@@ -19,7 +21,9 @@ services.kubernetes = {
1921 flannel.enable = true;
2022};
2123</programlisting>
22− Another way is to assign cluster roles ("master" and/or "node") to the host. This enables apiserver, controllerManager, scheduler, addonManager, kube-proxy and etcd:
24+ Another way is to assign cluster roles ("master" and/or "node") to the host.
25+ This enables apiserver, controllerManager, scheduler, addonManager,
26+ kube-proxy and etcd:
2327<programlisting>
2428<xref linkend="opt-services.kubernetes.roles"/> = [ "master" ];
2529</programlisting>
@@ -27,29 +31,66 @@ services.kubernetes = {
2731<programlisting>
2832<xref linkend="opt-services.kubernetes.roles"/> = [ "node" ];
2933</programlisting>
30− Assigning both the master and node roles is usable if you want a single node Kubernetes cluster for dev or testing purposes:
34+ Assigning both the master and node roles is usable if you want a single node
35+ Kubernetes cluster for dev or testing purposes:
3136<programlisting>
3237<xref linkend="opt-services.kubernetes.roles"/> = [ "master" "node" ];
3338</programlisting>
34− Note: Assigning either role will also default both <xref linkend="opt-services.kubernetes.flannel.enable"/> and <xref linkend="opt-services.kubernetes.easyCerts"/> to true. This sets up flannel as CNI and activates automatic PKI bootstrapping.
39+ Note: Assigning either role will also default both
40+ <xref linkend="opt-services.kubernetes.flannel.enable"/> and
41+ <xref linkend="opt-services.kubernetes.easyCerts"/> to true. This sets up
42+ flannel as CNI and activates automatic PKI bootstrapping.
3543 </para>
3644 <para>
37− As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have been disabled by default. While opening insecure ports is still possible, it is recommended not to bind these to other interfaces than loopback. To re-enable the insecure port on the apiserver, see options: <xref linkend="opt-services.kubernetes.apiserver.insecurePort"/> and <xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress"/>
45+ As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports
46+ on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have
47+ been disabled by default. While opening insecure ports is still possible, it
48+ is recommended not to bind these to other interfaces than loopback. To
49+ re-enable the insecure port on the apiserver, see options:
50+ <xref linkend="opt-services.kubernetes.apiserver.insecurePort"/> and
51+ <xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress"/>
3852 </para>
3953 <note>
4054 <para>
41− As of NixOS 19.03, it is mandatory to configure: <xref linkend="opt-services.kubernetes.masterAddress"/>. The masterAddress must be resolveable and routeable by all cluster nodes. In single node clusters, this can be set to <literal>localhost</literal>.
55+ As of NixOS 19.03, it is mandatory to configure:
56+ <xref linkend="opt-services.kubernetes.masterAddress"/>. The masterAddress
57+ must be resolveable and routeable by all cluster nodes. In single node
58+ clusters, this can be set to <literal>localhost</literal>.
4259 </para>
4360 </note>
4461 <para>
45− Role-based access control (RBAC) authorization mode is enabled by default. This means that anonymous requests to the apiserver secure port will expectedly cause a permission denied error. All cluster components must therefore be configured with x509 certificates for two-way tls communication. The x509 certificate subject section determines the roles and permissions granted by the apiserver to perform clusterwide or namespaced operations. See also: <link
46− xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/"> Using RBAC Authorization</link>.
62+ Role-based access control (RBAC) authorization mode is enabled by default.
63+ This means that anonymous requests to the apiserver secure port will
64+ expectedly cause a permission denied error. All cluster components must
65+ therefore be configured with x509 certificates for two-way tls communication.
66+ The x509 certificate subject section determines the roles and permissions
67+ granted by the apiserver to perform clusterwide or namespaced operations. See
68+ also:
69+ <link
70+ xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/">
71+ Using RBAC Authorization</link>.
4772 </para>
4873 <para>
49− The NixOS kubernetes module provides an option for automatic certificate bootstrapping and configuration, <xref linkend="opt-services.kubernetes.easyCerts"/>. The PKI bootstrapping process involves setting up a certificate authority (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a CA-cert for the cluster, and uses the CA-cert for signing subordinate certs issued to each of the cluster components. Subsequently, the certmgr daemon monitors active certificates and renews them when needed. For single node Kubernetes clusters, setting <xref linkend="opt-services.kubernetes.easyCerts"/> = true is sufficient and no further action is required. For joining extra node machines to an existing cluster on the other hand, establishing initial trust is mandatory.
74+ The NixOS kubernetes module provides an option for automatic certificate
75+ bootstrapping and configuration,
76+ <xref linkend="opt-services.kubernetes.easyCerts"/>. The PKI bootstrapping
77+ process involves setting up a certificate authority (CA) daemon (cfssl) on
78+ the kubernetes master node. cfssl generates a CA-cert for the cluster, and
79+ uses the CA-cert for signing subordinate certs issued to each of the cluster
80+ components. Subsequently, the certmgr daemon monitors active certificates and
81+ renews them when needed. For single node Kubernetes clusters, setting
82+ <xref linkend="opt-services.kubernetes.easyCerts"/> = true is sufficient and
83+ no further action is required. For joining extra node machines to an existing
84+ cluster on the other hand, establishing initial trust is mandatory.
5085 </para>
5186 <para>
52− To add new nodes to the cluster: On any (non-master) cluster node where <xref linkend="opt-services.kubernetes.easyCerts"/> is enabled, the helper script <literal>nixos-kubernetes-node-join</literal> is available on PATH. Given a token on stdin, it will copy the token to the kubernetes secrets directory and restart the certmgr service. As requested certificates are issued, the script will restart kubernetes cluster components as needed for them to pick up new keypairs.
87+ To add new nodes to the cluster: On any (non-master) cluster node where
88+ <xref linkend="opt-services.kubernetes.easyCerts"/> is enabled, the helper
89+ script <literal>nixos-kubernetes-node-join</literal> is available on PATH.
90+ Given a token on stdin, it will copy the token to the kubernetes secrets
91+ directory and restart the certmgr service. As requested certificates are
92+ issued, the script will restart kubernetes cluster components as needed for
93+ them to pick up new keypairs.
5394 </para>
5495 <note>
5596 <para>
@@ -57,6 +98,15 @@ services.kubernetes = {
5798 </para>
5899 </note>
59100 <para>
60− In order to interact with an RBAC-enabled cluster as an administrator, one needs to have cluster-admin privileges. By default, when easyCerts is enabled, a cluster-admin kubeconfig file is generated and linked into <literal>/etc/kubernetes/cluster-admin.kubeconfig</literal> as determined by <xref linkend="opt-services.kubernetes.pki.etcClusterAdminKubeconfig"/>. <literal>export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig</literal> will make kubectl use this kubeconfig to access and authenticate the cluster. The cluster-admin kubeconfig references an auto-generated keypair owned by root. Thus, only root on the kubernetes master may obtain cluster-admin rights by means of this file.
101+ In order to interact with an RBAC-enabled cluster as an administrator, one
102+ needs to have cluster-admin privileges. By default, when easyCerts is
103+ enabled, a cluster-admin kubeconfig file is generated and linked into
104+ <literal>/etc/kubernetes/cluster-admin.kubeconfig</literal> as determined by
105+ <xref linkend="opt-services.kubernetes.pki.etcClusterAdminKubeconfig"/>.
106+ <literal>export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig</literal>
107+ will make kubectl use this kubeconfig to access and authenticate the cluster.
108+ The cluster-admin kubeconfig references an auto-generated keypair owned by
109+ root. Thus, only root on the kubernetes master may obtain cluster-admin
110+ rights by means of this file.
61111 </para>
62112</chapter>
nixos/doc/manual/configuration/linux-kernel.xml+44−15
@@ -5,19 +5,27 @@
55 xml:id="sec-kernel-config">
66 <title>Linux Kernel</title>
77 <para>
8− You can override the Linux kernel and associated packages using the option <option>boot.kernelPackages</option>. For instance, this selects the Linux 3.10 kernel:
8+ You can override the Linux kernel and associated packages using the option
9+ <option>boot.kernelPackages</option>. For instance, this selects the Linux
10+ 3.10 kernel:
911<programlisting>
1012<xref linkend="opt-boot.kernelPackages"/> = pkgs.linuxPackages_3_10;
1113</programlisting>
12− Note that this not only replaces the kernel, but also packages that are specific to the kernel version, such as the NVIDIA video drivers. This ensures that driver packages are consistent with the kernel.
14+ Note that this not only replaces the kernel, but also packages that are
15+ specific to the kernel version, such as the NVIDIA video drivers. This
16+ ensures that driver packages are consistent with the kernel.
1317 </para>
1418 <para>
15− The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
19+ The default Linux kernel configuration should be fine for most users. You can
20+ see the configuration of your current kernel with the following command:
1621<programlisting>
1722zcat /proc/config.gz
1823</programlisting>
19− If you want to change the kernel configuration, you can use the <option>packageOverrides</option> feature (see <xref
20−linkend="sec-customising-packages" />). For instance, to enable support for the kernel debugger KGDB:
24+ If you want to change the kernel configuration, you can use the
25+ <option>packageOverrides</option> feature (see
26+ <xref
27+linkend="sec-customising-packages" />). For instance, to enable support
28+ for the kernel debugger KGDB:
2129<programlisting>
2230nixpkgs.config.packageOverrides = pkgs:
2331 { linux_3_4 = pkgs.linux_3_4.override {
@@ -28,31 +36,44 @@ nixpkgs.config.packageOverrides = pkgs:
2836 };
2937 };
3038</programlisting>
31− <varname>extraConfig</varname> takes a list of Linux kernel configuration options, one per line. The name of the option should not include the prefix <literal>CONFIG_</literal>. The option value is typically <literal>y</literal>, <literal>n</literal> or <literal>m</literal> (to build something as a kernel module).
39+ <varname>extraConfig</varname> takes a list of Linux kernel configuration
40+ options, one per line. The name of the option should not include the prefix
41+ <literal>CONFIG_</literal>. The option value is typically
42+ <literal>y</literal>, <literal>n</literal> or <literal>m</literal> (to build
43+ something as a kernel module).
3244 </para>
3345 <para>
34− Kernel modules for hardware devices are generally loaded automatically by <command>udev</command>. You can force a module to be loaded via <xref linkend="opt-boot.kernelModules"/>, e.g.
46+ Kernel modules for hardware devices are generally loaded automatically by
47+ <command>udev</command>. You can force a module to be loaded via
48+ <xref linkend="opt-boot.kernelModules"/>, e.g.
3549<programlisting>
3650<xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
3751</programlisting>
38− If the module is required early during the boot (e.g. to mount the root file system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>:
52+ If the module is required early during the boot (e.g. to mount the root file
53+ system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>:
3954<programlisting>
4055<xref linkend="opt-boot.initrd.kernelModules"/> = [ "cifs" ];
4156</programlisting>
42− This causes the specified modules and their dependencies to be added to the initial ramdisk.
57+ This causes the specified modules and their dependencies to be added to the
58+ initial ramdisk.
4359 </para>
4460 <para>
45− Kernel runtime parameters can be set through <xref linkend="opt-boot.kernel.sysctl"/>, e.g.
61+ Kernel runtime parameters can be set through
62+ <xref linkend="opt-boot.kernel.sysctl"/>, e.g.
4663<programlisting>
4764<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 120;
4865</programlisting>
49− sets the kernel’s TCP keepalive time to 120 seconds. To see the available parameters, run <command>sysctl -a</command>.
66+ sets the kernel’s TCP keepalive time to 120 seconds. To see the available
67+ parameters, run <command>sysctl -a</command>.
5068 </para>
5169 <section xml:id="sec-linux-config-customizing">
5270 <title>Customize your kernel</title>
5371
5472 <para>
55− The first step before compiling the kernel is to generate an appropriate <literal>.config</literal> configuration. Either you pass your own config via the <literal>configfile</literal> setting of <literal>linuxManualConfig</literal>:
73+ The first step before compiling the kernel is to generate an appropriate
74+ <literal>.config</literal> configuration. Either you pass your own config
75+ via the <literal>configfile</literal> setting of
76+ <literal>linuxManualConfig</literal>:
5677<screen><![CDATA[
5778 custom-kernel = super.linuxManualConfig {
5879 inherit (super) stdenv hostPlatform;
@@ -63,11 +84,17 @@ nixpkgs.config.packageOverrides = pkgs:
6384 allowImportFromDerivation = true;
6485 };
6586 ]]></screen>
66− You can edit the config with this snippet (by default <command>make menuconfig</command> won't work out of the box on nixos):
87+ You can edit the config with this snippet (by default <command>make
88+ menuconfig</command> won't work out of the box on nixos):
6789<screen><![CDATA[
6890 nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})'
6991 ]]></screen>
70− or you can let nixpkgs generate the configuration. Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>. The answers depend on parameters passed to <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you can influence by overriding <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>).
92+ or you can let nixpkgs generate the configuration. Nixpkgs generates it via
93+ answering the interactive kernel utility <command>make config</command>. The
94+ answers depend on parameters passed to
95+ <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you
96+ can influence by overriding <literal>extraConfig, autoModules,
97+ modDirVersion, preferBuiltin, extraConfig</literal>).
7198<screen><![CDATA[
7299
73100 mptcp93.override ({
@@ -94,7 +121,9 @@ nixpkgs.config.packageOverrides = pkgs:
94121 <title>Developing kernel modules</title>
95122
96123 <para>
97− When developing kernel modules it's often convenient to run edit-compile-run loop as quickly as possible. See below snippet as an example of developing <literal>mellanox</literal> drivers.
124+ When developing kernel modules it's often convenient to run edit-compile-run
125+ loop as quickly as possible. See below snippet as an example of developing
126+ <literal>mellanox</literal> drivers.
98127 </para>
99128
100129<screen><![CDATA[
nixos/doc/manual/configuration/luks-file-systems.xml+9−3
@@ -6,7 +6,10 @@
66 <title>LUKS-Encrypted File Systems</title>
77
88 <para>
9− NixOS supports file systems that are encrypted using <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, here is how you create an encrypted Ext4 file system on the device <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
9+ NixOS supports file systems that are encrypted using
10+ <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, here is how
11+ you create an encrypted Ext4 file system on the device
12+ <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
1013<screen>
1114# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d
1215
@@ -23,12 +26,15 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: ***
2326
2427# mkfs.ext4 /dev/mapper/crypted
2528</screen>
26− To ensure that this file system is automatically mounted at boot time as <filename>/</filename>, add the following to <filename>configuration.nix</filename>:
29+ To ensure that this file system is automatically mounted at boot time as
30+ <filename>/</filename>, add the following to
31+ <filename>configuration.nix</filename>:
2732<programlisting>
2833<link linkend="opt-boot.initrd.luks.devices._name__.device">boot.initrd.luks.devices.crypted.device</link> = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d";
2934<xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/crypted";
3035</programlisting>
31− Should grub be used as bootloader, and <filename>/boot</filename> is located on an encrypted partition, it is necessary to add the following grub option:
36+ Should grub be used as bootloader, and <filename>/boot</filename> is located
37+ on an encrypted partition, it is necessary to add the following grub option:
3238<programlisting><xref linkend="opt-boot.loader.grub.enableCryptodisk"/> = true;</programlisting>
3339 </para>
3440</section>
nixos/doc/manual/configuration/matrix.xml+65−8
@@ -5,16 +5,33 @@
55 xml:id="module-services-matrix">
66 <title>Matrix</title>
77 <para>
8− <link xlink:href="https://matrix.org/">Matrix</link> is an open standard for interoperable, decentralised, real-time communication over IP. It can be used to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere you need a standard HTTP API for publishing and subscribing to data whilst tracking the conversation history.
8+ <link xlink:href="https://matrix.org/">Matrix</link> is an open standard for
9+ interoperable, decentralised, real-time communication over IP. It can be used
10+ to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things
11+ communication - or anywhere you need a standard HTTP API for publishing and
12+ subscribing to data whilst tracking the conversation history.
913 </para>
1014 <para>
11− This chapter will show you how to set up your own, self-hosted Matrix homeserver using the Synapse reference homeserver, and how to serve your own copy of the Riot web client. See the <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try Matrix Now!</link> overview page for links to Riot Apps for Android and iOS, desktop clients, as well as bridges to other networks and other projects around Matrix.
15+ This chapter will show you how to set up your own, self-hosted Matrix
16+ homeserver using the Synapse reference homeserver, and how to serve your own
17+ copy of the Riot web client. See the
18+ <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try
19+ Matrix Now!</link> overview page for links to Riot Apps for Android and iOS,
20+ desktop clients, as well as bridges to other networks and other projects
21+ around Matrix.
1222 </para>
1323 <section xml:id="module-services-matrix-synapse">
1424 <title>Synapse Homeserver</title>
1525
1626 <para>
17− <link xlink:href="https://github.com/matrix-org/synapse">Synapse</link> is the reference homeserver implementation of Matrix from the core development team at matrix.org. The following configuration example will set up a synapse server for the <literal>example.org</literal> domain, served from the host <literal>myhostname.example.org</literal>. For more information, please refer to the <link xlink:href="https://github.com/matrix-org/synapse#synapse-installation"> installation instructions of Synapse </link>.
27+ <link xlink:href="https://github.com/matrix-org/synapse">Synapse</link> is
28+ the reference homeserver implementation of Matrix from the core development
29+ team at matrix.org. The following configuration example will set up a
30+ synapse server for the <literal>example.org</literal> domain, served from
31+ the host <literal>myhostname.example.org</literal>. For more information,
32+ please refer to the
33+ <link xlink:href="https://github.com/matrix-org/synapse#synapse-installation">
34+ installation instructions of Synapse </link>.
1835<programlisting>
1936let
2037 fqdn =
@@ -104,11 +121,26 @@ in {
104121 </para>
105122
106123 <para>
107− If the <code>A</code> and <code>AAAA</code> DNS records on <literal>example.org</literal> do not point on the same host as the records for <code>myhostname.example.org</code>, you can easily move the <code>/.well-known</code> virtualHost section of the code to the host that is serving <literal>example.org</literal>, while the rest stays on <literal>myhostname.example.org</literal> with no other changes required. This pattern also allows to seamlessly move the homeserver from <literal>myhostname.example.org</literal> to <literal>myotherhost.example.org</literal> by only changing the <code>/.well-known</code> redirection target.
124+ If the <code>A</code> and <code>AAAA</code> DNS records on
125+ <literal>example.org</literal> do not point on the same host as the records
126+ for <code>myhostname.example.org</code>, you can easily move the
127+ <code>/.well-known</code> virtualHost section of the code to the host that
128+ is serving <literal>example.org</literal>, while the rest stays on
129+ <literal>myhostname.example.org</literal> with no other changes required.
130+ This pattern also allows to seamlessly move the homeserver from
131+ <literal>myhostname.example.org</literal> to
132+ <literal>myotherhost.example.org</literal> by only changing the
133+ <code>/.well-known</code> redirection target.
108134 </para>
109135
110136 <para>
111− If you want to run a server with public registration by anybody, you can then enable <option>services.matrix-synapse.enable_registration = true;</option>. Otherwise, or you can generate a registration secret with <command>pwgen -s 64 1</command> and set it with <option>services.matrix-synapse.registration_shared_secret</option>. To create a new user or admin, run the following after you have set the secret and have rebuilt NixOS:
137+ If you want to run a server with public registration by anybody, you can
138+ then enable <option>services.matrix-synapse.enable_registration =
139+ true;</option>. Otherwise, or you can generate a registration secret with
140+ <command>pwgen -s 64 1</command> and set it with
141+ <option>services.matrix-synapse.registration_shared_secret</option>. To
142+ create a new user or admin, run the following after you have set the secret
143+ and have rebuilt NixOS:
112144<screen>
113145<prompt>$ </prompt>nix run nixpkgs.matrix-synapse
114146<prompt>$ </prompt>register_new_matrix_user -k <replaceable>your-registration-shared-secret</replaceable> http://localhost:8008
@@ -118,14 +150,32 @@ in {
118150<prompt>Make admin [no]:</prompt>
119151Success!
120152</screen>
121− In the example, this would create a user with the Matrix Identifier <literal>@your-username:example.org</literal>. Note that the registration secret ends up in the nix store and therefore is world-readable by any user on your machine, so it makes sense to only temporarily activate the <option>registration_shared_secret</option> option until a better solution for NixOS is in place.
153+ In the example, this would create a user with the Matrix Identifier
154+ <literal>@your-username:example.org</literal>. Note that the registration
155+ secret ends up in the nix store and therefore is world-readable by any user
156+ on your machine, so it makes sense to only temporarily activate the
157+ <option>registration_shared_secret</option> option until a better solution
158+ for NixOS is in place.
122159 </para>
123160 </section>
124161 <section xml:id="module-services-matrix-riot-web">
125162 <title>Riot Web Client</title>
126163
127164 <para>
128− <link xlink:href="https://github.com/vector-im/riot-web/">Riot Web</link> is the reference web client for Matrix and developed by the core team at matrix.org. The following snippet can be optionally added to the code before to complete the synapse installation with a web client served at <code>https://riot.myhostname.example.org</code> and <code>https://riot.example.org</code>. Alternatively, you can use the hosted copy at <link xlink:href="https://riot.im/app">https://riot.im/app</link>, or use other web clients or native client applications. Due to the <literal>/.well-known</literal> urls set up done above, many clients should fill in the required connection details automatically when you enter your Matrix Identifier. See <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try Matrix Now!</link> for a list of existing clients and their supported featureset.
165+ <link xlink:href="https://github.com/vector-im/riot-web/">Riot Web</link> is
166+ the reference web client for Matrix and developed by the core team at
167+ matrix.org. The following snippet can be optionally added to the code before
168+ to complete the synapse installation with a web client served at
169+ <code>https://riot.myhostname.example.org</code> and
170+ <code>https://riot.example.org</code>. Alternatively, you can use the hosted
171+ copy at <link xlink:href="https://riot.im/app">https://riot.im/app</link>,
172+ or use other web clients or native client applications. Due to the
173+ <literal>/.well-known</literal> urls set up done above, many clients should
174+ fill in the required connection details automatically when you enter your
175+ Matrix Identifier. See
176+ <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try
177+ Matrix Now!</link> for a list of existing clients and their supported
178+ featureset.
129179<programlisting>
130180services.nginx.virtualHosts."riot.${fqdn}" = {
131181 enableACME = true;
@@ -140,7 +190,14 @@ services.nginx.virtualHosts."riot.${fqdn}" = {
140190 </para>
141191
142192 <para>
143− Note that the Riot developers do not recommend running Riot and your Matrix homeserver on the same fully-qualified domain name for security reasons. In the example, this means that you should not reuse the <literal>myhostname.example.org</literal> virtualHost to also serve Riot, but instead serve it on a different subdomain, like <literal>riot.example.org</literal> in the example. See the <link xlink:href="https://github.com/vector-im/riot-web#important-security-note">Riot Important Security Notes</link> for more information on this subject.
193+ Note that the Riot developers do not recommend running Riot and your Matrix
194+ homeserver on the same fully-qualified domain name for security reasons. In
195+ the example, this means that you should not reuse the
196+ <literal>myhostname.example.org</literal> virtualHost to also serve Riot,
197+ but instead serve it on a different subdomain, like
198+ <literal>riot.example.org</literal> in the example. See the
199+ <link xlink:href="https://github.com/vector-im/riot-web#important-security-note">Riot
200+ Important Security Notes</link> for more information on this subject.
144201 </para>
145202 </section>
146203</chapter>
nixos/doc/manual/configuration/modularity.xml+50−13
@@ -6,11 +6,18 @@
66 <title>Modularity</title>
77
88 <para>
9− The NixOS configuration mechanism is modular. If your <filename>configuration.nix</filename> becomes too big, you can split it into multiple files. Likewise, if you have multiple NixOS configurations (e.g. for different computers) with some commonality, you can move the common configuration into a shared file.
9+ The NixOS configuration mechanism is modular. If your
10+ <filename>configuration.nix</filename> becomes too big, you can split it into
11+ multiple files. Likewise, if you have multiple NixOS configurations (e.g. for
12+ different computers) with some commonality, you can move the common
13+ configuration into a shared file.
1014 </para>
1115
1216 <para>
13− Modules have exactly the same syntax as <filename>configuration.nix</filename>. In fact, <filename>configuration.nix</filename> is itself a module. You can use other modules by including them from <filename>configuration.nix</filename>, e.g.:
17+ Modules have exactly the same syntax as
18+ <filename>configuration.nix</filename>. In fact,
19+ <filename>configuration.nix</filename> is itself a module. You can use other
20+ modules by including them from <filename>configuration.nix</filename>, e.g.:
1421<programlisting>
1522{ config, pkgs, ... }:
1623
@@ -20,7 +27,9 @@
2027 <replaceable>...</replaceable>
2128}
2229</programlisting>
23− Here, we include two modules from the same directory, <filename>vpn.nix</filename> and <filename>kde.nix</filename>. The latter might look like this:
30+ Here, we include two modules from the same directory,
31+ <filename>vpn.nix</filename> and <filename>kde.nix</filename>. The latter
32+ might look like this:
2433<programlisting>
2534{ config, pkgs, ... }:
2635
@@ -29,32 +38,55 @@
2938 <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
3039}
3140</programlisting>
32− Note that both <filename>configuration.nix</filename> and <filename>kde.nix</filename> define the option <xref linkend="opt-environment.systemPackages"/>. When multiple modules define an option, NixOS will try to <emphasis>merge</emphasis> the definitions. In the case of <xref linkend="opt-environment.systemPackages"/>, that’s easy: the lists of packages can simply be concatenated. The value in <filename>configuration.nix</filename> is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use <varname>mkBefore</varname>:
41+ Note that both <filename>configuration.nix</filename> and
42+ <filename>kde.nix</filename> define the option
43+ <xref linkend="opt-environment.systemPackages"/>. When multiple modules
44+ define an option, NixOS will try to <emphasis>merge</emphasis> the
45+ definitions. In the case of <xref linkend="opt-environment.systemPackages"/>,
46+ that’s easy: the lists of packages can simply be concatenated. The value in
47+ <filename>configuration.nix</filename> is merged last, so for list-type
48+ options, it will appear at the end of the merged list. If you want it to
49+ appear first, you can use <varname>mkBefore</varname>:
3350<programlisting>
3451<xref linkend="opt-boot.kernelModules"/> = mkBefore [ "kvm-intel" ];
3552</programlisting>
36− This causes the <literal>kvm-intel</literal> kernel module to be loaded before any other kernel modules.
53+ This causes the <literal>kvm-intel</literal> kernel module to be loaded
54+ before any other kernel modules.
3755 </para>
3856
3957 <para>
40− For other types of options, a merge may not be possible. For instance, if two modules define <xref linkend="opt-services.httpd.adminAddr"/>, <command>nixos-rebuild</command> will give an error:
58+ For other types of options, a merge may not be possible. For instance, if two
59+ modules define <xref linkend="opt-services.httpd.adminAddr"/>,
60+ <command>nixos-rebuild</command> will give an error:
4161<screen>
4262The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'.
4363</screen>
44− When that happens, it’s possible to force one definition take precedence over the others:
64+ When that happens, it’s possible to force one definition take precedence
65+ over the others:
4566<programlisting>
4667<xref linkend="opt-services.httpd.adminAddr"/> = pkgs.lib.mkForce "bob@example.org";
4768</programlisting>
4869 </para>
4970
5071 <para>
51− When using multiple modules, you may need to access configuration values defined in other modules. This is what the <varname>config</varname> function argument is for: it contains the complete, merged system configuration. That is, <varname>config</varname> is the result of combining the configurations returned by every module
72+ When using multiple modules, you may need to access configuration values
73+ defined in other modules. This is what the <varname>config</varname> function
74+ argument is for: it contains the complete, merged system configuration. That
75+ is, <varname>config</varname> is the result of combining the configurations
76+ returned by every module
5277 <footnote xml:id="footnote-nix-is-lazy">
5378 <para>
54− If you’re wondering how it’s possible that the (indirect) <emphasis>result</emphasis> of a function is passed as an <emphasis>input</emphasis> to that same function: that’s because Nix is a “lazy” language — it only computes values when they are needed. This works as long as no individual configuration value depends on itself.
79+ If you’re wondering how it’s possible that the (indirect)
80+ <emphasis>result</emphasis> of a function is passed as an
81+ <emphasis>input</emphasis> to that same function: that’s because Nix is a
82+ “lazy” language — it only computes values when they are needed. This
83+ works as long as no individual configuration value depends on itself.
5584 </para>
5685 </footnote>
57− . For example, here is a module that adds some packages to <xref linkend="opt-environment.systemPackages"/> only if <xref linkend="opt-services.xserver.enable"/> is set to <literal>true</literal> somewhere else:
86+ . For example, here is a module that adds some packages to
87+ <xref linkend="opt-environment.systemPackages"/> only if
88+ <xref linkend="opt-services.xserver.enable"/> is set to
89+ <literal>true</literal> somewhere else:
5890<programlisting>
5991{ config, pkgs, ... }:
6092
@@ -70,7 +102,9 @@ The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc
70102 </para>
71103
72104 <para>
73− With multiple modules, it may not be obvious what the final value of a configuration option is. The command <option>nixos-option</option> allows you to find out:
105+ With multiple modules, it may not be obvious what the final value of a
106+ configuration option is. The command <option>nixos-option</option> allows you
107+ to find out:
74108<screen>
75109<prompt>$ </prompt>nixos-option <xref linkend="opt-services.xserver.enable"/>
76110true
@@ -78,7 +112,8 @@ true
78112<prompt>$ </prompt>nixos-option <xref linkend="opt-boot.kernelModules"/>
79113[ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
80114</screen>
81− Interactive exploration of the configuration is possible using <command>nix repl</command>, a read-eval-print loop for Nix expressions. A typical use:
115+ Interactive exploration of the configuration is possible using <command>nix
116+ repl</command>, a read-eval-print loop for Nix expressions. A typical use:
82117<screen>
83118<prompt>$ </prompt>nix repl '&lt;nixpkgs/nixos>'
84119
@@ -91,7 +126,9 @@ true
91126 </para>
92127
93128 <para>
94− While abstracting your configuration, you may find it useful to generate modules using code, instead of writing files. The example below would have the same effect as importing a file which sets those options.
129+ While abstracting your configuration, you may find it useful to generate
130+ modules using code, instead of writing files. The example below would have
131+ the same effect as importing a file which sets those options.
95132<programlisting>
96133{ config, pkgs, ... }:
97134
nixos/doc/manual/configuration/network-manager.xml+17−5
@@ -6,27 +6,39 @@
66 <title>NetworkManager</title>
77
88 <para>
9− To facilitate network configuration, some desktop environments use NetworkManager. You can enable NetworkManager by setting:
9+ To facilitate network configuration, some desktop environments use
10+ NetworkManager. You can enable NetworkManager by setting:
1011<programlisting>
1112<xref linkend="opt-networking.networkmanager.enable"/> = true;
1213</programlisting>
13− some desktop managers (e.g., GNOME) enable NetworkManager automatically for you.
14+ some desktop managers (e.g., GNOME) enable NetworkManager automatically for
15+ you.
1416 </para>
1517
1618 <para>
17− All users that should have permission to change network settings must belong to the <code>networkmanager</code> group:
19+ All users that should have permission to change network settings must belong
20+ to the <code>networkmanager</code> group:
1821<programlisting>
1922<link linkend="opt-users.users._name__.extraGroups">users.users.alice.extraGroups</link> = [ "networkmanager" ];
2023</programlisting>
2124 </para>
2225
2326 <para>
24− NetworkManager is controlled using either <command>nmcli</command> or <command>nmtui</command> (curses-based terminal user interface). See their manual pages for details on their usage. Some desktop environments (GNOME, KDE) have their own configuration tools for NetworkManager. On XFCE, there is no configuration tool for NetworkManager by default: by adding <code>networkmanagerapplet</code> to the list of system packages, the graphical applet will be installed and will launch automatically when XFCE is starting (and will show in the status tray).
27+ NetworkManager is controlled using either <command>nmcli</command> or
28+ <command>nmtui</command> (curses-based terminal user interface). See their
29+ manual pages for details on their usage. Some desktop environments (GNOME,
30+ KDE) have their own configuration tools for NetworkManager. On XFCE, there is
31+ no configuration tool for NetworkManager by default: by adding
32+ <code>networkmanagerapplet</code> to the list of system packages, the
33+ graphical applet will be installed and will launch automatically when XFCE is
34+ starting (and will show in the status tray).
2535 </para>
2636
2737 <note>
2838 <para>
29− <code>networking.networkmanager</code> and <code>networking.wireless</code> (WPA Supplicant) cannot be enabled at the same time: you can still connect to the wireless networks using NetworkManager.
39+ <code>networking.networkmanager</code> and <code>networking.wireless</code>
40+ (WPA Supplicant) cannot be enabled at the same time: you can still connect
41+ to the wireless networks using NetworkManager.
3042 </para>
3143 </note>
3244</section>
nixos/doc/manual/configuration/networking.xml+2−1
@@ -5,7 +5,8 @@
55 xml:id="sec-networking">
66 <title>Networking</title>
77 <para>
8− This section describes how to configure networking components on your NixOS machine.
8+ This section describes how to configure networking components on your NixOS
9+ machine.
910 </para>
1011 <xi:include href="network-manager.xml" />
1112 <xi:include href="ssh.xml" />
nixos/doc/manual/configuration/package-mgmt.xml+10−3
@@ -5,16 +5,23 @@
55 xml:id="sec-package-management">
66 <title>Package Management</title>
77 <para>
8− This section describes how to add additional packages to your system. NixOS has two distinct styles of package management:
8+ This section describes how to add additional packages to your system. NixOS
9+ has two distinct styles of package management:
910 <itemizedlist>
1011 <listitem>
1112 <para>
12− <emphasis>Declarative</emphasis>, where you declare what packages you want in your <filename>configuration.nix</filename>. Every time you run <command>nixos-rebuild</command>, NixOS will ensure that you get a consistent set of binaries corresponding to your specification.
13+ <emphasis>Declarative</emphasis>, where you declare what packages you want
14+ in your <filename>configuration.nix</filename>. Every time you run
15+ <command>nixos-rebuild</command>, NixOS will ensure that you get a
16+ consistent set of binaries corresponding to your specification.
1317 </para>
1418 </listitem>
1519 <listitem>
1620 <para>
17− <emphasis>Ad hoc</emphasis>, where you install, upgrade and uninstall packages via the <command>nix-env</command> command. This style allows mixing packages from different Nixpkgs versions. It’s the only choice for non-root users.
21+ <emphasis>Ad hoc</emphasis>, where you install, upgrade and uninstall
22+ packages via the <command>nix-env</command> command. This style allows
23+ mixing packages from different Nixpkgs versions. It’s the only choice
24+ for non-root users.
1825 </para>
1926 </listitem>
2027 </itemizedlist>
nixos/doc/manual/configuration/profiles.xml+10−3
@@ -5,7 +5,12 @@
55 xml:id="ch-profiles">
66 <title>Profiles</title>
77 <para>
8− In some cases, it may be desirable to take advantage of commonly-used, predefined configurations provided by nixpkgs, but different from those that come as default. This is a role fulfilled by NixOS's Profiles, which come as files living in <filename>&lt;nixpkgs/nixos/modules/profiles&gt;</filename>. That is to say, expected usage is to add them to the imports list of your <filename>/etc/configuration.nix</filename> as such:
8+ In some cases, it may be desirable to take advantage of commonly-used,
9+ predefined configurations provided by nixpkgs, but different from those that
10+ come as default. This is a role fulfilled by NixOS's Profiles, which come as
11+ files living in <filename>&lt;nixpkgs/nixos/modules/profiles&gt;</filename>.
12+ That is to say, expected usage is to add them to the imports list of your
13+ <filename>/etc/configuration.nix</filename> as such:
914 </para>
1015<programlisting>
1116 imports = [
@@ -13,10 +18,12 @@
1318 ];
1419</programlisting>
1520 <para>
16− Even if some of these profiles seem only useful in the context of install media, many are actually intended to be used in real installs.
21+ Even if some of these profiles seem only useful in the context of install
22+ media, many are actually intended to be used in real installs.
1723 </para>
1824 <para>
19− What follows is a brief explanation on the purpose and use-case for each profile. Detailing each option configured by each one is out of scope.
25+ What follows is a brief explanation on the purpose and use-case for each
26+ profile. Detailing each option configured by each one is out of scope.
2027 </para>
2128 <xi:include href="profiles/all-hardware.xml" />
2229 <xi:include href="profiles/base.xml" />
nixos/doc/manual/configuration/profiles/all-hardware.xml+8−2
@@ -6,10 +6,16 @@
66 <title>All Hardware</title>
77
88 <para>
9− Enables all hardware supported by NixOS: i.e., all firmware is included, and all devices from which one may boot are enabled in the initrd. Its primary use is in the NixOS installation CDs.
9+ Enables all hardware supported by NixOS: i.e., all firmware is included, and
10+ all devices from which one may boot are enabled in the initrd. Its primary
11+ use is in the NixOS installation CDs.
1012 </para>
1113
1214 <para>
13− The enabled kernel modules include support for SATA and PATA, SCSI (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and Hyper-V. Additionally, <xref linkend="opt-hardware.enableAllFirmware"/> is enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically installed.
15+ The enabled kernel modules include support for SATA and PATA, SCSI
16+ (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and
17+ Hyper-V. Additionally, <xref linkend="opt-hardware.enableAllFirmware"/> is
18+ enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically
19+ installed.
1420 </para>
1521</section>
nixos/doc/manual/configuration/profiles/base.xml+5−1
@@ -6,6 +6,10 @@
66 <title>Base</title>
77
88 <para>
9− Defines the software packages included in the "minimal" installation CD. It installs several utilities useful in a simple recovery or install media, such as a text-mode web browser, and tools for manipulating block devices, networking, hardware diagnostics, and filesystems (with their respective kernel modules).
9+ Defines the software packages included in the "minimal" installation CD. It
10+ installs several utilities useful in a simple recovery or install media, such
11+ as a text-mode web browser, and tools for manipulating block devices,
12+ networking, hardware diagnostics, and filesystems (with their respective
13+ kernel modules).
1014 </para>
1115</section>
nixos/doc/manual/configuration/profiles/clone-config.xml+8−2
@@ -6,10 +6,16 @@
66 <title>Clone Config</title>
77
88 <para>
9− This profile is used in installer images. It provides an editable configuration.nix that imports all the modules that were also used when creating the image in the first place. As a result it allows users to edit and rebuild the live-system.
9+ This profile is used in installer images. It provides an editable
10+ configuration.nix that imports all the modules that were also used when
11+ creating the image in the first place. As a result it allows users to edit
12+ and rebuild the live-system.
1013 </para>
1114
1215 <para>
13− On images where the installation media also becomes an installation target, copying over <literal>configuration.nix</literal> should be disabled by setting <literal>installer.cloneConfig</literal> to <literal>false</literal>. For example, this is done in <literal>sd-image-aarch64.nix</literal>.
16+ On images where the installation media also becomes an installation target,
17+ copying over <literal>configuration.nix</literal> should be disabled by
18+ setting <literal>installer.cloneConfig</literal> to <literal>false</literal>.
19+ For example, this is done in <literal>sd-image-aarch64.nix</literal>.
1420 </para>
1521</section>
nixos/doc/manual/configuration/profiles/demo.xml+5−1
@@ -6,6 +6,10 @@
66 <title>Demo</title>
77
88 <para>
9− This profile just enables a <systemitem class="username">demo</systemitem> user, with password <literal>demo</literal>, uid <literal>1000</literal>, <systemitem class="groupname">wheel</systemitem> group and <link linkend="opt-services.xserver.displayManager.sddm.autoLogin"> autologin in the SDDM display manager</link>.
9+ This profile just enables a <systemitem class="username">demo</systemitem>
10+ user, with password <literal>demo</literal>, uid <literal>1000</literal>,
11+ <systemitem class="groupname">wheel</systemitem> group and
12+ <link linkend="opt-services.xserver.displayManager.sddm.autoLogin"> autologin
13+ in the SDDM display manager</link>.
1014 </para>
1115</section>
nixos/doc/manual/configuration/profiles/docker-container.xml+6−1
@@ -6,6 +6,11 @@
66 <title>Docker Container</title>
77
88 <para>
9− This is the profile from which the Docker images are generated. It prepares a working system by importing the <link linkend="sec-profile-minimal">Minimal</link> and <link linkend="sec-profile-clone-config">Clone Config</link> profiles, and setting appropriate configuration options that are useful inside a container context, like <xref linkend="opt-boot.isContainer"/>.
9+ This is the profile from which the Docker images are generated. It prepares a
10+ working system by importing the
11+ <link linkend="sec-profile-minimal">Minimal</link> and
12+ <link linkend="sec-profile-clone-config">Clone Config</link> profiles, and
13+ setting appropriate configuration options that are useful inside a container
14+ context, like <xref linkend="opt-boot.isContainer"/>.
1015 </para>
1116</section>
nixos/doc/manual/configuration/profiles/graphical.xml+9−2
@@ -6,10 +6,17 @@
66 <title>Graphical</title>
77
88 <para>
9− Defines a NixOS configuration with the Plasma 5 desktop. It's used by the graphical installation CD.
9+ Defines a NixOS configuration with the Plasma 5 desktop. It's used by the
10+ graphical installation CD.
1011 </para>
1112
1213 <para>
13− It sets <xref linkend="opt-services.xserver.enable"/>, <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>, <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> ( <link linkend="opt-services.xserver.desktopManager.plasma5.enableQt4Support"> without Qt4 Support</link>), and <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also includes glxinfo and firefox in the system packages list.
14+ It sets <xref linkend="opt-services.xserver.enable"/>,
15+ <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>,
16+ <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> (
17+ <link linkend="opt-services.xserver.desktopManager.plasma5.enableQt4Support">
18+ without Qt4 Support</link>), and
19+ <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also
20+ includes glxinfo and firefox in the system packages list.
1421 </para>
1522</section>
nixos/doc/manual/configuration/profiles/hardened.xml+11−3
@@ -6,11 +6,19 @@
66 <title>Hardened</title>
77
88 <para>
9− A profile with most (vanilla) hardening options enabled by default, potentially at the cost of features and performance.
9+ A profile with most (vanilla) hardening options enabled by default,
10+ potentially at the cost of features and performance.
1011 </para>
1112
1213 <para>
13− This includes a hardened kernel, and limiting the system information available to processes through the <filename>/sys</filename> and <filename>/proc</filename> filesystems. It also disables the User Namespaces feature of the kernel, which stops Nix from being able to build anything (this particular setting can be overriden via <xref linkend="opt-security.allowUserNamespaces"/>). See the <literal
14− xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix"> profile source</literal> for further detail on which settings are altered.
14+ This includes a hardened kernel, and limiting the system information
15+ available to processes through the <filename>/sys</filename> and
16+ <filename>/proc</filename> filesystems. It also disables the User Namespaces
17+ feature of the kernel, which stops Nix from being able to build anything
18+ (this particular setting can be overriden via
19+ <xref linkend="opt-security.allowUserNamespaces"/>). See the
20+ <literal
21+ xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix">
22+ profile source</literal> for further detail on which settings are altered.
1523 </para>
1624</section>
nixos/doc/manual/configuration/profiles/headless.xml+5−1
@@ -10,6 +10,10 @@
1010 </para>
1111
1212 <para>
13− Disables <link linkend="opt-sound.enable">sound</link>, <link linkend="opt-boot.vesa">vesa</link>, serial consoles, <link linkend="opt-systemd.enableEmergencyMode">emergency mode</link>, <link linkend="opt-boot.loader.grub.splashImage">grub splash images</link> and configures the kernel to reboot automatically on panic.
13+ Disables <link linkend="opt-sound.enable">sound</link>,
14+ <link linkend="opt-boot.vesa">vesa</link>, serial consoles,
15+ <link linkend="opt-systemd.enableEmergencyMode">emergency mode</link>,
16+ <link linkend="opt-boot.loader.grub.splashImage">grub splash images</link>
17+ and configures the kernel to reboot automatically on panic.
1418 </para>
1519</section>
nixos/doc/manual/configuration/profiles/installation-device.xml+19−6
@@ -6,18 +6,31 @@
66 <title>Installation Device</title>
77
88 <para>
9− Provides a basic configuration for installation devices like CDs. This enables redistributable firmware, includes the <link linkend="sec-profile-clone-config">Clone Config profile</link> and a copy of the Nixpkgs channel, so <command>nixos-install</command> works out of the box.
9+ Provides a basic configuration for installation devices like CDs.
10+ This enables redistributable firmware, includes the
11+ <link linkend="sec-profile-clone-config">Clone Config profile</link>
12+ and a copy of the Nixpkgs channel, so <command>nixos-install</command>
13+ works out of the box.
1014 </para>
11−
1215 <para>
13− Documentation for <link linkend="opt-documentation.enable">Nixpkgs</link> and <link linkend="opt-documentation.nixos.enable">NixOS</link> are forcefully enabled (to override the <link linkend="sec-profile-minimal">Minimal profile</link> preference); the NixOS manual is shown automatically on TTY 8, udisks is disabled. Autologin is enabled as <literal>nixos</literal> user, while passwordless login as both <literal>root</literal> and <literal>nixos</literal> is possible. Passwordless <command>sudo</command> is enabled too. <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> is enabled, but configured to not autostart.
16+ Documentation for <link linkend="opt-documentation.enable">Nixpkgs</link>
17+ and <link linkend="opt-documentation.nixos.enable">NixOS</link> are
18+ forcefully enabled (to override the
19+ <link linkend="sec-profile-minimal">Minimal profile</link> preference); the
20+ NixOS manual is shown automatically on TTY 8, udisks is disabled.
21+ Autologin is enabled as <literal>nixos</literal> user, while passwordless
22+ login as both <literal>root</literal> and <literal>nixos</literal> is possible.
23+ Passwordless <command>sudo</command> is enabled too.
24+ <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> is
25+ enabled, but configured to not autostart.
1426 </para>
15−
1627 <para>
17− It is explained how to login, start the ssh server, and if available, how to start the display manager.
28+ It is explained how to login, start the ssh server, and if available,
29+ how to start the display manager.
1830 </para>
1931
2032 <para>
21− Several settings are tweaked so that the installer has a better chance of succeeding under low-memory environments.
33+ Several settings are tweaked so that the installer has a better chance of
34+ succeeding under low-memory environments.
2235 </para>
2336</section>
nixos/doc/manual/configuration/profiles/minimal.xml+7−1
@@ -6,6 +6,12 @@
66 <title>Minimal</title>
77
88 <para>
9− This profile defines a small NixOS configuration. It does not contain any graphical stuff. It's a very short file that enables <link linkend="opt-environment.noXlibs">noXlibs</link>, sets <link linkend="opt-i18n.supportedLocales">i18n.supportedLocales</link> to only support the user-selected locale, <link linkend="opt-documentation.enable">disables packages' documentation </link>, and <link linkend="opt-sound.enable">disables sound</link>.
9+ This profile defines a small NixOS configuration. It does not contain any
10+ graphical stuff. It's a very short file that enables
11+ <link linkend="opt-environment.noXlibs">noXlibs</link>, sets
12+ <link linkend="opt-i18n.supportedLocales">i18n.supportedLocales</link> to
13+ only support the user-selected locale,
14+ <link linkend="opt-documentation.enable">disables packages' documentation
15+ </link>, and <link linkend="opt-sound.enable">disables sound</link>.
1016 </para>
1117</section>
nixos/doc/manual/configuration/profiles/qemu-guest.xml+5−2
@@ -6,10 +6,13 @@
66 <title>QEMU Guest</title>
77
88 <para>
9− This profile contains common configuration for virtual machines running under QEMU (using virtio).
9+ This profile contains common configuration for virtual machines running under
10+ QEMU (using virtio).
1011 </para>
1112
1213 <para>
13− It makes virtio modules available on the initrd, sets the system time from the hardware clock to work around a bug in qemu-kvm, and <link linkend="opt-security.rngd.enable">enables rngd</link>.
14+ It makes virtio modules available on the initrd, sets the system time from
15+ the hardware clock to work around a bug in qemu-kvm, and
16+ <link linkend="opt-security.rngd.enable">enables rngd</link>.
1417 </para>
1518</section>
nixos/doc/manual/configuration/ssh.xml+5−2
@@ -10,11 +10,14 @@
1010<programlisting>
1111<xref linkend="opt-services.openssh.enable"/> = true;
1212</programlisting>
13− By default, root logins using a password are disallowed. They can be disabled entirely by setting <xref linkend="opt-services.openssh.permitRootLogin"/> to <literal>"no"</literal>.
13+ By default, root logins using a password are disallowed. They can be disabled
14+ entirely by setting <xref linkend="opt-services.openssh.permitRootLogin"/> to
15+ <literal>"no"</literal>.
1416 </para>
1517
1618 <para>
17− You can declaratively specify authorised RSA/DSA public keys for a user as follows:
19+ You can declaratively specify authorised RSA/DSA public keys for a user as
20+ follows:
1821<!-- FIXME: this might not work if the user is unmanaged. -->
1922<programlisting>
2023<link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.users.alice.openssh.authorizedKeys.keys</link> =
nixos/doc/manual/configuration/summary.xml+6−2
@@ -6,8 +6,12 @@
66 <title>Syntax Summary</title>
77
88 <para>
9− 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 <link
10−xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual</link> for the rest.
9+ Below is a summary of the most important syntactic constructs in the Nix
10+ expression language. It’s not complete. In particular, there are many other
11+ built-in functions. See the
12+ <link
13+xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
14+ manual</link> for the rest.
1115 </para>
1216
1317 <informaltable frame='none'>
nixos/doc/manual/configuration/user-mgmt.xml+43−10
@@ -5,7 +5,10 @@
55 xml:id="sec-user-management">
66 <title>User Management</title>
77 <para>
8− NixOS supports both declarative and imperative styles of user management. In the declarative style, users are specified in <filename>configuration.nix</filename>. For instance, the following states that a user account named <literal>alice</literal> shall exist:
8+ NixOS supports both declarative and imperative styles of user management. In
9+ the declarative style, users are specified in
10+ <filename>configuration.nix</filename>. For instance, the following states
11+ that a user account named <literal>alice</literal> shall exist:
912<programlisting>
1013<xref linkend="opt-users.users"/>.alice = {
1114 <link linkend="opt-users.users._name__.isNormalUser">isNormalUser</link> = true;
@@ -15,33 +18,60 @@
1518 <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
1619};
1720</programlisting>
18− Note that <literal>alice</literal> is a member of the <literal>wheel</literal> and <literal>networkmanager</literal> groups, which allows her to use <command>sudo</command> to execute commands as <literal>root</literal> 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 <command>passwd</command> program to set a password, which is retained across invocations of <command>nixos-rebuild</command>.
21+ Note that <literal>alice</literal> is a member of the
22+ <literal>wheel</literal> and <literal>networkmanager</literal> groups, which
23+ allows her to use <command>sudo</command> to execute commands as
24+ <literal>root</literal> and to configure the network, respectively. Also note
25+ the SSH public key that allows remote logins with the corresponding private
26+ key. Users created in this way do not have a password by default, so they
27+ cannot log in via mechanisms that require a password. However, you can use
28+ the <command>passwd</command> program to set a password, which is retained
29+ across invocations of <command>nixos-rebuild</command>.
1930 </para>
2031 <para>
21− If you set <xref linkend="opt-users.mutableUsers"/> to false, then the contents of <literal>/etc/passwd</literal> and <literal>/etc/group</literal> will be congruent to your NixOS configuration. For instance, if you remove a user from <xref linkend="opt-users.users"/> 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 <link linkend="opt-users.users._name__.hashedPassword">hashedPassword</link> option. A hashed password can be generated using <command>mkpasswd -m sha-512</command> after installing the <literal>mkpasswd</literal> package.
32+ If you set <xref linkend="opt-users.mutableUsers"/> to false, then the
33+ contents of <literal>/etc/passwd</literal> and <literal>/etc/group</literal>
34+ will be congruent to your NixOS configuration. For instance, if you remove a
35+ user from <xref linkend="opt-users.users"/> and run nixos-rebuild, the user
36+ account will cease to exist. Also, imperative commands for managing users and
37+ groups, such as useradd, are no longer available. Passwords may still be
38+ assigned by setting the user's
39+ <link linkend="opt-users.users._name__.hashedPassword">hashedPassword</link>
40+ option. A hashed password can be generated using <command>mkpasswd -m
41+ sha-512</command> after installing the <literal>mkpasswd</literal> package.
2242 </para>
2343 <para>
24− A user ID (uid) is assigned automatically. You can also specify a uid manually by adding
44+ A user ID (uid) is assigned automatically. You can also specify a uid
45+ manually by adding
2546<programlisting>
2647uid = 1000;
2748</programlisting>
2849 to the user specification.
2950 </para>
3051 <para>
31− Groups can be specified similarly. The following states that a group named <literal>students</literal> shall exist:
52+ Groups can be specified similarly. The following states that a group named
53+ <literal>students</literal> shall exist:
3254<programlisting>
3355<xref linkend="opt-users.groups"/>.students.gid = 1000;
3456</programlisting>
35− As with users, the group ID (gid) is optional and will be assigned automatically if it’s missing.
57+ As with users, the group ID (gid) is optional and will be assigned
58+ automatically if it’s missing.
3659 </para>
3760 <para>
38− In the imperative style, users and groups are managed by commands such as <command>useradd</command>, <command>groupmod</command> and so on. For instance, to create a user account named <literal>alice</literal>:
61+ In the imperative style, users and groups are managed by commands such as
62+ <command>useradd</command>, <command>groupmod</command> and so on. For
63+ instance, to create a user account named <literal>alice</literal>:
3964<screen>
4065# useradd -m alice</screen>
41− 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:
66+ To make all nix tools available to this new user use `su - USER` which opens
67+ a login shell (==shell that loads the profile) for given user. This will
68+ create the ~/.nix-defexpr symlink. So run:
4269<screen>
4370# su - alice -c "true"</screen>
44− The flag <option>-m</option> 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 <command>passwd</command> utility:
71+ The flag <option>-m</option> causes the creation of a home directory for the
72+ new user, which is generally what you want. The user does not have an initial
73+ password and therefore cannot log in. A password can be set using the
74+ <command>passwd</command> utility:
4575<screen>
4676# passwd alice
4777Enter new UNIX password: ***
@@ -50,6 +80,9 @@ Retype new UNIX password: ***
5080 A user can be deleted using <command>userdel</command>:
5181<screen>
5282# userdel -r alice</screen>
53− The flag <option>-r</option> deletes the user’s home directory. Accounts can be modified using <command>usermod</command>. Unix groups can be managed using <command>groupadd</command>, <command>groupmod</command> and <command>groupdel</command>.
83+ The flag <option>-r</option> deletes the user’s home directory. Accounts
84+ can be modified using <command>usermod</command>. Unix groups can be managed
85+ using <command>groupadd</command>, <command>groupmod</command> and
86+ <command>groupdel</command>.
5487 </para>
5588</chapter>
nixos/doc/manual/configuration/wireless.xml+13−5
@@ -6,7 +6,9 @@
66 <title>Wireless Networks</title>
77
88 <para>
9− For a desktop installation using NetworkManager (e.g., GNOME), you just have to make sure the user is in the <code>networkmanager</code> group and you can skip the rest of this section on wireless networks.
9+ For a desktop installation using NetworkManager (e.g., GNOME), you just have
10+ to make sure the user is in the <code>networkmanager</code> group and you can
11+ skip the rest of this section on wireless networks.
1012 </para>
1113
1214 <para>
@@ -23,13 +25,17 @@
2325 "free.wifi" = {};
2426};
2527</programlisting>
26− 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 <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file yourself to define wireless networks, WPA keys and so on (see <citerefentry>
28+ Be aware that keys will be written to the nix store in plaintext! When no
29+ networks are set, it will default to using a configuration file at
30+ <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
31+ yourself to define wireless networks, WPA keys and so on (see <citerefentry>
2732 <refentrytitle>wpa_supplicant.conf</refentrytitle>
2833 <manvolnum>5</manvolnum> </citerefentry>).
2934 </para>
3035
3136 <para>
32− If you are using WPA2 you can generate pskRaw key using <command>wpa_passphrase</command>:
37+ If you are using WPA2 you can generate pskRaw key using
38+ <command>wpa_passphrase</command>:
3339<screen>
3440<prompt>$ </prompt>wpa_passphrase ESSID PSK
3541network={
@@ -45,10 +51,12 @@ network={
4551 };
4652}
4753</programlisting>
48− or you can use it to directly generate the <literal>wpa_supplicant.conf</literal>:
54+ or you can use it to directly generate the
55+ <literal>wpa_supplicant.conf</literal>:
4956<screen>
5057<prompt># </prompt>wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen>
51− After you have edited the <literal>wpa_supplicant.conf</literal>, you need to restart the wpa_supplicant service.
58+ After you have edited the <literal>wpa_supplicant.conf</literal>, you need to
59+ restart the wpa_supplicant service.
5260<screen>
5361<prompt># </prompt>systemctl restart wpa_supplicant.service</screen>
5462 </para>
nixos/doc/manual/configuration/x-windows.xml+111−40
@@ -5,18 +5,23 @@
55 xml:id="sec-x11">
66 <title>X Window System</title>
77 <para>
8− The X Window System (X11) provides the basis of NixOS’ graphical user interface. It can be enabled as follows:
8+ The X Window System (X11) provides the basis of NixOS’ graphical user
9+ interface. It can be enabled as follows:
910<programlisting>
1011<xref linkend="opt-services.xserver.enable"/> = true;
1112</programlisting>
12− The X server will automatically detect and use the appropriate video driver from a set of X.org drivers (such as <literal>vesa</literal> and <literal>intel</literal>). You can also specify a driver manually, e.g.
13+ The X server will automatically detect and use the appropriate video driver
14+ from a set of X.org drivers (such as <literal>vesa</literal> and
15+ <literal>intel</literal>). You can also specify a driver manually, e.g.
1316<programlisting>
1417<xref linkend="opt-services.xserver.videoDrivers"/> = [ "r128" ];
1518</programlisting>
1619 to enable X.org’s <literal>xf86-video-r128</literal> driver.
1720 </para>
1821 <para>
19− You also need to enable at least one desktop or window manager. Otherwise, you can only log into a plain undecorated <command>xterm</command> window. Thus you should pick one or more of the following lines:
22+ You also need to enable at least one desktop or window manager. Otherwise,
23+ you can only log into a plain undecorated <command>xterm</command> window.
24+ Thus you should pick one or more of the following lines:
2025<programlisting>
2126<xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
2227<xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true;
@@ -29,7 +34,9 @@
2934</programlisting>
3035 </para>
3136 <para>
32− NixOS’s default <emphasis>display manager</emphasis> (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:
37+ NixOS’s default <emphasis>display manager</emphasis> (the program that
38+ provides a graphical login prompt and manages the X server) is LightDM. You
39+ can select an alternative one by picking one of the following lines:
3340<programlisting>
3441<xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true;
3542<xref linkend="opt-services.xserver.displayManager.slim.enable"/> = true;
@@ -43,7 +50,8 @@
4350</programlisting>
4451 </para>
4552 <para>
46− The X server is started automatically at boot time. If you don’t want this to happen, you can set:
53+ The X server is started automatically at boot time. If you don’t want this
54+ to happen, you can set:
4755<programlisting>
4856<xref linkend="opt-services.xserver.autorun"/> = false;
4957</programlisting>
@@ -53,7 +61,8 @@
5361</screen>
5462 </para>
5563 <para>
56− On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, you should also set the following:
64+ On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine,
65+ you should also set the following:
5766<programlisting>
5867<xref linkend="opt-hardware.opengl.driSupport32Bit"/> = true;
5968</programlisting>
@@ -61,18 +70,23 @@
6170 <simplesect xml:id="sec-x11-auto-login">
6271 <title>Auto-login</title>
6372 <para>
64− The x11 login screen can be skipped entirely, automatically logging you into your window manager and desktop environment when you boot your computer.
73+ The x11 login screen can be skipped entirely, automatically logging you into
74+ your window manager and desktop environment when you boot your computer.
6575 </para>
6676 <para>
67− 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.
77+ This is especially helpful if you have disk encryption enabled. Since you
78+ already have to provide a password to decrypt your disk, entering a second
79+ password to login can be redundant.
6880 </para>
6981 <para>
70− 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:
82+ To enable auto-login, you need to define your default window manager and
83+ desktop environment. If you wanted no desktop environment and i3 as your your
84+ window manager, you'd define:
7185<programlisting>
7286<xref linkend="opt-services.xserver.desktopManager.default"/> = "none";
7387<xref linkend="opt-services.xserver.windowManager.default"/> = "i3";
7488</programlisting>
75− And, finally, to enable auto-login for a user <literal>johndoe</literal>:
89+ And, finally, to enable auto-login for a user <literal>johndoe</literal>:
7690<programlisting>
7791<xref linkend="opt-services.xserver.displayManager.auto.enable"/> = true;
7892<xref linkend="opt-services.xserver.displayManager.auto.user"/> = "johndoe";
@@ -82,7 +96,9 @@
8296 <simplesect xml:id="sec-x11-graphics-cards-nvidia">
8397 <title>Proprietary NVIDIA drivers</title>
8498 <para>
85− 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:
99+ NVIDIA provides a proprietary driver for its graphics cards that has better
100+ 3D performance than the X.org drivers. It is not enabled by default because
101+ it’s not free software. You can enable it as follows:
86102<programlisting>
87103<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidia" ];
88104</programlisting>
@@ -93,51 +109,76 @@
93109<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy304" ];
94110<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy173" ];
95111</programlisting>
96− You may need to reboot after enabling this driver to prevent a clash with other kernel modules.
112+ You may need to reboot after enabling this driver to prevent a clash with
113+ other kernel modules.
97114 </para>
98115 </simplesect>
99116 <simplesect xml:id="sec-x11--graphics-cards-amd">
100117 <title>Proprietary AMD drivers</title>
101118 <para>
102− 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:
119+ AMD provides a proprietary driver for its graphics cards that has better 3D
120+ performance than the X.org drivers. It is not enabled by default because
121+ it’s not free software. You can enable it as follows:
103122<programlisting>
104123<xref linkend="opt-services.xserver.videoDrivers"/> = [ "ati_unfree" ];
105124</programlisting>
106− You will need to reboot after enabling this driver to prevent a clash with other kernel modules.
125+ You will need to reboot after enabling this driver to prevent a clash with
126+ other kernel modules.
107127 </para>
108128 <note>
109− <para>
110− For recent AMD GPUs you most likely want to keep either the defaults or <literal>"amdgpu"</literal> (both free).
111− </para>
129+ <para>
130+ For recent AMD GPUs you most likely want to keep either the defaults
131+ or <literal>"amdgpu"</literal> (both free).
132+ </para>
112133 </note>
113134 </simplesect>
114135 <simplesect xml:id="sec-x11-touchpads">
115136 <title>Touchpads</title>
116137 <para>
117− Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows:
138+ Support for Synaptics touchpads (found in many laptops such as the Dell
139+ Latitude series) can be enabled as follows:
118140<programlisting>
119141<xref linkend="opt-services.xserver.libinput.enable"/> = true;
120142</programlisting>
121− The driver has many options (see <xref linkend="ch-options"/>). For instance, the following disables tap-to-click behavior:
143+ The driver has many options (see <xref linkend="ch-options"/>). For
144+ instance, the following disables tap-to-click behavior:
122145<programlisting>
123146<xref linkend="opt-services.xserver.libinput.tapping"/> = false;
124147</programlisting>
125− Note: the use of <literal>services.xserver.synaptics</literal> is deprecated since NixOS 17.09.
148+ Note: the use of <literal>services.xserver.synaptics</literal> is deprecated
149+ since NixOS 17.09.
126150 </para>
127151 </simplesect>
128152 <simplesect xml:id="sec-x11-gtk-and-qt-themes">
129153 <title>GTK/Qt themes</title>
130154 <para>
131− GTK themes can be installed either to user profile or system-wide (via <literal>environment.systemPackages</literal>). To make Qt 5 applications look similar to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal> package into your system environment. It should work for all Qt 5 library versions.
155+ GTK themes can be installed either to user profile or system-wide (via
156+ <literal>environment.systemPackages</literal>). To make Qt 5 applications
157+ look similar to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal>
158+ package into your system environment. It should work for all Qt 5 library
159+ versions.
132160 </para>
133161 </simplesect>
134162 <simplesect xml:id="custom-xkb-layouts">
135163 <title>Custom XKB layouts</title>
136164 <para>
137− It is possible to install custom <link xlink:href="https://en.wikipedia.org/wiki/X_keyboard_extension"> XKB </link> keyboard layouts using the option <option> <link linkend="opt-services.xserver.extraLayouts"> services.xserver.extraLayouts </link> </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.
165+ It is possible to install custom
166+ <link xlink:href="https://en.wikipedia.org/wiki/X_keyboard_extension">
167+ XKB
168+ </link>
169+ keyboard layouts using the option
170+ <option>
171+ <link linkend="opt-services.xserver.extraLayouts">
172+ services.xserver.extraLayouts
173+ </link>
174+ </option>.
175+ As a first example, we are going to create a layout based on the basic US
176+ layout, with an additional layer to type some greek symbols by pressing the
177+ right-alt key.
138178 </para>
139179 <para>
140− To do this we are going to create a <literal>us-greek</literal> file with a <literal>xkb_symbols</literal> section.
180+ To do this we are going to create a <literal>us-greek</literal> file
181+ with a <literal>xkb_symbols</literal> section.
141182 </para>
142183<programlisting>
143184xkb_symbols &quot;us-greek&quot;
@@ -153,7 +194,8 @@ xkb_symbols &quot;us-greek&quot;
153194};
154195</programlisting>
155196 <para>
156− To install the layout, the filepath, a description and the list of languages must be given:
197+ To install the layout, the filepath, a description and the list of
198+ languages must be given:
157199 </para>
158200<programlisting>
159201<xref linkend="opt-services.xserver.extraLayouts"/>.us-greek = {
@@ -163,18 +205,32 @@ xkb_symbols &quot;us-greek&quot;
163205}
164206</programlisting>
165207 <note>
166− <para>
167− The name should match the one given to the <literal>xkb_symbols</literal> block.
168− </para>
208+ <para>
209+ The name should match the one given to the
210+ <literal>xkb_symbols</literal> block.
211+ </para>
169212 </note>
170213 <para>
171− The layout should now be installed and ready to use: try it by running <literal>setxkbmap us-greek</literal> and type <literal>&lt;alt&gt;+a</literal>. To change the default the usual <option> <link linkend="opt-services.xserver.layout"> services.xserver.layout </link> </option> option can still be used.
214+ The layout should now be installed and ready to use: try it by
215+ running <literal>setxkbmap us-greek</literal> and type
216+ <literal>&lt;alt&gt;+a</literal>. To change the default the usual
217+ <option>
218+ <link linkend="opt-services.xserver.layout">
219+ services.xserver.layout
220+ </link>
221+ </option>
222+ option can still be used.
172223 </para>
173224 <para>
174− A layout can have several other components besides <literal>xkb_symbols</literal>, for example we will define new keycodes for some multimedia key and bind these to some symbol.
225+ A layout can have several other components besides
226+ <literal>xkb_symbols</literal>, for example we will define new
227+ keycodes for some multimedia key and bind these to some symbol.
175228 </para>
176229 <para>
177− Use the <emphasis>xev</emphasis> utility from <literal>pkgs.xorg.xev</literal> to find the codes of the keys of interest, then create a <literal>media-key</literal> file to hold the keycodes definitions
230+ Use the <emphasis>xev</emphasis> utility from
231+ <literal>pkgs.xorg.xev</literal> to find the codes of the keys of
232+ interest, then create a <literal>media-key</literal> file to hold
233+ the keycodes definitions
178234 </para>
179235<programlisting>
180236xkb_keycodes &quot;media&quot;
@@ -184,7 +240,7 @@ xkb_keycodes &quot;media&quot;
184240}
185241</programlisting>
186242 <para>
187− Now use the newly define keycodes in <literal>media-sym</literal>:
243+ Now use the newly define keycodes in <literal>media-sym</literal>:
188244 </para>
189245<programlisting>
190246xkb_symbols &quot;media&quot;
@@ -195,7 +251,7 @@ xkb_symbols &quot;media&quot;
195251}
196252</programlisting>
197253 <para>
198− As before, to install the layout do
254+ As before, to install the layout do
199255 </para>
200256<programlisting>
201257<xref linkend="opt-services.xserver.extraLayouts"/>.media = {
@@ -206,22 +262,37 @@ xkb_symbols &quot;media&quot;
206262};
207263</programlisting>
208264 <note>
209− <para>
210− The function <literal>pkgs.writeText &lt;filename&gt; &lt;content&gt; </literal> can be useful if you prefer to keep the layout definitions inside the NixOS configuration.
211− </para>
265+ <para>
266+ The function <literal>pkgs.writeText &lt;filename&gt; &lt;content&gt;
267+ </literal> can be useful if you prefer to keep the layout definitions
268+ inside the NixOS configuration.
269+ </para>
212270 </note>
213271 <para>
214− 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 <literal>setxkbmap</literal> at the start of the session with:
272+ Unfortunately, the Xorg server does not (currently) support setting a
273+ keymap directly but relies instead on XKB rules to select the matching
274+ components (keycodes, types, ...) of a layout. This means that components
275+ other than symbols won't be loaded by default. As a workaround, you
276+ can set the keymap using <literal>setxkbmap</literal> at the start of the
277+ session with:
215278 </para>
216279<programlisting>
217280<xref linkend="opt-services.xserver.displayManager.sessionCommands"/> = "setxkbmap -keycodes media";
218281</programlisting>
219282 <para>
220− If you are manually starting the X server, you should set the argument <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X won't find your layout files. For example with <command>xinit</command> run
221−<screen><prompt>$ </prompt>xinit -- -xkbdir /etc/X11/xkb</screen>
283+ If you are manually starting the X server, you should set the argument
284+ <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X won't find your layout files.
285+ For example with <command>xinit</command> run
286+ <screen><prompt>$ </prompt>xinit -- -xkbdir /etc/X11/xkb</screen>
222287 </para>
223288 <para>
224− To learn how to write layouts take a look at the XKB <link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts"> documentation </link>. More example layouts can also be found <link xlink:href="https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples"> here </link>.
289+ To learn how to write layouts take a look at the XKB
290+ <link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts">
291+ documentation
292+ </link>. More example layouts can also be found
293+ <link xlink:href="https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples">
294+ here
295+ </link>.
225296 </para>
226− </simplesect>
297+</simplesect>
227298</chapter>
nixos/doc/manual/configuration/xfce.xml+16−5
@@ -14,7 +14,8 @@
1414</programlisting>
1515 </para>
1616 <para>
17− Optionally, <emphasis>compton</emphasis> can be enabled for nice graphical effects, some example settings:
17+ Optionally, <emphasis>compton</emphasis> can be enabled for nice graphical
18+ effects, some example settings:
1819<programlisting>
1920<link linkend="opt-services.compton.enable">services.compton</link> = {
2021 <link linkend="opt-services.compton.enable">enable</link> = true;
@@ -26,7 +27,9 @@
2627</programlisting>
2728 </para>
2829 <para>
29− Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your <xref linkend="opt-environment.systemPackages"/>.
30+ Some Xfce programs are not installed automatically. To install them manually
31+ (system wide), put them into your
32+ <xref linkend="opt-environment.systemPackages"/>.
3033 </para>
3134 <simplesect xml:id="sec-xfce-thunar-volumes">
3235 <title>Thunar Volume Support</title>
@@ -41,17 +44,25 @@
4144 <simplesect xml:id="sec-xfce-polkit">
4245 <title>Polkit Authentication Agent</title>
4346 <para>
44− There is no authentication agent automatically installed alongside Xfce. To allow mounting of local (non-removable) filesystems, you will need to install one. Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout and login did the trick.
47+ There is no authentication agent automatically installed alongside Xfce. To
48+ allow mounting of local (non-removable) filesystems, you will need to
49+ install one. Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout
50+ and login did the trick.
4551 </para>
4652 </simplesect>
4753 <simplesect xml:id="sec-xfce-troubleshooting">
4854 <title>Troubleshooting</title>
4955 <para>
50− 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 <command>journalctl --user -b</command>).
56+ Even after enabling udisks2, volume management might not work. Thunar and/or
57+ the desktop takes time to show up. Thunar will spit out this kind of message
58+ on start (look at <command>journalctl --user -b</command>).
5159<programlisting>
5260Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported
5361</programlisting>
54− 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.
62+ This is caused by some needed GNOME services not running. This is all fixed
63+ by enabling "Launch GNOME services on startup" in the Advanced tab of the
64+ Session and Startup settings panel. Alternatively, you can run this command
65+ to do the same thing.
5566<programlisting>
5667<prompt>$ </prompt>xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true
5768</programlisting>
nixos/doc/manual/development/assertions.xml+15−3
@@ -6,11 +6,18 @@
66 <title>Warnings and Assertions</title>
77
88 <para>
9− 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.
9+ When configuration problems are detectable in a module, it is a good idea to
10+ write an assertion or warning. Doing so provides clear feedback to the user
11+ and prevents errors after the build.
1012 </para>
1113
1214 <para>
13− Although Nix has the <literal>abort</literal> and <literal>builtins.trace</literal> <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link> 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.
15+ Although Nix has the <literal>abort</literal> and
16+ <literal>builtins.trace</literal>
17+ <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link>
18+ to perform such tasks, they are not ideally suited for NixOS modules. Instead
19+ of these functions, you can declare your warnings and assertions using the
20+ NixOS module system.
1421 </para>
1522
1623 <section xml:id="sec-assertions-warnings">
@@ -41,7 +48,12 @@
4148 <title>Assertions</title>
4249
4350 <para>
44− This example, extracted from the <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix"> <literal>syslogd</literal> module </link> shows how to use <literal>assertions</literal>. 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.
51+ This example, extracted from the
52+ <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix">
53+ <literal>syslogd</literal> module </link> shows how to use
54+ <literal>assertions</literal>. Since there can only be one active syslog
55+ daemon at a time, an assertion is useful to prevent such a broken system
56+ from being built.
4557 </para>
4658
4759<programlisting>
nixos/doc/manual/development/building-nixos.xml+8−3
@@ -5,17 +5,22 @@
55 xml:id="sec-building-cd">
66 <title>Building Your Own NixOS CD</title>
77 <para>
8− Building a NixOS CD is as easy as configuring your own computer. The idea is to use another module which will replace your <filename>configuration.nix</filename> to configure the system that would be installed on the CD.
8+ Building a NixOS CD is as easy as configuring your own computer. The idea is
9+ to use another module which will replace your
10+ <filename>configuration.nix</filename> to configure the system that would be
11+ installed on the CD.
912 </para>
1013 <para>
11− Default CD/DVD configurations are available inside <filename>nixos/modules/installer/cd-dvd</filename>.
14+ Default CD/DVD configurations are available inside
15+ <filename>nixos/modules/installer/cd-dvd</filename>.
1216<screen>
1317<prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs.git
1418<prompt>$ </prompt>cd nixpkgs/nixos
1519<prompt>$ </prompt>nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix</screen>
1620 </para>
1721 <para>
18− Before burning your CD/DVD, you can check the content of the image by mounting anywhere like suggested by the following command:
22+ Before burning your CD/DVD, you can check the content of the image by
23+ mounting anywhere like suggested by the following command:
1924<screen>
2025<prompt># </prompt>mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
2126 </para>
nixos/doc/manual/development/building-parts.xml+23−8
@@ -5,11 +5,14 @@
55 xml:id="sec-building-parts">
66 <title>Building Specific Parts of NixOS</title>
77 <para>
8− With the command <command>nix-build</command>, you can build specific parts of your NixOS configuration. This is done as follows:
8+ With the command <command>nix-build</command>, you can build specific parts
9+ of your NixOS configuration. This is done as follows:
910<screen>
1011<prompt>$ </prompt>cd <replaceable>/path/to/nixpkgs/nixos</replaceable>
1112<prompt>$ </prompt>nix-build -A config.<replaceable>option</replaceable></screen>
12− where <replaceable>option</replaceable> is a NixOS option with type “derivation” (i.e. something that can be built). Attributes of interest include:
13+ where <replaceable>option</replaceable> is a NixOS option with type
14+ “derivation” (i.e. something that can be built). Attributes of interest
15+ include:
1316 <variablelist>
1417 <varlistentry>
1518 <term>
@@ -17,7 +20,10 @@
1720 </term>
1821 <listitem>
1922 <para>
20− 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 <command>nixos-rebuild</command> builds and what <filename>/run/current-system</filename> points to afterwards.
23+ The top-level option that builds the entire NixOS system. Everything else
24+ in your configuration is indirectly pulled in by this option. This is
25+ what <command>nixos-rebuild</command> builds and what
26+ <filename>/run/current-system</filename> points to afterwards.
2127 </para>
2228 <para>
2329 A shortcut to build this is:
@@ -42,7 +48,8 @@
4248 </term>
4349 <listitem>
4450 <para>
45− A tree of symlinks that form the static parts of <filename>/etc</filename>.
51+ A tree of symlinks that form the static parts of
52+ <filename>/etc</filename>.
4653 </para>
4754 </listitem>
4855 </varlistentry>
@@ -55,7 +62,9 @@
5562 </term>
5663 <listitem>
5764 <para>
58− 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 <option>-kernel</option> and <option>-initrd</option> options:
65+ The initial ramdisk and kernel of the system. This allows a quick way to
66+ test whether the kernel and the initial ramdisk boot correctly, by using
67+ QEMU’s <option>-kernel</option> and <option>-initrd</option> options:
5968<screen>
6069<prompt>$ </prompt>nix-build -A config.system.build.initialRamdisk -o initrd
6170<prompt>$ </prompt>nix-build -A config.system.build.kernel -o kernel
@@ -86,18 +95,24 @@
8695 </term>
8796 <listitem>
8897 <para>
89− This builds the unit with the specified name. Note that since unit names contain dots (e.g. <literal>httpd.service</literal>), you need to put them between quotes, like this:
98+ This builds the unit with the specified name. Note that since unit names
99+ contain dots (e.g. <literal>httpd.service</literal>), you need to put
100+ them between quotes, like this:
90101<screen>
91102<prompt>$ </prompt>nix-build -A 'config.systemd.units."httpd.service".unit'
92103</screen>
93− You can also test individual units, without rebuilding the whole system, by putting them in <filename>/run/systemd/system</filename>:
104+ You can also test individual units, without rebuilding the whole system,
105+ by putting them in <filename>/run/systemd/system</filename>:
94106<screen>
95107<prompt>$ </prompt>cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
96108 /run/systemd/system/tmp-httpd.service
97109<prompt># </prompt>systemctl daemon-reload
98110<prompt># </prompt>systemctl start tmp-httpd.service
99111</screen>
100− Note that the unit must not have the same name as any unit in <filename>/etc/systemd/system</filename> since those take precedence over <filename>/run/systemd/system</filename>. That’s why the unit is installed as <filename>tmp-httpd.service</filename> here.
112+ Note that the unit must not have the same name as any unit in
113+ <filename>/etc/systemd/system</filename> since those take precedence over
114+ <filename>/run/systemd/system</filename>. That’s why the unit is
115+ installed as <filename>tmp-httpd.service</filename> here.
101116 </para>
102117 </listitem>
103118 </varlistentry>
nixos/doc/manual/development/importing-modules.xml+5−2
@@ -6,7 +6,8 @@
66 <title>Importing Modules</title>
77
88 <para>
9− Sometimes NixOS modules need to be used in configuration but exist outside of Nixpkgs. These modules can be imported:
9+ Sometimes NixOS modules need to be used in configuration but exist outside of
10+ Nixpkgs. These modules can be imported:
1011 </para>
1112
1213<programlisting>
@@ -24,7 +25,9 @@
2425</programlisting>
2526
2627 <para>
27− The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> 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:
28+ The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> is an
29+ absolute path to a NixOS module that is included alongside the Nixpkgs NixOS
30+ modules. Like any NixOS module, this module can import additional modules:
2831 </para>
2932
3033<programlisting>
nixos/doc/manual/development/meta-attributes.xml+14−5
@@ -6,12 +6,18 @@
66 <title>Meta Attributes</title>
77
88 <para>
9− Like Nix packages, NixOS modules can declare meta-attributes to provide extra information. Module meta attributes are defined in the <filename
10− xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/misc/meta.nix">meta.nix</filename> special module.
9+ Like Nix packages, NixOS modules can declare meta-attributes to provide extra
10+ information. Module meta attributes are defined in the
11+ <filename
12+ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/misc/meta.nix">meta.nix</filename>
13+ special module.
1114 </para>
1215
1316 <para>
14− <literal>meta</literal> is a top level attribute like <literal>options</literal> and <literal>config</literal>. Available meta-attributes are <literal>maintainers</literal> and <literal>doc</literal>.
17+ <literal>meta</literal> is a top level attribute like
18+ <literal>options</literal> and <literal>config</literal>. Available
19+ meta-attributes are <literal>maintainers</literal> and
20+ <literal>doc</literal>.
1521 </para>
1622
1723 <para>
@@ -45,8 +51,11 @@
4551 </callout>
4652 <callout arearefs='modules-meta-2'>
4753 <para>
48− <varname>doc</varname> points to a valid DocBook file containing the module documentation. Its contents is automatically added to <xref
49− linkend="ch-configuration"/>. Changes to a module documentation have to be checked to not break building the NixOS manual:
54+ <varname>doc</varname> points to a valid DocBook file containing the module
55+ documentation. Its contents is automatically added to
56+ <xref
57+ linkend="ch-configuration"/>. Changes to a module documentation
58+ have to be checked to not break building the NixOS manual:
5059 </para>
5160<programlisting>$ nix-build nixos/release.nix -A manual</programlisting>
5261 </callout>
nixos/doc/manual/development/nixos-tests.xml+7−2
@@ -5,8 +5,13 @@
55 xml:id="sec-nixos-tests">
66 <title>NixOS Tests</title>
77 <para>
8− When you add some feature to NixOS, you should write a test for it. NixOS tests are kept in the directory <filename
9−xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>, 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.
8+ When you add some feature to NixOS, you should write a test for it. NixOS
9+ tests are kept in the directory
10+ <filename
11+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>,
12+ and are executed (using Nix) by a testing framework that automatically starts
13+ one or more virtual machines containing the NixOS system(s) required for the
14+ test.
1015 </para>
1116 <xi:include href="writing-nixos-tests.xml" />
1217 <xi:include href="running-nixos-tests.xml" />
nixos/doc/manual/development/option-declarations.xml+61−19
@@ -6,7 +6,9 @@
66 <title>Option Declarations</title>
77
88 <para>
9− 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:
9+ An option declaration specifies the name, type and description of a NixOS
10+ configuration option. It is invalid to define an option that hasn’t been
11+ declared in any module. An option declaration generally looks like this:
1012<programlisting>
1113options = {
1214 <replaceable>name</replaceable> = mkOption {
@@ -17,8 +19,13 @@ options = {
1719 };
1820};
1921</programlisting>
20− The attribute names within the <replaceable>name</replaceable> attribute path must be camel cased in general but should, as an exception, match the <link
21−xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attribute name</link> when referencing a Nixpkgs package. For example, the option <varname>services.nix-serve.bindAddress</varname> references the <varname>nix-serve</varname> Nixpkgs package.
22+ The attribute names within the <replaceable>name</replaceable> attribute path
23+ must be camel cased in general but should, as an exception, match the
24+ <link
25+xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
26+ package attribute name</link> when referencing a Nixpkgs package. For
27+ example, the option <varname>services.nix-serve.bindAddress</varname>
28+ references the <varname>nix-serve</varname> Nixpkgs package.
2229 </para>
2330
2431 <para>
@@ -30,7 +37,9 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
3037 </term>
3138 <listitem>
3239 <para>
33− The type of the option (see <xref linkend='sec-option-types' />). It may be omitted, but that’s not advisable since it may lead to errors that are hard to diagnose.
40+ The type of the option (see <xref linkend='sec-option-types' />). It may
41+ be omitted, but that’s not advisable since it may lead to errors that
42+ are hard to diagnose.
3443 </para>
3544 </listitem>
3645 </varlistentry>
@@ -40,7 +49,10 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
4049 </term>
4150 <listitem>
4251 <para>
43− 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.
52+ The default value used if no value is defined by any module. A default is
53+ not required; but if a default is not given, then users of the module
54+ will have to define the value of the option, otherwise an error will be
55+ thrown.
4456 </para>
4557 </listitem>
4658 </varlistentry>
@@ -60,7 +72,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
6072 </term>
6173 <listitem>
6274 <para>
63− A textual description of the option, in DocBook format, that will be included in the NixOS manual.
75+ A textual description of the option, in DocBook format, that will be
76+ included in the NixOS manual.
6477 </para>
6578 </listitem>
6679 </varlistentry>
@@ -71,15 +84,22 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
7184 <title>Extensible Option Types</title>
7285
7386 <para>
74− 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 <literal>enum</literal> and <literal>submodules</literal> and any composed forms of them.
87+ Extensible option types is a feature that allow to extend certain types
88+ declaration through multiple module files. This feature only work with a
89+ restricted set of types, namely <literal>enum</literal> and
90+ <literal>submodules</literal> and any composed forms of them.
7591 </para>
7692
7793 <para>
78− Extensible option types can be used for <literal>enum</literal> options that affects multiple modules, or as an alternative to related <literal>enable</literal> options.
94+ Extensible option types can be used for <literal>enum</literal> options that
95+ affects multiple modules, or as an alternative to related
96+ <literal>enable</literal> options.
7997 </para>
8098
8199 <para>
82− 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 ...).
100+ As an example, we will take the case of display managers. There is a central
101+ display manager module for generic display manager options and a module file
102+ per display manager backend (slim, sddm, gdm ...).
83103 </para>
84104
85105 <para>
@@ -87,12 +107,14 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
87107 <itemizedlist>
88108 <listitem>
89109 <para>
90− Managing the display managers independently by adding an enable option to every display manager module backend. (NixOS)
110+ Managing the display managers independently by adding an enable option to
111+ every display manager module backend. (NixOS)
91112 </para>
92113 </listitem>
93114 <listitem>
94115 <para>
95− Managing the display managers in the central module by adding an option to select which display manager backend to use.
116+ Managing the display managers in the central module by adding an option
117+ to select which display manager backend to use.
96118 </para>
97119 </listitem>
98120 </itemizedlist>
@@ -103,22 +125,37 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> package attri
103125 </para>
104126
105127 <para>
106− 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 <literal>enable</literal> option. As a result, this restriction has to be done explicitely by adding assertions in each display manager backend module.
128+ Making backends independent can quickly become hard to manage. For display
129+ managers, there can be only one enabled at a time, but the type system can
130+ not enforce this restriction as there is no relation between each backend
131+ <literal>enable</literal> option. As a result, this restriction has to be
132+ done explicitely by adding assertions in each display manager backend
133+ module.
107134 </para>
108135
109136 <para>
110− 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.
137+ On the other hand, managing the display managers backends in the central
138+ module will require to change the central module option every time a new
139+ backend is added or removed.
111140 </para>
112141
113142 <para>
114− By using extensible option types, it is possible to create a placeholder option in the central module (<xref linkend='ex-option-declaration-eot-service'
115− />), and to extend it in each backend module (<xref
116− linkend='ex-option-declaration-eot-backend-slim' />, <xref
143+ By using extensible option types, it is possible to create a placeholder
144+ option in the central module
145+ (<xref linkend='ex-option-declaration-eot-service'
146+ />), and to extend
147+ it in each backend module
148+ (<xref
149+ linkend='ex-option-declaration-eot-backend-slim' />,
150+ <xref
117151 linkend='ex-option-declaration-eot-backend-sddm' />).
118152 </para>
119153
120154 <para>
121− As a result, <literal>displayManager.enable</literal> 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.
155+ As a result, <literal>displayManager.enable</literal> option values can be
156+ added without changing the main service module file and the type system
157+ automatically enforce that there can only be a single display manager
158+ enabled.
122159 </para>
123160
124161 <example xml:id='ex-option-declaration-eot-service'>
@@ -147,11 +184,16 @@ services.xserver.displayManager.enable = mkOption {
147184 </example>
148185
149186 <para>
150− The placeholder declaration is a standard <literal>mkOption</literal> declaration, but it is important that extensible option declarations only use the <literal>type</literal> argument.
187+ The placeholder declaration is a standard <literal>mkOption</literal>
188+ declaration, but it is important that extensible option declarations only
189+ use the <literal>type</literal> argument.
151190 </para>
152191
153192 <para>
154− Extensible option types work with any of the composed variants of <literal>enum</literal> such as <literal>with types; nullOr (enum [ "foo" "bar" ])</literal> or <literal>with types; listOf (enum [ "foo" "bar" ])</literal>.
193+ Extensible option types work with any of the composed variants of
194+ <literal>enum</literal> such as <literal>with types; nullOr (enum [ "foo"
195+ "bar" ])</literal> or <literal>with types; listOf (enum [ "foo" "bar"
196+ ])</literal>.
155197 </para>
156198 </section>
157199</section>
nixos/doc/manual/development/option-def.xml+26−8
@@ -6,26 +6,33 @@
66 <title>Option Definitions</title>
77
88 <para>
9− Option definitions are generally straight-forward bindings of values to option names, like
9+ Option definitions are generally straight-forward bindings of values to
10+ option names, like
1011<programlisting>
1112config = {
1213 services.httpd.enable = true;
1314};
1415</programlisting>
15− However, sometimes you need to wrap an option definition or set of option definitions in a <emphasis>property</emphasis> to achieve certain effects:
16+ However, sometimes you need to wrap an option definition or set of option
17+ definitions in a <emphasis>property</emphasis> to achieve certain effects:
1618 </para>
1719
1820 <simplesect xml:id="sec-option-definitions-delaying-conditionals">
1921 <title>Delaying Conditionals</title>
2022 <para>
21− If a set of option definitions is conditional on the value of another option, you may need to use <varname>mkIf</varname>. Consider, for instance:
23+ If a set of option definitions is conditional on the value of another
24+ option, you may need to use <varname>mkIf</varname>. Consider, for instance:
2225<programlisting>
2326config = if config.services.httpd.enable then {
2427 environment.systemPackages = [ <replaceable>...</replaceable> ];
2528 <replaceable>...</replaceable>
2629} else {};
2730</programlisting>
28− This definition will cause Nix to fail with an “infinite recursion” error. Why? Because the value of <option>config.services.httpd.enable</option> depends on the value being constructed here. After all, you could also write the clearly circular and contradictory:
31+ This definition will cause Nix to fail with an “infinite recursion”
32+ error. Why? Because the value of
33+ <option>config.services.httpd.enable</option> depends on the value being
34+ constructed here. After all, you could also write the clearly circular and
35+ contradictory:
2936<programlisting>
3037config = if config.services.httpd.enable then {
3138 services.httpd.enable = false;
@@ -40,7 +47,9 @@ config = mkIf config.services.httpd.enable {
4047 <replaceable>...</replaceable>
4148};
4249</programlisting>
43− The special function <varname>mkIf</varname> causes the evaluation of the conditional to be “pushed down” into the individual definitions, as if you had written:
50+ The special function <varname>mkIf</varname> causes the evaluation of the
51+ conditional to be “pushed down” into the individual definitions, as if
52+ you had written:
4453<programlisting>
4554config = {
4655 environment.systemPackages = if config.services.httpd.enable then [ <replaceable>...</replaceable> ] else [];
@@ -53,18 +62,27 @@ config = {
5362 <simplesect xml:id="sec-option-definitions-setting-priorities">
5463 <title>Setting Priorities</title>
5564 <para>
56− A module can override the definitions of an option in other modules by setting a <emphasis>priority</emphasis>. 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 <varname>mkOverride</varname>, e.g.
65+ A module can override the definitions of an option in other modules by
66+ setting a <emphasis>priority</emphasis>. All option definitions that do not
67+ have the lowest priority value are discarded. By default, option definitions
68+ have priority 1000. You can specify an explicit priority by using
69+ <varname>mkOverride</varname>, e.g.
5770<programlisting>
5871services.openssh.enable = mkOverride 10 false;
5972</programlisting>
60− This definition causes all other definitions with priorities above 10 to be discarded. The function <varname>mkForce</varname> is equal to <varname>mkOverride 50</varname>.
73+ This definition causes all other definitions with priorities above 10 to be
74+ discarded. The function <varname>mkForce</varname> is equal to
75+ <varname>mkOverride 50</varname>.
6176 </para>
6277 </simplesect>
6378
6479 <simplesect xml:id="sec-option-definitions-merging">
6580 <title>Merging Configurations</title>
6681 <para>
67− In conjunction with <literal>mkIf</literal>, 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 <varname>mkMerge</varname>:
82+ In conjunction with <literal>mkIf</literal>, it is sometimes useful for a
83+ module to return multiple sets of option definitions, to be merged together
84+ as if they were declared in separate modules. This can be done using
85+ <varname>mkMerge</varname>:
6886<programlisting>
6987config = mkMerge
7088 [ # Unconditional stuff.
nixos/doc/manual/development/option-types.xml+161−47
@@ -6,14 +6,18 @@
66 <title>Options Types</title>
77
88 <para>
9− 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.
9+ Option types are a way to put constraints on the values a module option can
10+ take. Types are also responsible of how values are merged in case of multiple
11+ value definitions.
1012 </para>
1113
1214 <section xml:id="sec-option-types-basic">
1315 <title>Basic Types</title>
1416
1517 <para>
16− 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.
18+ Basic types are the simplest available types in the module system. Basic
19+ types include multiple string types that mainly differ in how definition
20+ merging is handled.
1721 </para>
1822
1923 <variablelist>
@@ -33,7 +37,8 @@
3337 </term>
3438 <listitem>
3539 <para>
36− A boolean, its values can be <literal>true</literal> or <literal>false</literal>.
40+ A boolean, its values can be <literal>true</literal> or
41+ <literal>false</literal>.
3742 </para>
3843 </listitem>
3944 </varlistentry>
@@ -43,7 +48,9 @@
4348 </term>
4449 <listitem>
4550 <para>
46− 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 <literal>types.package</literal> should be preferred.
51+ A filesystem path, defined as anything that when coerced to a string
52+ starts with a slash. Even if derivations can be considered as path, the
53+ more specific <literal>types.package</literal> should be preferred.
4754 </para>
4855 </listitem>
4956 </varlistentry>
@@ -80,7 +87,12 @@
8087 </term>
8188 <listitem>
8289 <para>
83− Signed integers with a fixed length (8, 16 or 32 bits). They go from <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase> </inlineequation> to <inlineequation> <mathphrase>2<superscript>n</superscript>/2−1</mathphrase> </inlineequation> respectively (e.g. <literal>−128</literal> to <literal>127</literal> for 8 bits).
90+ Signed integers with a fixed length (8, 16 or 32 bits). They go from
91+ <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase>
92+ </inlineequation> to <inlineequation>
93+ <mathphrase>2<superscript>n</superscript>/2−1</mathphrase>
94+ </inlineequation> respectively (e.g. <literal>−128</literal> to
95+ <literal>127</literal> for 8 bits).
8496 </para>
8597 </listitem>
8698 </varlistentry>
@@ -100,7 +112,12 @@
100112 </term>
101113 <listitem>
102114 <para>
103− Unsigned integers with a fixed length (8, 16 or 32 bits). They go from <inlineequation><mathphrase>0</mathphrase></inlineequation> to <inlineequation> <mathphrase>2<superscript>n</superscript>−1</mathphrase> </inlineequation> respectively (e.g. <literal>0</literal> to <literal>255</literal> for 8 bits).
115+ Unsigned integers with a fixed length (8, 16 or 32 bits). They go from
116+ <inlineequation><mathphrase>0</mathphrase></inlineequation> to
117+ <inlineequation>
118+ <mathphrase>2<superscript>n</superscript>−1</mathphrase>
119+ </inlineequation> respectively (e.g. <literal>0</literal> to
120+ <literal>255</literal> for 8 bits).
104121 </para>
105122 </listitem>
106123 </varlistentry>
@@ -120,7 +137,8 @@
120137 </term>
121138 <listitem>
122139 <para>
123− A port number. This type is an alias to <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>.
140+ A port number. This type is an alias to
141+ <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>.
124142 </para>
125143 </listitem>
126144 </varlistentry>
@@ -147,7 +165,8 @@
147165 </term>
148166 <listitem>
149167 <para>
150− A string. Multiple definitions are concatenated with a new line <literal>"\n"</literal>.
168+ A string. Multiple definitions are concatenated with a new line
169+ <literal>"\n"</literal>.
151170 </para>
152171 </listitem>
153172 </varlistentry>
@@ -157,7 +176,8 @@
157176 </term>
158177 <listitem>
159178 <para>
160− A string. Multiple definitions are concatenated with a comma <literal>","</literal>.
179+ A string. Multiple definitions are concatenated with a comma
180+ <literal>","</literal>.
161181 </para>
162182 </listitem>
163183 </varlistentry>
@@ -167,7 +187,8 @@
167187 </term>
168188 <listitem>
169189 <para>
170− A string. Multiple definitions are concatenated with a collon <literal>":"</literal>.
190+ A string. Multiple definitions are concatenated with a collon
191+ <literal>":"</literal>.
171192 </para>
172193 </listitem>
173194 </varlistentry>
@@ -177,7 +198,9 @@
177198 </term>
178199 <listitem>
179200 <para>
180− A string matching a specific regular expression. Multiple definitions cannot be merged. The regular expression is processed using <literal>builtins.match</literal>.
201+ A string matching a specific regular expression. Multiple definitions
202+ cannot be merged. The regular expression is processed using
203+ <literal>builtins.match</literal>.
181204 </para>
182205 </listitem>
183206 </varlistentry>
@@ -198,7 +221,9 @@
198221 </term>
199222 <listitem>
200223 <para>
201− One element of the list <replaceable>l</replaceable>, e.g. <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions cannot be merged.
224+ One element of the list <replaceable>l</replaceable>, e.g.
225+ <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions
226+ cannot be merged.
202227 </para>
203228 </listitem>
204229 </varlistentry>
@@ -208,7 +233,8 @@
208233 </term>
209234 <listitem>
210235 <para>
211− A string with a custom separator <replaceable>sep</replaceable>, e.g. <literal>types.separatedString "|"</literal>.
236+ A string with a custom separator <replaceable>sep</replaceable>, e.g.
237+ <literal>types.separatedString "|"</literal>.
212238 </para>
213239 </listitem>
214240 </varlistentry>
@@ -218,7 +244,9 @@
218244 </term>
219245 <listitem>
220246 <para>
221− An integer between <replaceable>lowest</replaceable> and <replaceable>highest</replaceable> (both inclusive). Useful for creating types like <literal>types.port</literal>.
247+ An integer between <replaceable>lowest</replaceable> and
248+ <replaceable>highest</replaceable> (both inclusive). Useful for creating
249+ types like <literal>types.port</literal>.
222250 </para>
223251 </listitem>
224252 </varlistentry>
@@ -228,7 +256,11 @@
228256 </term>
229257 <listitem>
230258 <para>
231− A set of sub options <replaceable>o</replaceable>. <replaceable>o</replaceable> 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 <xref
259+ A set of sub options <replaceable>o</replaceable>.
260+ <replaceable>o</replaceable> can be an attribute set or a function
261+ returning an attribute set. Submodules are used in composed types to
262+ create modular options. Submodule are detailed in
263+ <xref
232264 linkend='section-option-types-submodule' />.
233265 </para>
234266 </listitem>
@@ -240,7 +272,9 @@
240272 <title>Composed Types</title>
241273
242274 <para>
243− Composed types are types that take a type as parameter. <literal>listOf int</literal> and <literal>either int str</literal> are examples of composed types.
275+ Composed types are types that take a type as parameter. <literal>listOf
276+ int</literal> and <literal>either int str</literal> are examples of composed
277+ types.
244278 </para>
245279
246280 <variablelist>
@@ -250,7 +284,8 @@
250284 </term>
251285 <listitem>
252286 <para>
253− A list of <replaceable>t</replaceable> type, e.g. <literal>types.listOf int</literal>. Multiple definitions are merged with list concatenation.
287+ A list of <replaceable>t</replaceable> type, e.g. <literal>types.listOf
288+ int</literal>. Multiple definitions are merged with list concatenation.
254289 </para>
255290 </listitem>
256291 </varlistentry>
@@ -260,7 +295,9 @@
260295 </term>
261296 <listitem>
262297 <para>
263− An attribute set of where all the values are of <replaceable>t</replaceable> type. Multiple definitions result in the joined attribute set.
298+ An attribute set of where all the values are of
299+ <replaceable>t</replaceable> type. Multiple definitions result in the
300+ joined attribute set.
264301 </para>
265302 </listitem>
266303 </varlistentry>
@@ -270,7 +307,8 @@
270307 </term>
271308 <listitem>
272309 <para>
273− An attribute set or a list of <replaceable>t</replaceable> type. Multiple definitions are merged according to the value.
310+ An attribute set or a list of <replaceable>t</replaceable> type. Multiple
311+ definitions are merged according to the value.
274312 </para>
275313 </listitem>
276314 </varlistentry>
@@ -280,7 +318,8 @@
280318 </term>
281319 <listitem>
282320 <para>
283− <literal>null</literal> or type <replaceable>t</replaceable>. Multiple definitions are merged according to type <replaceable>t</replaceable>.
321+ <literal>null</literal> or type <replaceable>t</replaceable>. Multiple
322+ definitions are merged according to type <replaceable>t</replaceable>.
284323 </para>
285324 </listitem>
286325 </varlistentry>
@@ -290,7 +329,8 @@
290329 </term>
291330 <listitem>
292331 <para>
293− Ensures that type <replaceable>t</replaceable> cannot be merged. It is used to ensure option definitions are declared only once.
332+ Ensures that type <replaceable>t</replaceable> cannot be merged. It is
333+ used to ensure option definitions are declared only once.
294334 </para>
295335 </listitem>
296336 </varlistentry>
@@ -300,7 +340,9 @@
300340 </term>
301341 <listitem>
302342 <para>
303− Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable>, e.g. <literal>with types; either int str</literal>. Multiple definitions cannot be merged.
343+ Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable>,
344+ e.g. <literal>with types; either int str</literal>. Multiple definitions
345+ cannot be merged.
304346 </para>
305347 </listitem>
306348 </varlistentry>
@@ -310,7 +352,9 @@
310352 </term>
311353 <listitem>
312354 <para>
313− Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable> and so forth, e.g. <literal>with types; oneOf [ int str bool ]</literal>. Multiple definitions cannot be merged.
355+ Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable> and so forth,
356+ e.g. <literal>with types; oneOf [ int str bool ]</literal>. Multiple definitions
357+ cannot be merged.
314358 </para>
315359 </listitem>
316360 </varlistentry>
@@ -320,7 +364,12 @@
320364 </term>
321365 <listitem>
322366 <para>
323− Type <replaceable>to</replaceable> or type <replaceable>from</replaceable> which will be coerced to type <replaceable>to</replaceable> using function <replaceable>f</replaceable> which takes an argument of type <replaceable>from</replaceable> and return a value of type <replaceable>to</replaceable>. Can be used to preserve backwards compatibility of an option if its type was changed.
367+ Type <replaceable>to</replaceable> or type
368+ <replaceable>from</replaceable> which will be coerced to type
369+ <replaceable>to</replaceable> using function <replaceable>f</replaceable>
370+ which takes an argument of type <replaceable>from</replaceable> and
371+ return a value of type <replaceable>to</replaceable>. Can be used to
372+ preserve backwards compatibility of an option if its type was changed.
324373 </para>
325374 </listitem>
326375 </varlistentry>
@@ -331,15 +380,22 @@
331380 <title>Submodule</title>
332381
333382 <para>
334− <literal>submodule</literal> is a very powerful type that defines a set of sub-options that are handled like a separate module.
383+ <literal>submodule</literal> is a very powerful type that defines a set of
384+ sub-options that are handled like a separate module.
335385 </para>
336386
337387 <para>
338− It takes a parameter <replaceable>o</replaceable>, that should be a set, or a function returning a set with an <literal>options</literal> key defining the sub-options. Submodule option definitions are type-checked accordingly to the <literal>options</literal> declarations. Of course, you can nest submodule option definitons for even higher modularity.
388+ It takes a parameter <replaceable>o</replaceable>, that should be a set, or
389+ a function returning a set with an <literal>options</literal> key defining
390+ the sub-options. Submodule option definitions are type-checked accordingly
391+ to the <literal>options</literal> declarations. Of course, you can nest
392+ submodule option definitons for even higher modularity.
339393 </para>
340394
341395 <para>
342− The option set can be defined directly (<xref linkend='ex-submodule-direct' />) or as reference (<xref linkend='ex-submodule-reference' />).
396+ The option set can be defined directly
397+ (<xref linkend='ex-submodule-direct' />) or as reference
398+ (<xref linkend='ex-submodule-reference' />).
343399 </para>
344400
345401 <example xml:id='ex-submodule-direct'>
@@ -382,7 +438,12 @@ options.mod = mkOption {
382438 </example>
383439
384440 <para>
385− The <literal>submodule</literal> type is especially interesting when used with composed types like <literal>attrsOf</literal> or <literal>listOf</literal>. When composed with <literal>listOf</literal> (<xref linkend='ex-submodule-listof-declaration' />), <literal>submodule</literal> allows multiple definitions of the submodule option set (<xref linkend='ex-submodule-listof-definition' />).
441+ The <literal>submodule</literal> type is especially interesting when used
442+ with composed types like <literal>attrsOf</literal> or
443+ <literal>listOf</literal>. When composed with <literal>listOf</literal>
444+ (<xref linkend='ex-submodule-listof-declaration' />),
445+ <literal>submodule</literal> allows multiple definitions of the submodule
446+ option set (<xref linkend='ex-submodule-listof-definition' />).
386447 </para>
387448
388449 <example xml:id='ex-submodule-listof-declaration'>
@@ -413,7 +474,10 @@ config.mod = [
413474 </example>
414475
415476 <para>
416− When composed with <literal>attrsOf</literal> (<xref linkend='ex-submodule-attrsof-declaration' />), <literal>submodule</literal> allows multiple named definitions of the submodule option set (<xref linkend='ex-submodule-attrsof-definition' />).
477+ When composed with <literal>attrsOf</literal>
478+ (<xref linkend='ex-submodule-attrsof-declaration' />),
479+ <literal>submodule</literal> allows multiple named definitions of the
480+ submodule option set (<xref linkend='ex-submodule-attrsof-definition' />).
417481 </para>
418482
419483 <example xml:id='ex-submodule-attrsof-declaration'>
@@ -446,7 +510,8 @@ config.mod.two = { foo = 2; bar = "two"; };</screen>
446510 <title>Extending types</title>
447511
448512 <para>
449− Types are mainly characterized by their <literal>check</literal> and <literal>merge</literal> functions.
513+ Types are mainly characterized by their <literal>check</literal> and
514+ <literal>merge</literal> functions.
450515 </para>
451516
452517 <variablelist>
@@ -456,8 +521,13 @@ config.mod.two = { foo = 2; bar = "two"; };</screen>
456521 </term>
457522 <listitem>
458523 <para>
459− 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 <literal>addCheck</literal> function (<xref
460− linkend='ex-extending-type-check-1' />), or to fully override the check function (<xref linkend='ex-extending-type-check-2' />).
524+ The function to type check the value. Takes a value as parameter and
525+ return a boolean. It is possible to extend a type check with the
526+ <literal>addCheck</literal> function
527+ (<xref
528+ linkend='ex-extending-type-check-1' />), or to fully
529+ override the check function
530+ (<xref linkend='ex-extending-type-check-2' />).
461531 </para>
462532 <example xml:id='ex-extending-type-check-1'>
463533 <title>Adding a type check</title>
@@ -485,7 +555,11 @@ nixThings = mkOption {
485555 </term>
486556 <listitem>
487557 <para>
488− Function to merge the options values when multiple values are set. The function takes two parameters, <literal>loc</literal> the option path as a list of strings, and <literal>defs</literal> the list of defined values as a list. It is possible to override a type merge function for custom needs.
558+ Function to merge the options values when multiple values are set. The
559+ function takes two parameters, <literal>loc</literal> the option path as
560+ a list of strings, and <literal>defs</literal> the list of defined values
561+ as a list. It is possible to override a type merge function for custom
562+ needs.
489563 </para>
490564 </listitem>
491565 </varlistentry>
@@ -496,8 +570,12 @@ nixThings = mkOption {
496570 <title>Custom Types</title>
497571
498572 <para>
499− Custom types can be created with the <literal>mkOptionType</literal> function. As type creation includes some more complex topics such as submodule handling, it is recommended to get familiar with <filename
500− xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename> code before creating a new type.
573+ Custom types can be created with the <literal>mkOptionType</literal>
574+ function. As type creation includes some more complex topics such as
575+ submodule handling, it is recommended to get familiar with
576+ <filename
577+ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename>
578+ code before creating a new type.
501579 </para>
502580
503581 <para>
@@ -521,7 +599,8 @@ nixThings = mkOption {
521599 </term>
522600 <listitem>
523601 <para>
524− Description of the type used in documentation. Give information of the type and any of its arguments.
602+ Description of the type used in documentation. Give information of the
603+ type and any of its arguments.
525604 </para>
526605 </listitem>
527606 </varlistentry>
@@ -531,7 +610,10 @@ nixThings = mkOption {
531610 </term>
532611 <listitem>
533612 <para>
534− A function to type check the definition value. Takes the definition value as a parameter and returns a boolean indicating the type check result, <literal>true</literal> for success and <literal>false</literal> for failure.
613+ A function to type check the definition value. Takes the definition value
614+ as a parameter and returns a boolean indicating the type check result,
615+ <literal>true</literal> for success and <literal>false</literal> for
616+ failure.
535617 </para>
536618 </listitem>
537619 </varlistentry>
@@ -550,7 +632,8 @@ nixThings = mkOption {
550632 </term>
551633 <listitem>
552634 <para>
553− The option path as a list of strings, e.g. <literal>["boot" "loader "grub" "enable"]</literal>.
635+ The option path as a list of strings, e.g. <literal>["boot" "loader
636+ "grub" "enable"]</literal>.
554637 </para>
555638 </listitem>
556639 </varlistentry>
@@ -560,7 +643,12 @@ nixThings = mkOption {
560643 </term>
561644 <listitem>
562645 <para>
563− The list of sets of defined <literal>value</literal> and <literal>file</literal> where the value was defined, e.g. <literal>[ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } ]</literal>. The <literal>merge</literal> function should return the merged value or throw an error in case the values are impossible or not meant to be merged.
646+ The list of sets of defined <literal>value</literal> and
647+ <literal>file</literal> where the value was defined, e.g. <literal>[ {
648+ file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 }
649+ ]</literal>. The <literal>merge</literal> function should return the
650+ merged value or throw an error in case the values are impossible or
651+ not meant to be merged.
564652 </para>
565653 </listitem>
566654 </varlistentry>
@@ -573,7 +661,13 @@ nixThings = mkOption {
573661 </term>
574662 <listitem>
575663 <para>
576− 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. <literal>prefix: elemType.getSubOptions (prefix ++ [<replaceable>"prefix"</replaceable>])</literal> where <replaceable>"prefix"</replaceable> is the newly added prefix.
664+ For composed types that can take a submodule as type parameter, this
665+ function generate sub-options documentation. It takes the current option
666+ prefix as a list and return the set of sub-options. Usually defined in a
667+ recursive manner by adding a term to the prefix, e.g. <literal>prefix:
668+ elemType.getSubOptions (prefix ++
669+ [<replaceable>"prefix"</replaceable>])</literal> where
670+ <replaceable>"prefix"</replaceable> is the newly added prefix.
577671 </para>
578672 </listitem>
579673 </varlistentry>
@@ -583,7 +677,11 @@ nixThings = mkOption {
583677 </term>
584678 <listitem>
585679 <para>
586− 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 <literal>elemType</literal>, the function should just recursively look into submodules by returning <literal>elemType.getSubModules;</literal>.
680+ For composed types that can take a submodule as type parameter, this
681+ function should return the type parameters submodules. If the type
682+ parameter is called <literal>elemType</literal>, the function should just
683+ recursively look into submodules by returning
684+ <literal>elemType.getSubModules;</literal>.
587685 </para>
588686 </listitem>
589687 </varlistentry>
@@ -593,7 +691,14 @@ nixThings = mkOption {
593691 </term>
594692 <listitem>
595693 <para>
596− 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 <literal>substSubModules</literal>, e.g for a type <literal>composedType</literal> that take an <literal>elemtype</literal> type parameter, this function should be defined as <literal>m: composedType (elemType.substSubModules m)</literal>.
694+ For composed types that can take a submodule as type parameter, this
695+ function can be used to substitute the parameter of a submodule type. It
696+ takes a module as parameter and return the type with the submodule
697+ options substituted. It is usually defined as a type function call with a
698+ recursive call to <literal>substSubModules</literal>, e.g for a type
699+ <literal>composedType</literal> that take an <literal>elemtype</literal>
700+ type parameter, this function should be defined as <literal>m:
701+ composedType (elemType.substSubModules m)</literal>.
597702 </para>
598703 </listitem>
599704 </varlistentry>
@@ -603,7 +708,9 @@ nixThings = mkOption {
603708 </term>
604709 <listitem>
605710 <para>
606− A function to merge multiple type declarations. Takes the type to merge <literal>functor</literal> as parameter. A <literal>null</literal> return value means that type cannot be merged.
711+ A function to merge multiple type declarations. Takes the type to merge
712+ <literal>functor</literal> as parameter. A <literal>null</literal> return
713+ value means that type cannot be merged.
607714 </para>
608715 <variablelist>
609716 <varlistentry>
@@ -618,7 +725,8 @@ nixThings = mkOption {
618725 </varlistentry>
619726 </variablelist>
620727 <para>
621− Note: There is a generic <literal>defaultTypeMerge</literal> that work with most of value and composed types.
728+ Note: There is a generic <literal>defaultTypeMerge</literal> that work
729+ with most of value and composed types.
622730 </para>
623731 </listitem>
624732 </varlistentry>
@@ -628,7 +736,8 @@ nixThings = mkOption {
628736 </term>
629737 <listitem>
630738 <para>
631− An attribute set representing the type. It is used for type operations and has the following keys:
739+ An attribute set representing the type. It is used for type operations
740+ and has the following keys:
632741 </para>
633742 <variablelist>
634743 <varlistentry>
@@ -657,7 +766,10 @@ nixThings = mkOption {
657766 </term>
658767 <listitem>
659768 <para>
660− Holds the value parameter for value types. The types that have a <literal>payload</literal> are the <literal>enum</literal>, <literal>separatedString</literal> and <literal>submodule</literal> types.
769+ Holds the value parameter for value types. The types that have a
770+ <literal>payload</literal> are the <literal>enum</literal>,
771+ <literal>separatedString</literal> and <literal>submodule</literal>
772+ types.
661773 </para>
662774 </listitem>
663775 </varlistentry>
@@ -667,7 +779,9 @@ nixThings = mkOption {
667779 </term>
668780 <listitem>
669781 <para>
670− 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.
782+ A binary operation that can merge the payloads of two same types.
783+ Defined as a function that take two payloads as parameters and return
784+ the payloads merged.
671785 </para>
672786 </listitem>
673787 </varlistentry>
nixos/doc/manual/development/releases.xml+72−54
@@ -17,12 +17,15 @@
1717 <itemizedlist spacing="compact">
1818 <listitem>
1919 <para>
20− Send an email to the nix-devel mailinglist as a warning about upcoming beta "feature freeze" in a month.
20+ Send an email to the nix-devel mailinglist as a warning about upcoming
21+ beta "feature freeze" in a month.
2122 </para>
2223 </listitem>
2324 <listitem>
2425 <para>
25− 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.
26+ Discuss with Eelco Dolstra and the community (via IRC, ML) about what
27+ will reach the deadline. Any issue or Pull Request targeting the release
28+ should be included in the release milestone.
2629 </para>
2730 </listitem>
2831 </itemizedlist>
@@ -34,32 +37,42 @@
3437 <itemizedlist spacing="compact">
3538 <listitem>
3639 <para>
37− <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create an issue for tracking Zero Hydra Failures progress. ZHF is an effort to get build failures down to zero.</link>
40+ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create
41+ an issue for tracking Zero Hydra Failures progress. ZHF is an effort to
42+ get build failures down to zero.</link>
3843 </para>
3944 </listitem>
4045 <listitem>
4146 <para>
42− <literal>git tag -a -s -m &quot;Release 17.09-beta&quot; 17.09-beta &amp;&amp; git push --tags</literal>
47+ <literal>git tag -a -s -m &quot;Release 17.09-beta&quot; 17.09-beta
48+ &amp;&amp; git push --tags</literal>
4349 </para>
4450 </listitem>
4551 <listitem>
4652 <para>
47− From the master branch run <literal>git checkout -B release-17.09</literal>.
53+ From the master branch run <literal>git checkout -B
54+ release-17.09</literal>.
4855 </para>
4956 </listitem>
5057 <listitem>
5158 <para>
52− <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18"> Make sure a channel is created at http://nixos.org/channels/. </link>
59+ <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18">
60+ Make sure a channel is created at http://nixos.org/channels/. </link>
5361 </para>
5462 </listitem>
5563 <listitem>
5664 <para>
57− <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790"> Bump the <literal>system.defaultChannel</literal> attribute in <literal>nixos/modules/misc/version.nix</literal> </link>
65+ <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">
66+ Bump the <literal>system.defaultChannel</literal> attribute in
67+ <literal>nixos/modules/misc/version.nix</literal> </link>
5868 </para>
5969 </listitem>
6070 <listitem>
6171 <para>
62− <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06"> Update <literal>versionSuffix</literal> in <literal>nixos/release.nix</literal></link>, use <literal>git log --format=%an|wc -l</literal> to get the commit count
72+ <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06">
73+ Update <literal>versionSuffix</literal> in
74+ <literal>nixos/release.nix</literal></link>, use <literal>git log
75+ --format=%an|wc -l</literal> to get the commit count
6376 </para>
6477 </listitem>
6578 <listitem>
@@ -69,32 +82,44 @@
6982 </listitem>
7083 <listitem>
7184 <para>
72− <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842"> Pick a new name for the unstable branch. </link>
85+ <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842">
86+ Pick a new name for the unstable branch. </link>
7387 </para>
7488 </listitem>
7589 <listitem>
7690 <para>
77− Create a new release notes file for the upcoming release + 1, in this case <literal>rl-1803.xml</literal>.
91+ Create a new release notes file for the upcoming release + 1, in this
92+ case <literal>rl-1803.xml</literal>.
7893 </para>
7994 </listitem>
8095 <listitem>
8196 <para>
82− Create two Hydra jobsets: release-17.09 and release-17.09-small with <literal>stableBranch</literal> set to false.
97+ Create two Hydra jobsets: release-17.09 and release-17.09-small with
98+ <literal>stableBranch</literal> set to false.
8399 </para>
84100 </listitem>
85101 <listitem>
86102 <para>
87− 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' <link xlink:href="https://www.kernel.org/category/releases.html"> projected end-of-life</link> are after our release projected end-of-life
103+ Remove attributes that we know we will not be able to support,
104+ especially if there is a stable alternative. E.g. Check that our
105+ Linux kernels'
106+ <link xlink:href="https://www.kernel.org/category/releases.html">
107+ projected end-of-life</link> are after our release projected
108+ end-of-life
88109 </para>
89110 </listitem>
90111 <listitem>
91112 <para>
92− Edit changelog at <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal> (double check desktop versions are noted)
113+ Edit changelog at
114+ <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal> (double
115+ check desktop versions are noted)
93116 </para>
94117 <itemizedlist spacing="compact">
95118 <listitem>
96119 <para>
97− Get all new NixOS modules <literal>git diff release-17.03..release-17.09 nixos/modules/module-list.nix|grep ^+</literal>
120+ Get all new NixOS modules <literal>git diff
121+ release-17.03..release-17.09 nixos/modules/module-list.nix|grep
122+ ^+</literal>
98123 </para>
99124 </listitem>
100125 <listitem>
@@ -113,7 +138,8 @@
113138 <itemizedlist spacing="compact">
114139 <listitem>
115140 <para>
116− Monitor the master branch for bugfixes and minor updates and cherry-pick them to the release branch.
141+ Monitor the master branch for bugfixes and minor updates and cherry-pick
142+ them to the release branch.
117143 </para>
118144 </listitem>
119145 </itemizedlist>
@@ -130,17 +156,21 @@
130156 </listitem>
131157 <listitem>
132158 <para>
133− Release Nix (currently only Eelco Dolstra can do that). <link xlink:href="https://github.com/NixOS/nixpkgs/commit/53710c752a85f00658882531bc90a23a3d1287e4"> Make sure fallback is updated. </link>
159+ Release Nix (currently only Eelco Dolstra can do that).
160+ <link xlink:href="https://github.com/NixOS/nixpkgs/commit/53710c752a85f00658882531bc90a23a3d1287e4">
161+ Make sure fallback is updated. </link>
134162 </para>
135163 </listitem>
136164 <listitem>
137165 <para>
138− <link xlink:href="https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e"> Update README.md with new stable NixOS version information. </link>
166+ <link xlink:href="https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e">
167+ Update README.md with new stable NixOS version information. </link>
139168 </para>
140169 </listitem>
141170 <listitem>
142171 <para>
143− Change <literal>stableBranch</literal> to true and wait for channel to update.
172+ Change <literal>stableBranch</literal> to true and wait for channel to
173+ update.
144174 </para>
145175 </listitem>
146176 </itemizedlist>
@@ -157,27 +187,34 @@
157187 </listitem>
158188 <listitem>
159189 <para>
160− Update "Chapter 4. Upgrading NixOS" section of the manual to match new stable release version.
190+ Update "Chapter 4. Upgrading NixOS" section of the manual to match
191+ new stable release version.
161192 </para>
162193 </listitem>
163194 <listitem>
164195 <para>
165− Update http://nixos.org/nixos/download.html and http://nixos.org/nixos/manual in https://github.com/NixOS/nixos-org-configurations
196+ Update http://nixos.org/nixos/download.html and
197+ http://nixos.org/nixos/manual in
198+ https://github.com/NixOS/nixos-org-configurations
166199 </para>
167200 </listitem>
168201 <listitem>
169202 <para>
170− Get number of commits for the release: <literal>git log release-14.04..release-14.12 --format=%an|wc -l</literal>
203+ Get number of commits for the release: <literal>git log
204+ release-14.04..release-14.12 --format=%an|wc -l</literal>
171205 </para>
172206 </listitem>
173207 <listitem>
174208 <para>
175− Commits by contributor: <literal>git log release-14.04..release-14.12 --format=%an|sort|uniq -c|sort -rn</literal>
209+ Commits by contributor: <literal>git log release-14.04..release-14.12
210+ --format=%an|sort|uniq -c|sort -rn</literal>
176211 </para>
177212 </listitem>
178213 <listitem>
179214 <para>
180− 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.
215+ Send an email to nix-dev to announce the release with above information.
216+ Best to check how previous email was formulated to see what needs to be
217+ included.
181218 </para>
182219 </listitem>
183220 </itemizedlist>
@@ -185,45 +222,26 @@
185222 </section>
186223 <section xml:id="release-managers">
187224 <title>Release Management Team</title>
188−
189225 <para>
190− 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.
226+ For each release there are two release managers. After each release the
227+ release manager having managed two releases steps down and the release
228+ management team of the last release appoints a new release manager.
191229 </para>
192−
193230 <para>
194− 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.
231+ This makes sure a release management team always consists of one release
232+ manager who already has managed one release and one release manager being
233+ introduced to their role, making it easier to pass on knowledge and
234+ experience.
195235 </para>
196−
197236 <para>
198237 A release manager's role and responsibilities are:
199238 </para>
200−
201239 <itemizedlist>
202− <listitem>
203− <para>
204− manage the release process
205− </para>
206− </listitem>
207− <listitem>
208− <para>
209− start discussions about features and changes for a given release
210− </para>
211− </listitem>
212− <listitem>
213− <para>
214− create a roadmap
215− </para>
216− </listitem>
217− <listitem>
218− <para>
219− release in cooperation with Eelco Dolstra
220− </para>
221− </listitem>
222− <listitem>
223− <para>
224− decide which bug fixes, features, etc... get backported after a release
225− </para>
226− </listitem>
240+ <listitem><para>manage the release process</para></listitem>
241+ <listitem><para>start discussions about features and changes for a given release</para></listitem>
242+ <listitem><para>create a roadmap</para></listitem>
243+ <listitem><para>release in cooperation with Eelco Dolstra</para></listitem>
244+ <listitem><para>decide which bug fixes, features, etc... get backported after a release</para></listitem>
227245 </itemizedlist>
228246 </section>
229247 <section xml:id="release-schedule">
nixos/doc/manual/development/replace-modules.xml+18−4
@@ -6,15 +6,27 @@
66 <title>Replace Modules</title>
77
88 <para>
9− 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.
9+ Modules that are imported can also be disabled. The option declarations and
10+ config implementation of a disabled module will be ignored, allowing another
11+ to take it's place. This can be used to import a set of modules from another
12+ channel while keeping the rest of the system on a stable release.
1013 </para>
1114
1215 <para>
13− <literal>disabledModules</literal> is a top level attribute like <literal>imports</literal>, <literal>options</literal> and <literal>config</literal>. 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. &lt;nixpkgs/nixos/modules&gt; for nixos).
16+ <literal>disabledModules</literal> is a top level attribute like
17+ <literal>imports</literal>, <literal>options</literal> and
18+ <literal>config</literal>. It contains a list of modules that will be
19+ disabled. This can either be the full path to the module or a string with the
20+ filename relative to the modules path (eg. &lt;nixpkgs/nixos/modules&gt; for
21+ nixos).
1422 </para>
1523
1624 <para>
17− 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.
25+ This example will replace the existing postgresql module with the version
26+ defined in the nixos-unstable channel while keeping the rest of the modules
27+ and packages from the original nixos channel. This only overrides the module
28+ definition, this won't use postgresql from nixos-unstable unless explicitly
29+ configured to do so.
1830 </para>
1931
2032<programlisting>
@@ -34,7 +46,9 @@
3446</programlisting>
3547
3648 <para>
37− 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.
49+ This example shows how to define a custom module as a replacement for an
50+ existing module. Importing this module will disable the original module
51+ without having to know it's implementation details.
3852 </para>
3953
4054<programlisting>
nixos/doc/manual/development/running-nixos-tests-interactively.xml+10−4
@@ -6,7 +6,8 @@
66 <title>Running Tests interactively</title>
77
88 <para>
9− The test itself can be run interactively. This is particularly useful when developing or debugging a test:
9+ The test itself can be run interactively. This is particularly useful when
10+ developing or debugging a test:
1011<screen>
1112<prompt>$ </prompt>nix-build nixos/tests/login.nix -A driver
1213<prompt>$ </prompt>./result/bin/nixos-test-driver
@@ -20,7 +21,10 @@ starting VDE switch for network 1
2021<prompt>&gt;</prompt> $machine->succeed("touch /tmp/foo")
2122<prompt>&gt;</prompt> print($machine->succeed("pwd")) # Show stdout of command
2223</screen>
23− The function <command>testScript</command> 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).
24+ The function <command>testScript</command> executes the entire test script
25+ and drops you back into the test driver command line upon its completion.
26+ This allows you to inspect the state of the VMs after the test (e.g. to debug
27+ the test script).
2428 </para>
2529
2630 <para>
@@ -29,10 +33,12 @@ starting VDE switch for network 1
2933<prompt>$ </prompt>nix-build nixos/tests/login.nix -A driver
3034<prompt>$ </prompt>./result/bin/nixos-run-vms
3135</screen>
32− The script <command>nixos-run-vms</command> starts the virtual machines defined by test.
36+ The script <command>nixos-run-vms</command> starts the virtual machines
37+ defined by test.
3338 </para>
3439
3540 <para>
36− The machine state is kept across VM restarts in <filename>/tmp/vm-state-</filename><varname>machinename</varname>.
41+ The machine state is kept across VM restarts in
42+ <filename>/tmp/vm-state-</filename><varname>machinename</varname>.
3743 </para>
3844</section>
nixos/doc/manual/development/running-nixos-tests.xml+10−3
@@ -6,8 +6,11 @@
66 <title>Running Tests</title>
77
88 <para>
9− You can run tests using <command>nix-build</command>. For example, to run the test <filename
10−xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>, you just do:
9+ You can run tests using <command>nix-build</command>. For example, to run the
10+ test
11+ <filename
12+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>,
13+ you just do:
1114<screen>
1215<prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos/tests/login.nix>'
1316</screen>
@@ -21,7 +24,11 @@ machine: QEMU running (pid 8841)
2124…
22256 out of 6 tests succeeded
2326</screen>
24− 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:
27+ After building/downloading all required dependencies, this will perform a
28+ build that starts a QEMU/KVM virtual machine containing a NixOS system. The
29+ virtual machine mounts the Nix store of the host; this makes VM creation very
30+ fast, as no disk image needs to be created. Afterwards, you can view a
31+ pretty-printed log of the test:
2532<screen>
2633<prompt>$ </prompt>firefox result/log.html
2734</screen>
nixos/doc/manual/development/sources.xml+39−9
@@ -5,47 +5,77 @@
55 xml:id="sec-getting-sources">
66 <title>Getting the Sources</title>
77 <para>
8− By default, NixOS’s <command>nixos-rebuild</command> command uses the NixOS and Nixpkgs sources provided by the <literal>nixos</literal> channel (kept in <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To modify NixOS, however, you should check out the latest sources from Git. This is as follows:
8+ By default, NixOS’s <command>nixos-rebuild</command> command uses the NixOS
9+ and Nixpkgs sources provided by the <literal>nixos</literal> channel (kept in
10+ <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To
11+ modify NixOS, however, you should check out the latest sources from Git. This
12+ is as follows:
913<screen>
1014<prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs
1115<prompt>$ </prompt>cd nixpkgs
1216<prompt>$ </prompt>git remote add channels https://github.com/NixOS/nixpkgs-channels
1317<prompt>$ </prompt>git remote update channels
1418</screen>
15− This will check out the latest Nixpkgs sources to <filename>./nixpkgs</filename> the NixOS sources to <filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in a subdirectory of the Nixpkgs repository.) The remote <literal>channels</literal> refers to a read-only repository that tracks the Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/> for more information about channels). Thus, the Git branch <literal>channels/nixos-17.03</literal> will contain the latest built and tested version available in the <literal>nixos-17.03</literal> channel.
19+ This will check out the latest Nixpkgs sources to
20+ <filename>./nixpkgs</filename> the NixOS sources to
21+ <filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in a
22+ subdirectory of the Nixpkgs repository.) The remote
23+ <literal>channels</literal> refers to a read-only repository that tracks the
24+ Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/> for more
25+ information about channels). Thus, the Git branch
26+ <literal>channels/nixos-17.03</literal> will contain the latest built and
27+ tested version available in the <literal>nixos-17.03</literal> channel.
1628 </para>
1729 <para>
18− 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:
30+ It’s often inconvenient to develop directly on the master branch, since if
31+ somebody has just committed (say) a change to GCC, then the binary cache may
32+ not have caught up yet and you’ll have to rebuild everything from source.
33+ So you may want to create a local branch based on your current NixOS version:
1934<screen>
2035<prompt>$ </prompt>nixos-version
213617.09pre104379.6e0b727 (Hummingbird)
2237
2338<prompt>$ </prompt>git checkout -b local 6e0b727
2439</screen>
25− Or, to base your local branch on the latest version available in a NixOS channel:
40+ Or, to base your local branch on the latest version available in a NixOS
41+ channel:
2642<screen>
2743<prompt>$ </prompt>git remote update channels
2844<prompt>$ </prompt>git checkout -b local channels/nixos-17.03
2945</screen>
30− (Replace <literal>nixos-17.03</literal> with the name of the channel you want to use.) You can use <command>git merge</command> or <command>git rebase</command> to keep your local branch in sync with the channel, e.g.
46+ (Replace <literal>nixos-17.03</literal> with the name of the channel you want
47+ to use.) You can use <command>git merge</command> or <command>git
48+ rebase</command> to keep your local branch in sync with the channel, e.g.
3149<screen>
3250<prompt>$ </prompt>git remote update channels
3351<prompt>$ </prompt>git merge channels/nixos-17.03
3452</screen>
35− You can use <command>git cherry-pick</command> to copy commits from your local branch to the upstream branch.
53+ You can use <command>git cherry-pick</command> to copy commits from your
54+ local branch to the upstream branch.
3655 </para>
3756 <para>
38− If you want to rebuild your system using your (modified) sources, you need to tell <command>nixos-rebuild</command> about them using the <option>-I</option> flag:
57+ If you want to rebuild your system using your (modified) sources, you need to
58+ tell <command>nixos-rebuild</command> about them using the
59+ <option>-I</option> flag:
3960<screen>
4061<prompt># </prompt>nixos-rebuild switch -I nixpkgs=<replaceable>/my/sources</replaceable>/nixpkgs
4162</screen>
4263 </para>
4364 <para>
44− If you want <command>nix-env</command> to use the expressions in <replaceable>/my/sources</replaceable>, use <command>nix-env -f <replaceable>/my/sources</replaceable>/nixpkgs</command>, or change the default by adding a symlink in <filename>~/.nix-defexpr</filename>:
65+ If you want <command>nix-env</command> to use the expressions in
66+ <replaceable>/my/sources</replaceable>, use <command>nix-env -f
67+ <replaceable>/my/sources</replaceable>/nixpkgs</command>, or change the
68+ default by adding a symlink in <filename>~/.nix-defexpr</filename>:
4569<screen>
4670<prompt>$ </prompt>ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
4771</screen>
48− You may want to delete the symlink <filename>~/.nix-defexpr/channels_root</filename> 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 <filename>~/.nix-defexpr</filename> directory completely, log out and log in again and it should have been recreated with a link to the root channels.
72+ You may want to delete the symlink
73+ <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s NixOS
74+ channel from clashing with your own tree (this may break the
75+ command-not-found utility though). If you want to go back to the default
76+ state, you may just remove the <filename>~/.nix-defexpr</filename> directory
77+ completely, log out and log in again and it should have been recreated with a
78+ link to the root channels.
4979 </para>
5080<!-- FIXME: not sure what this means.
5181<para>You should not pass the base directory
nixos/doc/manual/development/testing-installer.xml+4−2
@@ -5,13 +5,15 @@
55 xml:id="ch-testing-installer">
66 <title>Testing the Installer</title>
77 <para>
8− Building, burning, and booting from an installation CD is rather tedious, so here is a quick way to see if the installer works properly:
8+ Building, burning, and booting from an installation CD is rather tedious, so
9+ here is a quick way to see if the installer works properly:
910<screen>
1011<prompt># </prompt>mount -t tmpfs none /mnt
1112<prompt># </prompt>nixos-generate-config --root /mnt
1213<prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-install
1314<prompt># </prompt>./result/bin/nixos-install</screen>
14− To start a login shell in the new NixOS installation in <filename>/mnt</filename>:
15+ To start a login shell in the new NixOS installation in
16+ <filename>/mnt</filename>:
1517<screen>
1618<prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-enter
1719<prompt># </prompt>./result/bin/nixos-enter
nixos/doc/manual/development/writing-documentation.xml+56−18
@@ -5,13 +5,18 @@
55 xml:id="sec-writing-documentation">
66 <title>Writing NixOS Documentation</title>
77 <para>
8− As NixOS grows, so too does the need for a catalogue and explanation of its extensive functionality. Collecting pertinent information from disparate sources and presenting it in an accessible style would be a worthy contribution to the project.
8+ As NixOS grows, so too does the need for a catalogue and explanation of its
9+ extensive functionality. Collecting pertinent information from disparate
10+ sources and presenting it in an accessible style would be a worthy
11+ contribution to the project.
912 </para>
1013 <section xml:id="sec-writing-docs-building-the-manual">
1114 <title>Building the Manual</title>
1215
1316 <para>
14− The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link> subdirectory of the Nixpkgs repository.
17+ The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the
18+ <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link>
19+ subdirectory of the Nixpkgs repository.
1520 </para>
1621
1722 <para>
@@ -24,45 +29,59 @@
2429</screen>
2530
2631 <para>
27− Once you are done making modifications to the manual, it's important to build it before committing. You can do that as follows:
32+ Once you are done making modifications to the manual, it's important to
33+ build it before committing. You can do that as follows:
2834 </para>
2935
3036<screen>nix-build nixos/release.nix -A manual.x86_64-linux</screen>
3137
3238 <para>
33− When this command successfully finishes, it will tell you where the manual got generated. The HTML will be accessible through the <filename>result</filename> symlink at <filename>./result/share/doc/nixos/index.html</filename>.
39+ When this command successfully finishes, it will tell you where the manual
40+ got generated. The HTML will be accessible through the
41+ <filename>result</filename> symlink at
42+ <filename>./result/share/doc/nixos/index.html</filename>.
3443 </para>
3544 </section>
3645 <section xml:id="sec-writing-docs-editing-docbook-xml">
3746 <title>Editing DocBook XML</title>
3847
3948 <para>
40− For general information on how to write in DocBook, see <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html"> DocBook 5: The Definitive Guide</link>.
49+ For general information on how to write in DocBook, see
50+ <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html"> DocBook
51+ 5: The Definitive Guide</link>.
4152 </para>
4253
4354 <para>
44− Emacs nXML Mode is very helpful for editing DocBook XML because it validates the document as you write, and precisely locates errors. To use it, see <xref linkend="sec-emacs-docbook-xml"/>.
55+ Emacs nXML Mode is very helpful for editing DocBook XML because it validates
56+ the document as you write, and precisely locates errors. To use it, see
57+ <xref linkend="sec-emacs-docbook-xml"/>.
4558 </para>
4659
4760 <para>
48− <link xlink:href="http://pandoc.org">Pandoc</link> can generate DocBook XML from a multitude of formats, which makes a good starting point.
61+ <link xlink:href="http://pandoc.org">Pandoc</link> can generate DocBook XML
62+ from a multitude of formats, which makes a good starting point.
4963 <example xml:id="ex-pandoc-xml-conv">
5064 <title>Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML</title>
5165<screen>pandoc -f markdown_github -t docbook5 docs.md -o my-section.md</screen>
5266 </example>
53− Pandoc can also quickly convert a single <filename>section.xml</filename> to HTML, which is helpful when drafting.
67+ Pandoc can also quickly convert a single <filename>section.xml</filename> to
68+ HTML, which is helpful when drafting.
5469 </para>
5570
5671 <para>
57− Sometimes writing valid DocBook is simply too difficult. In this case, submit your documentation updates in a <link
58− xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub Issue</link> and someone will handle the conversion to XML for you.
72+ Sometimes writing valid DocBook is simply too difficult. In this case,
73+ submit your documentation updates in a
74+ <link
75+ xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub
76+ Issue</link> and someone will handle the conversion to XML for you.
5977 </para>
6078 </section>
6179 <section xml:id="sec-writing-docs-creating-a-topic">
6280 <title>Creating a Topic</title>
6381
6482 <para>
65− You can use an existing topic as a basis for the new topic or create a topic from scratch.
83+ You can use an existing topic as a basis for the new topic or create a topic
84+ from scratch.
6685 </para>
6786
6887 <para>
@@ -70,27 +89,40 @@
7089 <itemizedlist>
7190 <listitem>
7291 <para>
73− The NixOS <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link> element is in <filename>nixos/doc/manual/manual.xml</filename>. It includes several <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link> which are in subdirectories.
92+ The NixOS
93+ <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link>
94+ element is in <filename>nixos/doc/manual/manual.xml</filename>. It
95+ includes several
96+ <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link>
97+ which are in subdirectories.
7498 </para>
7599 </listitem>
76100 <listitem>
77101 <para>
78− Store the topic file in the same directory as the <tag>part</tag> to which it belongs. If your topic is about configuring a NixOS module, then the XML file can be stored alongside the module definition <filename>nix</filename> file.
102+ Store the topic file in the same directory as the <tag>part</tag> to
103+ which it belongs. If your topic is about configuring a NixOS module, then
104+ the XML file can be stored alongside the module definition
105+ <filename>nix</filename> file.
79106 </para>
80107 </listitem>
81108 <listitem>
82109 <para>
83− If you include multiple words in the file name, separate the words with a dash. For example: <filename>ipv6-config.xml</filename>.
110+ If you include multiple words in the file name, separate the words with a
111+ dash. For example: <filename>ipv6-config.xml</filename>.
84112 </para>
85113 </listitem>
86114 <listitem>
87115 <para>
88− Make sure that the <tag>xml:id</tag> value is unique. You can use abbreviations if the ID is too long. For example: <varname>nixos-config</varname>.
116+ Make sure that the <tag>xml:id</tag> value is unique. You can use
117+ abbreviations if the ID is too long. For example:
118+ <varname>nixos-config</varname>.
89119 </para>
90120 </listitem>
91121 <listitem>
92122 <para>
93− Determine whether your topic is a chapter or a section. If you are unsure, open an existing topic file and check whether the main element is chapter or section.
123+ Determine whether your topic is a chapter or a section. If you are
124+ unsure, open an existing topic file and check whether the main element is
125+ chapter or section.
94126 </para>
95127 </listitem>
96128 </itemizedlist>
@@ -100,11 +132,17 @@
100132 <title>Adding a Topic to the Book</title>
101133
102134 <para>
103− Open the parent XML file and add an <varname>xi:include</varname> element to the list of chapters with the file name of the topic that you created. If you created a <tag>section</tag>, you add the file to the <tag>chapter</tag> file. If you created a <tag>chapter</tag>, you add the file to the <tag>part</tag> file.
135+ Open the parent XML file and add an <varname>xi:include</varname> element to
136+ the list of chapters with the file name of the topic that you created. If
137+ you created a <tag>section</tag>, you add the file to the <tag>chapter</tag>
138+ file. If you created a <tag>chapter</tag>, you add the file to the
139+ <tag>part</tag> file.
104140 </para>
105141
106142 <para>
107− If the topic is about configuring a NixOS module, it can be automatically included in the manual by using the <varname>meta.doc</varname> attribute. See <xref
143+ If the topic is about configuring a NixOS module, it can be automatically
144+ included in the manual by using the <varname>meta.doc</varname> attribute.
145+ See <xref
108146 linkend="sec-meta-attributes"/> for an explanation.
109147 </para>
110148 </section>
nixos/doc/manual/development/writing-modules.xml+56−13
@@ -5,25 +5,49 @@
55 xml:id="sec-writing-modules">
66 <title>Writing NixOS Modules</title>
77 <para>
8− NixOS has a modular system for declarative configuration. This system combines multiple <emphasis>modules</emphasis> to produce the full system configuration. One of the modules that constitute the configuration is <filename>/etc/nixos/configuration.nix</filename>. Most of the others live in the <link
9−xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link> subdirectory of the Nixpkgs tree.
8+ NixOS has a modular system for declarative configuration. This system
9+ combines multiple <emphasis>modules</emphasis> to produce the full system
10+ configuration. One of the modules that constitute the configuration is
11+ <filename>/etc/nixos/configuration.nix</filename>. Most of the others live in
12+ the
13+ <link
14+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link>
15+ subdirectory of the Nixpkgs tree.
1016 </para>
1117 <para>
12− Each NixOS module is a file that handles one logical aspect of the configuration, such as a specific kind of hardware, a service, or network settings. A module configuration does not have to handle everything from scratch; it can use the functionality provided by other modules for its implementation. Thus a module can <emphasis>declare</emphasis> options that can be used by other modules, and conversely can <emphasis>define</emphasis> options provided by other modules in its own implementation. For example, the module <link
13−xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link> declares the option <option>security.pam.services</option> that allows other modules (e.g. <link
14−xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>) to define PAM services; and it defines the option <option>environment.etc</option> (declared by <link
15−xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>) to cause files to be created in <filename>/etc/pam.d</filename>.
18+ Each NixOS module is a file that handles one logical aspect of the
19+ configuration, such as a specific kind of hardware, a service, or network
20+ settings. A module configuration does not have to handle everything from
21+ scratch; it can use the functionality provided by other modules for its
22+ implementation. Thus a module can <emphasis>declare</emphasis> options that
23+ can be used by other modules, and conversely can <emphasis>define</emphasis>
24+ options provided by other modules in its own implementation. For example, the
25+ module
26+ <link
27+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link>
28+ declares the option <option>security.pam.services</option> that allows other
29+ modules (e.g.
30+ <link
31+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>)
32+ to define PAM services; and it defines the option
33+ <option>environment.etc</option> (declared by
34+ <link
35+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>)
36+ to cause files to be created in <filename>/etc/pam.d</filename>.
1637 </para>
1738 <para xml:id="para-module-syn">
1839 In <xref
19−linkend="sec-configuration-syntax"/>, we saw the following structure of NixOS modules:
40+linkend="sec-configuration-syntax"/>, we saw the following structure
41+ of NixOS modules:
2042<programlisting>
2143{ config, pkgs, ... }:
2244
2345{ <replaceable>option definitions</replaceable>
2446}
2547</programlisting>
26− This is actually an <emphasis>abbreviated</emphasis> form of module that only defines options, but does not declare any. The structure of full NixOS modules is shown in <xref linkend='ex-module-syntax' />.
48+ This is actually an <emphasis>abbreviated</emphasis> form of module that only
49+ defines options, but does not declare any. The structure of full NixOS
50+ modules is shown in <xref linkend='ex-module-syntax' />.
2751 </para>
2852 <example xml:id='ex-module-syntax'>
2953 <title>Structure of NixOS Modules</title>
@@ -49,28 +73,47 @@ linkend="sec-configuration-syntax"/>, we saw the following structure of NixOS mo
4973 <calloutlist>
5074 <callout arearefs='module-syntax-1'>
5175 <para>
52− This line makes the current Nix expression a function. The variable <varname>pkgs</varname> contains Nixpkgs, while <varname>config</varname> contains the full system configuration. This line can be omitted if there is no reference to <varname>pkgs</varname> and <varname>config</varname> inside the module.
76+ This line makes the current Nix expression a function. The variable
77+ <varname>pkgs</varname> contains Nixpkgs, while <varname>config</varname>
78+ contains the full system configuration. This line can be omitted if there
79+ is no reference to <varname>pkgs</varname> and <varname>config</varname>
80+ inside the module.
5381 </para>
5482 </callout>
5583 <callout arearefs='module-syntax-2'>
5684 <para>
57− This list enumerates the paths to other NixOS modules that should be included in the evaluation of the system configuration. A default set of modules is defined in the file <filename>modules/module-list.nix</filename>. These don't need to be added in the import list.
85+ This list enumerates the paths to other NixOS modules that should be
86+ included in the evaluation of the system configuration. A default set of
87+ modules is defined in the file
88+ <filename>modules/module-list.nix</filename>. These don't need to be added
89+ in the import list.
5890 </para>
5991 </callout>
6092 <callout arearefs='module-syntax-3'>
6193 <para>
62− The attribute <varname>options</varname> is a nested set of <emphasis>option declarations</emphasis> (described below).
94+ The attribute <varname>options</varname> is a nested set of
95+ <emphasis>option declarations</emphasis> (described below).
6396 </para>
6497 </callout>
6598 <callout arearefs='module-syntax-4'>
6699 <para>
67− The attribute <varname>config</varname> is a nested set of <emphasis>option definitions</emphasis> (also described below).
100+ The attribute <varname>config</varname> is a nested set of
101+ <emphasis>option definitions</emphasis> (also described below).
68102 </para>
69103 </callout>
70104 </calloutlist>
71105 </para>
72106 <para>
73− <xref linkend='locate-example' /> shows a module that handles the regular update of the “locate” database, an index of all files in the file system. This module declares two options that can be defined by other modules (typically the user’s <filename>configuration.nix</filename>): <option>services.locate.enable</option> (whether the database should be updated) and <option>services.locate.interval</option> (when the update should be done). It implements its functionality by defining two options declared by other modules: <option>systemd.services</option> (the set of all systemd services) and <option>systemd.timers</option> (the list of commands to be executed periodically by <command>systemd</command>).
107+ <xref linkend='locate-example' /> shows a module that handles the regular
108+ update of the “locate” database, an index of all files in the file
109+ system. This module declares two options that can be defined by other modules
110+ (typically the user’s <filename>configuration.nix</filename>):
111+ <option>services.locate.enable</option> (whether the database should be
112+ updated) and <option>services.locate.interval</option> (when the update
113+ should be done). It implements its functionality by defining two options
114+ declared by other modules: <option>systemd.services</option> (the set of all
115+ systemd services) and <option>systemd.timers</option> (the list of commands
116+ to be executed periodically by <command>systemd</command>).
74117 </para>
75118 <example xml:id='locate-example'>
76119 <title>NixOS Module for the “locate” Service</title>
nixos/doc/manual/development/writing-nixos-tests.xml+84−29
@@ -31,9 +31,22 @@ import ./make-test.nix {
3131 '';
3232}
3333</programlisting>
34− The attribute <literal>testScript</literal> is a bit of Perl code that executes the test (described below). During the test, it will start one or more virtual machines, the configuration of which is described by the attribute <literal>machine</literal> (if you need only one machine in your test) or by the attribute <literal>nodes</literal> (if you need multiple machines). For instance, <filename
35−xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename> only needs a single machine to test whether users can log in on the virtual console, whether device ownership is correctly maintained when switching between consoles, and so on. On the other hand, <filename
36−xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>, which tests NFS client and server functionality in the Linux kernel (including whether locks are maintained across server crashes), requires three machines: a server and two clients.
34+ The attribute <literal>testScript</literal> is a bit of Perl code that
35+ executes the test (described below). During the test, it will start one or
36+ more virtual machines, the configuration of which is described by the
37+ attribute <literal>machine</literal> (if you need only one machine in your
38+ test) or by the attribute <literal>nodes</literal> (if you need multiple
39+ machines). For instance,
40+ <filename
41+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>
42+ only needs a single machine to test whether users can log in on the virtual
43+ console, whether device ownership is correctly maintained when switching
44+ between consoles, and so on. On the other hand,
45+ <filename
46+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>,
47+ which tests NFS client and server functionality in the Linux kernel
48+ (including whether locks are maintained across server crashes), requires
49+ three machines: a server and two clients.
3750 </para>
3851
3952 <para>
@@ -56,8 +69,10 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf
5669 </term>
5770 <listitem>
5871 <para>
59− The virtual networks to which the VM is connected. See <filename
60− xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename> for an example.
72+ The virtual networks to which the VM is connected. See
73+ <filename
74+ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename>
75+ for an example.
6176 </para>
6277 </listitem>
6378 </varlistentry>
@@ -67,23 +82,38 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf
6782 </term>
6883 <listitem>
6984 <para>
70− By default, the Nix store in the VM is not writable. If you enable this option, a writable union file system is mounted on top of the Nix store to make it appear writable. This is necessary for tests that run Nix operations that modify the store.
85+ By default, the Nix store in the VM is not writable. If you enable this
86+ option, a writable union file system is mounted on top of the Nix store
87+ to make it appear writable. This is necessary for tests that run Nix
88+ operations that modify the store.
7189 </para>
7290 </listitem>
7391 </varlistentry>
7492 </variablelist>
75− For more options, see the module <filename
93+ For more options, see the module
94+ <filename
7695xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix">qemu-vm.nix</filename>.
7796 </para>
7897
7998 <para>
80− The test script is a sequence of Perl statements that perform various actions, such as starting VMs, executing commands in the VMs, and so on. Each virtual machine is represented as an object stored in the variable <literal>$<replaceable>name</replaceable></literal>, where <replaceable>name</replaceable> is the identifier of the machine (which is just <literal>machine</literal> if you didn’t specify multiple machines using the <literal>nodes</literal> attribute). For instance, the following starts the machine, waits until it has finished booting, then executes a command and checks that the output is more-or-less correct:
99+ The test script is a sequence of Perl statements that perform various
100+ actions, such as starting VMs, executing commands in the VMs, and so on. Each
101+ virtual machine is represented as an object stored in the variable
102+ <literal>$<replaceable>name</replaceable></literal>, where
103+ <replaceable>name</replaceable> is the identifier of the machine (which is
104+ just <literal>machine</literal> if you didn’t specify multiple machines
105+ using the <literal>nodes</literal> attribute). For instance, the following
106+ starts the machine, waits until it has finished booting, then executes a
107+ command and checks that the output is more-or-less correct:
81108<programlisting>
82109$machine->start;
83110$machine->waitForUnit("default.target");
84111$machine->succeed("uname") =~ /Linux/ or die;
85112</programlisting>
86− The first line is actually unnecessary; machines are implicitly started when you first execute an action on them (such as <literal>waitForUnit</literal> or <literal>succeed</literal>). If you have multiple machines, you can speed up the test by starting them in parallel:
113+ The first line is actually unnecessary; machines are implicitly started when
114+ you first execute an action on them (such as <literal>waitForUnit</literal>
115+ or <literal>succeed</literal>). If you have multiple machines, you can speed
116+ up the test by starting them in parallel:
87117<programlisting>
88118startAll;
89119</programlisting>
@@ -98,7 +128,8 @@ startAll;
98128 </term>
99129 <listitem>
100130 <para>
101− Start the virtual machine. This method is asynchronous — it does not wait for the machine to finish booting.
131+ Start the virtual machine. This method is asynchronous — it does not
132+ wait for the machine to finish booting.
102133 </para>
103134 </listitem>
104135 </varlistentry>
@@ -128,7 +159,8 @@ startAll;
128159 </term>
129160 <listitem>
130161 <para>
131− Simulate unplugging the Ethernet cable that connects the machine to the other machines.
162+ Simulate unplugging the Ethernet cable that connects the machine to the
163+ other machines.
132164 </para>
133165 </listitem>
134166 </varlistentry>
@@ -148,7 +180,8 @@ startAll;
148180 </term>
149181 <listitem>
150182 <para>
151− Take a picture of the display of the virtual machine, in PNG format. The screenshot is linked from the HTML log.
183+ Take a picture of the display of the virtual machine, in PNG format. The
184+ screenshot is linked from the HTML log.
152185 </para>
153186 </listitem>
154187 </varlistentry>
@@ -158,11 +191,13 @@ startAll;
158191 </term>
159192 <listitem>
160193 <para>
161− Return a textual representation of what is currently visible on the machine's screen using optical character recognition.
194+ Return a textual representation of what is currently visible on the
195+ machine's screen using optical character recognition.
162196 </para>
163197 <note>
164198 <para>
165− This requires passing <option>enableOCR</option> to the test attribute set.
199+ This requires passing <option>enableOCR</option> to the test attribute
200+ set.
166201 </para>
167202 </note>
168203 </listitem>
@@ -173,7 +208,8 @@ startAll;
173208 </term>
174209 <listitem>
175210 <para>
176− Send a command to the QEMU monitor. This is rarely used, but allows doing stuff such as attaching virtual USB disks to a running machine.
211+ Send a command to the QEMU monitor. This is rarely used, but allows doing
212+ stuff such as attaching virtual USB disks to a running machine.
177213 </para>
178214 </listitem>
179215 </varlistentry>
@@ -183,7 +219,8 @@ startAll;
183219 </term>
184220 <listitem>
185221 <para>
186− Simulate pressing keys on the virtual keyboard, e.g., <literal>sendKeys("ctrl-alt-delete")</literal>.
222+ Simulate pressing keys on the virtual keyboard, e.g.,
223+ <literal>sendKeys("ctrl-alt-delete")</literal>.
187224 </para>
188225 </listitem>
189226 </varlistentry>
@@ -193,7 +230,9 @@ startAll;
193230 </term>
194231 <listitem>
195232 <para>
196− Simulate typing a sequence of characters on the virtual keyboard, e.g., <literal>sendKeys("foobar\n")</literal> will type the string <literal>foobar</literal> followed by the Enter key.
233+ Simulate typing a sequence of characters on the virtual keyboard, e.g.,
234+ <literal>sendKeys("foobar\n")</literal> will type the string
235+ <literal>foobar</literal> followed by the Enter key.
197236 </para>
198237 </listitem>
199238 </varlistentry>
@@ -203,7 +242,9 @@ startAll;
203242 </term>
204243 <listitem>
205244 <para>
206− Execute a shell command, returning a list <literal>(<replaceable>status</replaceable>, <replaceable>stdout</replaceable>)</literal>.
245+ Execute a shell command, returning a list
246+ <literal>(<replaceable>status</replaceable>,
247+ <replaceable>stdout</replaceable>)</literal>.
207248 </para>
208249 </listitem>
209250 </varlistentry>
@@ -213,7 +254,8 @@ startAll;
213254 </term>
214255 <listitem>
215256 <para>
216− Execute a shell command, raising an exception if the exit status is not zero, otherwise returning the standard output.
257+ Execute a shell command, raising an exception if the exit status is not
258+ zero, otherwise returning the standard output.
217259 </para>
218260 </listitem>
219261 </varlistentry>
@@ -223,7 +265,8 @@ startAll;
223265 </term>
224266 <listitem>
225267 <para>
226− Like <methodname>succeed</methodname>, but raising an exception if the command returns a zero status.
268+ Like <methodname>succeed</methodname>, but raising an exception if the
269+ command returns a zero status.
227270 </para>
228271 </listitem>
229272 </varlistentry>
@@ -273,7 +316,8 @@ startAll;
273316 </term>
274317 <listitem>
275318 <para>
276− Wait until a process is listening on the given TCP port (on <literal>localhost</literal>, at least).
319+ Wait until a process is listening on the given TCP port (on
320+ <literal>localhost</literal>, at least).
277321 </para>
278322 </listitem>
279323 </varlistentry>
@@ -303,11 +347,14 @@ startAll;
303347 </term>
304348 <listitem>
305349 <para>
306− Wait until the supplied regular expressions matches the textual contents of the screen by using optical character recognition (see <methodname>getScreenText</methodname>).
350+ Wait until the supplied regular expressions matches the textual contents
351+ of the screen by using optical character recognition (see
352+ <methodname>getScreenText</methodname>).
307353 </para>
308354 <note>
309355 <para>
310− This requires passing <option>enableOCR</option> to the test attribute set.
356+ This requires passing <option>enableOCR</option> to the test attribute
357+ set.
311358 </para>
312359 </note>
313360 </listitem>
@@ -318,7 +365,8 @@ startAll;
318365 </term>
319366 <listitem>
320367 <para>
321− Wait until an X11 window has appeared whose name matches the given regular expression, e.g., <literal>waitForWindow(qr/Terminal/)</literal>.
368+ Wait until an X11 window has appeared whose name matches the given
369+ regular expression, e.g., <literal>waitForWindow(qr/Terminal/)</literal>.
322370 </para>
323371 </listitem>
324372 </varlistentry>
@@ -328,10 +376,13 @@ startAll;
328376 </term>
329377 <listitem>
330378 <para>
331− Copies a file from host to machine, e.g., <literal>copyFileFromHost("myfile", "/etc/my/important/file")</literal>.
379+ Copies a file from host to machine, e.g.,
380+ <literal>copyFileFromHost("myfile", "/etc/my/important/file")</literal>.
332381 </para>
333382 <para>
334− The first argument is the file on the host. The file needs to be accessible while building the nix derivation. The second argument is the location of the file on the machine.
383+ The first argument is the file on the host. The file needs to be
384+ accessible while building the nix derivation. The second argument is the
385+ location of the file on the machine.
335386 </para>
336387 </listitem>
337388 </varlistentry>
@@ -341,7 +392,8 @@ startAll;
341392 </term>
342393 <listitem>
343394 <para>
344− Runs <literal>systemctl</literal> commands with optional support for <literal>systemctl --user</literal>
395+ Runs <literal>systemctl</literal> commands with optional support for
396+ <literal>systemctl --user</literal>
345397 </para>
346398 <para>
347399<programlisting>
@@ -355,12 +407,15 @@ $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `
355407 </para>
356408
357409 <para>
358− To test user units declared by <literal>systemd.user.services</literal> the optional <literal>$user</literal> argument can be used:
410+ To test user units declared by <literal>systemd.user.services</literal> the
411+ optional <literal>$user</literal> argument can be used:
359412<programlisting>
360413$machine->start;
361414$machine->waitForX;
362415$machine->waitForUnit("xautolock.service", "x-session-user");
363416</programlisting>
364− This applies to <literal>systemctl</literal>, <literal>getUnitInfo</literal>, <literal>waitForUnit</literal>, <literal>startJob</literal> and <literal>stopJob</literal>.
417+ This applies to <literal>systemctl</literal>, <literal>getUnitInfo</literal>,
418+ <literal>waitForUnit</literal>, <literal>startJob</literal> and
419+ <literal>stopJob</literal>.
365420 </para>
366421</section>
nixos/doc/manual/installation/changing-config.xml+40−13
@@ -4,20 +4,28 @@
44 xml:id="sec-changing-config">
55 <title>Changing the Configuration</title>
66 <para>
7− The file <filename>/etc/nixos/configuration.nix</filename> contains the current configuration of your machine. Whenever you’ve <link linkend="ch-configuration">changed something</link> in that file, you should do
7+ The file <filename>/etc/nixos/configuration.nix</filename> contains the
8+ current configuration of your machine. Whenever you’ve
9+ <link linkend="ch-configuration">changed something</link> in that file, you
10+ should do
811<screen>
912<prompt># </prompt>nixos-rebuild switch
1013</screen>
11− to build the new configuration, make it the default configuration for booting, and try to realise the configuration in the running system (e.g., by restarting system services).
14+ to build the new configuration, make it the default configuration for
15+ booting, and try to realise the configuration in the running system (e.g., by
16+ restarting system services).
1217 <warning>
1318 <para>
14− This command doesn't start/stop <link linkend="opt-systemd.user.services">user services</link> automatically. <command>nixos-rebuild</command> only runs a <literal>daemon-reload</literal> for each user with running user services.
19+ This command doesn't start/stop <link linkend="opt-systemd.user.services">user
20+ services</link> automatically. <command>nixos-rebuild</command> only runs a
21+ <literal>daemon-reload</literal> for each user with running user services.
1522 </para>
1623 </warning>
1724 </para>
1825 <warning>
1926 <para>
20− These commands must be executed as root, so you should either run them from a root shell or by prefixing them with <literal>sudo -i</literal>.
27+ These commands must be executed as root, so you should either run them from
28+ a root shell or by prefixing them with <literal>sudo -i</literal>.
2129 </para>
2230 </warning>
2331 <para>
@@ -25,44 +33,63 @@
2533<screen>
2634<prompt># </prompt>nixos-rebuild test
2735</screen>
28− to build the configuration and switch the running system to it, but without making it the boot default. So if (say) the configuration locks up your machine, you can just reboot to get back to a working configuration.
36+ to build the configuration and switch the running system to it, but without
37+ making it the boot default. So if (say) the configuration locks up your
38+ machine, you can just reboot to get back to a working configuration.
2939 </para>
3040 <para>
3141 There is also
3242<screen>
3343<prompt># </prompt>nixos-rebuild boot
3444</screen>
35− to build the configuration and make it the boot default, but not switch to it now (so it will only take effect after the next reboot).
45+ to build the configuration and make it the boot default, but not switch to it
46+ now (so it will only take effect after the next reboot).
3647 </para>
3748 <para>
38− You can make your configuration show up in a different submenu of the GRUB 2 boot screen by giving it a different <emphasis>profile name</emphasis>, e.g.
49+ You can make your configuration show up in a different submenu of the GRUB 2
50+ boot screen by giving it a different <emphasis>profile name</emphasis>, e.g.
3951<screen>
4052<prompt># </prompt>nixos-rebuild switch -p test
4153</screen>
42− which causes the new configuration (and previous ones created using <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile 'test'”. This can be useful to separate test configurations from “stable” configurations.
54+ which causes the new configuration (and previous ones created using
55+ <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile
56+ 'test'”. This can be useful to separate test configurations from
57+ “stable” configurations.
4358 </para>
4459 <para>
4560 Finally, you can do
4661<screen>
4762<prompt>$ </prompt>nixos-rebuild build
4863</screen>
49− to build the configuration but nothing more. This is useful to see whether everything compiles cleanly.
64+ to build the configuration but nothing more. This is useful to see whether
65+ everything compiles cleanly.
5066 </para>
5167 <para>
52− If you have a machine that supports hardware virtualisation, you can also test the new configuration in a sandbox by building and running a QEMU <emphasis>virtual machine</emphasis> that contains the desired configuration. Just do
68+ If you have a machine that supports hardware virtualisation, you can also
69+ test the new configuration in a sandbox by building and running a QEMU
70+ <emphasis>virtual machine</emphasis> that contains the desired configuration.
71+ Just do
5372<screen>
5473<prompt>$ </prompt>nixos-rebuild build-vm
5574<prompt>$ </prompt>./result/bin/run-*-vm
5675</screen>
57− The VM does not have any data from your host system, so your existing user accounts and home directories will not be available unless you have set <literal>mutableUsers = false</literal>. Another way is to temporarily add the following to your configuration:
76+ The VM does not have any data from your host system, so your existing user
77+ accounts and home directories will not be available unless you have set
78+ <literal>mutableUsers = false</literal>. Another way is to temporarily add
79+ the following to your configuration:
5880<screen>
5981<link linkend="opt-users.users._name__.initialHashedPassword">users.users.your-user.initialHashedPassword</link> = "test";
6082</screen>
61− <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have started the virtual machine at least once without the right users, otherwise the changes will not get picked up. You can forward ports on the host to the guest. For instance, the following will forward host port 2222 to guest port 22 (SSH):
83+ <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have
84+ started the virtual machine at least once without the right users, otherwise
85+ the changes will not get picked up. You can forward ports on the host to the
86+ guest. For instance, the following will forward host port 2222 to guest port
87+ 22 (SSH):
6288<screen>
6389<prompt>$ </prompt>QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
6490</screen>
65− allowing you to log in via SSH (assuming you have set the appropriate passwords or SSH authorized keys):
91+ allowing you to log in via SSH (assuming you have set the appropriate
92+ passwords or SSH authorized keys):
6693<screen>
6794<prompt>$ </prompt>ssh -p 2222 localhost
6895</screen>
nixos/doc/manual/installation/installation.xml+2−1
@@ -6,7 +6,8 @@
66 <title>Installation</title>
77 <partintro xml:id="ch-installation-intro">
88 <para>
9− This section describes how to obtain, install, and configure NixOS for first-time use.
9+ This section describes how to obtain, install, and configure NixOS for
10+ first-time use.
1011 </para>
1112 </partintro>
1213 <xi:include href="obtaining.xml" />
nixos/doc/manual/installation/installing-behind-a-proxy.xml+11−4
@@ -6,13 +6,16 @@
66 <title>Installing behind a proxy</title>
77
88 <para>
9− To install NixOS behind a proxy, do the following before running <literal>nixos-install</literal>.
9+ To install NixOS behind a proxy, do the following before running
10+ <literal>nixos-install</literal>.
1011 </para>
1112
1213 <orderedlist numeration="arabic">
1314 <listitem>
1415 <para>
15− Update proxy configuration in <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet accessible after reboot.
16+ Update proxy configuration in
17+ <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet
18+ accessible after reboot.
1619 </para>
1720<programlisting>
1821networking.proxy.default = &quot;http://user:password@proxy:port/&quot;;
@@ -21,7 +24,8 @@ networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
2124 </listitem>
2225 <listitem>
2326 <para>
24− Setup the proxy environment variables in the shell where you are running <literal>nixos-install</literal>.
27+ Setup the proxy environment variables in the shell where you are running
28+ <literal>nixos-install</literal>.
2529 </para>
2630<programlisting>
2731# proxy_url=&quot;http://user:password@proxy:port/&quot;
@@ -35,7 +39,10 @@ networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
3539
3640 <note>
3741 <para>
38− If you are switching networks with different proxy configurations, use the <literal>nesting.clone</literal> option in <literal>configuration.nix</literal> to switch proxies at runtime. Refer to <xref linkend="ch-options" /> for more information.
42+ If you are switching networks with different proxy configurations, use the
43+ <literal>nesting.clone</literal> option in
44+ <literal>configuration.nix</literal> to switch proxies at runtime. Refer to
45+ <xref linkend="ch-options" /> for more information.
3946 </para>
4047 </note>
4148</section>
nixos/doc/manual/installation/installing-from-other-distro.xml+112−40
@@ -8,23 +8,28 @@
88 <title>Installing from another Linux distribution</title>
99
1010 <para>
11− Because Nix (the package manager) &amp; Nixpkgs (the Nix packages collection) can both be installed on any (most?) Linux distributions, they can be used to install NixOS in various creative ways. You can, for instance:
11+ Because Nix (the package manager) &amp; Nixpkgs (the Nix packages collection)
12+ can both be installed on any (most?) Linux distributions, they can be used to
13+ install NixOS in various creative ways. You can, for instance:
1214 </para>
1315
1416 <orderedlist>
1517 <listitem>
1618 <para>
17− Install NixOS on another partition, from your existing Linux distribution (without the use of a USB or optical device!)
19+ Install NixOS on another partition, from your existing Linux distribution
20+ (without the use of a USB or optical device!)
1821 </para>
1922 </listitem>
2023 <listitem>
2124 <para>
22− Install NixOS on the same partition (in place!), from your existing non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>.
25+ Install NixOS on the same partition (in place!), from your existing
26+ non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>.
2327 </para>
2428 </listitem>
2529 <listitem>
2630 <para>
27− Install NixOS on your hard drive from the Live CD of any Linux distribution.
31+ Install NixOS on your hard drive from the Live CD of any Linux
32+ distribution.
2833 </para>
2934 </listitem>
3035 </orderedlist>
@@ -45,8 +50,10 @@
4550<prompt>$ </prompt>curl https://nixos.org/nix/install | sh
4651<prompt>$ </prompt>. $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell</screen>
4752 <para>
48− More details in the <link
49− xlink:href="https://nixos.org/nix/manual/#chap-quick-start"> Nix manual</link>
53+ More details in the
54+ <link
55+ xlink:href="https://nixos.org/nix/manual/#chap-quick-start">
56+ Nix manual</link>
5057 </para>
5158 </listitem>
5259 <listitem>
@@ -54,18 +61,21 @@
5461 Switch to the NixOS channel:
5562 </para>
5663 <para>
57− If you've just installed Nix on a non-NixOS distribution, you will be on the <literal>nixpkgs</literal> channel by default.
64+ If you've just installed Nix on a non-NixOS distribution, you will be on
65+ the <literal>nixpkgs</literal> channel by default.
5866 </para>
5967<screen>
6068<prompt>$ </prompt>nix-channel --list
6169nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
6270 <para>
63− As that channel gets released without running the NixOS tests, it will be safer to use the <literal>nixos-*</literal> channels instead:
71+ As that channel gets released without running the NixOS tests, it will be
72+ safer to use the <literal>nixos-*</literal> channels instead:
6473 </para>
6574<screen>
6675<prompt>$ </prompt>nix-channel --add https://nixos.org/channels/nixos-<replaceable>version</replaceable> nixpkgs</screen>
6776 <para>
68− You may want to throw in a <literal>nix-channel --update</literal> for good measure.
77+ You may want to throw in a <literal>nix-channel --update</literal> for good
78+ measure.
6979 </para>
7080 </listitem>
7181 <listitem>
@@ -73,24 +83,33 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
7383 Install the NixOS installation tools:
7484 </para>
7585 <para>
76− You'll need <literal>nixos-generate-config</literal> and <literal>nixos-install</literal> and we'll throw in some man pages and <literal>nixos-enter</literal> just in case you want to chroot into your NixOS partition. They are installed by default on NixOS, but you don't have NixOS yet..
86+ You'll need <literal>nixos-generate-config</literal> and
87+ <literal>nixos-install</literal> and we'll throw in some man pages and
88+ <literal>nixos-enter</literal> just in case you want to chroot into your
89+ NixOS partition. They are installed by default on NixOS, but you don't have
90+ NixOS yet..
7791 </para>
7892<screen><prompt>$ </prompt>nix-env -iE "_: with import &lt;nixpkgs/nixos&gt; { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]"</screen>
7993 </listitem>
8094 <listitem>
8195 <note>
8296 <para>
83− The following 5 steps are only for installing NixOS to another partition. For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>, skip ahead.
97+ The following 5 steps are only for installing NixOS to another partition.
98+ For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>,
99+ skip ahead.
84100 </para>
85101 </note>
86102 <para>
87103 Prepare your target partition:
88104 </para>
89105 <para>
90− At this point it is time to prepare your target partition. Please refer to the partitioning, file-system creation, and mounting steps of <xref linkend="sec-installation" />
106+ At this point it is time to prepare your target partition. Please refer to
107+ the partitioning, file-system creation, and mounting steps of
108+ <xref linkend="sec-installation" />
91109 </para>
92110 <para>
93− If you're about to install NixOS in place using <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step.
111+ If you're about to install NixOS in place using
112+ <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step.
94113 </para>
95114 </listitem>
96115 <listitem>
@@ -99,11 +118,17 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
99118 </para>
100119<screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /mnt</screen>
101120 <para>
102− You'll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref
103− linkend="sec-installation" /> for more information.
121+ You'll probably want to edit the configuration files. Refer to the
122+ <literal>nixos-generate-config</literal> step in
123+ <xref
124+ linkend="sec-installation" /> for more
125+ information.
104126 </para>
105127 <para>
106− Consider setting up the NixOS bootloader to give you the ability to boot on your existing Linux partition. For instance, if you're using GRUB and your existing distribution is running Ubuntu, you may want to add something like this to your <literal>configuration.nix</literal>:
128+ Consider setting up the NixOS bootloader to give you the ability to boot on
129+ your existing Linux partition. For instance, if you're using GRUB and your
130+ existing distribution is running Ubuntu, you may want to add something like
131+ this to your <literal>configuration.nix</literal>:
107132 </para>
108133<programlisting>
109134<xref linkend="opt-boot.loader.grub.extraEntries"/> = ''
@@ -113,12 +138,14 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
113138 }
114139'';</programlisting>
115140 <para>
116− (You can find the appropriate UUID for your partition in <literal>/dev/disk/by-uuid</literal>)
141+ (You can find the appropriate UUID for your partition in
142+ <literal>/dev/disk/by-uuid</literal>)
117143 </para>
118144 </listitem>
119145 <listitem>
120146 <para>
121− Create the <literal>nixbld</literal> group and user on your original distribution:
147+ Create the <literal>nixbld</literal> group and user on your original
148+ distribution:
122149 </para>
123150<screen>
124151<prompt>$ </prompt>sudo groupadd -g 30000 nixbld
@@ -130,12 +157,14 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
130157 </para>
131158 <warning>
132159 <para>
133− Once you complete this step, you might no longer be able to boot on existing systems without the help of a rescue USB drive or similar.
160+ Once you complete this step, you might no longer be able to boot on
161+ existing systems without the help of a rescue USB drive or similar.
134162 </para>
135163 </warning>
136164<screen><prompt>$ </prompt>sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt</screen>
137165 <para>
138− Again, please refer to the <literal>nixos-install</literal> step in <xref linkend="sec-installation" /> for more information.
166+ Again, please refer to the <literal>nixos-install</literal> step in
167+ <xref linkend="sec-installation" /> for more information.
139168 </para>
140169 <para>
141170 That should be it for installation to another partition!
@@ -149,13 +178,16 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
149178<prompt>$ </prompt>sudo userdel nixbld
150179<prompt>$ </prompt>sudo groupdel nixbld</screen>
151180 <para>
152− If you do not wish to keep the Nix package manager installed either, run something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the line that the Nix installer added to your <literal>~/.profile</literal>.
181+ If you do not wish to keep the Nix package manager installed either, run
182+ something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the
183+ line that the Nix installer added to your <literal>~/.profile</literal>.
153184 </para>
154185 </listitem>
155186 <listitem>
156187 <note>
157188 <para>
158− The following steps are only for installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>:
189+ The following steps are only for installing NixOS in place using
190+ <literal>NIXOS_LUSTRATE</literal>:
159191 </para>
160192 </note>
161193 <para>
@@ -163,11 +195,20 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
163195 </para>
164196<screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /</screen>
165197 <para>
166− Note that this will place the generated configuration files in <literal>/etc/nixos</literal>. You'll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref
167− linkend="sec-installation" /> for more information.
198+ Note that this will place the generated configuration files in
199+ <literal>/etc/nixos</literal>. You'll probably want to edit the
200+ configuration files. Refer to the <literal>nixos-generate-config</literal>
201+ step in <xref
202+ linkend="sec-installation" /> for more
203+ information.
168204 </para>
169205 <para>
170− You'll likely want to set a root password for your first boot using the configuration files because you won't have a chance to enter a password until after you reboot. You can initalize the root password to an empty one with this line: (and of course don't forget to set one once you've rebooted or to lock the account with <literal>sudo passwd -l root</literal> if you use <literal>sudo</literal>)
206+ You'll likely want to set a root password for your first boot using the
207+ configuration files because you won't have a chance to enter a password
208+ until after you reboot. You can initalize the root password to an empty one
209+ with this line: (and of course don't forget to set one once you've rebooted
210+ or to lock the account with <literal>sudo passwd -l root</literal> if you
211+ use <literal>sudo</literal>)
171212 </para>
172213<programlisting>
173214<link linkend="opt-users.users._name__.initialHashedPassword">users.users.root.initialHashedPassword</link> = "";
@@ -175,25 +216,34 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
175216 </listitem>
176217 <listitem>
177218 <para>
178− Build the NixOS closure and install it in the <literal>system</literal> profile:
219+ Build the NixOS closure and install it in the <literal>system</literal>
220+ profile:
179221 </para>
180222<screen><prompt>$ </prompt>nix-env -p /nix/var/nix/profiles/system -f '&lt;nixpkgs/nixos&gt;' -I nixos-config=/etc/nixos/configuration.nix -iA system</screen>
181223 </listitem>
182224 <listitem>
183225 <para>
184− Change ownership of the <literal>/nix</literal> tree to root (since your Nix install was probably single user):
226+ Change ownership of the <literal>/nix</literal> tree to root (since your
227+ Nix install was probably single user):
185228 </para>
186229<screen><prompt>$ </prompt>sudo chown -R 0.0 /nix</screen>
187230 </listitem>
188231 <listitem>
189232 <para>
190− Set up the <literal>/etc/NIXOS</literal> and <literal>/etc/NIXOS_LUSTRATE</literal> files:
233+ Set up the <literal>/etc/NIXOS</literal> and
234+ <literal>/etc/NIXOS_LUSTRATE</literal> files:
191235 </para>
192236 <para>
193− <literal>/etc/NIXOS</literal> officializes that this is now a NixOS partition (the bootup scripts require its presence).
237+ <literal>/etc/NIXOS</literal> officializes that this is now a NixOS
238+ partition (the bootup scripts require its presence).
194239 </para>
195240 <para>
196− <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to move <emphasis>everything</emphasis> that's in the root partition to <literal>/old-root</literal>. This will move your existing distribution out of the way in the very early stages of the NixOS bootup. There are exceptions (we do need to keep NixOS there after all), so the NixOS lustrate process will not touch:
241+ <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to
242+ move <emphasis>everything</emphasis> that's in the root partition to
243+ <literal>/old-root</literal>. This will move your existing distribution out
244+ of the way in the very early stages of the NixOS bootup. There are
245+ exceptions (we do need to keep NixOS there after all), so the NixOS
246+ lustrate process will not touch:
197247 </para>
198248 <itemizedlist>
199249 <listitem>
@@ -208,19 +258,26 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
208258 </listitem>
209259 <listitem>
210260 <para>
211− Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal> (one per line)
261+ Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal>
262+ (one per line)
212263 </para>
213264 </listitem>
214265 </itemizedlist>
215266 <note>
216267 <para>
217− Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09. The act of "lustrating" refers to the wiping of the existing distribution. Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS to remove all mutable files from your root partition (anything that's not in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on the next boot.
268+ Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09.
269+ The act of "lustrating" refers to the wiping of the existing distribution.
270+ Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS
271+ to remove all mutable files from your root partition (anything that's not
272+ in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on
273+ the next boot.
218274 </para>
219275 <para>
220276 lustrate /ˈlʌstreɪt/ verb.
221277 </para>
222278 <para>
223− purify by expiatory sacrifice, ceremonial washing, or some other ritual action.
279+ purify by expiatory sacrifice, ceremonial washing, or some other ritual
280+ action.
224281 </para>
225282 </note>
226283 <para>
@@ -231,7 +288,8 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
231288<prompt>$ </prompt>sudo touch /etc/NIXOS_LUSTRATE
232289</screen>
233290 <para>
234− Let's also make sure the NixOS configuration files are kept once we reboot on NixOS:
291+ Let's also make sure the NixOS configuration files are kept once we reboot
292+ on NixOS:
235293 </para>
236294<screen>
237295<prompt>$ </prompt>echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE
@@ -239,11 +297,18 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
239297 </listitem>
240298 <listitem>
241299 <para>
242− Finally, move the <literal>/boot</literal> directory of your current distribution out of the way (the lustrate process will take care of the rest once you reboot, but this one must be moved out now because NixOS needs to install its own boot files:
300+ Finally, move the <literal>/boot</literal> directory of your current
301+ distribution out of the way (the lustrate process will take care of the
302+ rest once you reboot, but this one must be moved out now because NixOS
303+ needs to install its own boot files:
243304 </para>
244305 <warning>
245306 <para>
246− Once you complete this step, your current distribution will no longer be bootable! If you didn't get all the NixOS configuration right, especially those settings pertaining to boot loading and root partition, NixOS may not be bootable either. Have a USB rescue device ready in case this happens.
307+ Once you complete this step, your current distribution will no longer be
308+ bootable! If you didn't get all the NixOS configuration right, especially
309+ those settings pertaining to boot loading and root partition, NixOS may
310+ not be bootable either. Have a USB rescue device ready in case this
311+ happens.
247312 </para>
248313 </warning>
249314<screen>
@@ -256,7 +321,8 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
256321 </listitem>
257322 <listitem>
258323 <para>
259− If for some reason you want to revert to the old distribution, you'll need to boot on a USB rescue disk and do something along these lines:
324+ If for some reason you want to revert to the old distribution, you'll need
325+ to boot on a USB rescue disk and do something along these lines:
260326 </para>
261327<screen>
262328# mkdir root
@@ -271,14 +337,20 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
271337 This may work as is or you might also need to reinstall the boot loader
272338 </para>
273339 <para>
274− And of course, if you're happy with NixOS and no longer need the old distribution:
340+ And of course, if you're happy with NixOS and no longer need the old
341+ distribution:
275342 </para>
276343<screen>sudo rm -rf /old-root</screen>
277344 </listitem>
278345 <listitem>
279346 <para>
280− It's also worth noting that this whole process can be automated. This is especially useful for Cloud VMs, where provider do not provide NixOS. For instance, <link
281− xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link> uses the lustrate process to convert Digital Ocean droplets to NixOS from other distributions automatically.
347+ It's also worth noting that this whole process can be automated. This is
348+ especially useful for Cloud VMs, where provider do not provide NixOS. For
349+ instance,
350+ <link
351+ xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link>
352+ uses the lustrate process to convert Digital Ocean droplets to NixOS from
353+ other distributions automatically.
282354 </para>
283355 </listitem>
284356 </orderedlist>
nixos/doc/manual/installation/installing-pxe.xml+20−5
@@ -10,7 +10,9 @@
1010 </para>
1111
1212 <para>
13− These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another option. To build the necessary files from a recent version of nixpkgs, you can run:
13+ These instructions assume that you have an existing PXE or iPXE
14+ infrastructure and simply want to add the NixOS installer as another option.
15+ To build the necessary files from a recent version of nixpkgs, you can run:
1416 </para>
1517
1618<programlisting>
@@ -18,18 +20,31 @@ nix-build -A netboot nixos/release.nix
1820</programlisting>
1921
2022 <para>
21− This will create a <literal>result</literal> directory containing: * <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal> – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe script demonstrating the appropriate kernel command line arguments for this image
23+ This will create a <literal>result</literal> directory containing: *
24+ <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal>
25+ – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe
26+ script demonstrating the appropriate kernel command line arguments for this
27+ image
2228 </para>
2329
2430 <para>
25− If you’re using plain PXE, configure your boot loader to use the <literal>bzImage</literal> and <literal>initrd</literal> files and have it provide the same kernel command line arguments found in <literal>netboot.ipxe</literal>.
31+ If you’re using plain PXE, configure your boot loader to use the
32+ <literal>bzImage</literal> and <literal>initrd</literal> files and have it
33+ provide the same kernel command line arguments found in
34+ <literal>netboot.ipxe</literal>.
2635 </para>
2736
2837 <para>
29− If you’re using iPXE, depending on how your HTTP/FTP/etc. server is configured you may be able to use <literal>netboot.ipxe</literal> unmodified, or you may need to update the paths to the files to match your server’s directory layout
38+ If you’re using iPXE, depending on how your HTTP/FTP/etc. server is
39+ configured you may be able to use <literal>netboot.ipxe</literal> unmodified,
40+ or you may need to update the paths to the files to match your server’s
41+ directory layout
3042 </para>
3143
3244 <para>
33− In the future we may begin making these files available as build products from hydra at which point we will update this documentation with instructions on how to obtain them either for placing on a dedicated TFTP server or to boot them directly over the internet.
45+ In the future we may begin making these files available as build products
46+ from hydra at which point we will update this documentation with instructions
47+ on how to obtain them either for placing on a dedicated TFTP server or to
48+ boot them directly over the internet.
3449 </para>
3550</section>
nixos/doc/manual/installation/installing-usb.xml+12−3
@@ -6,7 +6,12 @@
66 <title>Booting from a USB Drive</title>
77
88 <para>
9− For systems without CD drive, the NixOS live CD can be booted from a USB stick. You can use the <command>dd</command> utility to write the image: <command>dd if=<replaceable>path-to-image</replaceable> of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying the correct drive; you can use the <command>lsblk</command> command to get a list of block devices.
9+ For systems without CD drive, the NixOS live CD can be booted from a USB
10+ stick. You can use the <command>dd</command> utility to write the image:
11+ <command>dd if=<replaceable>path-to-image</replaceable>
12+ of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying
13+ the correct drive; you can use the <command>lsblk</command> command to get a
14+ list of block devices.
1015 <note>
1116 <title>On macOS</title>
1217 <para>
@@ -20,12 +25,16 @@
2025Unmount of all volumes on diskN was successful
2126<prompt>$ </prompt>sudo dd if=nix.iso of=/dev/rdiskN
2227</screen>
23− Using the 'raw' <command>rdiskN</command> device instead of <command>diskN</command> completes in minutes instead of hours. After <command>dd</command> completes, a GUI dialog "The disk you inserted was not readable by this computer" will pop up, which can be ignored.
28+ Using the 'raw' <command>rdiskN</command> device instead of
29+ <command>diskN</command> completes in minutes instead of hours. After
30+ <command>dd</command> completes, a GUI dialog "The disk you inserted was
31+ not readable by this computer" will pop up, which can be ignored.
2432 </para>
2533 </note>
2634 </para>
2735
2836 <para>
29− The <command>dd</command> utility will write the image verbatim to the drive, making it the recommended option for both UEFI and non-UEFI installations.
37+ The <command>dd</command> utility will write the image verbatim to the drive,
38+ making it the recommended option for both UEFI and non-UEFI installations.
3039 </para>
3140</section>
nixos/doc/manual/installation/installing-virtualbox-guest.xml+22−7
@@ -6,8 +6,13 @@
66 <title>Installing in a VirtualBox guest</title>
77
88 <para>
9− Installing NixOS into a VirtualBox guest is convenient for users who want to try NixOS without installing it on bare metal. If you want to use a pre-made VirtualBox appliance, it is available at <link
10− xlink:href="https://nixos.org/nixos/download.html">the downloads page</link>. If you want to set up a VirtualBox guest manually, follow these instructions:
9+ Installing NixOS into a VirtualBox guest is convenient for users who want to
10+ try NixOS without installing it on bare metal. If you want to use a pre-made
11+ VirtualBox appliance, it is available at
12+ <link
13+ xlink:href="https://nixos.org/nixos/download.html">the downloads
14+ page</link>. If you want to set up a VirtualBox guest manually, follow these
15+ instructions:
1116 </para>
1217
1318 <orderedlist>
@@ -38,18 +43,21 @@
3843 </listitem>
3944 <listitem>
4045 <para>
41− Click on Settings / System / Acceleration and enable "VT-x/AMD-V" acceleration
46+ Click on Settings / System / Acceleration and enable "VT-x/AMD-V"
47+ acceleration
4248 </para>
4349 </listitem>
4450 <listitem>
4551 <para>
46− Save the settings, start the virtual machine, and continue installation like normal
52+ Save the settings, start the virtual machine, and continue installation
53+ like normal
4754 </para>
4855 </listitem>
4956 </orderedlist>
5057
5158 <para>
52− There are a few modifications you should make in configuration.nix. Enable booting:
59+ There are a few modifications you should make in configuration.nix. Enable
60+ booting:
5361 </para>
5462
5563<programlisting>
@@ -57,7 +65,8 @@
5765</programlisting>
5866
5967 <para>
60− Also remove the fsck that runs at startup. It will always fail to run, stopping your boot until you press <literal>*</literal>.
68+ Also remove the fsck that runs at startup. It will always fail to run,
69+ stopping your boot until you press <literal>*</literal>.
6170 </para>
6271
6372<programlisting>
@@ -65,7 +74,13 @@
6574</programlisting>
6675
6776 <para>
68− Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do not add <literal>"nofail"</literal>, the system will no boot properly. The same goes for disabling <literal>rngd</literal> which is normally used to get randomness but this does not work in virtual machines.
77+ Shared folders can be given a name and a path in the host system in the
78+ VirtualBox settings (Machine / Settings / Shared Folders, then click on the
79+ "Add" icon). Add the following to the
80+ <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do
81+ not add <literal>"nofail"</literal>, the system will no boot properly. The
82+ same goes for disabling <literal>rngd</literal> which is normally used to get
83+ randomness but this does not work in virtual machines.
6984 </para>
7085
7186<programlisting>
nixos/doc/manual/installation/installing.xml+177−53
@@ -8,46 +8,67 @@
88 <title>Booting the system</title>
99
1010 <para>
11− NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow.
11+ NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
12+ installation is by and large the same as a BIOS installation. The
13+ differences are mentioned in the steps that follow.
1214 </para>
1315
1416 <para>
15− The installation media can be burned to a CD, or now more commonly, "burned" to a USB drive (see <xref linkend="sec-booting-from-usb"/>).
17+ The installation media can be burned to a CD, or now more commonly, "burned"
18+ to a USB drive (see <xref linkend="sec-booting-from-usb"/>).
1619 </para>
1720
1821 <para>
19− The installation media contains a basic NixOS installation. When it’s finished booting, it should have detected most of your hardware.
22+ The installation media contains a basic NixOS installation. When it’s
23+ finished booting, it should have detected most of your hardware.
2024 </para>
2125
2226 <para>
23− The NixOS manual is available on virtual console 8 (press Alt+F8 to access) or by running <command>nixos-help</command>.
27+ The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
28+ or by running <command>nixos-help</command>.
2429 </para>
2530
2631 <para>
27− You are logged-in automatically as <literal>nixos</literal>. The <literal>nixos</literal> user account has an empty password so you can use <command>sudo</command> without a password.
32+ You are logged-in automatically as <literal>nixos</literal>.
33+ The <literal>nixos</literal> user account has an empty password so you
34+ can use <command>sudo</command> without a password.
2835 </para>
2936
3037 <para>
31− If you downloaded the graphical ISO image, you can run <command>systemctl start display-manager</command> to start the desktop environment. If you want to continue on the terminal, you can use <command>loadkeys</command> to switch to your preferred keyboard layout. (We even provide neo2 via <command>loadkeys de neo</command>!)
38+ If you downloaded the graphical ISO image, you can run <command>systemctl
39+ start display-manager</command> to start the desktop environment. If you want to continue on the
40+ terminal, you can use <command>loadkeys</command> to switch to your
41+ preferred keyboard layout. (We even provide neo2 via <command>loadkeys de
42+ neo</command>!)
3243 </para>
3344
3445 <section xml:id="sec-installation-booting-networking">
3546 <title>Networking in the installer</title>
3647
3748 <para>
38− The boot process should have brought up networking (check <command>ip a</command>). Networking is necessary for the installer, since it will download lots of stuff (such as source tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP server on your network. Otherwise configure networking manually using <command>ifconfig</command>.
49+ The boot process should have brought up networking (check <command>ip
50+ a</command>). Networking is necessary for the installer, since it will
51+ download lots of stuff (such as source tarballs or Nixpkgs channel
52+ binaries). It’s best if you have a DHCP server on your network. Otherwise
53+ configure networking manually using <command>ifconfig</command>.
3954 </para>
4055
4156 <para>
42− To manually configure the network on the graphical installer, first disable network-manager with <command>systemctl stop NetworkManager</command>.
57+ To manually configure the network on the graphical installer, first disable
58+ network-manager with <command>systemctl stop NetworkManager</command>.
4359 </para>
4460
4561 <para>
46− To manually configure the wifi on the minimal installer, run <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID' 'key')</command>.
62+ To manually configure the wifi on the minimal installer, run
63+ <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID'
64+ 'key')</command>.
4765 </para>
4866
4967 <para>
50− If you would like to continue the installation from a different machine you need to activate the SSH daemon via <command>systemctl start sshd</command>. You then must set a password for either <literal>root</literal> or <literal>nixos</literal> with <command>passwd></command> to be able to login.
68+ If you would like to continue the installation from a different machine you
69+ need to activate the SSH daemon via <command>systemctl start
70+ sshd</command>. You then must set a password for either <literal>root</literal> or
71+ <literal>nixos</literal> with <command>passwd></command> to be able to login.
5172 </para>
5273 </section>
5374 </section>
@@ -55,25 +76,32 @@
5576 <title>Partitioning and formatting</title>
5677
5778 <para>
58− The NixOS installer doesn’t do any partitioning or formatting, so you need to do that yourself.
79+ The NixOS installer doesn’t do any partitioning or formatting, so you need
80+ to do that yourself.
5981 </para>
6082
6183 <para>
62− The NixOS installer ships with multiple partitioning tools. The examples below use <command>parted</command>, but also provides <command>fdisk</command>, <command>gdisk</command>, <command>cfdisk</command>, and <command>cgdisk</command>.
84+ The NixOS installer ships with multiple partitioning tools. The examples
85+ below use <command>parted</command>, but also provides
86+ <command>fdisk</command>, <command>gdisk</command>,
87+ <command>cfdisk</command>, and <command>cgdisk</command>.
6388 </para>
6489
6590 <para>
66− The recommended partition scheme differs depending if the computer uses <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>.
91+ The recommended partition scheme differs depending if the computer uses
92+ <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>.
6793 </para>
6894
6995 <section xml:id="sec-installation-partitioning-UEFI">
7096 <title>UEFI (GPT)</title>
7197
7298 <para>
73− Here's an example partition scheme for UEFI, using <filename>/dev/sda</filename> as the device.
99+ Here's an example partition scheme for UEFI, using
100+ <filename>/dev/sda</filename> as the device.
74101 <note>
75102 <para>
76− You can safely ignore <command>parted</command>'s informational message about needing to update /etc/fstab.
103+ You can safely ignore <command>parted</command>'s informational message
104+ about needing to update /etc/fstab.
77105 </para>
78106 </note>
79107 </para>
@@ -88,24 +116,31 @@
88116 </listitem>
89117 <listitem>
90118 <para>
91− Add the <emphasis>root</emphasis> partition. This will fill the disk except for the end part, where the swap will live, and the space left in front (512MiB) which will be used by the boot partition.
119+ Add the <emphasis>root</emphasis> partition. This will fill the disk
120+ except for the end part, where the swap will live, and the space left in
121+ front (512MiB) which will be used by the boot partition.
92122<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 512MiB -8GiB</screen>
93123 </para>
94124 </listitem>
95125 <listitem>
96126 <para>
97− Next, add a <emphasis>swap</emphasis> partition. The size required will vary according to needs, here a 8GiB one is created.
127+ Next, add a <emphasis>swap</emphasis> partition. The size required will
128+ vary according to needs, here a 8GiB one is created.
98129<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
99130 <note>
100131 <para>
101− The swap partition size rules are no different than for other Linux distributions.
132+ The swap partition size rules are no different than for other Linux
133+ distributions.
102134 </para>
103135 </note>
104136 </para>
105137 </listitem>
106138 <listitem>
107139 <para>
108− Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses the ESP (EFI system partition) as its <emphasis>/boot</emphasis> partition. It uses the initially reserved 512MiB at the start of the disk.
140+ Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses
141+ the ESP (EFI system partition) as its <emphasis>/boot</emphasis>
142+ partition. It uses the initially reserved 512MiB at the start of the
143+ disk.
109144<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
110145<prompt># </prompt>parted /dev/sda -- set 3 boot on</screen>
111146 </para>
@@ -114,7 +149,8 @@
114149 </para>
115150
116151 <para>
117− Once complete, you can follow with <xref linkend="sec-installation-partitioning-formatting"/>.
152+ Once complete, you can follow with
153+ <xref linkend="sec-installation-partitioning-formatting"/>.
118154 </para>
119155 </section>
120156
@@ -122,10 +158,12 @@
122158 <title>Legacy Boot (MBR)</title>
123159
124160 <para>
125− Here's an example partition scheme for Legacy Boot, using <filename>/dev/sda</filename> as the device.
161+ Here's an example partition scheme for Legacy Boot, using
162+ <filename>/dev/sda</filename> as the device.
126163 <note>
127164 <para>
128− You can safely ignore <command>parted</command>'s informational message about needing to update /etc/fstab.
165+ You can safely ignore <command>parted</command>'s informational message
166+ about needing to update /etc/fstab.
129167 </para>
130168 </note>
131169 </para>
@@ -140,17 +178,20 @@
140178 </listitem>
141179 <listitem>
142180 <para>
143− Add the <emphasis>root</emphasis> partition. This will fill the the disk except for the end part, where the swap will live.
181+ Add the <emphasis>root</emphasis> partition. This will fill the the disk
182+ except for the end part, where the swap will live.
144183<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 1MiB -8GiB</screen>
145184 </para>
146185 </listitem>
147186 <listitem>
148187 <para>
149− Finally, add a <emphasis>swap</emphasis> partition. The size required will vary according to needs, here a 8GiB one is created.
188+ Finally, add a <emphasis>swap</emphasis> partition. The size required
189+ will vary according to needs, here a 8GiB one is created.
150190<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
151191 <note>
152192 <para>
153− The swap partition size rules are no different than for other Linux distributions.
193+ The swap partition size rules are no different than for other Linux
194+ distributions.
154195 </para>
155196 </note>
156197 </para>
@@ -159,7 +200,8 @@
159200 </para>
160201
161202 <para>
162− Once complete, you can follow with <xref linkend="sec-installation-partitioning-formatting"/>.
203+ Once complete, you can follow with
204+ <xref linkend="sec-installation-partitioning-formatting"/>.
163205 </para>
164206 </section>
165207
@@ -171,14 +213,20 @@
171213 <itemizedlist>
172214 <listitem>
173215 <para>
174− For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is recommended that you assign a unique symbolic label to the file system using the option <option>-L <replaceable>label</replaceable></option>, since this makes the file system configuration independent from device changes. For example:
216+ For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is
217+ recommended that you assign a unique symbolic label to the file system
218+ using the option <option>-L <replaceable>label</replaceable></option>,
219+ since this makes the file system configuration independent from device
220+ changes. For example:
175221<screen>
176222<prompt># </prompt>mkfs.ext4 -L nixos /dev/sda1</screen>
177223 </para>
178224 </listitem>
179225 <listitem>
180226 <para>
181− For creating swap partitions: <command>mkswap</command>. Again it’s recommended to assign a label to the swap partition: <option>-L <replaceable>label</replaceable></option>. For example:
227+ For creating swap partitions: <command>mkswap</command>. Again it’s
228+ recommended to assign a label to the swap partition: <option>-L
229+ <replaceable>label</replaceable></option>. For example:
182230<screen>
183231<prompt># </prompt>mkswap -L swap /dev/sda2</screen>
184232 </para>
@@ -191,7 +239,9 @@
191239 </term>
192240 <listitem>
193241 <para>
194− For creating boot partitions: <command>mkfs.fat</command>. Again it’s recommended to assign a label to the boot partition: <option>-n <replaceable>label</replaceable></option>. For example:
242+ For creating boot partitions: <command>mkfs.fat</command>. Again
243+ it’s recommended to assign a label to the boot partition:
244+ <option>-n <replaceable>label</replaceable></option>. For example:
195245<screen>
196246<prompt># </prompt>mkfs.fat -F 32 -n boot /dev/sda3</screen>
197247 </para>
@@ -201,7 +251,9 @@
201251 </listitem>
202252 <listitem>
203253 <para>
204− For creating LVM volumes, the LVM commands, e.g., <command>pvcreate</command>, <command>vgcreate</command>, and <command>lvcreate</command>.
254+ For creating LVM volumes, the LVM commands, e.g.,
255+ <command>pvcreate</command>, <command>vgcreate</command>, and
256+ <command>lvcreate</command>.
205257 </para>
206258 </listitem>
207259 <listitem>
@@ -219,7 +271,8 @@
219271 <orderedlist>
220272 <listitem>
221273 <para>
222− Mount the target file system on which NixOS should be installed on <filename>/mnt</filename>, e.g.
274+ Mount the target file system on which NixOS should be installed on
275+ <filename>/mnt</filename>, e.g.
223276<screen>
224277<prompt># </prompt>mount /dev/disk/by-label/nixos /mnt
225278</screen>
@@ -245,26 +298,44 @@
245298 </listitem>
246299 <listitem>
247300 <para>
248− If your machine has a limited amount of memory, you may want to activate swap devices now (<command>swapon <replaceable>device</replaceable></command>). The installer (or rather, the build actions that it may spawn) may need quite a bit of RAM, depending on your configuration.
301+ If your machine has a limited amount of memory, you may want to activate
302+ swap devices now (<command>swapon
303+ <replaceable>device</replaceable></command>). The installer (or rather,
304+ the build actions that it may spawn) may need quite a bit of RAM,
305+ depending on your configuration.
249306<screen>
250307<prompt># </prompt>swapon /dev/sda2</screen>
251308 </para>
252309 </listitem>
253310 <listitem>
254311 <para>
255− You now need to create a file <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the intended configuration of the system. This is because NixOS has a <emphasis>declarative</emphasis> configuration model: you create or edit a description of the desired configuration of your system, and then NixOS takes care of making it happen. The syntax of the NixOS configuration file is described in <xref linkend="sec-configuration-syntax"/>, while a list of available configuration options appears in <xref
256− linkend="ch-options"/>. A minimal example is shown in <xref
312+ You now need to create a file
313+ <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the
314+ intended configuration of the system. This is because NixOS has a
315+ <emphasis>declarative</emphasis> configuration model: you create or edit a
316+ description of the desired configuration of your system, and then NixOS
317+ takes care of making it happen. The syntax of the NixOS configuration file
318+ is described in <xref linkend="sec-configuration-syntax"/>, while a list
319+ of available configuration options appears in
320+ <xref
321+ linkend="ch-options"/>. A minimal example is shown in
322+ <xref
257323 linkend="ex-config"/>.
258324 </para>
259325 <para>
260− The command <command>nixos-generate-config</command> can generate an initial configuration file for you:
326+ The command <command>nixos-generate-config</command> can generate an
327+ initial configuration file for you:
261328<screen>
262329<prompt># </prompt>nixos-generate-config --root /mnt</screen>
263− You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your needs:
330+ You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename>
331+ to suit your needs:
264332<screen>
265333<prompt># </prompt>nano /mnt/etc/nixos/configuration.nix
266334</screen>
267− If you’re using the graphical ISO image, other editors may be available (such as <command>vim</command>). If you have network access, you can also install other editors — for instance, you can install Emacs by running <literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
335+ If you’re using the graphical ISO image, other editors may be available
336+ (such as <command>vim</command>). If you have network access, you can also
337+ install other editors — for instance, you can install Emacs by running
338+ <literal>nix-env -f '&lt;nixpkgs&gt;' -iA emacs</literal>.
268339 </para>
269340 <variablelist>
270341 <varlistentry>
@@ -273,7 +344,9 @@
273344 </term>
274345 <listitem>
275346 <para>
276− You <emphasis>must</emphasis> set the option <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
347+ You <emphasis>must</emphasis> set the option
348+ <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk
349+ the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
277350 </para>
278351 </listitem>
279352 </varlistentry>
@@ -283,26 +356,60 @@
283356 </term>
284357 <listitem>
285358 <para>
286− You <emphasis>must</emphasis> set the option <xref linkend="opt-boot.loader.systemd-boot.enable"/> to <literal>true</literal>. <command>nixos-generate-config</command> should do this automatically for new configurations when booted in UEFI mode.
359+ You <emphasis>must</emphasis> set the option
360+ <xref linkend="opt-boot.loader.systemd-boot.enable"/> to
361+ <literal>true</literal>. <command>nixos-generate-config</command>
362+ should do this automatically for new configurations when booted in UEFI
363+ mode.
287364 </para>
288365 <para>
289− You may want to look at the options starting with <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option> and <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option> as well.
366+ You may want to look at the options starting with
367+ <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option>
368+ and
369+ <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option>
370+ as well.
290371 </para>
291372 </listitem>
292373 </varlistentry>
293374 </variablelist>
294375 <para>
295− If there are other operating systems running on the machine before installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/> option can be set to <literal>true</literal> to automatically add them to the grub menu.
376+ If there are other operating systems running on the machine before
377+ installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/>
378+ option can be set to <literal>true</literal> to automatically add them to
379+ the grub menu.
296380 </para>
297381 <para>
298− If you need to configure networking for your machine the configuration options are described in <xref linkend="sec-networking"/>.
382+ If you need to configure networking for your machine the configuration
383+ options are described in <xref linkend="sec-networking"/>.
299384 </para>
300385 <para>
301− Another critical option is <option>fileSystems</option>, specifying the file systems that need to be mounted by NixOS. However, you typically don’t need to set it yourself, because <command>nixos-generate-config</command> sets it automatically in <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your currently mounted file systems. (The configuration file <filename>hardware-configuration.nix</filename> is included from <filename>configuration.nix</filename> and will be overwritten by future invocations of <command>nixos-generate-config</command>; thus, you generally should not modify it.) Additionally, you may want to look at <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware configuration for known-hardware</link> at this point or after installation.
386+ Another critical option is <option>fileSystems</option>, specifying the
387+ file systems that need to be mounted by NixOS. However, you typically
388+ don’t need to set it yourself, because
389+ <command>nixos-generate-config</command> sets it automatically in
390+ <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your
391+ currently mounted file systems. (The configuration file
392+ <filename>hardware-configuration.nix</filename> is included from
393+ <filename>configuration.nix</filename> and will be overwritten by future
394+ invocations of <command>nixos-generate-config</command>; thus, you
395+ generally should not modify it.) Additionally, you may want to look at
396+ <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware
397+ configuration for known-hardware</link> at this point or after
398+ installation.
399+
302400 </para>
303401 <note>
304402 <para>
305− Depending on your hardware configuration or type of file system, you may need to set the option <option>boot.initrd.kernelModules</option> to include the kernel modules that are necessary for mounting the root file system, otherwise the installed system will not be able to boot. (If this happens, boot from the installation media again, mount the target file system on <filename>/mnt</filename>, fix <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun <filename>nixos-install</filename>.) In most cases, <command>nixos-generate-config</command> will figure out the required modules.
403+ Depending on your hardware configuration or type of file system, you may
404+ need to set the option <option>boot.initrd.kernelModules</option> to
405+ include the kernel modules that are necessary for mounting the root file
406+ system, otherwise the installed system will not be able to boot. (If this
407+ happens, boot from the installation media again, mount the target file
408+ system on <filename>/mnt</filename>, fix
409+ <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
410+ <filename>nixos-install</filename>.) In most cases,
411+ <command>nixos-generate-config</command> will figure out the required
412+ modules.
306413 </para>
307414 </note>
308415 </listitem>
@@ -311,17 +418,24 @@
311418 Do the installation:
312419<screen>
313420<prompt># </prompt>nixos-install</screen>
314− Cross fingers. If this fails due to a temporary problem (such as a network issue while downloading binaries from the NixOS binary cache), you can just re-run <command>nixos-install</command>. Otherwise, fix your <filename>configuration.nix</filename> and then re-run <command>nixos-install</command>.
421+ Cross fingers. If this fails due to a temporary problem (such as a network
422+ issue while downloading binaries from the NixOS binary cache), you can
423+ just re-run <command>nixos-install</command>. Otherwise, fix your
424+ <filename>configuration.nix</filename> and then re-run
425+ <command>nixos-install</command>.
315426 </para>
316427 <para>
317− As the last step, <command>nixos-install</command> will ask you to set the password for the <literal>root</literal> user, e.g.
428+ As the last step, <command>nixos-install</command> will ask you to set the
429+ password for the <literal>root</literal> user, e.g.
318430<screen>
319431setting root password...
320432Enter new UNIX password: ***
321433Retype new UNIX password: ***</screen>
322434 <note>
323435 <para>
324− For unattended installations, it is possible to use <command>nixos-install --no-root-passwd</command> in order to disable the password prompt entirely.
436+ For unattended installations, it is possible to use
437+ <command>nixos-install --no-root-passwd</command> in order to disable
438+ the password prompt entirely.
325439 </para>
326440 </note>
327441 </para>
@@ -335,14 +449,21 @@ Retype new UNIX password: ***</screen>
335449 </listitem>
336450 <listitem>
337451 <para>
338− You should now be able to boot into the installed NixOS. The GRUB boot menu shows a list of <emphasis>available configurations</emphasis> (initially just one). Every time you change the NixOS configuration (see <link
339− linkend="sec-changing-config">Changing Configuration</link> ), a new item is added to the menu. This allows you to easily roll back to a previous configuration if something goes wrong.
452+ You should now be able to boot into the installed NixOS. The GRUB boot
453+ menu shows a list of <emphasis>available configurations</emphasis>
454+ (initially just one). Every time you change the NixOS configuration (see
455+ <link
456+ linkend="sec-changing-config">Changing Configuration</link>
457+ ), a new item is added to the menu. This allows you to easily roll back to
458+ a previous configuration if something goes wrong.
340459 </para>
341460 <para>
342− You should log in and change the <literal>root</literal> password with <command>passwd</command>.
461+ You should log in and change the <literal>root</literal> password with
462+ <command>passwd</command>.
343463 </para>
344464 <para>
345− You’ll probably want to create some user accounts as well, which can be done with <command>useradd</command>:
465+ You’ll probably want to create some user accounts as well, which can be
466+ done with <command>useradd</command>:
346467<screen>
347468<prompt>$ </prompt>useradd -c 'Eelco Dolstra' -m eelco
348469<prompt>$ </prompt>passwd eelco</screen>
@@ -363,8 +484,11 @@ Retype new UNIX password: ***</screen>
363484 <title>Installation summary</title>
364485
365486 <para>
366− To summarise, <xref linkend="ex-install-sequence" /> shows a typical sequence of commands for installing NixOS on an empty hard drive (here <filename>/dev/sda</filename>). <xref linkend="ex-config"
367−/> shows a corresponding configuration Nix expression.
487+ To summarise, <xref linkend="ex-install-sequence" /> shows a typical
488+ sequence of commands for installing NixOS on an empty hard drive (here
489+ <filename>/dev/sda</filename>). <xref linkend="ex-config"
490+/> shows a
491+ corresponding configuration Nix expression.
368492 </para>
369493
370494 <example xml:id="ex-partition-scheme-MBR">
nixos/doc/manual/installation/obtaining.xml+29−9
@@ -5,28 +5,48 @@
55 xml:id="sec-obtaining">
66 <title>Obtaining NixOS</title>
77 <para>
8− NixOS ISO images can be downloaded from the <link
9−xlink:href="http://nixos.org/nixos/download.html">NixOS download page</link>. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the preferred method to prepare a USB stick. A number of alternative methods are presented in the <link
10−xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS Wiki</link>.
8+ NixOS ISO images can be downloaded from the
9+ <link
10+xlink:href="http://nixos.org/nixos/download.html">NixOS download
11+ page</link>. There are a number of installation options. If you happen to
12+ have an optical drive and a spare CD, burning the image to CD and booting
13+ from that is probably the easiest option. Most people will need to prepare a
14+ USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the
15+ preferred method to prepare a USB stick. A number of alternative methods are
16+ presented in the
17+ <link
18+xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS
19+ Wiki</link>.
1120 </para>
1221 <para>
13− As an alternative to installing NixOS yourself, you can get a running NixOS system through several other means:
22+ As an alternative to installing NixOS yourself, you can get a running NixOS
23+ system through several other means:
1424 <itemizedlist>
1525 <listitem>
1626 <para>
17− Using virtual appliances in Open Virtualization Format (OVF) that can be imported into VirtualBox. These are available from the <link xlink:href="http://nixos.org/nixos/download.html">NixOS download page</link>.
27+ Using virtual appliances in Open Virtualization Format (OVF) that can be
28+ imported into VirtualBox. These are available from the
29+ <link xlink:href="http://nixos.org/nixos/download.html">NixOS download
30+ page</link>.
1831 </para>
1932 </listitem>
2033 <listitem>
2134 <para>
22− Using AMIs for Amazon’s EC2. To find one for your region and instance type, please refer to the <link
23− xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list of most recent AMIs</link>.
35+ Using AMIs for Amazon’s EC2. To find one for your region and instance
36+ type, please refer to the
37+ <link
38+ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list
39+ of most recent AMIs</link>.
2440 </para>
2541 </listitem>
2642 <listitem>
2743 <para>
28− Using NixOps, the NixOS-based cloud deployment tool, which allows you to provision VirtualBox and EC2 NixOS instances from declarative specifications. Check out the <link
29− xlink:href="https://nixos.org/nixops">NixOps homepage</link> for details.
44+ Using NixOps, the NixOS-based cloud deployment tool, which allows you to
45+ provision VirtualBox and EC2 NixOS instances from declarative
46+ specifications. Check out the
47+ <link
48+ xlink:href="https://nixos.org/nixops">NixOps homepage</link> for
49+ details.
3050 </para>
3151 </listitem>
3252 </itemizedlist>
nixos/doc/manual/installation/upgrading.xml+65−17
@@ -4,33 +4,68 @@
44 xml:id="sec-upgrading">
55 <title>Upgrading NixOS</title>
66 <para>
7− The best way to keep your NixOS installation up to date is to use one of the NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for distributing Nix expressions and associated binaries. The NixOS channels are updated automatically from NixOS’s Git repository after certain tests have passed and all packages have been built. These channels are:
7+ The best way to keep your NixOS installation up to date is to use one of the
8+ NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for
9+ distributing Nix expressions and associated binaries. The NixOS channels are
10+ updated automatically from NixOS’s Git repository after certain tests have
11+ passed and all packages have been built. These channels are:
812 <itemizedlist>
913 <listitem>
1014 <para>
11− <emphasis>Stable channels</emphasis>, such as <literal
12− xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>. 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.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a major change that has the potential to break things). Stable channels are generally maintained until the next stable branch is created.
15+ <emphasis>Stable channels</emphasis>, such as
16+ <literal
17+ xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>.
18+ These only get conservative bug fixes and package upgrades. For instance,
19+ a channel update may cause the Linux kernel on your system to be upgraded
20+ from 4.19.34 to 4.19.38 (a minor bug fix), but not from
21+ 4.19.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a
22+ major change that has the potential to break things). Stable channels are
23+ generally maintained until the next stable branch is created.
1324 </para>
1425 <para></para>
1526 </listitem>
1627 <listitem>
1728 <para>
18− The <emphasis>unstable channel</emphasis>, <literal
19− xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>. This corresponds to NixOS’s main development branch, and may thus see radical changes between channel updates. It’s not recommended for production systems.
29+ The <emphasis>unstable channel</emphasis>,
30+ <literal
31+ xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
32+ This corresponds to NixOS’s main development branch, and may thus see
33+ radical changes between channel updates. It’s not recommended for
34+ production systems.
2035 </para>
2136 </listitem>
2237 <listitem>
2338 <para>
24− <emphasis>Small channels</emphasis>, such as <literal
25− xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal> or <literal
26− xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. 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.
39+ <emphasis>Small channels</emphasis>, such as
40+ <literal
41+ xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal>
42+ or
43+ <literal
44+ xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.
45+ These are identical to the stable and unstable channels described above,
46+ except that they contain fewer binary packages. This means they get
47+ updated faster than the regular channels (for instance, when a critical
48+ security patch is committed to NixOS’s source tree), but may require
49+ more packages to be built from source than usual. They’re mostly
50+ intended for server environments and as such contain few GUI applications.
2751 </para>
2852 </listitem>
2953 </itemizedlist>
30− To see what channels are available, go to <link xlink:href="https://nixos.org/channels"/>. (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 <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest supported stable release.
54+ To see what channels are available, go to
55+ <link xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the
56+ various channels redirect to a directory that contains the channel’s latest
57+ version and includes ISO images and VirtualBox appliances.) Please note that
58+ during the release process, channels that are not yet released will be
59+ present here as well. See the Getting NixOS page
60+ <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest
61+ supported stable release.
3162 </para>
3263 <para>
33− 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 <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re subscribed to, run the following as root:
64+ When you first install NixOS, you’re automatically subscribed to the NixOS
65+ channel that corresponds to your installation source. For instance, if you
66+ installed from a 19.03 ISO, you will be subscribed to the
67+ <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re
68+ subscribed to, run the following as root:
3469<screen>
3570# nix-channel --list | grep nixos
3671nixos https://nixos.org/channels/nixos-unstable
@@ -39,7 +74,8 @@ nixos https://nixos.org/channels/nixos-unstable
3974<screen>
4075# nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
4176</screen>
42− (Be sure to include the <literal>nixos</literal> parameter at the end.) For instance, to use the NixOS 19.03 stable channel:
77+ (Be sure to include the <literal>nixos</literal> parameter at the end.) For
78+ instance, to use the NixOS 19.03 stable channel:
4379<screen>
4480# nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
4581</screen>
@@ -53,31 +89,43 @@ nixos https://nixos.org/channels/nixos-unstable
5389</screen>
5490 </para>
5591 <para>
56− You can then upgrade NixOS to the latest version in your chosen channel by running
92+ You can then upgrade NixOS to the latest version in your chosen channel by
93+ running
5794<screen>
5895# nixos-rebuild switch --upgrade
5996</screen>
60− which is equivalent to the more verbose <literal>nix-channel --update nixos; nixos-rebuild switch</literal>.
97+ which is equivalent to the more verbose <literal>nix-channel --update nixos;
98+ nixos-rebuild switch</literal>.
6199 </para>
62100 <note>
63101 <para>
64− Channels are set per user. This means that running <literal> nix-channel --add</literal> as a non root user (or without sudo) will not affect configuration in <literal>/etc/nixos/configuration.nix</literal>
102+ Channels are set per user. This means that running <literal> nix-channel
103+ --add</literal> as a non root user (or without sudo) will not affect
104+ configuration in <literal>/etc/nixos/configuration.nix</literal>
65105 </para>
66106 </note>
67107 <warning>
68108 <para>
69− It is generally safe to switch back and forth between channels. The only exception is that a newer NixOS may also have a newer Nix version, which may involve an upgrade of Nix’s database schema. This cannot be undone easily, so in that case you will not be able to go back to your original channel.
109+ It is generally safe to switch back and forth between channels. The only
110+ exception is that a newer NixOS may also have a newer Nix version, which may
111+ involve an upgrade of Nix’s database schema. This cannot be undone easily,
112+ so in that case you will not be able to go back to your original channel.
70113 </para>
71114 </warning>
72115 <section xml:id="sec-upgrading-automatic">
73116 <title>Automatic Upgrades</title>
74117
75118 <para>
76− You can keep a NixOS system up-to-date automatically by adding the following to <filename>configuration.nix</filename>:
119+ You can keep a NixOS system up-to-date automatically by adding the following
120+ to <filename>configuration.nix</filename>:
77121<programlisting>
78122<xref linkend="opt-system.autoUpgrade.enable"/> = true;
79123</programlisting>
80− This enables a periodically executed systemd service named <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild switch --upgrade</command> to upgrade NixOS to the latest version in the current channel. (To see when the service runs, see <command>systemctl list-timers</command>.) You can also specify a channel explicitly, e.g.
124+ This enables a periodically executed systemd service named
125+ <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild
126+ switch --upgrade</command> to upgrade NixOS to the latest version in the
127+ current channel. (To see when the service runs, see <command>systemctl
128+ list-timers</command>.) You can also specify a channel explicitly, e.g.
81129<programlisting>
82130<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-19.03;
83131</programlisting>
nixos/doc/manual/man-configuration.xml+4−1
@@ -14,7 +14,10 @@
1414 <refsection>
1515 <title>Description</title>
1616 <para>
17− The file <filename>/etc/nixos/configuration.nix</filename> contains the declarative specification of your NixOS system configuration. The command <command>nixos-rebuild</command> takes this file and realises the system configuration specified therein.
17+ The file <filename>/etc/nixos/configuration.nix</filename> contains the
18+ declarative specification of your NixOS system configuration. The command
19+ <command>nixos-rebuild</command> takes this file and realises the system
20+ configuration specified therein.
1821 </para>
1922 </refsection>
2023 <refsection>
nixos/doc/manual/man-nixos-build-vms.xml+29−12
@@ -24,12 +24,14 @@
2424
2525 <arg>
2626 <option>--help</option>
27− </arg>
28−
29− <arg>
30− <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
31− </arg>
32−
27+ </arg>
28+
29+ <arg>
30+ <option>--option</option>
31+ <replaceable>name</replaceable>
32+ <replaceable>value</replaceable>
33+ </arg>
34+
3335 <arg choice="plain">
3436 <replaceable>network.nix</replaceable>
3537 </arg>
@@ -38,7 +40,11 @@
3840 <refsection>
3941 <title>Description</title>
4042 <para>
41− This command builds a network of QEMU-KVM virtual machines of a Nix expression specifying a network of NixOS machines. The virtual network can be started by executing the <filename>bin/run-vms</filename> shell script that is generated by this command. By default, a <filename>result</filename> symlink is produced that points to the generated virtual network.
43+ This command builds a network of QEMU-KVM virtual machines of a Nix
44+ expression specifying a network of NixOS machines. The virtual network can
45+ be started by executing the <filename>bin/run-vms</filename> shell script
46+ that is generated by this command. By default, a <filename>result</filename>
47+ symlink is produced that points to the generated virtual network.
4248 </para>
4349 <para>
4450 A network Nix expression has the following structure:
@@ -65,7 +71,18 @@
6571 };
6672}
6773</screen>
68− Each attribute in the expression represents a machine in the network (e.g. <varname>test1</varname> and <varname>test2</varname>) referring to a function defining a NixOS configuration. In each NixOS configuration, two attributes have a special meaning. The <varname>deployment.targetHost</varname> specifies the address (domain name or IP address) of the system which is used by <command>ssh</command> to perform remote deployment operations. The <varname>nixpkgs.localSystem.system</varname> attribute can be used to specify an architecture for the target machine, such as <varname>i686-linux</varname> which builds a 32-bit NixOS configuration. Omitting this property will build the configuration for the same architecture as the host system.
74+ Each attribute in the expression represents a machine in the network (e.g.
75+ <varname>test1</varname> and <varname>test2</varname>) referring to a
76+ function defining a NixOS configuration. In each NixOS configuration, two
77+ attributes have a special meaning. The
78+ <varname>deployment.targetHost</varname> specifies the address (domain name
79+ or IP address) of the system which is used by <command>ssh</command> to
80+ perform remote deployment operations. The
81+ <varname>nixpkgs.localSystem.system</varname> attribute can be used to
82+ specify an architecture for the target machine, such as
83+ <varname>i686-linux</varname> which builds a 32-bit NixOS configuration.
84+ Omitting this property will build the configuration for the same
85+ architecture as the host system.
6986 </para>
7087 </refsection>
7188 <refsection>
@@ -109,10 +126,10 @@
109126 <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
110127 </term>
111128 <listitem>
112− <para>
113− Set the Nix configuration option <replaceable>name</replaceable> to <replaceable>value</replaceable>. This overrides settings in the Nix configuration file (see <citerefentry>
114− <refentrytitle>nix.conf</refentrytitle>
115− <manvolnum>5</manvolnum></citerefentry>).
129+ <para>Set the Nix configuration option
130+ <replaceable>name</replaceable> to <replaceable>value</replaceable>.
131+ This overrides settings in the Nix configuration file (see
132+ <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
116133 </para>
117134 </listitem>
118135 </varlistentry>
nixos/doc/manual/man-nixos-enter.xml+15−7
@@ -34,7 +34,7 @@
3434 </arg>
3535 <replaceable>shell-command</replaceable>
3636 </arg>
37−
37+
3838 <arg>
3939 <arg choice='plain'>
4040 <option>--silent</option>
@@ -58,7 +58,9 @@
5858 <refsection>
5959 <title>Description</title>
6060 <para>
61− This command runs a command in a NixOS chroot environment, that is, in a filesystem hierarchy previously prepared using <command>nixos-install</command>.
61+ This command runs a command in a NixOS chroot environment, that is, in a
62+ filesystem hierarchy previously prepared using
63+ <command>nixos-install</command>.
6264 </para>
6365 </refsection>
6466 <refsection>
@@ -73,7 +75,8 @@
7375 </term>
7476 <listitem>
7577 <para>
76− The path to the NixOS system you want to enter. It defaults to <filename>/mnt</filename>.
78+ The path to the NixOS system you want to enter. It defaults to
79+ <filename>/mnt</filename>.
7780 </para>
7881 </listitem>
7982 </varlistentry>
@@ -83,7 +86,10 @@
8386 </term>
8487 <listitem>
8588 <para>
86− The NixOS system configuration to use. It defaults to <filename>/nix/var/nix/profiles/system</filename>. You can enter a previous NixOS configuration by specifying a path such as <filename>/nix/var/nix/profiles/system-106-link</filename>.
89+ The NixOS system configuration to use. It defaults to
90+ <filename>/nix/var/nix/profiles/system</filename>. You can enter a
91+ previous NixOS configuration by specifying a path such as
92+ <filename>/nix/var/nix/profiles/system-106-link</filename>.
8793 </para>
8894 </listitem>
8995 </varlistentry>
@@ -106,7 +112,7 @@
106112 </term>
107113 <listitem>
108114 <para>
109− Suppresses all output from the activation script of the target system.
115+ Suppresses all output from the activation script of the target system.
110116 </para>
111117 </listitem>
112118 </varlistentry>
@@ -116,7 +122,8 @@
116122 </term>
117123 <listitem>
118124 <para>
119− Interpret the remaining arguments as the program name and arguments to be invoked. The program is not executed in a shell.
125+ Interpret the remaining arguments as the program name and arguments to be
126+ invoked. The program is not executed in a shell.
120127 </para>
121128 </listitem>
122129 </varlistentry>
@@ -125,7 +132,8 @@
125132 <refsection>
126133 <title>Examples</title>
127134 <para>
128− Start an interactive shell in the NixOS installation in <filename>/mnt</filename>:
135+ Start an interactive shell in the NixOS installation in
136+ <filename>/mnt</filename>:
129137 </para>
130138<screen>
131139# nixos-enter /mnt
nixos/doc/manual/man-nixos-generate-config.xml+49−15
@@ -13,18 +13,18 @@
1313 </refnamediv>
1414 <refsynopsisdiv>
1515 <cmdsynopsis>
16− <command>nixos-generate-config</command>
16+ <command>nixos-generate-config</command>
1717 <arg>
1818 <option>--force</option>
1919 </arg>
20−
20+
2121 <arg>
2222 <arg choice='plain'>
2323 <option>--root</option>
2424 </arg>
2525 <replaceable>root</replaceable>
2626 </arg>
27−
27+
2828 <arg>
2929 <arg choice='plain'>
3030 <option>--dir</option>
@@ -44,10 +44,20 @@
4444 </term>
4545 <listitem>
4646 <para>
47− This module sets NixOS configuration options based on your current hardware configuration. In particular, it sets the <option>fileSystem</option> option to reflect all currently mounted file systems, the <option>swapDevices</option> option to reflect active swap devices, and the <option>boot.initrd.*</option> options to ensure that the initial ramdisk contains any kernel modules necessary for mounting the root file system.
47+ This module sets NixOS configuration options based on your current
48+ hardware configuration. In particular, it sets the
49+ <option>fileSystem</option> option to reflect all currently mounted file
50+ systems, the <option>swapDevices</option> option to reflect active swap
51+ devices, and the <option>boot.initrd.*</option> options to ensure that
52+ the initial ramdisk contains any kernel modules necessary for mounting
53+ the root file system.
4854 </para>
4955 <para>
50− If this file already exists, it is overwritten. Thus, you should not modify it manually. Rather, you should include it from your <filename>/etc/nixos/configuration.nix</filename>, and re-run <command>nixos-generate-config</command> to update it whenever your hardware configuration changes.
56+ If this file already exists, it is overwritten. Thus, you should not
57+ modify it manually. Rather, you should include it from your
58+ <filename>/etc/nixos/configuration.nix</filename>, and re-run
59+ <command>nixos-generate-config</command> to update it whenever your
60+ hardware configuration changes.
5161 </para>
5262 </listitem>
5363 </varlistentry>
@@ -57,7 +67,10 @@
5767 </term>
5868 <listitem>
5969 <para>
60− This is the main NixOS system configuration module. If it already exists, it’s left unchanged. Otherwise, <command>nixos-generate-config</command> will write a template for you to customise.
70+ This is the main NixOS system configuration module. If it already
71+ exists, it’s left unchanged. Otherwise,
72+ <command>nixos-generate-config</command> will write a template for you
73+ to customise.
6174 </para>
6275 </listitem>
6376 </varlistentry>
@@ -76,7 +89,12 @@
7689 </term>
7790 <listitem>
7891 <para>
79− If this option is given, treat the directory <replaceable>root</replaceable> as the root of the file system. This means that configuration files will be written to <filename><replaceable>root</replaceable>/etc/nixos</filename>, and that any file systems outside of <replaceable>root</replaceable> are ignored for the purpose of generating the <option>fileSystems</option> option.
92+ If this option is given, treat the directory
93+ <replaceable>root</replaceable> as the root of the file system. This
94+ means that configuration files will be written to
95+ <filename><replaceable>root</replaceable>/etc/nixos</filename>, and that
96+ any file systems outside of <replaceable>root</replaceable> are ignored
97+ for the purpose of generating the <option>fileSystems</option> option.
8098 </para>
8199 </listitem>
82100 </varlistentry>
@@ -86,7 +104,9 @@
86104 </term>
87105 <listitem>
88106 <para>
89− If this option is given, write the configuration files to the directory <replaceable>dir</replaceable> instead of <filename>/etc/nixos</filename>.
107+ If this option is given, write the configuration files to the directory
108+ <replaceable>dir</replaceable> instead of
109+ <filename>/etc/nixos</filename>.
90110 </para>
91111 </listitem>
92112 </varlistentry>
@@ -96,7 +116,8 @@
96116 </term>
97117 <listitem>
98118 <para>
99− Overwrite <filename>/etc/nixos/configuration.nix</filename> if it already exists.
119+ Overwrite <filename>/etc/nixos/configuration.nix</filename> if it already
120+ exists.
100121 </para>
101122 </listitem>
102123 </varlistentry>
@@ -106,7 +127,8 @@
106127 </term>
107128 <listitem>
108129 <para>
109− Omit everything concerning file systems and swap devices from the hardware configuration.
130+ Omit everything concerning file systems and swap devices from the
131+ hardware configuration.
110132 </para>
111133 </listitem>
112134 </varlistentry>
@@ -116,7 +138,9 @@
116138 </term>
117139 <listitem>
118140 <para>
119− Don't generate <filename>configuration.nix</filename> or <filename>hardware-configuration.nix</filename> and print the hardware configuration to stdout only.
141+ Don't generate <filename>configuration.nix</filename> or
142+ <filename>hardware-configuration.nix</filename> and print the hardware
143+ configuration to stdout only.
120144 </para>
121145 </listitem>
122146 </varlistentry>
@@ -125,11 +149,16 @@
125149 <refsection>
126150 <title>Examples</title>
127151 <para>
128− This command is typically used during NixOS installation to write initial configuration modules. For example, if you created and mounted the target file systems on <filename>/mnt</filename> and <filename>/mnt/boot</filename>, you would run:
152+ This command is typically used during NixOS installation to write initial
153+ configuration modules. For example, if you created and mounted the target
154+ file systems on <filename>/mnt</filename> and
155+ <filename>/mnt/boot</filename>, you would run:
129156<screen>
130157<prompt>$ </prompt>nixos-generate-config --root /mnt
131158</screen>
132− The resulting file <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might look like this:
159+ The resulting file
160+ <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might look
161+ like this:
133162<programlisting>
134163# Do not modify this file! It was generated by ‘nixos-generate-config’
135164# and may be overwritten by future invocations. Please make changes
@@ -164,7 +193,10 @@
164193 nix.maxJobs = 8;
165194}
166195</programlisting>
167− It will also create a basic <filename>/mnt/etc/nixos/configuration.nix</filename>, which you should edit to customise the logical configuration of your system. This file includes the result of the hardware scan as follows:
196+ It will also create a basic
197+ <filename>/mnt/etc/nixos/configuration.nix</filename>, which you should edit
198+ to customise the logical configuration of your system. This file includes
199+ the result of the hardware scan as follows:
168200<programlisting>
169201 imports = [ ./hardware-configuration.nix ];
170202</programlisting>
@@ -174,7 +206,9 @@
174206<screen>
175207<prompt>$ </prompt>nixos-generate-config
176208</screen>
177− to update <filename>/etc/nixos/hardware-configuration.nix</filename>. Your <filename>/etc/nixos/configuration.nix</filename> will <emphasis>not</emphasis> be overwritten.
209+ to update <filename>/etc/nixos/hardware-configuration.nix</filename>. Your
210+ <filename>/etc/nixos/configuration.nix</filename> will
211+ <emphasis>not</emphasis> be overwritten.
178212 </para>
179213 </refsection>
180214</refentry>
nixos/doc/manual/man-nixos-install.xml+67−28
@@ -13,72 +13,72 @@
1313 </refnamediv>
1414 <refsynopsisdiv>
1515 <cmdsynopsis>
16− <command>nixos-install</command>
16+ <command>nixos-install</command>
1717 <arg>
1818 <arg choice='plain'>
1919 <option>-I</option>
2020 </arg>
2121 <replaceable>path</replaceable>
2222 </arg>
23−
23+
2424 <arg>
2525 <arg choice='plain'>
2626 <option>--root</option>
2727 </arg>
2828 <replaceable>root</replaceable>
2929 </arg>
30−
30+
3131 <arg>
3232 <arg choice='plain'>
3333 <option>--system</option>
3434 </arg>
3535 <replaceable>path</replaceable>
3636 </arg>
37−
37+
3838 <arg>
3939 <arg choice='plain'>
4040 <option>--no-channel-copy</option>
4141 </arg>
4242 </arg>
43−
43+
4444 <arg>
4545 <arg choice='plain'>
4646 <option>--no-root-passwd</option>
4747 </arg>
4848 </arg>
49−
49+
5050 <arg>
5151 <arg choice='plain'>
5252 <option>--no-bootloader</option>
5353 </arg>
5454 </arg>
55−
55+
5656 <arg>
57− <group choice='req'>
57+ <group choice='req'>
5858 <arg choice='plain'>
5959 <option>--max-jobs</option>
6060 </arg>
61−
61+
6262 <arg choice='plain'>
6363 <option>-j</option>
6464 </arg>
6565 </group> <replaceable>number</replaceable>
6666 </arg>
67−
67+
6868 <arg>
6969 <option>--cores</option> <replaceable>number</replaceable>
7070 </arg>
71−
71+
7272 <arg>
7373 <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
7474 </arg>
75−
75+
7676 <arg>
7777 <arg choice='plain'>
7878 <option>--show-trace</option>
7979 </arg>
8080 </arg>
81−
81+
8282 <arg>
8383 <arg choice='plain'>
8484 <option>--help</option>
@@ -89,32 +89,43 @@
8989 <refsection>
9090 <title>Description</title>
9191 <para>
92− This command installs NixOS in the file system mounted on <filename>/mnt</filename>, based on the NixOS configuration specified in <filename>/mnt/etc/nixos/configuration.nix</filename>. It performs the following steps:
92+ This command installs NixOS in the file system mounted on
93+ <filename>/mnt</filename>, based on the NixOS configuration specified in
94+ <filename>/mnt/etc/nixos/configuration.nix</filename>. It performs the
95+ following steps:
9396 <itemizedlist>
9497 <listitem>
9598 <para>
96− It copies Nix and its dependencies to <filename>/mnt/nix/store</filename>.
99+ It copies Nix and its dependencies to
100+ <filename>/mnt/nix/store</filename>.
97101 </para>
98102 </listitem>
99103 <listitem>
100104 <para>
101− It runs Nix in <filename>/mnt</filename> to build the NixOS configuration specified in <filename>/mnt/etc/nixos/configuration.nix</filename>.
105+ It runs Nix in <filename>/mnt</filename> to build the NixOS configuration
106+ specified in <filename>/mnt/etc/nixos/configuration.nix</filename>.
102107 </para>
103108 </listitem>
104109 <listitem>
105110 <para>
106− It installs the GRUB boot loader on the device specified in the option <option>boot.loader.grub.device</option> (unless <option>--no-bootloader</option> is specified), and generates a GRUB configuration file that boots into the NixOS configuration just installed.
111+ It installs the GRUB boot loader on the device specified in the option
112+ <option>boot.loader.grub.device</option> (unless
113+ <option>--no-bootloader</option> is specified), and generates a GRUB
114+ configuration file that boots into the NixOS configuration just
115+ installed.
107116 </para>
108117 </listitem>
109118 <listitem>
110119 <para>
111− It prompts you for a password for the root account (unless <option>--no-root-passwd</option> is specified).
120+ It prompts you for a password for the root account (unless
121+ <option>--no-root-passwd</option> is specified).
112122 </para>
113123 </listitem>
114124 </itemizedlist>
115125 </para>
116126 <para>
117− This command is idempotent: if it is interrupted or fails due to a temporary problem (e.g. a network issue), you can safely re-run it.
127+ This command is idempotent: if it is interrupted or fails due to a temporary
128+ problem (e.g. a network issue), you can safely re-run it.
118129 </para>
119130 </refsection>
120131 <refsection>
@@ -129,7 +140,9 @@
129140 </term>
130141 <listitem>
131142 <para>
132− Defaults to <filename>/mnt</filename>. If this option is given, treat the directory <replaceable>root</replaceable> as the root of the NixOS installation.
143+ Defaults to <filename>/mnt</filename>. If this option is given, treat the
144+ directory <replaceable>root</replaceable> as the root of the NixOS
145+ installation.
133146 </para>
134147 </listitem>
135148 </varlistentry>
@@ -139,10 +152,16 @@
139152 </term>
140153 <listitem>
141154 <para>
142− If this option is provided, <command>nixos-install</command> will install the specified closure rather than attempt to build one from <filename>/mnt/etc/nixos/configuration.nix</filename>.
155+ If this option is provided, <command>nixos-install</command> will install
156+ the specified closure rather than attempt to build one from
157+ <filename>/mnt/etc/nixos/configuration.nix</filename>.
143158 </para>
144159 <para>
145− The closure must be an appropriately configured NixOS system, with boot loader and partition configuration that fits the target host. Such a closure is typically obtained with a command such as <command>nix-build -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system --no-out-link</command>
160+ The closure must be an appropriately configured NixOS system, with boot
161+ loader and partition configuration that fits the target host. Such a
162+ closure is typically obtained with a command such as <command>nix-build
163+ -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system
164+ --no-out-link</command>
146165 </para>
147166 </listitem>
148167 </varlistentry>
@@ -152,7 +171,10 @@
152171 </term>
153172 <listitem>
154173 <para>
155− Add a path to the Nix expression search path. This option may be given multiple times. See the NIX_PATH environment variable for information on the semantics of the Nix search path. Paths added through <replaceable>-I</replaceable> take precedence over NIX_PATH.
174+ Add a path to the Nix expression search path. This option may be given
175+ multiple times. See the NIX_PATH environment variable for information on
176+ the semantics of the Nix search path. Paths added through
177+ <replaceable>-I</replaceable> take precedence over NIX_PATH.
156178 </para>
157179 </listitem>
158180 </varlistentry>
@@ -165,7 +187,9 @@
165187 </term>
166188 <listitem>
167189 <para>
168− Sets the maximum number of build jobs that Nix will perform in parallel to the specified number. The default is <literal>1</literal>. A higher value is useful on SMP systems or to exploit I/O latency.
190+ Sets the maximum number of build jobs that Nix will perform in parallel
191+ to the specified number. The default is <literal>1</literal>. A higher
192+ value is useful on SMP systems or to exploit I/O latency.
169193 </para>
170194 </listitem>
171195 </varlistentry>
@@ -175,7 +199,15 @@
175199 </term>
176200 <listitem>
177201 <para>
178− Sets the value of the <envar>NIX_BUILD_CORES</envar> environment variable in the invocation of builders. Builders can use this variable at their discretion to control the maximum amount of parallelism. For instance, in Nixpkgs, if the derivation attribute <varname>enableParallelBuilding</varname> is set to <literal>true</literal>, the builder passes the <option>-j<replaceable>N</replaceable></option> flag to GNU Make. The value <literal>0</literal> means that the builder should use all available CPU cores in the system.
202+ Sets the value of the <envar>NIX_BUILD_CORES</envar> environment variable
203+ in the invocation of builders. Builders can use this variable at their
204+ discretion to control the maximum amount of parallelism. For instance, in
205+ Nixpkgs, if the derivation attribute
206+ <varname>enableParallelBuilding</varname> is set to
207+ <literal>true</literal>, the builder passes the
208+ <option>-j<replaceable>N</replaceable></option> flag to GNU Make. The
209+ value <literal>0</literal> means that the builder should use all
210+ available CPU cores in the system.
179211 </para>
180212 </listitem>
181213 </varlistentry>
@@ -185,7 +217,8 @@
185217 </term>
186218 <listitem>
187219 <para>
188− Set the Nix configuration option <replaceable>name</replaceable> to <replaceable>value</replaceable>.
220+ Set the Nix configuration option <replaceable>name</replaceable> to
221+ <replaceable>value</replaceable>.
189222 </para>
190223 </listitem>
191224 </varlistentry>
@@ -195,7 +228,8 @@
195228 </term>
196229 <listitem>
197230 <para>
198− Causes Nix to print out a stack trace in case of Nix expression evaluation errors.
231+ Causes Nix to print out a stack trace in case of Nix expression
232+ evaluation errors.
199233 </para>
200234 </listitem>
201235 </varlistentry>
@@ -214,7 +248,12 @@
214248 <refsection>
215249 <title>Examples</title>
216250 <para>
217− A typical NixOS installation is done by creating and mounting a file system on <filename>/mnt</filename>, generating a NixOS configuration in <filename>/mnt/etc/nixos/configuration.nix</filename>, and running <command>nixos-install</command>. For instance, if we want to install NixOS on an <literal>ext4</literal> file system created in <filename>/dev/sda1</filename>:
251+ A typical NixOS installation is done by creating and mounting a file system
252+ on <filename>/mnt</filename>, generating a NixOS configuration in
253+ <filename>/mnt/etc/nixos/configuration.nix</filename>, and running
254+ <command>nixos-install</command>. For instance, if we want to install NixOS
255+ on an <literal>ext4</literal> file system created in
256+ <filename>/dev/sda1</filename>:
218257<screen>
219258<prompt>$ </prompt>mkfs.ext4 /dev/sda1
220259<prompt>$ </prompt>mount /dev/sda1 /mnt
nixos/doc/manual/man-nixos-option.xml+17−10
@@ -13,19 +13,19 @@
1313 </refnamediv>
1414 <refsynopsisdiv>
1515 <cmdsynopsis>
16− <command>nixos-option</command>
16+ <command>nixos-option</command>
1717 <arg>
1818 <option>-I</option> <replaceable>path</replaceable>
1919 </arg>
20−
20+
2121 <arg>
2222 <option>--verbose</option>
2323 </arg>
24−
24+
2525 <arg>
2626 <option>--xml</option>
2727 </arg>
28−
28+
2929 <arg choice="plain">
3030 <replaceable>option.name</replaceable>
3131 </arg>
@@ -34,10 +34,13 @@
3434 <refsection>
3535 <title>Description</title>
3636 <para>
37− This command evaluates the configuration specified in <filename>/etc/nixos/configuration.nix</filename> and returns the properties of the option name given as argument.
37+ This command evaluates the configuration specified in
38+ <filename>/etc/nixos/configuration.nix</filename> and returns the properties
39+ of the option name given as argument.
3840 </para>
3941 <para>
40− When the option name is not an option, the command prints the list of attributes contained in the attribute set.
42+ When the option name is not an option, the command prints the list of
43+ attributes contained in the attribute set.
4144 </para>
4245 </refsection>
4346 <refsection>
@@ -52,7 +55,8 @@
5255 </term>
5356 <listitem>
5457 <para>
55− This option is passed to the underlying <command>nix-instantiate</command> invocation.
58+ This option is passed to the underlying
59+ <command>nix-instantiate</command> invocation.
5660 </para>
5761 </listitem>
5862 </varlistentry>
@@ -62,7 +66,8 @@
6266 </term>
6367 <listitem>
6468 <para>
65− This option enables verbose mode, which currently is just the Bash <command>set</command> <option>-x</option> debug mode.
69+ This option enables verbose mode, which currently is just the Bash
70+ <command>set</command> <option>-x</option> debug mode.
6671 </para>
6772 </listitem>
6873 </varlistentry>
@@ -87,7 +92,8 @@
8792 </term>
8893 <listitem>
8994 <para>
90− Path to the main NixOS configuration module. Defaults to <filename>/etc/nixos/configuration.nix</filename>.
95+ Path to the main NixOS configuration module. Defaults to
96+ <filename>/etc/nixos/configuration.nix</filename>.
9197 </para>
9298 </listitem>
9399 </varlistentry>
@@ -124,7 +130,8 @@ Defined by:
124130 <refsection>
125131 <title>Bugs</title>
126132 <para>
127− The author listed in the following section is wrong. If there is any other bug, please report to Nicolas Pierron.
133+ The author listed in the following section is wrong. If there is any other
134+ bug, please report to Nicolas Pierron.
128135 </para>
129136 </refsection>
130137</refentry>
nixos/doc/manual/man-nixos-rebuild.xml+219−90
@@ -7,45 +7,47 @@
77 <refmiscinfo class="source">NixOS</refmiscinfo>
88<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
99 </refmeta>
10+
1011 <refnamediv>
1112 <refname><command>nixos-rebuild</command>
1213 </refname><refpurpose>reconfigure a NixOS machine</refpurpose>
1314 </refnamediv>
15+
1416 <refsynopsisdiv>
1517 <cmdsynopsis>
16− <command>nixos-rebuild</command><group choice='req'>
18+ <command>nixos-rebuild</command><group choice='req'>
1719 <arg choice='plain'>
1820 <option>switch</option>
1921 </arg>
20−
22+
2123 <arg choice='plain'>
2224 <option>boot</option>
2325 </arg>
24−
26+
2527 <arg choice='plain'>
2628 <option>test</option>
2729 </arg>
28−
30+
2931 <arg choice='plain'>
3032 <option>build</option>
3133 </arg>
32−
34+
3335 <arg choice='plain'>
3436 <option>dry-build</option>
3537 </arg>
36−
38+
3739 <arg choice='plain'>
3840 <option>dry-activate</option>
3941 </arg>
40−
42+
4143 <arg choice='plain'>
4244 <option>edit</option>
4345 </arg>
44−
46+
4547 <arg choice='plain'>
4648 <option>build-vm</option>
4749 </arg>
48−
50+
4951 <arg choice='plain'>
5052 <option>build-vm-with-bootloader</option>
5153 </arg>
@@ -54,33 +56,34 @@
5456 <arg>
5557 <option>--upgrade</option>
5658 </arg>
57−
59+
5860 <arg>
5961 <option>--install-bootloader</option>
6062 </arg>
61−
63+
6264 <arg>
6365 <option>--no-build-nix</option>
6466 </arg>
65−
67+
6668 <arg>
6769 <option>--fast</option>
6870 </arg>
69−
71+
7072 <arg>
7173 <option>--rollback</option>
7274 </arg>
73−
75+
7476 <arg>
7577 <option>--builders</option> <replaceable>builder-spec</replaceable>
7678 </arg>
79+
7780 <sbr />
7881 <arg>
79− <group choice='req'>
82+ <group choice='req'>
8083 <arg choice='plain'>
8184 <option>--profile-name</option>
8285 </arg>
83−
86+
8487 <arg choice='plain'>
8588 <option>-p</option>
8689 </arg>
@@ -90,67 +93,56 @@
9093 <arg>
9194 <option>--show-trace</option>
9295 </arg>
93−
9496 <arg>
95− <option>-I</option> <replaceable>path</replaceable>
97+ <option>-I</option>
98+ <replaceable>path</replaceable>
9699 </arg>
97−
98100 <arg>
99− <group choice='req'>
100− <arg choice='plain'>
101− <option>--verbose</option>
102− </arg>
103−
104− <arg choice='plain'>
105− <option>-v</option>
106− </arg>
107− </group>
101+ <group choice='req'>
102+ <arg choice='plain'><option>--verbose</option></arg>
103+ <arg choice='plain'><option>-v</option></arg>
104+ </group>
108105 </arg>
109−
110106 <arg>
111− <group choice='req'>
112− <arg choice='plain'>
113− <option>--max-jobs</option>
114− </arg>
115−
116− <arg choice='plain'>
117− <option>-j</option>
118− </arg>
119− </group> <replaceable>number</replaceable>
107+ <group choice='req'>
108+ <arg choice='plain'><option>--max-jobs</option></arg>
109+ <arg choice='plain'><option>-j</option></arg>
110+ </group>
111+ <replaceable>number</replaceable>
120112 </arg>
121−
122113 <arg>
123− <group choice='req'>
124− <arg choice='plain'>
125− <option>--keep-failed</option>
126− </arg>
127−
128− <arg choice='plain'>
129− <option>-K</option>
130− </arg>
131− </group>
114+ <group choice='req'>
115+ <arg choice='plain'><option>--keep-failed</option></arg>
116+ <arg choice='plain'><option>-K</option></arg>
117+ </group>
132118 </arg>
133−
134119 <arg>
135− <group choice='req'>
136− <arg choice='plain'>
137− <option>--keep-going</option>
138− </arg>
139−
140− <arg choice='plain'>
141− <option>-k</option>
142− </arg>
143− </group>
120+ <group choice='req'>
121+ <arg choice='plain'><option>--keep-going</option></arg>
122+ <arg choice='plain'><option>-k</option></arg>
123+ </group>
144124 </arg>
145125 </cmdsynopsis>
146126 </refsynopsisdiv>
127+
147128 <refsection>
148129 <title>Description</title>
130+
149131 <para>
150− This command updates the system so that it corresponds to the configuration specified in <filename>/etc/nixos/configuration.nix</filename>. Thus, every time you modify <filename>/etc/nixos/configuration.nix</filename> or any NixOS module, you must run <command>nixos-rebuild</command> to make the changes take effect. It builds the new system in <filename>/nix/store</filename>, 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.
132+ This command updates the system so that it corresponds to the configuration
133+ specified in <filename>/etc/nixos/configuration.nix</filename>. Thus, every
134+ time you modify <filename>/etc/nixos/configuration.nix</filename> or any
135+ NixOS module, you must run <command>nixos-rebuild</command> to make the
136+ changes take effect. It builds the new system in
137+ <filename>/nix/store</filename>, runs its activation script, and stop and
138+ (re)starts any system services if needed. Please note that user services need
139+ to be started manually as they aren't detected by the activation script at the moment.
151140 </para>
141+
152142 <para>
153− This command has one required argument, which specifies the desired operation. It must be one of the following:
143+ This command has one required argument, which specifies the desired
144+ operation. It must be one of the following:
145+
154146 <variablelist>
155147 <varlistentry>
156148 <term>
@@ -158,64 +150,91 @@
158150 </term>
159151 <listitem>
160152 <para>
161− 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 <command>nixos-rebuild switch</command> or <command>nixos-rebuild boot</command> remain available in the GRUB menu.
153+ Build and activate the new configuration, and make it the boot default.
154+ That is, the configuration is added to the GRUB boot menu as the default
155+ menu entry, so that subsequent reboots will boot the system into the new
156+ configuration. Previous configurations activated with
157+ <command>nixos-rebuild switch</command> or <command>nixos-rebuild
158+ boot</command> remain available in the GRUB menu.
162159 </para>
163160 </listitem>
164161 </varlistentry>
162+
165163 <varlistentry>
166164 <term>
167165 <option>boot</option>
168166 </term>
169167 <listitem>
170168 <para>
171− Build the new configuration and make it the boot default (as with <command>nixos-rebuild switch</command>), but do not activate it. That is, the system continues to run the previous configuration until the next reboot.
169+ Build the new configuration and make it the boot default (as with
170+ <command>nixos-rebuild switch</command>), but do not activate it. That
171+ is, the system continues to run the previous configuration until the
172+ next reboot.
172173 </para>
173174 </listitem>
174175 </varlistentry>
176+
175177 <varlistentry>
176178 <term>
177179 <option>test</option>
178180 </term>
179181 <listitem>
180182 <para>
181− 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 <command>nixos-rebuild switch</command> or <command>nixos-rebuild boot</command>).
183+ Build and activate the new configuration, but do not add it to the GRUB
184+ boot menu. Thus, if you reboot the system (or if it crashes), you will
185+ automatically revert to the default configuration (i.e. the
186+ configuration resulting from the last call to <command>nixos-rebuild
187+ switch</command> or <command>nixos-rebuild boot</command>).
182188 </para>
183189 </listitem>
184190 </varlistentry>
191+
185192 <varlistentry>
186193 <term>
187194 <option>build</option>
188195 </term>
189196 <listitem>
190197 <para>
191− Build the new configuration, but neither activate it nor add it to the GRUB boot menu. It leaves a symlink named <filename>result</filename> in the current directory, which points to the output of the top-level “system” derivation. This is essentially the same as doing
198+ Build the new configuration, but neither activate it nor add it to the
199+ GRUB boot menu. It leaves a symlink named <filename>result</filename> in
200+ the current directory, which points to the output of the top-level
201+ “system” derivation. This is essentially the same as doing
192202<screen>
193203<prompt>$ </prompt>nix-build /path/to/nixpkgs/nixos -A system
194204</screen>
195− Note that you do not need to be <literal>root</literal> to run <command>nixos-rebuild build</command>.
205+ Note that you do not need to be <literal>root</literal> to run
206+ <command>nixos-rebuild build</command>.
196207 </para>
197208 </listitem>
198209 </varlistentry>
210+
199211 <varlistentry>
200212 <term>
201213 <option>dry-build</option>
202214 </term>
203215 <listitem>
204216 <para>
205− Show what store paths would be built or downloaded by any of the operations above, but otherwise do nothing.
217+ Show what store paths would be built or downloaded by any of the
218+ operations above, but otherwise do nothing.
206219 </para>
207220 </listitem>
208221 </varlistentry>
222+
209223 <varlistentry>
210224 <term>
211225 <option>dry-activate</option>
212226 </term>
213227 <listitem>
214228 <para>
215− Build the new configuration, but instead of activating it, show what changes would be performed by the activation (i.e. by <command>nixos-rebuild test</command>). For instance, this command will print which systemd units would be restarted. The list of changes is not guaranteed to be complete.
229+ Build the new configuration, but instead of activating it, show what
230+ changes would be performed by the activation (i.e. by
231+ <command>nixos-rebuild test</command>). For instance, this command will
232+ print which systemd units would be restarted. The list of changes is not
233+ guaranteed to be complete.
216234 </para>
217235 </listitem>
218236 </varlistentry>
237+
219238 <varlistentry>
220239 <term>
221240 <option>edit</option>
@@ -226,49 +245,80 @@
226245 </para>
227246 </listitem>
228247 </varlistentry>
248+
229249 <varlistentry>
230250 <term>
231251 <option>build-vm</option>
232252 </term>
233253 <listitem>
234254 <para>
235− Build a script that starts a NixOS virtual machine with the desired configuration. It leaves a symlink <filename>result</filename> in the current directory that points (under <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>) at the script that starts the VM. Thus, to test a NixOS configuration in a virtual machine, you should do the following:
255+ Build a script that starts a NixOS virtual machine with the desired
256+ configuration. It leaves a symlink <filename>result</filename> in the
257+ current directory that points (under
258+ <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>)
259+ at the script that starts the VM. Thus, to test a NixOS configuration in
260+ a virtual machine, you should do the following:
236261<screen>
237262<prompt>$ </prompt>nixos-rebuild build-vm
238263<prompt>$ </prompt>./result/bin/run-*-vm
239264</screen>
240265 </para>
266+
241267 <para>
242− The VM is implemented using the <literal>qemu</literal> package. For best performance, you should load the <literal>kvm-intel</literal> or <literal>kvm-amd</literal> kernel modules to get hardware virtualisation.
268+ The VM is implemented using the <literal>qemu</literal> package. For
269+ best performance, you should load the <literal>kvm-intel</literal> or
270+ <literal>kvm-amd</literal> kernel modules to get hardware
271+ virtualisation.
243272 </para>
273+
244274 <para>
245− 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 <command>nixos-rebuild</command>; to change the VM’s configuration, you must halt the VM and re-run the commands above.
275+ The VM mounts the Nix store of the host through the 9P file system. The
276+ host Nix store is read-only, so Nix commands that modify the Nix store
277+ will not work in the VM. This includes commands such as
278+ <command>nixos-rebuild</command>; to change the VM’s configuration,
279+ you must halt the VM and re-run the commands above.
246280 </para>
281+
247282 <para>
248− The VM has its own <literal>ext3</literal> 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 <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
283+ The VM has its own <literal>ext3</literal> root file system, which is
284+ automatically created when the VM is first started, and is persistent
285+ across reboots of the VM. It is stored in
286+ <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
249287<!-- The entire file system hierarchy of the host is available in
250288 the VM under <filename>/hostfs</filename>.-->
251289 </para>
252290 </listitem>
253291 </varlistentry>
292+
254293 <varlistentry>
255294 <term>
256295 <option>build-vm-with-bootloader</option>
257296 </term>
258297 <listitem>
259298 <para>
260− Like <option>build-vm</option>, 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 <command>nixos-rebuild switch</command>), 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 <filename>/boot</filename> partition, which is mounted read-only in the VM.
299+ Like <option>build-vm</option>, but boots using the regular boot loader
300+ of your configuration (e.g., GRUB 1 or 2), rather than booting directly
301+ into the kernel and initial ramdisk of the system. This allows you to
302+ test whether the boot loader works correctly. However, it does not
303+ guarantee that your NixOS configuration will boot successfully on the
304+ host hardware (i.e., after running <command>nixos-rebuild
305+ switch</command>), because the hardware and boot loader configuration in
306+ the VM are different. The boot loader is installed on an automatically
307+ generated virtual disk containing a <filename>/boot</filename>
308+ partition, which is mounted read-only in the VM.
261309 </para>
262310 </listitem>
263311 </varlistentry>
264312 </variablelist>
265313 </para>
266314 </refsection>
315+
267316 <refsection>
268317 <title>Options</title>
269318 <para>
270319 This command accepts the following options:
271320 </para>
321+
272322 <variablelist>
273323 <varlistentry>
274324 <term>
@@ -280,56 +330,84 @@
280330 </para>
281331 </listitem>
282332 </varlistentry>
333+
283334 <varlistentry>
284335 <term>
285336 <option>--install-bootloader</option>
286337 </term>
287338 <listitem>
288339 <para>
289− Causes the boot loader to be (re)installed on the device specified by the relevant configuration options.
340+ Causes the boot loader to be (re)installed on the device specified by the
341+ relevant configuration options.
290342 </para>
291343 </listitem>
292344 </varlistentry>
345+
293346 <varlistentry>
294347 <term>
295348 <option>--no-build-nix</option>
296349 </term>
297350 <listitem>
298351 <para>
299− Normally, <command>nixos-rebuild</command> first builds the <varname>nixUnstable</varname> 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.
352+ Normally, <command>nixos-rebuild</command> first builds the
353+ <varname>nixUnstable</varname> attribute in Nixpkgs, and uses the
354+ resulting instance of the Nix package manager to build the new system
355+ configuration. This is necessary if the NixOS modules use features not
356+ provided by the currently installed version of Nix. This option disables
357+ building a new Nix.
300358 </para>
301359 </listitem>
302360 </varlistentry>
361+
303362 <varlistentry>
304363 <term>
305364 <option>--fast</option>
306365 </term>
307366 <listitem>
308367 <para>
309− Equivalent to <option>--no-build-nix</option> <option>--show-trace</option>. This option is useful if you call <command>nixos-rebuild</command> frequently (e.g. if you’re hacking on a NixOS module).
368+ Equivalent to <option>--no-build-nix</option>
369+ <option>--show-trace</option>. This option is useful if you call
370+ <command>nixos-rebuild</command> frequently (e.g. if you’re hacking on
371+ a NixOS module).
310372 </para>
311373 </listitem>
312374 </varlistentry>
375+
313376 <varlistentry>
314377 <term>
315378 <option>--rollback</option>
316379 </term>
317380 <listitem>
318381 <para>
319− Instead of building a new configuration as specified by <filename>/etc/nixos/configuration.nix</filename>, roll back to the previous configuration. (The previous configuration is defined as the one before the “current” generation of the Nix profile <filename>/nix/var/nix/profiles/system</filename>.)
382+ Instead of building a new configuration as specified by
383+ <filename>/etc/nixos/configuration.nix</filename>, roll back to the
384+ previous configuration. (The previous configuration is defined as the one
385+ before the “current” generation of the Nix profile
386+ <filename>/nix/var/nix/profiles/system</filename>.)
320387 </para>
321388 </listitem>
322389 </varlistentry>
390+
323391 <varlistentry>
324392 <term>
325393 <option>--builders</option> <replaceable>builder-spec</replaceable>
326394 </term>
327395 <listitem>
328396 <para>
329− Allow ad-hoc remote builders for building the new system. This requires the user executing <command>nixos-rebuild</command> (usually root) to be configured as a trusted user in the Nix daemon. This can be achieved by using the <literal>nix.trustedUsers</literal> NixOS option. Examples values for that option are described in the <literal>Remote builds chapter</literal> in the Nix manual, (i.e. <command>--builders "ssh://bigbrother x86_64-linux"</command>). By specifying an empty string existing builders specified in <filename>/etc/nix/machines</filename> can be ignored: <command>--builders ""</command> for example when they are not reachable due to network connectivity.
397+ Allow ad-hoc remote builders for building the new system. This requires
398+ the user executing <command>nixos-rebuild</command> (usually root) to be
399+ configured as a trusted user in the Nix daemon. This can be achieved by
400+ using the <literal>nix.trustedUsers</literal> NixOS option. Examples
401+ values for that option are described in the <literal>Remote builds
402+ chapter</literal> in the Nix manual, (i.e. <command>--builders
403+ "ssh://bigbrother x86_64-linux"</command>). By specifying an empty string
404+ existing builders specified in <filename>/etc/nix/machines</filename> can
405+ be ignored: <command>--builders ""</command> for example when they are
406+ not reachable due to network connectivity.
330407 </para>
331408 </listitem>
332409 </varlistentry>
410+
333411 <varlistentry>
334412 <term>
335413 <option>--profile-name</option>
@@ -339,56 +417,97 @@
339417 </term>
340418 <listitem>
341419 <para>
342− Instead of using the Nix profile <filename>/nix/var/nix/profiles/system</filename> to keep track of the current and previous system configurations, use <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>. When you use GRUB 2, for every system profile created with this flag, NixOS will create a submenu named “NixOS - Profile '<replaceable>name</replaceable>'” in GRUB’s boot menu, containing the current and previous configurations of this profile.
420+ Instead of using the Nix profile
421+ <filename>/nix/var/nix/profiles/system</filename> to keep track of the
422+ current and previous system configurations, use
423+ <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>.
424+ When you use GRUB 2, for every system profile created with this flag,
425+ NixOS will create a submenu named “NixOS - Profile
426+ '<replaceable>name</replaceable>'” in GRUB’s boot menu, containing
427+ the current and previous configurations of this profile.
343428 </para>
344429 <para>
345− For instance, if you want to test a configuration file named <filename>test.nix</filename> without affecting the default system profile, you would do:
430+ For instance, if you want to test a configuration file named
431+ <filename>test.nix</filename> without affecting the default system
432+ profile, you would do:
346433<screen>
347434<prompt>$ </prompt>nixos-rebuild switch -p test -I nixos-config=./test.nix
348435</screen>
349− The new configuration will appear in the GRUB 2 submenu “NixOS - Profile 'test'”.
436+ The new configuration will appear in the GRUB 2 submenu “NixOS -
437+ Profile 'test'”.
350438 </para>
351439 </listitem>
352440 </varlistentry>
441+
353442 <varlistentry>
354443 <term>
355444 <option>--build-host</option>
356445 </term>
357446 <listitem>
358447 <para>
359− 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 <option>--target-host</option> is not set, the build will be copied back to the local machine when done.
448+ Instead of building the new configuration locally, use the specified host
449+ to perform the build. The host needs to be accessible with ssh, and must
450+ be able to perform Nix builds. If the option
451+ <option>--target-host</option> is not set, the build will be copied back
452+ to the local machine when done.
360453 </para>
361454 <para>
362− Note that, if <option>--no-build-nix</option> 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.
455+ Note that, if <option>--no-build-nix</option> is not specified, Nix will
456+ be built both locally and remotely. This is because the configuration
457+ will always be evaluated locally even though the building might be
458+ performed remotely.
363459 </para>
364460 <para>
365− You can include a remote user name in the host name (<replaceable>user@host</replaceable>). You can also set ssh options by defining the <envar>NIX_SSHOPTS</envar> environment variable.
461+ You can include a remote user name in the host name
462+ (<replaceable>user@host</replaceable>). You can also set ssh options by
463+ defining the <envar>NIX_SSHOPTS</envar> environment variable.
366464 </para>
367465 </listitem>
368466 </varlistentry>
467+
369468 <varlistentry>
370469 <term>
371470 <option>--target-host</option>
372471 </term>
373472 <listitem>
374473 <para>
375− Specifies the NixOS target host. By setting this to something other than <replaceable>localhost</replaceable>, 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 <option>switch</option>, <option>boot</option> and <option>test</option> you need root access.
474+ Specifies the NixOS target host. By setting this to something other than
475+ <replaceable>localhost</replaceable>, the system activation will happen
476+ on the remote host instead of the local machine. The remote host needs to
477+ be accessible over ssh, and for the commands <option>switch</option>,
478+ <option>boot</option> and <option>test</option> you need root access.
376479 </para>
480+
377481 <para>
378− If <option>--build-host</option> is not explicitly specified, <option>--build-host</option> will implicitly be set to the same value as <option>--target-host</option>. So, if you only specify <option>--target-host</option> both building and activation will take place remotely (and no build artifacts will be copied to the local machine).
482+ If <option>--build-host</option> is not explicitly specified,
483+ <option>--build-host</option> will implicitly be set to the same value as
484+ <option>--target-host</option>. So, if you only specify
485+ <option>--target-host</option> both building and activation will take
486+ place remotely (and no build artifacts will be copied to the local
487+ machine).
379488 </para>
489+
380490 <para>
381− You can include a remote user name in the host name (<replaceable>user@host</replaceable>). You can also set ssh options by defining the <envar>NIX_SSHOPTS</envar> environment variable.
491+ You can include a remote user name in the host name
492+ (<replaceable>user@host</replaceable>). You can also set ssh options by
493+ defining the <envar>NIX_SSHOPTS</envar> environment variable.
382494 </para>
383495 </listitem>
384496 </varlistentry>
385497 </variablelist>
498+
386499 <para>
387− In addition, <command>nixos-rebuild</command> accepts various Nix-related flags, including <option>--max-jobs</option> / <option>-j</option>, <option>--show-trace</option>, <option>--keep-failed</option>, <option>--keep-going</option> and <option>--verbose</option> / <option>-v</option>. See the Nix manual for details.
500+ In addition, <command>nixos-rebuild</command> accepts various Nix-related
501+ flags, including <option>--max-jobs</option> / <option>-j</option>,
502+ <option>--show-trace</option>, <option>--keep-failed</option>,
503+ <option>--keep-going</option> and <option>--verbose</option> /
504+ <option>-v</option>. See the Nix manual for details.
388505 </para>
389506 </refsection>
507+
390508 <refsection>
391509 <title>Environment</title>
510+
392511 <variablelist>
393512 <varlistentry>
394513 <term>
@@ -396,25 +515,31 @@
396515 </term>
397516 <listitem>
398517 <para>
399− Path to the main NixOS configuration module. Defaults to <filename>/etc/nixos/configuration.nix</filename>.
518+ Path to the main NixOS configuration module. Defaults to
519+ <filename>/etc/nixos/configuration.nix</filename>.
400520 </para>
401521 </listitem>
402522 </varlistentry>
523+
403524 <varlistentry>
404525 <term>
405526 <envar>NIX_SSHOPTS</envar>
406527 </term>
407528 <listitem>
408529 <para>
409− Additional options to be passed to <command>ssh</command> on the command line.
530+ Additional options to be passed to <command>ssh</command> on the command
531+ line.
410532 </para>
411533 </listitem>
412534 </varlistentry>
413535 </variablelist>
414536 </refsection>
537+
415538 <refsection>
416539 <title>Files</title>
540+
417541 <variablelist>
542+
418543 <varlistentry>
419544 <term>
420545 <filename>/run/current-system</filename>
@@ -425,18 +550,22 @@
425550 </para>
426551 </listitem>
427552 </varlistentry>
553+
428554 <varlistentry>
429555 <term>
430556 <filename>/nix/var/nix/profiles/system</filename>
431557 </term>
432558 <listitem>
433559 <para>
434− The Nix profile that contains the current and previous system configurations. Used to generate the GRUB boot menu.
560+ The Nix profile that contains the current and previous system
561+ configurations. Used to generate the GRUB boot menu.
435562 </para>
436563 </listitem>
437564 </varlistentry>
565+
438566 </variablelist>
439567 </refsection>
568+
440569 <refsection>
441570 <title>Bugs</title>
442571 <para>
nixos/doc/manual/man-nixos-version.xml+17−6
@@ -25,7 +25,8 @@
2525 <refsection>
2626 <title>Description</title>
2727 <para>
28− This command shows the version of the currently active NixOS configuration. For example:
28+ This command shows the version of the currently active NixOS configuration.
29+ For example:
2930<screen>$ nixos-version
303116.03.1011.6317da4 (Emu)
3132</screen>
@@ -37,7 +38,8 @@
3738 </term>
3839 <listitem>
3940 <para>
40− The NixOS release, indicating the year and month in which it was released (e.g. March 2016).
41+ The NixOS release, indicating the year and month in which it was
42+ released (e.g. March 2016).
4143 </para>
4244 </listitem>
4345 </varlistentry>
@@ -47,7 +49,12 @@
4749 </term>
4850 <listitem>
4951 <para>
50− 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 <literal>git</literal> when the current NixOS configuration was built from a checkout of the Nixpkgs Git repository rather than from a NixOS channel.
52+ The number of commits in the Nixpkgs Git repository between the start of
53+ the release branch and the commit from which this version was built.
54+ This ensures that NixOS versions are monotonically increasing. It is
55+ <literal>git</literal> when the current NixOS configuration was built
56+ from a checkout of the Nixpkgs Git repository rather than from a NixOS
57+ channel.
5158 </para>
5259 </listitem>
5360 </varlistentry>
@@ -57,7 +64,8 @@
5764 </term>
5865 <listitem>
5966 <para>
60− The first 7 characters of the commit in the Nixpkgs Git repository from which this version was built.
67+ The first 7 characters of the commit in the Nixpkgs Git repository from
68+ which this version was built.
6169 </para>
6270 </listitem>
6371 </varlistentry>
@@ -67,7 +75,9 @@
6775 </term>
6876 <listitem>
6977 <para>
70− 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.
78+ The code name of the NixOS release. The first letter of the code name
79+ indicates that this is the N'th stable NixOS release; for example, Emu
80+ is the fifth release.
7181 </para>
7282 </listitem>
7383 </varlistentry>
@@ -89,7 +99,8 @@
8999 </term>
90100 <listitem>
91101 <para>
92− Show the full SHA1 hash of the Git commit from which this configuration was built, e.g.
102+ Show the full SHA1 hash of the Git commit from which this configuration
103+ was built, e.g.
93104<screen>$ nixos-version --hash
941056317da40006f6bc2480c6781999c52d88dde2acf
95106</screen>
nixos/doc/manual/manual.xml+15−6
@@ -11,17 +11,26 @@
1111 <preface xml:id="preface">
1212 <title>Preface</title>
1313 <para>
14− This manual describes how to install, use and extend NixOS, a Linux distribution based on the purely functional package management system Nix.
14+ This manual describes how to install, use and extend NixOS, a Linux
15+ distribution based on the purely functional package management system Nix.
1516 </para>
1617 <para>
17− If you encounter problems, please report them on the <literal
18− xlink:href="https://discourse.nixos.org">Discourse</literal> or on the <link
19− xlink:href="irc://irc.freenode.net/#nixos"> <literal>#nixos</literal> channel on Freenode</link>. Bugs should be reported in <link
20− xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’ GitHub issue tracker</link>.
18+ If you encounter problems, please report them on the
19+ <literal
20+ xlink:href="https://discourse.nixos.org">Discourse</literal> or
21+ on the <link
22+ xlink:href="irc://irc.freenode.net/#nixos">
23+ <literal>#nixos</literal> channel on Freenode</link>. Bugs should be
24+ reported in
25+ <link
26+ xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’
27+ GitHub issue tracker</link>.
2128 </para>
2229 <note>
2330 <para>
24− Commands prefixed with <literal>#</literal> have to be run as root, either requiring to login as root user or temporarily switching to it using <literal>sudo</literal> for example.
31+ Commands prefixed with <literal>#</literal> have to be run as root, either
32+ requiring to login as root user or temporarily switching to it using
33+ <literal>sudo</literal> for example.
2534 </para>
2635 </note>
2736 </preface>
nixos/doc/manual/release-notes/release-notes.xml+2−1
@@ -5,7 +5,8 @@
55 xml:id="ch-release-notes">
66 <title>Release Notes</title>
77 <para>
8− This section lists the release notes for each stable version of NixOS and current unstable revision.
8+ This section lists the release notes for each stable version of NixOS and
9+ current unstable revision.
910 </para>
1011 <xi:include href="rl-2003.xml" />
1112 <xi:include href="rl-1909.xml" />
nixos/doc/manual/release-notes/rl-1404.xml+66−17
@@ -6,16 +6,23 @@
66 <title>Release 14.04 (“Baboon”, 2014/04/30)</title>
77
88 <para>
9− 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:
9+ This is the second stable release branch of NixOS. In addition to numerous
10+ new and upgraded packages and modules, this release has the following
11+ highlights:
1012 <itemizedlist>
1113 <listitem>
1214 <para>
13− Installation on UEFI systems is now supported. See <xref linkend="sec-installation"/> for details.
15+ Installation on UEFI systems is now supported. See
16+ <xref linkend="sec-installation"/> for details.
1417 </para>
1518 </listitem>
1619 <listitem>
1720 <para>
18− Systemd has been updated to version 212, which has <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous improvements</link>. NixOS now automatically starts systemd user instances when you log in. You can define global user units through the <option>systemd.unit.*</option> options.
21+ Systemd has been updated to version 212, which has
22+ <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous
23+ improvements</link>. NixOS now automatically starts systemd user instances
24+ when you log in. You can define global user units through the
25+ <option>systemd.unit.*</option> options.
1926 </para>
2027 </listitem>
2128 <listitem>
@@ -40,28 +47,47 @@
4047 </listitem>
4148 <listitem>
4249 <para>
43− Nix has been updated to 1.7 (<link
50+ Nix has been updated to 1.7
51+ (<link
4452 xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>).
4553 </para>
4654 </listitem>
4755 <listitem>
4856 <para>
49− NixOS now supports fully declarative management of users and groups. If you set <option>users.mutableUsers</option> to <literal>false</literal>, then the contents of <filename>/etc/passwd</filename> and <filename>/etc/group</filename> will be <link
50− xlink:href="https://www.usenix.org/legacy/event/lisa02/tech/full_papers/traugott/traugott_html/">congruent</link> to your NixOS configuration. For instance, if you remove a user from <option>users.extraUsers</option> and run <command>nixos-rebuild</command>, the user account will cease to exist. Also, imperative commands for managing users and groups, such as <command>useradd</command>, are no longer available. If <option>users.mutableUsers</option> is <literal>true</literal> (the default), then behaviour is unchanged from NixOS 13.10.
57+ NixOS now supports fully declarative management of users and groups. If
58+ you set <option>users.mutableUsers</option> to <literal>false</literal>,
59+ then the contents of <filename>/etc/passwd</filename> and
60+ <filename>/etc/group</filename> will be
61+ <link
62+ xlink:href="https://www.usenix.org/legacy/event/lisa02/tech/full_papers/traugott/traugott_html/">congruent</link>
63+ to your NixOS configuration. For instance, if you remove a user from
64+ <option>users.extraUsers</option> and run
65+ <command>nixos-rebuild</command>, the user account will cease to exist.
66+ Also, imperative commands for managing users and groups, such as
67+ <command>useradd</command>, are no longer available. If
68+ <option>users.mutableUsers</option> is <literal>true</literal> (the
69+ default), then behaviour is unchanged from NixOS 13.10.
5170 </para>
5271 </listitem>
5372 <listitem>
5473 <para>
55− 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 <xref linkend="ch-containers"/> for details.
74+ NixOS now has basic container support, meaning you can easily run a NixOS
75+ instance as a container in a NixOS host system. These containers are
76+ suitable for testing and experimentation but not production use, since
77+ they’re not fully isolated from the host. See
78+ <xref linkend="ch-containers"/> for details.
5679 </para>
5780 </listitem>
5881 <listitem>
5982 <para>
60− Systemd units provided by packages can now be overridden from the NixOS configuration. For instance, if a package <literal>foo</literal> provides systemd units, you can say:
83+ Systemd units provided by packages can now be overridden from the NixOS
84+ configuration. For instance, if a package <literal>foo</literal> provides
85+ systemd units, you can say:
6186<programlisting>
6287systemd.packages = [ pkgs.foo ];
6388</programlisting>
64− to enable those units. You can then set or override unit options in the usual way, e.g.
89+ to enable those units. You can then set or override unit options in the
90+ usual way, e.g.
6591<programlisting>
6692systemd.services.foo.wantedBy = [ "multi-user.target" ];
6793systemd.services.foo.serviceConfig.MemoryLimit = "512M";
@@ -72,11 +98,14 @@ systemd.services.foo.serviceConfig.MemoryLimit = "512M";
7298 </para>
7399
74100 <para>
75− When upgrading from a previous release, please be aware of the following incompatible changes:
101+ When upgrading from a previous release, please be aware of the following
102+ incompatible changes:
76103 <itemizedlist>
77104 <listitem>
78105 <para>
79− 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:
106+ Nixpkgs no longer exposes unfree packages by default. If your NixOS
107+ configuration requires unfree packages from Nixpkgs, you need to enable
108+ support for them explicitly by setting:
80109<programlisting>
81110nixpkgs.config.allowUnfree = true;
82111</programlisting>
@@ -89,7 +118,8 @@ error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:
89118 </listitem>
90119 <listitem>
91120 <para>
92− The Adobe Flash player is no longer enabled by default in the Firefox and Chromium wrappers. To enable it, you must set:
121+ The Adobe Flash player is no longer enabled by default in the Firefox and
122+ Chromium wrappers. To enable it, you must set:
93123<programlisting>
94124nixpkgs.config.allowUnfree = true;
95125nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox
@@ -99,7 +129,8 @@ nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium
99129 </listitem>
100130 <listitem>
101131 <para>
102− The firewall is now enabled by default. If you don’t want this, you need to disable it explicitly:
132+ The firewall is now enabled by default. If you don’t want this, you need
133+ to disable it explicitly:
103134<programlisting>
104135networking.firewall.enable = false;
105136</programlisting>
@@ -107,22 +138,40 @@ networking.firewall.enable = false;
107138 </listitem>
108139 <listitem>
109140 <para>
110− The option <option>boot.loader.grub.memtest86</option> has been renamed to <option>boot.loader.grub.memtest86.enable</option>.
141+ The option <option>boot.loader.grub.memtest86</option> has been renamed to
142+ <option>boot.loader.grub.memtest86.enable</option>.
111143 </para>
112144 </listitem>
113145 <listitem>
114146 <para>
115− The <literal>mysql55</literal> service has been merged into the <literal>mysql</literal> service, which no longer sets a default for the option <option>services.mysql.package</option>.
147+ The <literal>mysql55</literal> service has been merged into the
148+ <literal>mysql</literal> service, which no longer sets a default for the
149+ option <option>services.mysql.package</option>.
116150 </para>
117151 </listitem>
118152 <listitem>
119153 <para>
120− Package variants are now differentiated by suffixing the name, rather than the version. For instance, <filename>sqlite-3.8.4.3-interactive</filename> is now called <filename>sqlite-interactive-3.8.4.3</filename>. This ensures that <literal>nix-env -i sqlite</literal> is unambiguous, and that <literal>nix-env -u</literal> won’t “upgrade” <literal>sqlite</literal> to <literal>sqlite-interactive</literal> or vice versa. Notably, this change affects the Firefox wrapper (which provides plugins), as it is now called <literal>firefox-wrapper</literal>. So when using <command>nix-env</command>, you should do <literal>nix-env -e firefox; nix-env -i firefox-wrapper</literal> if you want to keep using the wrapper. This change does not affect declarative package management, since attribute names like <literal>pkgs.firefoxWrapper</literal> were already unambiguous.
154+ Package variants are now differentiated by suffixing the name, rather than
155+ the version. For instance, <filename>sqlite-3.8.4.3-interactive</filename>
156+ is now called <filename>sqlite-interactive-3.8.4.3</filename>. This
157+ ensures that <literal>nix-env -i sqlite</literal> is unambiguous, and that
158+ <literal>nix-env -u</literal> won’t “upgrade”
159+ <literal>sqlite</literal> to <literal>sqlite-interactive</literal> or vice
160+ versa. Notably, this change affects the Firefox wrapper (which provides
161+ plugins), as it is now called <literal>firefox-wrapper</literal>. So when
162+ using <command>nix-env</command>, you should do <literal>nix-env -e
163+ firefox; nix-env -i firefox-wrapper</literal> if you want to keep using
164+ the wrapper. This change does not affect declarative package management,
165+ since attribute names like <literal>pkgs.firefoxWrapper</literal> were
166+ already unambiguous.
121167 </para>
122168 </listitem>
123169 <listitem>
124170 <para>
125− The symlink <filename>/etc/ca-bundle.crt</filename> is gone. Programs should instead use the environment variable <envar>OPENSSL_X509_CERT_FILE</envar> (which points to <filename>/etc/ssl/certs/ca-bundle.crt</filename>).
171+ The symlink <filename>/etc/ca-bundle.crt</filename> is gone. Programs
172+ should instead use the environment variable
173+ <envar>OPENSSL_X509_CERT_FILE</envar> (which points to
174+ <filename>/etc/ssl/certs/ca-bundle.crt</filename>).
126175 </para>
127176 </listitem>
128177 </itemizedlist>
nixos/doc/manual/release-notes/rl-1412.xml+62−19
@@ -6,16 +6,19 @@
66 <title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
77
88 <para>
9− In addition to numerous new and upgraded packages, this release has the following highlights:
9+ In addition to numerous new and upgraded packages, this release has the
10+ following highlights:
1011 <itemizedlist>
1112 <listitem>
1213 <para>
13− Systemd has been updated to version 217, which has numerous <link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link>
14+ Systemd has been updated to version 217, which has numerous
15+ <link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link>
1416 </para>
1517 </listitem>
1618 <listitem>
1719 <para>
18− <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html"> Nix has been updated to 1.8.</link>
20+ <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
21+ Nix has been updated to 1.8.</link>
1922 </para>
2023 </listitem>
2124 <listitem>
@@ -35,7 +38,13 @@
3538 </listitem>
3639 <listitem>
3740 <para>
38− If <option>users.mutableUsers</option> is enabled (the default), changes made to the declaration of a user or group will be correctly realised when running <command>nixos-rebuild</command>. For instance, removing a user specification from <filename>configuration.nix</filename> will cause the actual user account to be deleted. If <option>users.mutableUsers</option> is disabled, it is no longer necessary to specify UIDs or GIDs; if omitted, they are allocated dynamically.
41+ If <option>users.mutableUsers</option> is enabled (the default), changes
42+ made to the declaration of a user or group will be correctly realised when
43+ running <command>nixos-rebuild</command>. For instance, removing a user
44+ specification from <filename>configuration.nix</filename> will cause the
45+ actual user account to be deleted. If <option>users.mutableUsers</option>
46+ is disabled, it is no longer necessary to specify UIDs or GIDs; if
47+ omitted, they are allocated dynamically.
3948 </para>
4049 </listitem>
4150 </itemizedlist>
@@ -353,12 +362,18 @@
353362 </para>
354363
355364 <para>
356− When upgrading from a previous release, please be aware of the following incompatible changes:
365+ When upgrading from a previous release, please be aware of the following
366+ incompatible changes:
357367 <itemizedlist>
358368 <listitem>
359369 <para>
360− The default version of Apache httpd is now 2.4. If you use the <option>extraConfig</option> option to pass literal Apache configuration text, you may need to update it — see <link
361−xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s documentation</link> for details. If you wish to continue to use httpd 2.2, add the following line to your NixOS configuration:
370+ The default version of Apache httpd is now 2.4. If you use the
371+ <option>extraConfig</option> option to pass literal Apache configuration
372+ text, you may need to update it — see
373+ <link
374+xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s
375+ documentation</link> for details. If you wish to continue to use httpd
376+ 2.2, add the following line to your NixOS configuration:
362377<programlisting>
363378services.httpd.package = pkgs.apacheHttpd_2_2;
364379</programlisting>
@@ -366,57 +381,85 @@ services.httpd.package = pkgs.apacheHttpd_2_2;
366381 </listitem>
367382 <listitem>
368383 <para>
369− PHP 5.3 has been removed because it is no longer supported by the PHP project. A <link
370−xlink:href="http://php.net/migration54">migration guide</link> is available.
384+ PHP 5.3 has been removed because it is no longer supported by the PHP
385+ project. A <link
386+xlink:href="http://php.net/migration54">migration
387+ guide</link> is available.
371388 </para>
372389 </listitem>
373390 <listitem>
374391 <para>
375− The host side of a container virtual Ethernet pair is now called <literal>ve-<replaceable>container-name</replaceable></literal> rather than <literal>c-<replaceable>container-name</replaceable></literal>.
392+ The host side of a container virtual Ethernet pair is now called
393+ <literal>ve-<replaceable>container-name</replaceable></literal> rather
394+ than <literal>c-<replaceable>container-name</replaceable></literal>.
376395 </para>
377396 </listitem>
378397 <listitem>
379398 <para>
380− GNOME 3.10 support has been dropped. The default GNOME version is now 3.12.
399+ GNOME 3.10 support has been dropped. The default GNOME version is now
400+ 3.12.
381401 </para>
382402 </listitem>
383403 <listitem>
384404 <para>
385− VirtualBox has been upgraded to 4.3.20 release. Users may be required to run <command>rm -rf /tmp/.vbox*</command>. The line <literal>imports = [ &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is no longer necessary, use <literal>services.virtualboxHost.enable = true</literal> instead.
405+ VirtualBox has been upgraded to 4.3.20 release. Users may be required to
406+ run <command>rm -rf /tmp/.vbox*</command>. The line <literal>imports = [
407+ &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is no
408+ longer necessary, use <literal>services.virtualboxHost.enable =
409+ true</literal> instead.
386410 </para>
387411 <para>
388− 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 <literal>vboxusers</literal> group.
412+ Also, hardening mode is now enabled by default, which means that unless
413+ you want to use USB support, you no longer need to be a member of the
414+ <literal>vboxusers</literal> group.
389415 </para>
390416 </listitem>
391417 <listitem>
392418 <para>
393− Chromium has been updated to 39.0.2171.65. <option>enablePepperPDF</option> is now enabled by default. <literal>chromium*Wrapper</literal> packages no longer exist, because upstream removed NSAPI support. <literal>chromium-stable</literal> has been renamed to <literal>chromium</literal>.
419+ Chromium has been updated to 39.0.2171.65.
420+ <option>enablePepperPDF</option> is now enabled by default.
421+ <literal>chromium*Wrapper</literal> packages no longer exist, because
422+ upstream removed NSAPI support. <literal>chromium-stable</literal> has
423+ been renamed to <literal>chromium</literal>.
394424 </para>
395425 </listitem>
396426 <listitem>
397427 <para>
398− Python packaging documentation is now part of nixpkgs manual. To override the python packages available to a custom python you now use <literal>pkgs.pythonFull.buildEnv.override</literal> instead of <literal>pkgs.pythonFull.override</literal>.
428+ Python packaging documentation is now part of nixpkgs manual. To override
429+ the python packages available to a custom python you now use
430+ <literal>pkgs.pythonFull.buildEnv.override</literal> instead of
431+ <literal>pkgs.pythonFull.override</literal>.
399432 </para>
400433 </listitem>
401434 <listitem>
402435 <para>
403− <literal>boot.resumeDevice = "8:6"</literal> 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.
436+ <literal>boot.resumeDevice = "8:6"</literal> is no longer supported. Most
437+ users will want to leave it undefined, which takes the swap partitions
438+ automatically. There is an evaluation assertion to ensure that the string
439+ starts with a slash.
404440 </para>
405441 </listitem>
406442 <listitem>
407443 <para>
408− The system-wide default timezone for NixOS installations changed from <literal>CET</literal> to <literal>UTC</literal>. To choose a different timezone for your system, configure <literal>time.timeZone</literal> in <literal>configuration.nix</literal>. A fairly complete list of possible values for that setting is available at <link
444+ The system-wide default timezone for NixOS installations changed from
445+ <literal>CET</literal> to <literal>UTC</literal>. To choose a different
446+ timezone for your system, configure <literal>time.timeZone</literal> in
447+ <literal>configuration.nix</literal>. A fairly complete list of possible
448+ values for that setting is available at
449+ <link
409450xlink:href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"/>.
410451 </para>
411452 </listitem>
412453 <listitem>
413454 <para>
414− GNU screen has been updated to 4.2.1, which breaks the ability to connect to sessions created by older versions of screen.
455+ GNU screen has been updated to 4.2.1, which breaks the ability to connect
456+ to sessions created by older versions of screen.
415457 </para>
416458 </listitem>
417459 <listitem>
418460 <para>
419− The Intel GPU driver was updated to the 3.x prerelease version (used by most distributions) and supports DRI3 now.
461+ The Intel GPU driver was updated to the 3.x prerelease version (used by
462+ most distributions) and supports DRI3 now.
420463 </para>
421464 </listitem>
422465 </itemizedlist>
nixos/doc/manual/release-notes/rl-1509.xml+163−45
@@ -6,23 +6,42 @@
66 <title>Release 15.09 (“Dingo”, 2015/09/30)</title>
77
88 <para>
9− In addition to numerous new and upgraded packages, this release has the following highlights:
9+ In addition to numerous new and upgraded packages, this release has the
10+ following highlights:
1011 </para>
1112
1213 <itemizedlist>
1314 <listitem>
1415 <para>
15− The <link xlink:href="http://haskell.org/">Haskell</link> packages infrastructure has been re-designed from the ground up (&quot;Haskell NG&quot;). NixOS now distributes the latest version of every single package registered on <link
16− xlink:href="http://hackage.haskell.org/">Hackage</link> -- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the <link
17− xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure</link>. 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 <link
18− xlink:href="http://www.stackage.org/">LTS Haskell</link> release since version 0.0 as well as the most recent <link
19− xlink:href="http://www.stackage.org/">Stackage Nightly</link> snapshot. The announcement <link
20− xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">&quot;Full Stackage Support in Nixpkgs&quot;</link> gives additional details.
16+ The <link xlink:href="http://haskell.org/">Haskell</link> packages
17+ infrastructure has been re-designed from the ground up (&quot;Haskell
18+ NG&quot;). NixOS now distributes the latest version of every single package
19+ registered on
20+ <link
21+ xlink:href="http://hackage.haskell.org/">Hackage</link> -- well
22+ in excess of 8,000 Haskell packages. Detailed instructions on how to use
23+ that infrastructure can be found in the
24+ <link
25+ xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's
26+ Guide to the Haskell Infrastructure</link>. Users migrating from an earlier
27+ release may find helpful information below, in the list of
28+ backwards-incompatible changes. Furthermore, we distribute 51(!) additional
29+ Haskell package sets that provide every single
30+ <link
31+ xlink:href="http://www.stackage.org/">LTS Haskell</link> release
32+ since version 0.0 as well as the most recent
33+ <link
34+ xlink:href="http://www.stackage.org/">Stackage Nightly</link>
35+ snapshot. The announcement
36+ <link
37+ xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">&quot;Full
38+ Stackage Support in Nixpkgs&quot;</link> gives additional details.
2139 </para>
2240 </listitem>
2341 <listitem>
2442 <para>
25− Nix has been updated to version 1.10, which among other improvements enables cryptographic signatures on binary caches for improved security.
43+ Nix has been updated to version 1.10, which among other improvements
44+ enables cryptographic signatures on binary caches for improved security.
2645 </para>
2746 </listitem>
2847 <listitem>
@@ -31,7 +50,8 @@
3150<programlisting>
3251system.autoUpgrade.enable = true;
3352</programlisting>
34− This will cause the system to periodically check for updates in your current channel and run <command>nixos-rebuild</command>.
53+ This will cause the system to periodically check for updates in your
54+ current channel and run <command>nixos-rebuild</command>.
3555 </para>
3656 </listitem>
3757 <listitem>
@@ -51,7 +71,8 @@ system.autoUpgrade.enable = true;
5171 </listitem>
5272 <listitem>
5373 <para>
54− 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.
74+ KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and
75+ Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10.
5576 </para>
5677 </listitem>
5778 <listitem>
@@ -403,61 +424,93 @@ system.autoUpgrade.enable = true;
403424 </para>
404425
405426 <para>
406− When upgrading from a previous release, please be aware of the following incompatible changes:
427+ When upgrading from a previous release, please be aware of the following
428+ incompatible changes:
407429 <itemizedlist>
408430 <listitem>
409431 <para>
410− <command>sshd</command> 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
432+ <command>sshd</command> no longer supports DSA and ECDSA host keys by
433+ default. If you have existing systems with such host keys and want to
434+ continue to use them, please set
411435<programlisting>
412436system.stateVersion = "14.12";
413437</programlisting>
414− The new option <option>system.stateVersion</option> ensures that certain configuration changes that could break existing systems (such as the <command>sshd</command> host key setting) will maintain compatibility with the specified NixOS release. NixOps sets the state version of existing deployments automatically.
438+ The new option <option>system.stateVersion</option> ensures that certain
439+ configuration changes that could break existing systems (such as the
440+ <command>sshd</command> host key setting) will maintain compatibility with
441+ the specified NixOS release. NixOps sets the state version of existing
442+ deployments automatically.
415443 </para>
416444 </listitem>
417445 <listitem>
418446 <para>
419− <command>cron</command> is no longer enabled by default, unless you have a non-empty <option>services.cron.systemCronJobs</option>. To force <command>cron</command> to be enabled, set <option>services.cron.enable = true</option>.
447+ <command>cron</command> is no longer enabled by default, unless you have a
448+ non-empty <option>services.cron.systemCronJobs</option>. To force
449+ <command>cron</command> to be enabled, set <option>services.cron.enable =
450+ true</option>.
420451 </para>
421452 </listitem>
422453 <listitem>
423454 <para>
424− 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 <option>nix.requireSignedBinaryCaches = false</option>.
455+ Nix now requires binary caches to be cryptographically signed. If you have
456+ unsigned binary caches that you want to continue to use, you should set
457+ <option>nix.requireSignedBinaryCaches = false</option>.
425458 </para>
426459 </listitem>
427460 <listitem>
428461 <para>
429− Steam now doesn't need root rights to work. Instead of using <literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>. <literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>, and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
462+ Steam now doesn't need root rights to work. Instead of using
463+ <literal>*-steam-chrootenv</literal>, you should now just run
464+ <literal>steam</literal>. <literal>steamChrootEnv</literal> package was
465+ renamed to <literal>steam</literal>, and old <literal>steam</literal>
466+ package -- to <literal>steamOriginal</literal>.
430467 </para>
431468 </listitem>
432469 <listitem>
433470 <para>
434− CMPlayer has been renamed to bomi upstream. Package <literal>cmplayer</literal> was accordingly renamed to <literal>bomi</literal>
471+ CMPlayer has been renamed to bomi upstream. Package
472+ <literal>cmplayer</literal> was accordingly renamed to
473+ <literal>bomi</literal>
435474 </para>
436475 </listitem>
437476 <listitem>
438477 <para>
439− Atom Shell has been renamed to Electron upstream. Package <literal>atom-shell</literal> was accordingly renamed to <literal>electron</literal>
478+ Atom Shell has been renamed to Electron upstream. Package
479+ <literal>atom-shell</literal> was accordingly renamed to
480+ <literal>electron</literal>
440481 </para>
441482 </listitem>
442483 <listitem>
443484 <para>
444− Elm is not released on Hackage anymore. You should now use <literal>elmPackages.elm</literal> which contains the latest Elm platform.
485+ Elm is not released on Hackage anymore. You should now use
486+ <literal>elmPackages.elm</literal> which contains the latest Elm platform.
445487 </para>
446488 </listitem>
447489 <listitem>
448490 <para>
449− The CUPS printing service has been updated to version <literal>2.0.2</literal>. Furthermore its systemd service has been renamed to <literal>cups.service</literal>.
491+ The CUPS printing service has been updated to version
492+ <literal>2.0.2</literal>. Furthermore its systemd service has been renamed
493+ to <literal>cups.service</literal>.
450494 </para>
451495 <para>
452− Local printers are no longer shared or advertised by default. This behavior can be changed by enabling <option>services.printing.defaultShared</option> or <option>services.printing.browsing</option> respectively.
496+ Local printers are no longer shared or advertised by default. This
497+ behavior can be changed by enabling
498+ <option>services.printing.defaultShared</option> or
499+ <option>services.printing.browsing</option> respectively.
453500 </para>
454501 </listitem>
455502 <listitem>
456503 <para>
457− The VirtualBox host and guest options have been named more consistently. They can now found in <option>virtualisation.virtualbox.host.*</option> instead of <option>services.virtualboxHost.*</option> and <option>virtualisation.virtualbox.guest.*</option> instead of <option>services.virtualboxGuest.*</option>.
504+ The VirtualBox host and guest options have been named more consistently.
505+ They can now found in <option>virtualisation.virtualbox.host.*</option>
506+ instead of <option>services.virtualboxHost.*</option> and
507+ <option>virtualisation.virtualbox.guest.*</option> instead of
508+ <option>services.virtualboxGuest.*</option>.
458509 </para>
459510 <para>
460− Also, there now is support for the <literal>vboxsf</literal> file system using the <option>fileSystems</option> configuration attribute. An example of how this can be used in a configuration:
511+ Also, there now is support for the <literal>vboxsf</literal> file system
512+ using the <option>fileSystems</option> configuration attribute. An example
513+ of how this can be used in a configuration:
461514<programlisting>
462515fileSystems."/shiny" = {
463516 device = "myshinysharedfolder";
@@ -468,7 +521,15 @@ fileSystems."/shiny" = {
468521 </listitem>
469522 <listitem>
470523 <para>
471− &quot;<literal>nix-env -qa</literal>&quot; no longer discovers Haskell packages by name. The only packages visible in the global scope are <literal>ghc</literal>, <literal>cabal-install</literal>, and <literal>stack</literal>, 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 <literal>nix-env -qa</literal> 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:
524+ &quot;<literal>nix-env -qa</literal>&quot; no longer discovers Haskell
525+ packages by name. The only packages visible in the global scope are
526+ <literal>ghc</literal>, <literal>cabal-install</literal>, and
527+ <literal>stack</literal>, but all other packages are hidden. The reason
528+ for this inconvenience is the sheer size of the Haskell package set.
529+ Name-based lookups are expensive, and most <literal>nix-env -qa</literal>
530+ operations would become much slower if we'd add the entire Hackage
531+ database into the top level attribute set. Instead, the list of Haskell
532+ packages can be displayed by running:
472533 </para>
473534<programlisting>
474535nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskellPackages
@@ -480,56 +541,91 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskellPackages
480541nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.pandoc
481542</programlisting>
482543 <para>
483− Installing Haskell <emphasis>libraries</emphasis> this way, however, is no longer supported. See the next item for more details.
544+ Installing Haskell <emphasis>libraries</emphasis> this way, however, is no
545+ longer supported. See the next item for more details.
484546 </para>
485547 </listitem>
486548 <listitem>
487549 <para>
488− Previous versions of NixOS came with a feature called <literal>ghc-wrapper</literal>, a small script that allowed GHC to transparently pick up on libraries installed in the user's profile. This feature has been deprecated; <literal>ghc-wrapper</literal> was removed from the distribution. The proper way to register Haskell libraries with the compiler now is the <literal>haskellPackages.ghcWithPackages</literal> function. The <link
489− xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure</link> provides more information about this subject.
550+ Previous versions of NixOS came with a feature called
551+ <literal>ghc-wrapper</literal>, a small script that allowed GHC to
552+ transparently pick up on libraries installed in the user's profile. This
553+ feature has been deprecated; <literal>ghc-wrapper</literal> was removed
554+ from the distribution. The proper way to register Haskell libraries with
555+ the compiler now is the <literal>haskellPackages.ghcWithPackages</literal>
556+ function. The
557+ <link
558+ xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's
559+ Guide to the Haskell Infrastructure</link> provides more information about
560+ this subject.
490561 </para>
491562 </listitem>
492563 <listitem>
493564 <para>
494− All Haskell builds that have been generated with version 1.x of the <literal>cabal2nix</literal> utility are now invalid and need to be re-generated with a current version of <literal>cabal2nix</literal> to function. The most recent version of this tool can be installed by running <literal>nix-env -i cabal2nix</literal>.
565+ All Haskell builds that have been generated with version 1.x of the
566+ <literal>cabal2nix</literal> utility are now invalid and need to be
567+ re-generated with a current version of <literal>cabal2nix</literal> to
568+ function. The most recent version of this tool can be installed by running
569+ <literal>nix-env -i cabal2nix</literal>.
495570 </para>
496571 </listitem>
497572 <listitem>
498573 <para>
499− The <literal>haskellPackages</literal> set in Nixpkgs used to have a function attribute called <literal>extension</literal> that users could override in their <literal>~/.nixpkgs/config.nix</literal> files to configure additional attributes, etc. That function still exists, but it's now called <literal>overrides</literal>.
574+ The <literal>haskellPackages</literal> set in Nixpkgs used to have a
575+ function attribute called <literal>extension</literal> that users could
576+ override in their <literal>~/.nixpkgs/config.nix</literal> files to
577+ configure additional attributes, etc. That function still exists, but it's
578+ now called <literal>overrides</literal>.
500579 </para>
501580 </listitem>
502581 <listitem>
503582 <para>
504− The OpenBLAS library has been updated to version <literal>0.2.14</literal>. Support for the <literal>x86_64-darwin</literal> 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.
583+ The OpenBLAS library has been updated to version
584+ <literal>0.2.14</literal>. Support for the
585+ <literal>x86_64-darwin</literal> platform was added. Dynamic architecture
586+ detection was enabled; OpenBLAS now selects microarchitecture-optimized
587+ routines at runtime, so optimal performance is achieved without the need
588+ to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages
589+ which use an optimized BLAS or LAPACK implementation.
505590 </para>
506591 </listitem>
507592 <listitem>
508593 <para>
509− The <literal>phpfpm</literal> is now using the default PHP version (<literal>pkgs.php</literal>) instead of PHP 5.4 (<literal>pkgs.php54</literal>).
594+ The <literal>phpfpm</literal> is now using the default PHP version
595+ (<literal>pkgs.php</literal>) instead of PHP 5.4
596+ (<literal>pkgs.php54</literal>).
510597 </para>
511598 </listitem>
512599 <listitem>
513600 <para>
514− The <literal>locate</literal> 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 <option>services.locate.includeStore = true</option>.
601+ The <literal>locate</literal> service no longer indexes the Nix store by
602+ default, preventing packages with potentially numerous versions from
603+ cluttering the output. Indexing the store can be activated by setting
604+ <option>services.locate.includeStore = true</option>.
515605 </para>
516606 </listitem>
517607 <listitem>
518608 <para>
519− The Nix expression search path (<envar>NIX_PATH</envar>) no longer contains <filename>/etc/nixos/nixpkgs</filename> by default. You can override <envar>NIX_PATH</envar> by setting <option>nix.nixPath</option>.
609+ The Nix expression search path (<envar>NIX_PATH</envar>) no longer
610+ contains <filename>/etc/nixos/nixpkgs</filename> by default. You can
611+ override <envar>NIX_PATH</envar> by setting <option>nix.nixPath</option>.
520612 </para>
521613 </listitem>
522614 <listitem>
523615 <para>
524− Python 2.6 has been marked as broken (as it no longer receives security updates from upstream).
616+ Python 2.6 has been marked as broken (as it no longer receives security
617+ updates from upstream).
525618 </para>
526619 </listitem>
527620 <listitem>
528621 <para>
529− Any use of module arguments such as <varname>pkgs</varname> to access library functions, or to define <literal>imports</literal> attributes will now lead to an infinite loop at the time of the evaluation.
622+ Any use of module arguments such as <varname>pkgs</varname> to access
623+ library functions, or to define <literal>imports</literal> attributes will
624+ now lead to an infinite loop at the time of the evaluation.
530625 </para>
531626 <para>
532− In case of an infinite loop, use the <command>--show-trace</command> command line argument and read the line just above the error message.
627+ In case of an infinite loop, use the <command>--show-trace</command>
628+ command line argument and read the line just above the error message.
533629<screen>
534630<prompt>$ </prompt>nixos-rebuild build --show-trace
535631…
@@ -538,7 +634,9 @@ infinite recursion encountered
538634</screen>
539635 </para>
540636 <para>
541− Any use of <literal>pkgs.lib</literal>, should be replaced by <varname>lib</varname>, after adding it as argument of the module. The following module
637+ Any use of <literal>pkgs.lib</literal>, should be replaced by
638+ <varname>lib</varname>, after adding it as argument of the module. The
639+ following module
542640<programlisting>
543641{ config, pkgs, ... }:
544642
@@ -566,7 +664,9 @@ with lib;
566664</programlisting>
567665 </para>
568666 <para>
569− When <varname>pkgs</varname> is used to download other projects to import their modules, and only in such cases, it should be replaced by <literal>(import &lt;nixpkgs&gt; {})</literal>. The following module
667+ When <varname>pkgs</varname> is used to download other projects to import
668+ their modules, and only in such cases, it should be replaced by
669+ <literal>(import &lt;nixpkgs&gt; {})</literal>. The following module
570670<programlisting>
571671{ config, pkgs, ... }:
572672
@@ -606,25 +706,43 @@ in
606706 <itemizedlist>
607707 <listitem>
608708 <para>
609− The nixos and nixpkgs channels were unified, so one <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal> instead of <literal>nix-env -iA nixos.pkgs.bash</literal>. See <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the commit</link> for details.
709+ The nixos and nixpkgs channels were unified, so one
710+ <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal>
711+ instead of <literal>nix-env -iA nixos.pkgs.bash</literal>. See
712+ <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the
713+ commit</link> for details.
610714 </para>
611715 </listitem>
612716 <listitem>
613717 <para>
614− Users running an SSH server who worry about the quality of their <literal>/etc/ssh/moduli</literal> file with respect to the <link
615− xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities discovered in the Diffie-Hellman key exchange</link> can now replace OpenSSH's default version with one they generated themselves using the new <option>services.openssh.moduliFile</option> option.
718+ Users running an SSH server who worry about the quality of their
719+ <literal>/etc/ssh/moduli</literal> file with respect to the
720+ <link
721+ xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities
722+ discovered in the Diffie-Hellman key exchange</link> can now replace
723+ OpenSSH's default version with one they generated themselves using the new
724+ <option>services.openssh.moduliFile</option> option.
616725 </para>
617726 </listitem>
618727 <listitem>
619728 <para>
620− A newly packaged TeX Live 2015 is provided in <literal>pkgs.texlive</literal>, split into 6500 nix packages. For basic user documentation see <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1"
621− >the source</link>. Beware of <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757"
622− >an issue</link> when installing a too large package set. The plan is to deprecate and maybe delete the original TeX packages until the next release.
729+ A newly packaged TeX Live 2015 is provided in
730+ <literal>pkgs.texlive</literal>, split into 6500 nix packages. For basic
731+ user documentation see
732+ <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1"
733+ >the
734+ source</link>. Beware of
735+ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757"
736+ >an
737+ issue</link> when installing a too large package set. The plan is to
738+ deprecate and maybe delete the original TeX packages until the next
739+ release.
623740 </para>
624741 </listitem>
625742 <listitem>
626743 <para>
627− <option>buildEnv.env</option> on all Python interpreters is now available for nix-shell interoperability.
744+ <option>buildEnv.env</option> on all Python interpreters is now available
745+ for nix-shell interoperability.
628746 </para>
629747 </listitem>
630748 </itemizedlist>
nixos/doc/manual/release-notes/rl-1603.xml+164−41
@@ -6,14 +6,17 @@
66 <title>Release 16.03 (“Emu”, 2016/03/31)</title>
77
88 <para>
9− In addition to numerous new and upgraded packages, this release has the following highlights:
9+ In addition to numerous new and upgraded packages, this release has the
10+ following highlights:
1011 </para>
1112
1213 <itemizedlist>
1314 <listitem>
1415 <para>
15− Systemd 229, bringing <link
16− xlink:href="https://github.com/systemd/systemd/blob/v229/NEWS">numerous improvements</link> over 217.
16+ Systemd 229, bringing
17+ <link
18+ xlink:href="https://github.com/systemd/systemd/blob/v229/NEWS">numerous
19+ improvements</link> over 217.
1720 </para>
1821 </listitem>
1922 <listitem>
@@ -23,8 +26,11 @@
2326 </listitem>
2427 <listitem>
2528 <para>
26− GCC 5.3 (was 4.9). Note that GCC 5 <link
27− xlink:href="https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html">changes the C++ ABI in an incompatible way</link>; this may cause problems if you try to link objects compiled with different versions of GCC.
29+ GCC 5.3 (was 4.9). Note that GCC 5
30+ <link
31+ xlink:href="https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html">changes
32+ the C++ ABI in an incompatible way</link>; this may cause problems if you
33+ try to link objects compiled with different versions of GCC.
2834 </para>
2935 </listitem>
3036 <listitem>
@@ -39,10 +45,20 @@
3945 </listitem>
4046 <listitem>
4147 <para>
42− Improved support for ensuring <link
43− xlink:href="https://reproducible-builds.org/">bitwise reproducible builds</link>. For example, <literal>stdenv</literal> now sets the environment variable <envar
44− xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH</envar> to a deterministic value, and Nix has <link
45− xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.11">gained an option</link> 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).
48+ Improved support for ensuring
49+ <link
50+ xlink:href="https://reproducible-builds.org/">bitwise
51+ reproducible builds</link>. For example, <literal>stdenv</literal> now sets
52+ the environment variable
53+ <envar
54+ xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH</envar>
55+ to a deterministic value, and Nix has
56+ <link
57+ xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.11">gained
58+ an option</link> to repeat a build a number of times to test determinism.
59+ An ongoing project, the goal of exact reproducibility is to allow binaries
60+ to be verified independently (e.g., a user might only trust binaries that
61+ appear in three independent binary caches).
4662 </para>
4763 </listitem>
4864 <listitem>
@@ -319,38 +335,56 @@
319335 </para>
320336
321337 <para>
322− When upgrading from a previous release, please be aware of the following incompatible changes:
338+ When upgrading from a previous release, please be aware of the following
339+ incompatible changes:
323340 </para>
324341
325342 <itemizedlist>
326343 <listitem>
327344 <para>
328− We no longer produce graphical ISO images and VirtualBox images for <literal>i686-linux</literal>. A minimal ISO image is still provided.
345+ We no longer produce graphical ISO images and VirtualBox images for
346+ <literal>i686-linux</literal>. A minimal ISO image is still provided.
329347 </para>
330348 </listitem>
331349 <listitem>
332350 <para>
333− Firefox and similar browsers are now <emphasis>wrapped by default</emphasis>. The package and attribute names are plain <literal>firefox</literal> or <literal>midori</literal>, etc. Backward-compatibility attributes were set up, but note that <command>nix-env -u</command> will <emphasis>not</emphasis> update your current <literal>firefox-with-plugins</literal>; you have to uninstall it and install <literal>firefox</literal> instead.
351+ Firefox and similar browsers are now <emphasis>wrapped by
352+ default</emphasis>. The package and attribute names are plain
353+ <literal>firefox</literal> or <literal>midori</literal>, etc.
354+ Backward-compatibility attributes were set up, but note that
355+ <command>nix-env -u</command> will <emphasis>not</emphasis> update your
356+ current <literal>firefox-with-plugins</literal>; you have to uninstall it
357+ and install <literal>firefox</literal> instead.
334358 </para>
335359 </listitem>
336360 <listitem>
337361 <para>
338− <command>wmiiSnap</command> has been replaced with <command>wmii_hg</command>, but <command>services.xserver.windowManager.wmii.enable</command> has been updated respectively so this only affects you if you have explicitly installed <command>wmiiSnap</command>.
362+ <command>wmiiSnap</command> has been replaced with
363+ <command>wmii_hg</command>, but
364+ <command>services.xserver.windowManager.wmii.enable</command> has been
365+ updated respectively so this only affects you if you have explicitly
366+ installed <command>wmiiSnap</command>.
339367 </para>
340368 </listitem>
341369 <listitem>
342370 <para>
343− <literal>jobs</literal> NixOS option has been removed. It served as compatibility layer between Upstart jobs and SystemD services. All services have been rewritten to use <literal>systemd.services</literal>
371+ <literal>jobs</literal> NixOS option has been removed. It served as
372+ compatibility layer between Upstart jobs and SystemD services. All services
373+ have been rewritten to use <literal>systemd.services</literal>
344374 </para>
345375 </listitem>
346376 <listitem>
347377 <para>
348− <command>wmiimenu</command> is removed, as it has been removed by the developers upstream. Use <command>wimenu</command> from the <command>wmii-hg</command> package.
378+ <command>wmiimenu</command> is removed, as it has been removed by the
379+ developers upstream. Use <command>wimenu</command> from the
380+ <command>wmii-hg</command> package.
349381 </para>
350382 </listitem>
351383 <listitem>
352384 <para>
353− 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.
385+ Gitit is no longer automatically added to the module list in NixOS and as
386+ such there will not be any manual entries for it. You will need to add an
387+ import statement to your NixOS configuration in order to use it, e.g.
354388<programlisting><![CDATA[
355389{
356390 imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ];
@@ -361,7 +395,10 @@
361395 </listitem>
362396 <listitem>
363397 <para>
364− <command>nginx</command> does not accept flags for enabling and disabling modules anymore. Instead it accepts <literal>modules</literal> argument, which is a list of modules to be built in. All modules now reside in <literal>nginxModules</literal> set. Example configuration:
398+ <command>nginx</command> does not accept flags for enabling and disabling
399+ modules anymore. Instead it accepts <literal>modules</literal> argument,
400+ which is a list of modules to be built in. All modules now reside in
401+ <literal>nginxModules</literal> set. Example configuration:
365402<programlisting><![CDATA[
366403nginx.override {
367404 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
@@ -371,42 +408,66 @@ nginx.override {
371408 </listitem>
372409 <listitem>
373410 <para>
374− <command>s3sync</command> 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 <command>tarsnap</command> and others.
411+ <command>s3sync</command> is removed, as it hasn't been developed by
412+ upstream for 4 years and only runs with ruby 1.8. For an actively-developer
413+ alternative look at <command>tarsnap</command> and others.
375414 </para>
376415 </listitem>
377416 <listitem>
378417 <para>
379− <command>ruby_1_8</command> has been removed as it's not supported from upstream anymore and probably contains security issues.
418+ <command>ruby_1_8</command> has been removed as it's not supported from
419+ upstream anymore and probably contains security issues.
380420 </para>
381421 </listitem>
382422 <listitem>
383423 <para>
384− <literal>tidy-html5</literal> package is removed. Upstream only provided <literal>(lib)tidy5</literal> during development, and now they went back to <literal>(lib)tidy</literal> to work as a drop-in replacement of the original package that has been unmaintained for years. You can (still) use the <literal>html-tidy</literal> package, which got updated to a stable release from this new upstream.
424+ <literal>tidy-html5</literal> package is removed. Upstream only provided
425+ <literal>(lib)tidy5</literal> during development, and now they went back to
426+ <literal>(lib)tidy</literal> to work as a drop-in replacement of the
427+ original package that has been unmaintained for years. You can (still) use
428+ the <literal>html-tidy</literal> package, which got updated to a stable
429+ release from this new upstream.
385430 </para>
386431 </listitem>
387432 <listitem>
388433 <para>
389− <literal>extraDeviceOptions</literal> argument is removed from <literal>bumblebee</literal> package. Instead there are now two separate arguments: <literal>extraNvidiaDeviceOptions</literal> and <literal>extraNouveauDeviceOptions</literal> for setting extra X11 options for nvidia and nouveau drivers, respectively.
434+ <literal>extraDeviceOptions</literal> argument is removed from
435+ <literal>bumblebee</literal> package. Instead there are now two separate
436+ arguments: <literal>extraNvidiaDeviceOptions</literal> and
437+ <literal>extraNouveauDeviceOptions</literal> for setting extra X11 options
438+ for nvidia and nouveau drivers, respectively.
390439 </para>
391440 </listitem>
392441 <listitem>
393442 <para>
394− The <literal>Ctrl+Alt+Backspace</literal> key combination no longer kills the X server by default. There's a new option <option>services.xserver.enableCtrlAltBackspace</option> allowing to enable the combination again.
443+ The <literal>Ctrl+Alt+Backspace</literal> key combination no longer kills
444+ the X server by default. There's a new option
445+ <option>services.xserver.enableCtrlAltBackspace</option> allowing to enable
446+ the combination again.
395447 </para>
396448 </listitem>
397449 <listitem>
398450 <para>
399− <literal>emacsPackagesNg</literal> now contains all packages from the ELPA, MELPA, and MELPA Stable repositories.
451+ <literal>emacsPackagesNg</literal> now contains all packages from the ELPA,
452+ MELPA, and MELPA Stable repositories.
400453 </para>
401454 </listitem>
402455 <listitem>
403456 <para>
404− Data directory for Postfix MTA server is moved from <filename>/var/postfix</filename> to <filename>/var/lib/postfix</filename>. Old configurations are migrated automatically. <literal>service.postfix</literal> module has also received many improvements, such as correct directories' access rights, new <literal>aliasFiles</literal> and <literal>mapFiles</literal> options and more.
457+ Data directory for Postfix MTA server is moved from
458+ <filename>/var/postfix</filename> to <filename>/var/lib/postfix</filename>.
459+ Old configurations are migrated automatically.
460+ <literal>service.postfix</literal> module has also received many
461+ improvements, such as correct directories' access rights, new
462+ <literal>aliasFiles</literal> and <literal>mapFiles</literal> options and
463+ more.
405464 </para>
406465 </listitem>
407466 <listitem>
408467 <para>
409− 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:
468+ Filesystem options should now be configured as a list of strings, not a
469+ comma-separated string. The old style will continue to work, but print a
470+ warning, until the 16.09 release. An example of the new style:
410471<programlisting>
411472fileSystems."/example" = {
412473 device = "/dev/sdc";
@@ -418,20 +479,44 @@ fileSystems."/example" = {
418479 </listitem>
419480 <listitem>
420481 <para>
421− CUPS, installed by <literal>services.printing</literal> module, now has its data directory in <filename>/var/lib/cups</filename>. Old configurations from <filename>/etc/cups</filename> are moved there automatically, but there might be problems. Also configuration options <literal>services.printing.cupsdConf</literal> and <literal>services.printing.cupsdFilesConf</literal> 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, <literal>services.printing.extraConf</literal> and new option <literal>services.printing.extraFilesConf</literal> should be enough; if you encounter a situation when they are not, please file a bug.
482+ CUPS, installed by <literal>services.printing</literal> module, now has its
483+ data directory in <filename>/var/lib/cups</filename>. Old configurations
484+ from <filename>/etc/cups</filename> are moved there automatically, but
485+ there might be problems. Also configuration options
486+ <literal>services.printing.cupsdConf</literal> and
487+ <literal>services.printing.cupsdFilesConf</literal> were removed because
488+ they had been allowing one to override configuration variables required for
489+ CUPS to work at all on NixOS. For most use cases,
490+ <literal>services.printing.extraConf</literal> and new option
491+ <literal>services.printing.extraFilesConf</literal> should be enough; if
492+ you encounter a situation when they are not, please file a bug.
422493 </para>
423494 <para>
424− There are also Gutenprint improvements; in particular, a new option <literal>services.printing.gutenprint</literal> is added to enable automatic updating of Gutenprint PPMs; it's greatly recommended to enable it instead of adding <literal>gutenprint</literal> to the <literal>drivers</literal> list.
495+ There are also Gutenprint improvements; in particular, a new option
496+ <literal>services.printing.gutenprint</literal> is added to enable
497+ automatic updating of Gutenprint PPMs; it's greatly recommended to enable
498+ it instead of adding <literal>gutenprint</literal> to the
499+ <literal>drivers</literal> list.
425500 </para>
426501 </listitem>
427502 <listitem>
428503 <para>
429− <literal>services.xserver.vaapiDrivers</literal> has been removed. Use <literal>hardware.opengl.extraPackages{,32}</literal> instead. You can also specify VDPAU drivers there.
504+ <literal>services.xserver.vaapiDrivers</literal> has been removed. Use
505+ <literal>hardware.opengl.extraPackages{,32}</literal> instead. You can also
506+ specify VDPAU drivers there.
430507 </para>
431508 </listitem>
432509 <listitem>
433510 <para>
434− <literal>programs.ibus</literal> moved to <literal>i18n.inputMethod.ibus</literal>. The option <literal>programs.ibus.plugins</literal> changed to <literal>i18n.inputMethod.ibus.engines</literal> and the option to enable ibus changed from <literal>programs.ibus.enable</literal> to <literal>i18n.inputMethod.enabled</literal>. <literal>i18n.inputMethod.enabled</literal> should be set to the used input method name, <literal>"ibus"</literal> for ibus. An example of the new style:
511+ <literal>programs.ibus</literal> moved to
512+ <literal>i18n.inputMethod.ibus</literal>. The option
513+ <literal>programs.ibus.plugins</literal> changed to
514+ <literal>i18n.inputMethod.ibus.engines</literal> and the option to enable
515+ ibus changed from <literal>programs.ibus.enable</literal> to
516+ <literal>i18n.inputMethod.enabled</literal>.
517+ <literal>i18n.inputMethod.enabled</literal> should be set to the used input
518+ method name, <literal>"ibus"</literal> for ibus. An example of the new
519+ style:
435520<programlisting>
436521i18n.inputMethod.enabled = "ibus";
437522i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ];
@@ -445,17 +530,26 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
445530 </listitem>
446531 <listitem>
447532 <para>
448− <literal>services.udev.extraRules</literal> option now writes rules to <filename>99-local.rules</filename> instead of <filename>10-local.rules</filename>. This makes all the user rules apply after others, so their results wouldn't be overriden by anything else.
533+ <literal>services.udev.extraRules</literal> option now writes rules to
534+ <filename>99-local.rules</filename> instead of
535+ <filename>10-local.rules</filename>. This makes all the user rules apply
536+ after others, so their results wouldn't be overriden by anything else.
449537 </para>
450538 </listitem>
451539 <listitem>
452540 <para>
453− Large parts of the <literal>services.gitlab</literal> module has been been rewritten. There are new configuration options available. The <literal>stateDir</literal> option was renamned to <literal>statePath</literal> and the <literal>satellitesDir</literal> option was removed. Please review the currently available options.
541+ Large parts of the <literal>services.gitlab</literal> module has been been
542+ rewritten. There are new configuration options available. The
543+ <literal>stateDir</literal> option was renamned to
544+ <literal>statePath</literal> and the <literal>satellitesDir</literal>
545+ option was removed. Please review the currently available options.
454546 </para>
455547 </listitem>
456548 <listitem>
457549 <para>
458− The option <option>services.nsd.zones.&lt;name&gt;.data</option> no longer interpret the dollar sign ($) as a shell variable, as such it should not be escaped anymore. Thus the following zone data:
550+ The option <option>services.nsd.zones.&lt;name&gt;.data</option> no longer
551+ interpret the dollar sign ($) as a shell variable, as such it should not be
552+ escaped anymore. Thus the following zone data:
459553 </para>
460554<programlisting>
461555\$ORIGIN example.com.
@@ -473,7 +567,9 @@ $TTL 1800
473567 </listitem>
474568 <listitem>
475569 <para>
476− <literal>service.syncthing.dataDir</literal> options now has to point to exact folder where syncthing is writing to. Example configuration should look something like:
570+ <literal>service.syncthing.dataDir</literal> options now has to point to
571+ exact folder where syncthing is writing to. Example configuration should
572+ look something like:
477573 </para>
478574<programlisting>
479575services.syncthing = {
@@ -485,24 +581,45 @@ services.syncthing = {
485581 </listitem>
486582 <listitem>
487583 <para>
488− <literal>networking.firewall.allowPing</literal> is now enabled by default. Users are encouraged to configure an appropriate rate limit for their machines using the Kernel interface at <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the firewall itself, i.e. by setting the NixOS option <literal>networking.firewall.pingLimit</literal>.
584+ <literal>networking.firewall.allowPing</literal> is now enabled by default.
585+ Users are encouraged to configure an appropriate rate limit for their
586+ machines using the Kernel interface at
587+ <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and
588+ <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the
589+ firewall itself, i.e. by setting the NixOS option
590+ <literal>networking.firewall.pingLimit</literal>.
489591 </para>
490592 </listitem>
491593 <listitem>
492594 <para>
493− Systems with some broadcom cards used to result into a generated config that is no longer accepted. If you get errors like
595+ Systems with some broadcom cards used to result into a generated config
596+ that is no longer accepted. If you get errors like
494597<screen>error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created</screen>
495− you should either re-run <command>nixos-generate-config</command> or manually replace <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal> by <literal>config.boot.kernelPackages.broadcom_sta</literal> in your <filename>/etc/nixos/hardware-configuration.nix</filename>. More discussion is on <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595"> the github issue</link>.
598+ you should either re-run <command>nixos-generate-config</command> or
599+ manually replace
600+ <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal> by
601+ <literal>config.boot.kernelPackages.broadcom_sta</literal> in your
602+ <filename>/etc/nixos/hardware-configuration.nix</filename>. More discussion
603+ is on <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595"> the
604+ github issue</link>.
496605 </para>
497606 </listitem>
498607 <listitem>
499608 <para>
500− The <literal>services.xserver.startGnuPGAgent</literal> 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 <filename>~/.bashrc</filename> or some file that’s sourced when your shell is started:
609+ The <literal>services.xserver.startGnuPGAgent</literal> option has been
610+ removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new
611+ approach no longer requires (or even supports) the "start everything as a
612+ child of the agent" scheme we've implemented in NixOS for older versions.
613+ To configure the gpg-agent for your X session, add the following code to
614+ <filename>~/.bashrc</filename> or some file that’s sourced when your
615+ shell is started:
501616<programlisting>
502617GPG_TTY=$(tty)
503618export GPG_TTY
504619 </programlisting>
505− If you want to use gpg-agent for SSH, too, add the following to your session initialization (e.g. <literal>displayManager.sessionCommands</literal>)
620+ If you want to use gpg-agent for SSH, too, add the following to your
621+ session initialization (e.g.
622+ <literal>displayManager.sessionCommands</literal>)
506623<programlisting>
507624gpg-connect-agent /bye
508625unset SSH_AGENT_PID
@@ -512,11 +629,15 @@ export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh"
512629<programlisting>
513630enable-ssh-support
514631 </programlisting>
515− is included in your <filename>~/.gnupg/gpg-agent.conf</filename>. You will need to use <command>ssh-add</command> 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:
632+ is included in your <filename>~/.gnupg/gpg-agent.conf</filename>. You will
633+ need to use <command>ssh-add</command> to re-add your ssh keys. If gpg’s
634+ automatic transformation of the private keys to the new format fails, you
635+ will need to re-import your private keyring as well:
516636<programlisting>
517637gpg --import ~/.gnupg/secring.gpg
518638 </programlisting>
519− The <command>gpg-agent(1)</command> man page has more details about this subject, i.e. in the "EXAMPLES" section.
639+ The <command>gpg-agent(1)</command> man page has more details about this
640+ subject, i.e. in the "EXAMPLES" section.
520641 </para>
521642 </listitem>
522643 </itemizedlist>
@@ -540,7 +661,9 @@ gpg --import ~/.gnupg/secring.gpg
540661 </listitem>
541662 <listitem>
542663 <para>
543− 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.
664+ Input method support was improved. New NixOS modules (fcitx, nabi and
665+ uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus
666+ engines (hangul and m17n) have been added.
544667 </para>
545668 </listitem>
546669 </itemizedlist>
nixos/doc/manual/release-notes/rl-1609.xml+126−35
@@ -6,36 +6,48 @@
66 <title>Release 16.09 (“Flounder”, 2016/09/30)</title>
77
88 <para>
9− In addition to numerous new and upgraded packages, this release has the following highlights:
9+ In addition to numerous new and upgraded packages, this release has the
10+ following highlights:
1011 </para>
1112
1213 <itemizedlist>
1314 <listitem>
1415 <para>
15− Many NixOS configurations and Nix packages now use significantly less disk space, thanks to the <link
16− xlink:href="https://github.com/NixOS/nixpkgs/issues/7117">extensive work on closure size reduction</link>. 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.
16+ Many NixOS configurations and Nix packages now use significantly less disk
17+ space, thanks to the
18+ <link
19+ xlink:href="https://github.com/NixOS/nixpkgs/issues/7117">extensive
20+ work on closure size reduction</link>. For example, the closure size of a
21+ minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in
22+ 16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB.
1723 </para>
1824 </listitem>
1925 <listitem>
2026 <para>
21− To improve security, packages are now <link
22− xlink:href="https://github.com/NixOS/nixpkgs/pull/12895">built using various hardening features</link>. See the Nixpkgs manual for more information.
27+ To improve security, packages are now
28+ <link
29+ xlink:href="https://github.com/NixOS/nixpkgs/pull/12895">built
30+ using various hardening features</link>. See the Nixpkgs manual for more
31+ information.
2332 </para>
2433 </listitem>
2534 <listitem>
2635 <para>
2736 Support for PXE netboot. See <xref
28− linkend="sec-booting-from-pxe" /> for documentation.
37+ linkend="sec-booting-from-pxe" />
38+ for documentation.
2939 </para>
3040 </listitem>
3141 <listitem>
3242 <para>
33− X.org server 1.18. If you use the <literal>ati_unfree</literal> driver, 1.17 is still used due to an ABI incompatibility.
43+ X.org server 1.18. If you use the <literal>ati_unfree</literal> driver,
44+ 1.17 is still used due to an ABI incompatibility.
3445 </para>
3546 </listitem>
3647 <listitem>
3748 <para>
38− This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default Linux kernel remains 4.4.
49+ This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default
50+ Linux kernel remains 4.4.
3951 </para>
4052 </listitem>
4153 </itemizedlist>
@@ -53,71 +65,122 @@
5365 </itemizedlist>
5466
5567 <para>
56− When upgrading from a previous release, please be aware of the following incompatible changes:
68+ When upgrading from a previous release, please be aware of the following
69+ incompatible changes:
5770 </para>
5871
5972 <itemizedlist>
6073 <listitem>
6174 <para>
62− 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 <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were changed</link> late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.)
75+ A large number of packages have been converted to use the multiple outputs
76+ feature of Nix to greatly reduce the amount of required disk space, as
77+ mentioned above. This may require changes to any custom packages to make
78+ them build again; see the relevant chapter in the Nixpkgs manual for more
79+ information. (Additional caveat to packagers: some packaging conventions
80+ related to multiple-output packages
81+ <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were
82+ changed</link> late (August 2016) in the release cycle and differ from the
83+ initial introduction of multiple outputs.)
6384 </para>
6485 </listitem>
6586 <listitem>
6687 <para>
67− Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided <literal>haskell.packages.lts-x_y</literal> 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. <link
68− xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The motivation for this change</link> has been discussed at length on the <literal>nix-dev</literal> mailing list and in <link
69− xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github issue #14897</link>. Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in <link
70− xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another nix-dev article</link>.
88+ Previous versions of Nixpkgs had support for all versions of the LTS
89+ Haskell package set. That support has been dropped. The previously provided
90+ <literal>haskell.packages.lts-x_y</literal> package sets still exist in
91+ name to aviod breaking user code, but these package sets don't actually
92+ contain the versions mandated by the corresponding LTS release. Instead,
93+ our package set it loosely based on the latest available LTS release, i.e.
94+ LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will
95+ drop those old names entirely.
96+ <link
97+ xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The
98+ motivation for this change</link> has been discussed at length on the
99+ <literal>nix-dev</literal> mailing list and in
100+ <link
101+ xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github
102+ issue #14897</link>. Development strategies for Haskell hackers who want to
103+ rely on Nix and NixOS have been described in
104+ <link
105+ xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another
106+ nix-dev article</link>.
71107 </para>
72108 </listitem>
73109 <listitem>
74110 <para>
75− Shell aliases for systemd sub-commands <link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were dropped</link>: <command>start</command>, <command>stop</command>, <command>restart</command>, <command>status</command>.
111+ Shell aliases for systemd sub-commands
112+ <link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were
113+ dropped</link>: <command>start</command>, <command>stop</command>,
114+ <command>restart</command>, <command>status</command>.
76115 </para>
77116 </listitem>
78117 <listitem>
79118 <para>
80− 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
119+ Redis now binds to 127.0.0.1 only instead of listening to all network
120+ interfaces. This is the default behavior of Redis 3.2
81121 </para>
82122 </listitem>
83123 <listitem>
84124 <para>
85− <literal>/var/empty</literal> is now immutable. Activation script runs <command>chattr +i</command> to forbid any modifications inside the folder. See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18365"> the pull request</link> for what bugs this caused.
125+ <literal>/var/empty</literal> is now immutable. Activation script runs
126+ <command>chattr +i</command> to forbid any modifications inside the folder.
127+ See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18365"> the
128+ pull request</link> for what bugs this caused.
86129 </para>
87130 </listitem>
88131 <listitem>
89132 <para>
90− Gitlab's maintainance script <command>gitlab-runner</command> was removed and split up into the more clearer <command>gitlab-run</command> and <command>gitlab-rake</command> scripts, because <command>gitlab-runner</command> is a component of Gitlab CI.
133+ Gitlab's maintainance script <command>gitlab-runner</command> was removed
134+ and split up into the more clearer <command>gitlab-run</command> and
135+ <command>gitlab-rake</command> scripts, because
136+ <command>gitlab-runner</command> is a component of Gitlab CI.
91137 </para>
92138 </listitem>
93139 <listitem>
94140 <para>
95− <literal>services.xserver.libinput.accelProfile</literal> default changed from <literal>flat</literal> to <literal>adaptive</literal>, as per <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79"> official documentation</link>.
141+ <literal>services.xserver.libinput.accelProfile</literal> default changed
142+ from <literal>flat</literal> to <literal>adaptive</literal>, as per
143+ <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79">
144+ official documentation</link>.
96145 </para>
97146 </listitem>
98147 <listitem>
99148 <para>
100− <literal>fonts.fontconfig.ultimate.rendering</literal> was removed because our presets were obsolete for some time. New presets are hardcoded into FreeType; you can select a preset via <literal>fonts.fontconfig.ultimate.preset</literal>. You can customize those presets via ordinary environment variables, using <literal>environment.variables</literal>.
149+ <literal>fonts.fontconfig.ultimate.rendering</literal> was removed because
150+ our presets were obsolete for some time. New presets are hardcoded into
151+ FreeType; you can select a preset via
152+ <literal>fonts.fontconfig.ultimate.preset</literal>. You can customize
153+ those presets via ordinary environment variables, using
154+ <literal>environment.variables</literal>.
101155 </para>
102156 </listitem>
103157 <listitem>
104158 <para>
105− The <literal>audit</literal> service is no longer enabled by default. Use <literal>security.audit.enable = true</literal> to explicitly enable it.
159+ The <literal>audit</literal> service is no longer enabled by default. Use
160+ <literal>security.audit.enable = true</literal> to explicitly enable it.
106161 </para>
107162 </listitem>
108163 <listitem>
109164 <para>
110− <literal>pkgs.linuxPackages.virtualbox</literal> 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 <literal>pkgs.virtualbox</literal> instead.
165+ <literal>pkgs.linuxPackages.virtualbox</literal> now contains only the
166+ kernel modules instead of the VirtualBox user space binaries. If you want
167+ to reference the user space binaries, you have to use the new
168+ <literal>pkgs.virtualbox</literal> instead.
111169 </para>
112170 </listitem>
113171 <listitem>
114172 <para>
115− <literal>goPackages</literal> was replaced with separated Go applications in appropriate <literal>nixpkgs</literal> categories. Each Go package uses its own dependency set. There's also a new <literal>go2nix</literal> tool introduced to generate a Go package definition from its Go source automatically.
173+ <literal>goPackages</literal> was replaced with separated Go applications
174+ in appropriate <literal>nixpkgs</literal> categories. Each Go package uses
175+ its own dependency set. There's also a new <literal>go2nix</literal> tool
176+ introduced to generate a Go package definition from its Go source
177+ automatically.
116178 </para>
117179 </listitem>
118180 <listitem>
119181 <para>
120− <literal>services.mongodb.extraConfig</literal> configuration format was changed to YAML.
182+ <literal>services.mongodb.extraConfig</literal> configuration format was
183+ changed to YAML.
121184 </para>
122185 </listitem>
123186 <listitem>
@@ -134,42 +197,70 @@
134197 <itemizedlist>
135198 <listitem>
136199 <para>
137− 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
200+ Revamped grsecurity/PaX support. There is now only a single general-purpose
201+ distribution kernel and the configuration interface has been streamlined.
202+ Desktop users should be able to simply set
138203<programlisting>security.grsecurity.enable = true</programlisting>
139− to get a reasonably secure system without having to sacrifice too much functionality.
204+ to get a reasonably secure system without having to sacrifice too much
205+ functionality.
140206 </para>
141207 </listitem>
142208 <listitem>
143209 <para>
144− Special filesystems, like <literal>/proc</literal>, <literal>/run</literal> 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 <command>nixos-rebuild switch</command> if possible. One benefit from this is improved security — most such filesystems are now mounted with <literal>noexec</literal>, <literal>nodev</literal> and/or <literal>nosuid</literal> options.
210+ Special filesystems, like <literal>/proc</literal>, <literal>/run</literal>
211+ and others, now have the same mount options as recommended by systemd and
212+ are unified across different places in NixOS. Mount options are updated
213+ during <command>nixos-rebuild switch</command> if possible. One benefit
214+ from this is improved security — most such filesystems are now mounted
215+ with <literal>noexec</literal>, <literal>nodev</literal> and/or
216+ <literal>nosuid</literal> options.
145217 </para>
146218 </listitem>
147219 <listitem>
148220 <para>
149− 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 (<literal>networking.firewall.logReversePathDrops</literal>) for easier debugging.
221+ The reverse path filter was interfering with DHCPv4 server operation in the
222+ past. An exception for DHCPv4 and a new option to log packets that were
223+ dropped due to the reverse path filter was added
224+ (<literal>networking.firewall.logReversePathDrops</literal>) for easier
225+ debugging.
150226 </para>
151227 </listitem>
152228 <listitem>
153229 <para>
154− Containers configuration within <literal>containers.&lt;name&gt;.config</literal> is <link
155− xlink:href="https://github.com/NixOS/nixpkgs/pull/17365">now properly typed and checked</link>. In particular, partial configurations are merged correctly.
230+ Containers configuration within
231+ <literal>containers.&lt;name&gt;.config</literal> is
232+ <link
233+ xlink:href="https://github.com/NixOS/nixpkgs/pull/17365">now
234+ properly typed and checked</link>. In particular, partial configurations
235+ are merged correctly.
156236 </para>
157237 </listitem>
158238 <listitem>
159239 <para>
160− The directory container setuid wrapper programs, <filename>/var/setuid-wrappers</filename>, <link
161− xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now updated atomically to prevent failures if the switch to a new configuration is interrupted.</link>
240+ The directory container setuid wrapper programs,
241+ <filename>/var/setuid-wrappers</filename>,
242+ <link
243+ xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now
244+ updated atomically to prevent failures if the switch to a new configuration
245+ is interrupted.</link>
162246 </para>
163247 </listitem>
164248 <listitem>
165249 <para>
166− <literal>services.xserver.startGnuPGAgent</literal> has been removed due to GnuPG 2.1.x bump. See <link
167− xlink:href="https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c"> how to achieve similar behavior</link>. You might need to <literal>pkill gpg-agent</literal> after the upgrade to prevent a stale agent being in the way.
250+ <literal>services.xserver.startGnuPGAgent</literal> has been removed due to
251+ GnuPG 2.1.x bump. See
252+ <link
253+ xlink:href="https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c">
254+ how to achieve similar behavior</link>. You might need to <literal>pkill
255+ gpg-agent</literal> after the upgrade to prevent a stale agent being in the
256+ way.
168257 </para>
169258 </listitem>
170259 <listitem>
171260 <para>
172− <link xlink:href="https://github.com/NixOS/nixpkgs/commit/e561edc322d275c3687fec431935095cfc717147"> Declarative users could share the uid due to the bug in the script handling conflict resolution. </link>
261+ <link xlink:href="https://github.com/NixOS/nixpkgs/commit/e561edc322d275c3687fec431935095cfc717147">
262+ Declarative users could share the uid due to the bug in the script handling
263+ conflict resolution. </link>
173264 </para>
174265 </listitem>
175266 <listitem>
nixos/doc/manual/release-notes/rl-1703.xml+148−45
@@ -13,24 +13,29 @@
1313 <title>Highlights</title>
1414
1515 <para>
16− In addition to numerous new and upgraded packages, this release has the following highlights:
16+ In addition to numerous new and upgraded packages, this release has the
17+ following highlights:
1718 </para>
1819
1920 <itemizedlist>
2021 <listitem>
2122 <para>
22− Nixpkgs is now extensible through overlays. See the <link
23− xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs manual</link> for more information.
23+ Nixpkgs is now extensible through overlays. See the
24+ <link
25+ xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs
26+ manual</link> for more information.
2427 </para>
2528 </listitem>
2629 <listitem>
2730 <para>
28− 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.
31+ This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The
32+ default Linux kernel is 4.9 and Nix is at 1.11.8.
2933 </para>
3034 </listitem>
3135 <listitem>
3236 <para>
33− The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed
37+ The default desktop environment now is KDE's Plasma 5. KDE 4 has been
38+ removed
3439 </para>
3540 </listitem>
3641 <listitem>
@@ -40,24 +45,35 @@
4045 </listitem>
4146 <listitem>
4247 <para>
43− X.org server uses branch 1.19. Due to ABI incompatibilities, <literal>ati_unfree</literal> keeps forcing 1.17 and <literal>amdgpu-pro</literal> starts forcing 1.18.
48+ X.org server uses branch 1.19. Due to ABI incompatibilities,
49+ <literal>ati_unfree</literal> keeps forcing 1.17 and
50+ <literal>amdgpu-pro</literal> starts forcing 1.18.
4451 </para>
4552 </listitem>
4653 <listitem>
4754 <para>
48− Cross compilation has been rewritten. See the nixpkgs manual for details. The most obvious breaking change is that in derivations there is no <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> are now cross by default, not native.
55+ Cross compilation has been rewritten. See the nixpkgs manual for details.
56+ The most obvious breaking change is that in derivations there is no
57+ <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> are now
58+ cross by default, not native.
4959 </para>
5060 </listitem>
5161 <listitem>
5262 <para>
53− The <literal>overridePackages</literal> function has been rewritten to be replaced by <link
54− xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> overlays</link>
63+ The <literal>overridePackages</literal> function has been rewritten to be
64+ replaced by
65+ <link
66+ xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
67+ overlays</link>
5568 </para>
5669 </listitem>
5770 <listitem>
5871 <para>
59− Packages in nixpkgs can be marked as insecure through listed vulnerabilities. See the <link
60− xlink:href="https://nixos.org/nixpkgs/manual/#sec-allow-insecure">Nixpkgs manual</link> for more information.
72+ Packages in nixpkgs can be marked as insecure through listed
73+ vulnerabilities. See the
74+ <link
75+ xlink:href="https://nixos.org/nixpkgs/manual/#sec-allow-insecure">Nixpkgs
76+ manual</link> for more information.
6177 </para>
6278 </listitem>
6379 <listitem>
@@ -496,64 +512,92 @@
496512 <title>Backward Incompatibilities</title>
497513
498514 <para>
499− When upgrading from a previous release, please be aware of the following incompatible changes:
515+ When upgrading from a previous release, please be aware of the following
516+ incompatible changes:
500517 </para>
501518
502519 <itemizedlist>
503520 <listitem>
504521 <para>
505− Derivations have no <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> and are now cross by default, not native.
522+ Derivations have no <literal>.nativeDrv</literal> nor
523+ <literal>.crossDrv</literal> and are now cross by default, not native.
506524 </para>
507525 </listitem>
508526 <listitem>
509527 <para>
510− <literal>stdenv.overrides</literal> is now expected to take <literal>self</literal> and <literal>super</literal> arguments. See <literal>lib.trivial.extends</literal> for what those parameters represent.
528+ <literal>stdenv.overrides</literal> is now expected to take
529+ <literal>self</literal> and <literal>super</literal> arguments. See
530+ <literal>lib.trivial.extends</literal> for what those parameters
531+ represent.
511532 </para>
512533 </listitem>
513534 <listitem>
514535 <para>
515− <literal>ansible</literal> now defaults to ansible version 2 as version 1 has been removed due to a serious <link
516− xlink:href="https://www.computest.nl/advisories/CT-2017-0109_Ansible.txt"> vulnerability</link> unpatched by upstream.
536+ <literal>ansible</literal> now defaults to ansible version 2 as version 1
537+ has been removed due to a serious
538+ <link
539+ xlink:href="https://www.computest.nl/advisories/CT-2017-0109_Ansible.txt">
540+ vulnerability</link> unpatched by upstream.
517541 </para>
518542 </listitem>
519543 <listitem>
520544 <para>
521− <literal>gnome</literal> alias has been removed along with <literal>gtk</literal>, <literal>gtkmm</literal> and several others. Now you need to use versioned attributes, like <literal>gnome3</literal>.
545+ <literal>gnome</literal> alias has been removed along with
546+ <literal>gtk</literal>, <literal>gtkmm</literal> and several others. Now
547+ you need to use versioned attributes, like <literal>gnome3</literal>.
522548 </para>
523549 </listitem>
524550 <listitem>
525551 <para>
526− The attribute name of the Radicale daemon has been changed from <literal>pythonPackages.radicale</literal> to <literal>radicale</literal>.
552+ The attribute name of the Radicale daemon has been changed from
553+ <literal>pythonPackages.radicale</literal> to <literal>radicale</literal>.
527554 </para>
528555 </listitem>
529556 <listitem>
530557 <para>
531− The <literal>stripHash</literal> bash function in <literal>stdenv</literal> changed according to its documentation; it now outputs the stripped name to <literal>stdout</literal> instead of putting it in the variable <literal>strippedName</literal>.
558+ The <literal>stripHash</literal> bash function in
559+ <literal>stdenv</literal> changed according to its documentation; it now
560+ outputs the stripped name to <literal>stdout</literal> instead of putting
561+ it in the variable <literal>strippedName</literal>.
532562 </para>
533563 </listitem>
534564 <listitem>
535565 <para>
536− 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.
566+ PHP now scans for extra configuration .ini files in /etc/php.d instead of
567+ /etc. This prevents accidentally loading non-PHP .ini files that may be in
568+ /etc.
537569 </para>
538570 </listitem>
539571 <listitem>
540572 <para>
541− Two lone top-level dict dbs moved into <literal>dictdDBs</literal>. This affects: <literal>dictdWordnet</literal> which is now at <literal>dictdDBs.wordnet</literal> and <literal>dictdWiktionary</literal> which is now at <literal>dictdDBs.wiktionary</literal>
573+ Two lone top-level dict dbs moved into <literal>dictdDBs</literal>. This
574+ affects: <literal>dictdWordnet</literal> which is now at
575+ <literal>dictdDBs.wordnet</literal> and <literal>dictdWiktionary</literal>
576+ which is now at <literal>dictdDBs.wiktionary</literal>
542577 </para>
543578 </listitem>
544579 <listitem>
545580 <para>
546− Parsoid service now uses YAML configuration format. <literal>service.parsoid.interwikis</literal> is now called <literal>service.parsoid.wikis</literal> and is a list of either API URLs or attribute sets as specified in parsoid's documentation.
581+ Parsoid service now uses YAML configuration format.
582+ <literal>service.parsoid.interwikis</literal> is now called
583+ <literal>service.parsoid.wikis</literal> and is a list of either API URLs
584+ or attribute sets as specified in parsoid's documentation.
547585 </para>
548586 </listitem>
549587 <listitem>
550588 <para>
551− <literal>Ntpd</literal> was replaced by <literal>systemd-timesyncd</literal> as the default service to synchronize system time with a remote NTP server. The old behavior can be restored by setting <literal>services.ntp.enable</literal> to <literal>true</literal>. Upstream time servers for all NTP implementations are now configured using <literal>networking.timeServers</literal>.
589+ <literal>Ntpd</literal> was replaced by
590+ <literal>systemd-timesyncd</literal> as the default service to synchronize
591+ system time with a remote NTP server. The old behavior can be restored by
592+ setting <literal>services.ntp.enable</literal> to <literal>true</literal>.
593+ Upstream time servers for all NTP implementations are now configured using
594+ <literal>networking.timeServers</literal>.
552595 </para>
553596 </listitem>
554597 <listitem>
555598 <para>
556− <literal>service.nylon</literal> is now declared using named instances. As an example:
599+ <literal>service.nylon</literal> is now declared using named instances. As
600+ an example:
557601<programlisting>
558602 services.nylon = {
559603 enable = true;
@@ -576,8 +620,11 @@
576620 </listitem>
577621 <listitem>
578622 <para>
579− <literal>overridePackages</literal> function no longer exists. It is replaced by <link
580− xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> overlays</link>. For example, the following code:
623+ <literal>overridePackages</literal> function no longer exists. It is
624+ replaced by
625+ <link
626+ xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
627+ overlays</link>. For example, the following code:
581628<programlisting>
582629let
583630 pkgs = import &lt;nixpkgs&gt; {};
@@ -595,42 +642,72 @@ in
595642 </listitem>
596643 <listitem>
597644 <para>
598− 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 <literal>networking.firewall.autoLoadConntrackHelpers</literal> and tune <literal>networking.firewall.connectionTrackingModules</literal> to suit your needs.
645+ Autoloading connection tracking helpers is now disabled by default. This
646+ default was also changed in the Linux kernel and is considered insecure if
647+ not configured properly in your firewall. If you need connection tracking
648+ helpers (i.e. for active FTP) please enable
649+ <literal>networking.firewall.autoLoadConntrackHelpers</literal> and tune
650+ <literal>networking.firewall.connectionTrackingModules</literal> to suit
651+ your needs.
599652 </para>
600653 </listitem>
601654 <listitem>
602655 <para>
603− <literal>local_recipient_maps</literal> 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 <literal>services.postfix.extraConfig</literal>.
656+ <literal>local_recipient_maps</literal> is not set to empty value by
657+ Postfix service. It's an insecure default as stated by Postfix
658+ documentation. Those who want to retain this setting need to set it via
659+ <literal>services.postfix.extraConfig</literal>.
604660 </para>
605661 </listitem>
606662 <listitem>
607663 <para>
608− 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 <literal>-4</literal> and <literal>-6</literal> have been added. One notable incompatibility is that specifying an interface (for link-local IPv6 for instance) is no longer done with the <literal>-I</literal> flag, but by encoding the interface into the address (<literal>ping fe80::1%eth0</literal>).
664+ Iputils no longer provide ping6 and traceroute6. The functionality of
665+ these tools has been integrated into ping and traceroute respectively. To
666+ enforce an address family the new flags <literal>-4</literal> and
667+ <literal>-6</literal> have been added. One notable incompatibility is that
668+ specifying an interface (for link-local IPv6 for instance) is no longer
669+ done with the <literal>-I</literal> flag, but by encoding the interface
670+ into the address (<literal>ping fe80::1%eth0</literal>).
609671 </para>
610672 </listitem>
611673 <listitem>
612674 <para>
613− The socket handling of the <literal>services.rmilter</literal> module has been fixed and refactored. As rmilter doesn't support binding to more than one socket, the options <literal>bindUnixSockets</literal> and <literal>bindInetSockets</literal> have been replaced by <literal>services.rmilter.bindSocket.*</literal>. The default is still a unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to the options documentation for more information.
675+ The socket handling of the <literal>services.rmilter</literal> module has
676+ been fixed and refactored. As rmilter doesn't support binding to more than
677+ one socket, the options <literal>bindUnixSockets</literal> and
678+ <literal>bindInetSockets</literal> have been replaced by
679+ <literal>services.rmilter.bindSocket.*</literal>. The default is still a
680+ unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to the
681+ options documentation for more information.
614682 </para>
615683 </listitem>
616684 <listitem>
617685 <para>
618− The <literal>fetch*</literal> functions no longer support md5, please use sha256 instead.
686+ The <literal>fetch*</literal> functions no longer support md5, please use
687+ sha256 instead.
619688 </para>
620689 </listitem>
621690 <listitem>
622691 <para>
623− The dnscrypt-proxy module interface has been streamlined around the <option>extraArgs</option> option. Where possible, legacy option declarations are mapped to <option>extraArgs</option> but will emit warnings. The <option>resolverList</option> has been outright removed: to use an unlisted resolver, use the <option>customResolver</option> option.
692+ The dnscrypt-proxy module interface has been streamlined around the
693+ <option>extraArgs</option> option. Where possible, legacy option
694+ declarations are mapped to <option>extraArgs</option> but will emit
695+ warnings. The <option>resolverList</option> has been outright removed: to
696+ use an unlisted resolver, use the <option>customResolver</option> option.
624697 </para>
625698 </listitem>
626699 <listitem>
627700 <para>
628− torbrowser now stores local state under <filename>~/.local/share/tor-browser</filename> by default. Any browser profile data from the old location, <filename>~/.torbrowser4</filename>, must be migrated manually.
701+ torbrowser now stores local state under
702+ <filename>~/.local/share/tor-browser</filename> by default. Any browser
703+ profile data from the old location, <filename>~/.torbrowser4</filename>,
704+ must be migrated manually.
629705 </para>
630706 </listitem>
631707 <listitem>
632708 <para>
633− The ihaskell, monetdb, offlineimap and sitecopy services have been removed.
709+ The ihaskell, monetdb, offlineimap and sitecopy services have been
710+ removed.
634711 </para>
635712 </listitem>
636713 </itemizedlist>
@@ -646,12 +723,18 @@ in
646723 <itemizedlist>
647724 <listitem>
648725 <para>
649− 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.
726+ Module type system have a new extensible option types feature that allow
727+ to extend certain types, such as enum, through multiple option
728+ declarations of the same option across multiple modules.
650729 </para>
651730 </listitem>
652731 <listitem>
653732 <para>
654− <literal>jre</literal> 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 <literal>jre_headless</literal>.
733+ <literal>jre</literal> now defaults to GTK UI by default. This improves
734+ visual consistency and makes Java follow system font style, improving the
735+ situation on HighDPI displays. This has a cost of increased closure size;
736+ for server and other headless workloads it's recommended to use
737+ <literal>jre_headless</literal>.
655738 </para>
656739 </listitem>
657740 <listitem>
@@ -661,37 +744,53 @@ in
661744 </listitem>
662745 <listitem>
663746 <para>
664− 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.
747+ The Python 2.7 interpreter does not use modules anymore. Instead, all
748+ CPython interpreters now include the whole standard library except for
749+ `tkinter`, which is available in the Python package set.
665750 </para>
666751 </listitem>
667752 <listitem>
668753 <para>
669− 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 <literal>nix-shell</literal>. See the Nixpkgs manual for details.
754+ Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
755+ Minor modifications had to be made to the interpreters in order to
756+ generate deterministic bytecode. This has security implications and is
757+ relevant for those using Python in a <literal>nix-shell</literal>. See the
758+ Nixpkgs manual for details.
670759 </para>
671760 </listitem>
672761 <listitem>
673762 <para>
674− The Python package sets now use a fixed-point combinator and the sets are available as attributes of the interpreters.
763+ The Python package sets now use a fixed-point combinator and the sets are
764+ available as attributes of the interpreters.
675765 </para>
676766 </listitem>
677767 <listitem>
678768 <para>
679− The Python function <literal>buildPythonPackage</literal> has been improved and can be used to build from Setuptools source, Flit source, and precompiled Wheels.
769+ The Python function <literal>buildPythonPackage</literal> has been
770+ improved and can be used to build from Setuptools source, Flit source, and
771+ precompiled Wheels.
680772 </para>
681773 </listitem>
682774 <listitem>
683775 <para>
684− When adding new or updating current Python libraries, the expressions should be put in separate files in <literal>pkgs/development/python-modules</literal> and called from <literal>python-packages.nix</literal>.
776+ When adding new or updating current Python libraries, the expressions
777+ should be put in separate files in
778+ <literal>pkgs/development/python-modules</literal> and called from
779+ <literal>python-packages.nix</literal>.
685780 </para>
686781 </listitem>
687782 <listitem>
688783 <para>
689− 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.
784+ The dnscrypt-proxy service supports synchronizing the list of public
785+ resolvers without working DNS resolution. This fixes issues caused by the
786+ resolver list becoming outdated. It also improves the viability of
787+ DNSCrypt only configurations.
690788 </para>
691789 </listitem>
692790 <listitem>
693791 <para>
694− Containers using bridged networking no longer lose their connection after changes to the host networking.
792+ Containers using bridged networking no longer lose their connection after
793+ changes to the host networking.
695794 </para>
696795 </listitem>
697796 <listitem>
@@ -701,12 +800,16 @@ in
701800 </listitem>
702801 <listitem>
703802 <para>
704− The bind DNS utilities (e.g. dig) have been split into their own output and are now also available in <literal>pkgs.dnsutils</literal> and it is no longer necessary to pull in all of <literal>bind</literal> to use them.
803+ The bind DNS utilities (e.g. dig) have been split into their own output
804+ and are now also available in <literal>pkgs.dnsutils</literal> and it is
805+ no longer necessary to pull in all of <literal>bind</literal> to use them.
705806 </para>
706807 </listitem>
707808 <listitem>
708809 <para>
709− Per-user configuration was moved from <filename>~/.nixpkgs</filename> to <filename>~/.config/nixpkgs</filename>. The former is still valid for <filename>config.nix</filename> for backwards compatibility.
810+ Per-user configuration was moved from <filename>~/.nixpkgs</filename> to
811+ <filename>~/.config/nixpkgs</filename>. The former is still valid for
812+ <filename>config.nix</filename> for backwards compatibility.
710813 </para>
711814 </listitem>
712815 </itemizedlist>
nixos/doc/manual/release-notes/rl-1709.xml+227−65
@@ -13,23 +13,30 @@
1313 <title>Highlights</title>
1414
1515 <para>
16− In addition to numerous new and upgraded packages, this release has the following highlights:
16+ In addition to numerous new and upgraded packages, this release has the
17+ following highlights:
1718 </para>
1819
1920 <itemizedlist>
2021 <listitem>
2122 <para>
22− 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.
23+ The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE
24+ Applications to 17.08.1 and KDE Frameworks to 5.37.
2325 </para>
2426 </listitem>
2527 <listitem>
2628 <para>
27− 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.
29+ The user handling now keeps track of deallocated UIDs/GIDs. When a user or
30+ group is revived, this allows it to be allocated the UID/GID it had
31+ before. A consequence is that UIDs and GIDs are no longer reused.
2832 </para>
2933 </listitem>
3034 <listitem>
3135 <para>
32− The module option <option>services.xserver.xrandrHeads</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:
36+ The module option <option>services.xserver.xrandrHeads</option> now causes
37+ the first head specified in this list to be set as the primary head. Apart
38+ from that, it's now possible to also set additional options by using an
39+ attribute set, for example:
3340<programlisting>
3441{ services.xserver.xrandrHeads = [
3542 "HDMI-0"
@@ -43,21 +50,36 @@
4350 ];
4451}
4552</programlisting>
46− This will set the <literal>DVI-0</literal> output to be the primary head, even though <literal>HDMI-0</literal> is the first head in the list.
53+ This will set the <literal>DVI-0</literal> output to be the primary head,
54+ even though <literal>HDMI-0</literal> is the first head in the list.
4755 </para>
4856 </listitem>
4957 <listitem>
5058 <para>
51− The handling of SSL in the <literal>services.nginx</literal> module has been cleaned up, renaming the misnamed <literal>enableSSL</literal> to <literal>onlySSL</literal> which reflects its original intention. This is not to be used with the already existing <literal>forceSSL</literal> 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 <literal>enableSSL</literal> option to keep the previous behaviour.
59+ The handling of SSL in the <literal>services.nginx</literal> module has
60+ been cleaned up, renaming the misnamed <literal>enableSSL</literal> to
61+ <literal>onlySSL</literal> which reflects its original intention. This is
62+ not to be used with the already existing <literal>forceSSL</literal> which
63+ creates a second non-SSL virtual host redirecting to the SSL virtual host.
64+ This by chance had worked earlier due to specific implementation details.
65+ In case you had specified both please remove the
66+ <literal>enableSSL</literal> option to keep the previous behaviour.
5267 </para>
5368 <para>
54− Another <literal>addSSL</literal> option has been introduced to configure both a non-SSL virtual host and an SSL virtual host with the same configuration.
69+ Another <literal>addSSL</literal> option has been introduced to configure
70+ both a non-SSL virtual host and an SSL virtual host with the same
71+ configuration.
5572 </para>
5673 <para>
57− Options to configure <literal>resolver</literal> options and <literal>upstream</literal> blocks have been introduced. See their information for further details.
74+ Options to configure <literal>resolver</literal> options and
75+ <literal>upstream</literal> blocks have been introduced. See their
76+ information for further details.
5877 </para>
5978 <para>
60− The <literal>port</literal> option has been replaced by a more generic <literal>listen</literal> option which makes it possible to specify multiple addresses, ports and SSL configs dependant on the new SSL handling mentioned above.
79+ The <literal>port</literal> option has been replaced by a more generic
80+ <literal>listen</literal> option which makes it possible to specify
81+ multiple addresses, ports and SSL configs dependant on the new SSL
82+ handling mentioned above.
6183 </para>
6284 </listitem>
6385 </itemizedlist>
@@ -446,31 +468,47 @@
446468 <title>Backward Incompatibilities</title>
447469
448470 <para>
449− When upgrading from a previous release, please be aware of the following incompatible changes:
471+ When upgrading from a previous release, please be aware of the following
472+ incompatible changes:
450473 </para>
451474
452475 <itemizedlist>
453476 <listitem>
454477 <para>
455− <emphasis role="strong"> In an Qemu-based virtualization environment, the network interface names changed from i.e. <literal>enp0s3</literal> to <literal>ens3</literal>. </emphasis>
478+ <emphasis role="strong"> In an Qemu-based virtualization environment, the
479+ network interface names changed from i.e. <literal>enp0s3</literal> to
480+ <literal>ens3</literal>. </emphasis>
456481 </para>
457482 <para>
458− This is due to a kernel configuration change. The new naming is consistent with those of other Linux distributions with systemd. See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/29197">#29197</link> for more information.
483+ This is due to a kernel configuration change. The new naming is consistent
484+ with those of other Linux distributions with systemd. See
485+ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/29197">#29197</link>
486+ for more information.
459487 </para>
460488 <para>
461− A machine is affected if the <literal>virt-what</literal> tool either returns <literal>qemu</literal> or <literal>kvm</literal> <emphasis>and</emphasis> has interface names used in any part of its NixOS configuration, in particular if a static network configuration with <literal>networking.interfaces</literal> is used.
489+ A machine is affected if the <literal>virt-what</literal> tool either
490+ returns <literal>qemu</literal> or <literal>kvm</literal>
491+ <emphasis>and</emphasis> has interface names used in any part of its NixOS
492+ configuration, in particular if a static network configuration with
493+ <literal>networking.interfaces</literal> is used.
462494 </para>
463495 <para>
464496 Before rebooting affected machines, please ensure:
465497 <itemizedlist>
466498 <listitem>
467499 <para>
468− Change the interface names in your NixOS configuration. The first interface will be called <literal>ens3</literal>, the second one <literal>ens8</literal> and starting from there incremented by 1.
500+ Change the interface names in your NixOS configuration. The first
501+ interface will be called <literal>ens3</literal>, the second one
502+ <literal>ens8</literal> and starting from there incremented by 1.
469503 </para>
470504 </listitem>
471505 <listitem>
472506 <para>
473− After changing the interface names, rebuild your system with <literal>nixos-rebuild boot</literal> to activate the new configuration after a reboot. If you switch to the new configuration right away you might lose network connectivity! If using <literal>nixops</literal>, deploy with <literal>nixops deploy --force-reboot</literal>.
507+ After changing the interface names, rebuild your system with
508+ <literal>nixos-rebuild boot</literal> to activate the new configuration
509+ after a reboot. If you switch to the new configuration right away you
510+ might lose network connectivity! If using <literal>nixops</literal>,
511+ deploy with <literal>nixops deploy --force-reboot</literal>.
474512 </para>
475513 </listitem>
476514 </itemizedlist>
@@ -478,59 +516,88 @@
478516 </listitem>
479517 <listitem>
480518 <para>
481− The following changes apply if the <literal>stateVersion</literal> is changed to 17.09 or higher. For <literal>stateVersion = "17.03"</literal> or lower the old behavior is preserved.
519+ The following changes apply if the <literal>stateVersion</literal> is
520+ changed to 17.09 or higher. For <literal>stateVersion = "17.03"</literal>
521+ or lower the old behavior is preserved.
482522 </para>
483523 <itemizedlist>
484524 <listitem>
485525 <para>
486− The <literal>postgres</literal> default version was changed from 9.5 to 9.6.
526+ The <literal>postgres</literal> default version was changed from 9.5 to
527+ 9.6.
487528 </para>
488529 </listitem>
489530 <listitem>
490531 <para>
491− The <literal>postgres</literal> superuser name has changed from <literal>root</literal> to <literal>postgres</literal> to more closely follow what other Linux distributions are doing.
532+ The <literal>postgres</literal> superuser name has changed from
533+ <literal>root</literal> to <literal>postgres</literal> to more closely
534+ follow what other Linux distributions are doing.
492535 </para>
493536 </listitem>
494537 <listitem>
495538 <para>
496− The <literal>postgres</literal> default <literal>dataDir</literal> has changed from <literal>/var/db/postgres</literal> to <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is 9.6 for example.
539+ The <literal>postgres</literal> default <literal>dataDir</literal> has
540+ changed from <literal>/var/db/postgres</literal> to
541+ <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is
542+ 9.6 for example.
497543 </para>
498544 </listitem>
499545 <listitem>
500546 <para>
501− The <literal>mysql</literal> default <literal>dataDir</literal> has changed from <literal>/var/mysql</literal> to <literal>/var/lib/mysql</literal>.
547+ The <literal>mysql</literal> default <literal>dataDir</literal> has
548+ changed from <literal>/var/mysql</literal> to
549+ <literal>/var/lib/mysql</literal>.
502550 </para>
503551 </listitem>
504552 <listitem>
505553 <para>
506− Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by setting the <literal>package</literal> to <literal>radicale2</literal>, which is done automatically when <literal>stateVersion</literal> is 17.09 or higher. The <literal>extraArgs</literal> option has been added to allow passing the data migration arguments specified in the instructions; see the <filename xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/radicale.nix">radicale.nix</filename> NixOS test for an example migration.
554+ Radicale's default package has changed from 1.x to 2.x. Instructions to
555+ migrate can be found <link xlink:href="http://radicale.org/1to2/"> here
556+ </link>. It is also possible to use the newer version by setting the
557+ <literal>package</literal> to <literal>radicale2</literal>, which is
558+ done automatically when <literal>stateVersion</literal> is 17.09 or
559+ higher. The <literal>extraArgs</literal> option has been added to allow
560+ passing the data migration arguments specified in the instructions; see
561+ the
562+ <filename xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/radicale.nix">radicale.nix</filename>
563+ NixOS test for an example migration.
507564 </para>
508565 </listitem>
509566 </itemizedlist>
510567 </listitem>
511568 <listitem>
512569 <para>
513− The <literal>aiccu</literal> package was removed. This is due to SixXS <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6 tunnel.
570+ The <literal>aiccu</literal> package was removed. This is due to SixXS
571+ <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6
572+ tunnel.
514573 </para>
515574 </listitem>
516575 <listitem>
517576 <para>
518− The <literal>fanctl</literal> package and <literal>fan</literal> module have been removed due to the developers not upstreaming their iproute2 patches and lagging with compatibility to recent iproute2 versions.
577+ The <literal>fanctl</literal> package and <literal>fan</literal> module
578+ have been removed due to the developers not upstreaming their iproute2
579+ patches and lagging with compatibility to recent iproute2 versions.
519580 </para>
520581 </listitem>
521582 <listitem>
522583 <para>
523− Top-level <literal>idea</literal> package collection was renamed. All JetBrains IDEs are now at <literal>jetbrains</literal>.
584+ Top-level <literal>idea</literal> package collection was renamed. All
585+ JetBrains IDEs are now at <literal>jetbrains</literal>.
524586 </para>
525587 </listitem>
526588 <listitem>
527589 <para>
528− <literal>flexget</literal>'s state database cannot be upgraded to its new internal format, requiring removal of any existing <literal>db-config.sqlite</literal> which will be automatically recreated.
590+ <literal>flexget</literal>'s state database cannot be upgraded to its new
591+ internal format, requiring removal of any existing
592+ <literal>db-config.sqlite</literal> which will be automatically recreated.
529593 </para>
530594 </listitem>
531595 <listitem>
532596 <para>
533− The <literal>ipfs</literal> service now doesn't ignore the <literal>dataDir</literal> 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
597+ The <literal>ipfs</literal> service now doesn't ignore the
598+ <literal>dataDir</literal> option anymore. If you've ever set this option
599+ to anything other than the default you'll have to either unset it (so the
600+ default gets used) or migrate the old data manually with
534601<programlisting>
535602dataDir=&lt;valueOfDataDir&gt;
536603mv /var/lib/ipfs/.ipfs/* $dataDir
@@ -540,66 +607,107 @@ rmdir /var/lib/ipfs/.ipfs
540607 </listitem>
541608 <listitem>
542609 <para>
543− The <literal>caddy</literal> service was previously using an extra <literal>.caddy</literal> directory in the data directory specified with the <literal>dataDir</literal> option. The contents of the <literal>.caddy</literal> directory are now expected to be in the <literal>dataDir</literal>.
610+ The <literal>caddy</literal> service was previously using an extra
611+ <literal>.caddy</literal> directory in the data directory specified with
612+ the <literal>dataDir</literal> option. The contents of the
613+ <literal>.caddy</literal> directory are now expected to be in the
614+ <literal>dataDir</literal>.
544615 </para>
545616 </listitem>
546617 <listitem>
547618 <para>
548− The <literal>ssh-agent</literal> user service is not started by default anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if needed. There is also a new <literal>programs.gnupg.agent</literal> module that creates a <literal>gpg-agent</literal> user service. It can also serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
619+ The <literal>ssh-agent</literal> user service is not started by default
620+ anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if
621+ needed. There is also a new <literal>programs.gnupg.agent</literal> module
622+ that creates a <literal>gpg-agent</literal> user service. It can also
623+ serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
549624 </para>
550625 </listitem>
551626 <listitem>
552627 <para>
553− The <literal>services.tinc.networks.&lt;name&gt;.listenAddress</literal> 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 <literal>services.tinc.networks.&lt;name&gt;.bindToAddress</literal> instead. Refer to the description of the options for more details.
628+ The <literal>services.tinc.networks.&lt;name&gt;.listenAddress</literal>
629+ option had a misleading name that did not correspond to its behavior. It
630+ now correctly defines the ip to listen for incoming connections on. To
631+ keep the previous behaviour, use
632+ <literal>services.tinc.networks.&lt;name&gt;.bindToAddress</literal>
633+ instead. Refer to the description of the options for more details.
554634 </para>
555635 </listitem>
556636 <listitem>
557637 <para>
558− <literal>tlsdate</literal> package and module were removed. This is due to the project being dead and not building with openssl 1.1.
638+ <literal>tlsdate</literal> package and module were removed. This is due to
639+ the project being dead and not building with openssl 1.1.
559640 </para>
560641 </listitem>
561642 <listitem>
562643 <para>
563− <literal>wvdial</literal> package and module were removed. This is due to the project being dead and not building with openssl 1.1.
644+ <literal>wvdial</literal> package and module were removed. This is due to
645+ the project being dead and not building with openssl 1.1.
564646 </para>
565647 </listitem>
566648 <listitem>
567649 <para>
568− <literal>cc-wrapper</literal>'s setup-hook now exports a number of environment variables corresponding to binutils binaries, (e.g. <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>, 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.
650+ <literal>cc-wrapper</literal>'s setup-hook now exports a number of
651+ environment variables corresponding to binutils binaries, (e.g.
652+ <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>, etc). This
653+ is done to prevent packages' build systems guessing, which is harder to
654+ predict, especially when cross-compiling. However, some packages have
655+ broken due to this—their build systems either not supporting, or
656+ claiming to support without adequate testing, taking such environment
657+ variables as parameters.
569658 </para>
570659 </listitem>
571660 <listitem>
572661 <para>
573− <literal>services.firefox.syncserver</literal> 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.
662+ <literal>services.firefox.syncserver</literal> now runs by default as a
663+ non-root user. To accomodate this change, the default sqlite database
664+ location has also been changed. Migration should work automatically. Refer
665+ to the description of the options for more details.
574666 </para>
575667 </listitem>
576668 <listitem>
577669 <para>
578− The <literal>compiz</literal> window manager and package was removed. The system support had been broken for several years.
670+ The <literal>compiz</literal> window manager and package was removed. The
671+ system support had been broken for several years.
579672 </para>
580673 </listitem>
581674 <listitem>
582675 <para>
583− Touchpad support should now be enabled through <literal>libinput</literal> as <literal>synaptics</literal> is now deprecated. See the option <literal>services.xserver.libinput.enable</literal>.
676+ Touchpad support should now be enabled through <literal>libinput</literal>
677+ as <literal>synaptics</literal> is now deprecated. See the option
678+ <literal>services.xserver.libinput.enable</literal>.
584679 </para>
585680 </listitem>
586681 <listitem>
587682 <para>
588− grsecurity/PaX support has been dropped, following upstream's decision to cease free support. See <link xlink:href="https://grsecurity.net/passing_the_baton.php"> upstream's announcement</link> for more information. No complete replacement for grsecurity/PaX is available presently.
683+ grsecurity/PaX support has been dropped, following upstream's decision to
684+ cease free support. See
685+ <link xlink:href="https://grsecurity.net/passing_the_baton.php">
686+ upstream's announcement</link> for more information. No complete
687+ replacement for grsecurity/PaX is available presently.
589688 </para>
590689 </listitem>
591690 <listitem>
592691 <para>
593− <literal>services.mysql</literal> now has declarative configuration of databases and users with the <literal>ensureDatabases</literal> and <literal>ensureUsers</literal> options.
692+ <literal>services.mysql</literal> now has declarative configuration of
693+ databases and users with the <literal>ensureDatabases</literal> and
694+ <literal>ensureUsers</literal> options.
594695 </para>
595696 <para>
596− These options will never delete existing databases and users, especially not when the value of the options are changed.
697+ These options will never delete existing databases and users, especially
698+ not when the value of the options are changed.
597699 </para>
598700 <para>
599− The MySQL users will be identified using <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/"> Unix socket authentication</link>. This authenticates the Unix user with the same name only, and that without the need for a password.
701+ The MySQL users will be identified using
702+ <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/">
703+ Unix socket authentication</link>. This authenticates the Unix user with
704+ the same name only, and that without the need for a password.
600705 </para>
601706 <para>
602− If you have previously created a MySQL <literal>root</literal> user <emphasis>with a password</emphasis>, you will need to add <literal>root</literal> user for unix socket authentication before using the new options. This can be done by running the following SQL script:
707+ If you have previously created a MySQL <literal>root</literal> user
708+ <emphasis>with a password</emphasis>, you will need to add
709+ <literal>root</literal> user for unix socket authentication before using
710+ the new options. This can be done by running the following SQL script:
603711<programlisting language="sql">
604712CREATE USER 'root'@'%' IDENTIFIED BY '';
605713GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
@@ -612,38 +720,55 @@ FLUSH PRIVILEGES;
612720 </listitem>
613721 <listitem>
614722 <para>
615− <literal>services.mysqlBackup</literal> now works by default without any user setup, including for users other than <literal>mysql</literal>.
723+ <literal>services.mysqlBackup</literal> now works by default without any
724+ user setup, including for users other than <literal>mysql</literal>.
616725 </para>
617726 <para>
618− By default, the <literal>mysql</literal> user is no longer the user which performs the backup. Instead a system account <literal>mysqlbackup</literal> is used.
727+ By default, the <literal>mysql</literal> user is no longer the user which
728+ performs the backup. Instead a system account
729+ <literal>mysqlbackup</literal> is used.
619730 </para>
620731 <para>
621− The <literal>mysqlBackup</literal> service is also now using systemd timers instead of <literal>cron</literal>.
732+ The <literal>mysqlBackup</literal> service is also now using systemd
733+ timers instead of <literal>cron</literal>.
622734 </para>
623735 <para>
624− Therefore, the <literal>services.mysqlBackup.period</literal> option no longer exists, and has been replaced with <literal>services.mysqlBackup.calendar</literal>, which is in the format of <link
736+ Therefore, the <literal>services.mysqlBackup.period</literal> option no
737+ longer exists, and has been replaced with
738+ <literal>services.mysqlBackup.calendar</literal>, which is in the format
739+ of
740+ <link
625741 xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.time.html#Calendar%20Events">systemd.time(7)</link>.
626742 </para>
627743 <para>
628− 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.
744+ If you expect to be sent an e-mail when the backup fails, consider using a
745+ script which monitors the systemd journal for errors. Regretfully, at
746+ present there is no built-in functionality for this.
629747 </para>
630748 <para>
631− You can check that backups still work by running <command>systemctl start mysql-backup</command> then <command>systemctl status mysql-backup</command>.
749+ You can check that backups still work by running <command>systemctl start
750+ mysql-backup</command> then <command>systemctl status
751+ mysql-backup</command>.
632752 </para>
633753 </listitem>
634754 <listitem>
635755 <para>
636− Templated systemd services e.g <literal>container@name</literal> are now handled currectly when switching to a new configuration, resulting in them being reloaded.
756+ Templated systemd services e.g <literal>container@name</literal> are now
757+ handled currectly when switching to a new configuration, resulting in them
758+ being reloaded.
637759 </para>
638760 </listitem>
639761 <listitem>
640762 <para>
641− Steam: the <literal>newStdcpp</literal> parameter was removed and should not be needed anymore.
763+ Steam: the <literal>newStdcpp</literal> parameter was removed and should
764+ not be needed anymore.
642765 </para>
643766 </listitem>
644767 <listitem>
645768 <para>
646− 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.
769+ Redis has been updated to version 4 which mandates a cluster mass-restart,
770+ due to changes in the network handling, in order to ensure compatibility
771+ with networks NATing traffic.
647772 </para>
648773 </listitem>
649774 </itemizedlist>
@@ -659,28 +784,46 @@ FLUSH PRIVILEGES;
659784 <itemizedlist>
660785 <listitem>
661786 <para>
662− Modules can now be disabled by using <link
663− xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules"> disabledModules</link>, 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.
787+ Modules can now be disabled by using
788+ <link
789+ xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules">
790+ disabledModules</link>, allowing another to take it's place. This can be
791+ used to import a set of modules from another channel while keeping the
792+ rest of the system on a stable release.
664793 </para>
665794 </listitem>
666795 <listitem>
667796 <para>
668− 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.
797+ Updated to FreeType 2.7.1, including a new TrueType engine. The new engine
798+ replaces the Infinality engine which was the default in NixOS. The default
799+ font rendering settings are now provided by fontconfig-penultimate,
800+ replacing fontconfig-ultimate; the new defaults are less invasive and
801+ provide rendering that is more consistent with other systems and hopefully
802+ with each font designer's intent. Some system-wide configuration has been
803+ removed from the Fontconfig NixOS module where user Fontconfig settings
804+ are available.
669805 </para>
670806 </listitem>
671807 <listitem>
672808 <para>
673− ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal> have therefore been removed.
809+ ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable,
810+ splUnstable</literal> have therefore been removed.
674811 </para>
675812 </listitem>
676813 <listitem>
677814 <para>
678− The <option>time.timeZone</option> option now allows the value <literal>null</literal> in addition to timezone strings. This value allows changing the timezone of a system imperatively using <command>timedatectl set-timezone</command>. The default timezone is still UTC.
815+ The <option>time.timeZone</option> option now allows the value
816+ <literal>null</literal> in addition to timezone strings. This value allows
817+ changing the timezone of a system imperatively using <command>timedatectl
818+ set-timezone</command>. The default timezone is still UTC.
679819 </para>
680820 </listitem>
681821 <listitem>
682822 <para>
683− Nixpkgs overlays may now be specified with a file as well as a directory. The value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the <filename>~/.config/nixpkgs/overlays</filename> directory.
823+ Nixpkgs overlays may now be specified with a file as well as a directory.
824+ The value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and
825+ <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of
826+ the <filename>~/.config/nixpkgs/overlays</filename> directory.
684827 </para>
685828 <para>
686829 See the overlays chapter of the Nixpkgs manual for more details.
@@ -688,48 +831,67 @@ FLUSH PRIVILEGES;
688831 </listitem>
689832 <listitem>
690833 <para>
691− Definitions for <filename>/etc/hosts</filename> can now be specified declaratively with <literal>networking.hosts</literal>.
834+ Definitions for <filename>/etc/hosts</filename> can now be specified
835+ declaratively with <literal>networking.hosts</literal>.
692836 </para>
693837 </listitem>
694838 <listitem>
695839 <para>
696− 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.
840+ Two new options have been added to the installer loader, in addition to
841+ the default having changed. The kernel log verbosity has been lowered to
842+ the upstream default for the default options, in order to not spam the
843+ console when e.g. joining a network.
697844 </para>
698845 <para>
699− This therefore leads to adding a new <literal>debug</literal> option to set the log level to the previous verbose mode, to make debugging easier, but still accessible easily.
846+ This therefore leads to adding a new <literal>debug</literal> option to
847+ set the log level to the previous verbose mode, to make debugging easier,
848+ but still accessible easily.
700849 </para>
701850 <para>
702− Additionally a <literal>copytoram</literal> 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.
851+ Additionally a <literal>copytoram</literal> option has been added, which
852+ makes it possible to remove the install medium after booting. This allows
853+ tethering from your phone after booting from it.
703854 </para>
704855 </listitem>
705856 <listitem>
706857 <para>
707− <literal>services.gitlab-runner.configOptions</literal> has been added to specify the configuration of gitlab-runners declaratively.
858+ <literal>services.gitlab-runner.configOptions</literal> has been added to
859+ specify the configuration of gitlab-runners declaratively.
708860 </para>
709861 </listitem>
710862 <listitem>
711863 <para>
712− <literal>services.jenkins.plugins</literal> has been added to install plugins easily, this can be generated with jenkinsPlugins2nix.
864+ <literal>services.jenkins.plugins</literal> has been added to install
865+ plugins easily, this can be generated with jenkinsPlugins2nix.
713866 </para>
714867 </listitem>
715868 <listitem>
716869 <para>
717− <literal>services.postfix.config</literal> 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.
870+ <literal>services.postfix.config</literal> has been added to specify the
871+ main.cf with NixOS options. Additionally other options have been added to
872+ the postfix module and has been improved further.
718873 </para>
719874 </listitem>
720875 <listitem>
721876 <para>
722− The GitLab package and module have been updated to the latest 10.0 release.
877+ The GitLab package and module have been updated to the latest 10.0
878+ release.
723879 </para>
724880 </listitem>
725881 <listitem>
726882 <para>
727− The <literal>systemd-boot</literal> boot loader now lists the NixOS version, kernel version and build date of all bootable generations.
883+ The <literal>systemd-boot</literal> boot loader now lists the NixOS
884+ version, kernel version and build date of all bootable generations.
728885 </para>
729886 </listitem>
730887 <listitem>
731888 <para>
732− 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>services.dnscrypt-proxy.resolverName</option> option or setting it to <literal>"random"</literal>.
889+ The dnscrypt-proxy service now defaults to using a random upstream
890+ resolver, selected from the list of public non-logging resolvers with
891+ DNSSEC support. Existing configurations can be migrated to this mode of
892+ operation by omitting the
893+ <option>services.dnscrypt-proxy.resolverName</option> option or setting it
894+ to <literal>"random"</literal>.
733895 </para>
734896 </listitem>
735897 </itemizedlist>
nixos/doc/manual/release-notes/rl-1803.xml+210−56
@@ -13,7 +13,8 @@
1313 <title>Highlights</title>
1414
1515 <para>
16− In addition to numerous new and upgraded packages, this release has the following highlights:
16+ In addition to numerous new and upgraded packages, this release has the
17+ following highlights:
1718 </para>
1819
1920 <itemizedlist>
@@ -24,36 +25,48 @@
2425 </listitem>
2526 <listitem>
2627 <para>
27− 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.
28+ Platform support: x86_64-linux and x86_64-darwin since release time (the
29+ latter isn't NixOS, really). Binaries for aarch64-linux are available, but
30+ no channel exists yet, as it's waiting for some test fixes, etc.
2831 </para>
2932 </listitem>
3033 <listitem>
3134 <para>
32− Nix now defaults to 2.0; see its <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.0">release notes</link>.
35+ Nix now defaults to 2.0; see its
36+ <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.0">release
37+ notes</link>.
3338 </para>
3439 </listitem>
3540 <listitem>
3641 <para>
37− Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> 7, systemd: 234 -> 237.
42+ Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 ->
43+ 7, systemd: 234 -> 237.
3844 </para>
3945 </listitem>
4046 <listitem>
4147 <para>
42− Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 -> 5.12.
48+ Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10
49+ -> 5.12.
4350 </para>
4451 </listitem>
4552 <listitem>
4653 <para>
47− 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:
54+ MariaDB 10.2, updated from 10.1, is now the default MySQL implementation.
55+ While upgrading a few changes have been made to the infrastructure
56+ involved:
4857 <itemizedlist>
4958 <listitem>
5059 <para>
51− <literal>libmysql</literal> has been deprecated, please use <literal>mysql.connector-c</literal> instead, a compatibility passthru has been added to the MySQL packages.
60+ <literal>libmysql</literal> has been deprecated, please use
61+ <literal>mysql.connector-c</literal> instead, a compatibility passthru
62+ has been added to the MySQL packages.
5263 </para>
5364 </listitem>
5465 <listitem>
5566 <para>
56− The <literal>mysql57</literal> package has a new <literal>static</literal> output containing the static libraries including <literal>libmysqld.a</literal>
67+ The <literal>mysql57</literal> package has a new
68+ <literal>static</literal> output containing the static libraries
69+ including <literal>libmysqld.a</literal>
5770 </para>
5871 </listitem>
5972 </itemizedlist>
@@ -390,7 +403,8 @@
390403 <title>Backward Incompatibilities</title>
391404
392405 <para>
393− When upgrading from a previous release, please be aware of the following incompatible changes:
406+ When upgrading from a previous release, please be aware of the following
407+ incompatible changes:
394408 </para>
395409
396410 <itemizedlist>
@@ -401,26 +415,39 @@
401415 </listitem>
402416 <listitem>
403417 <para>
404− Dollar signs in options under <option>services.postfix</option> 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.
418+ Dollar signs in options under <option>services.postfix</option> are passed
419+ verbatim to Postfix, which will interpret them as the beginning of a
420+ parameter expression. This was already true for string-valued options in
421+ the previous release, but not for list-valued options. If you need to pass
422+ literal dollar signs through Postfix, double them.
405423 </para>
406424 </listitem>
407425 <listitem>
408426 <para>
409− The <literal>postage</literal> package (for web-based PostgreSQL administration) has been renamed to <literal>pgmanage</literal>. The corresponding module has also been renamed. To migrate please rename all <option>services.postage</option> options to <option>services.pgmanage</option>.
427+ The <literal>postage</literal> package (for web-based PostgreSQL
428+ administration) has been renamed to <literal>pgmanage</literal>. The
429+ corresponding module has also been renamed. To migrate please rename all
430+ <option>services.postage</option> options to
431+ <option>services.pgmanage</option>.
410432 </para>
411433 </listitem>
412434 <listitem>
413435 <para>
414− 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 <literal>nix-env</literal>. The change affects the following packages:
436+ Package attributes starting with a digit have been prefixed with an
437+ underscore sign. This is to avoid quoting in the configuration and other
438+ issues with command-line tools like <literal>nix-env</literal>. The change
439+ affects the following packages:
415440 <itemizedlist>
416441 <listitem>
417442 <para>
418− <literal>2048-in-terminal</literal> → <literal>_2048-in-terminal</literal>
443+ <literal>2048-in-terminal</literal> →
444+ <literal>_2048-in-terminal</literal>
419445 </para>
420446 </listitem>
421447 <listitem>
422448 <para>
423− <literal>90secondportraits</literal> → <literal>_90secondportraits</literal>
449+ <literal>90secondportraits</literal> →
450+ <literal>_90secondportraits</literal>
424451 </para>
425452 </listitem>
426453 <listitem>
@@ -438,77 +465,134 @@
438465 </listitem>
439466 <listitem>
440467 <para>
441− <emphasis role="strong"> 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. </emphasis>
468+ <emphasis role="strong"> The OpenSSH service no longer enables support for
469+ DSA keys by default, which could cause a system lock out. Update your keys
470+ or, unfavorably, re-enable DSA support manually. </emphasis>
442471 </para>
443472 <para>
444− DSA support was <link xlink:href="https://www.openssh.com/legacy.html">deprecated in OpenSSH 7.0</link>, due to it being too weak. To re-enable support, add <literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end of your <option>services.openssh.extraConfig</option>.
473+ DSA support was
474+ <link xlink:href="https://www.openssh.com/legacy.html">deprecated in
475+ OpenSSH 7.0</link>, due to it being too weak. To re-enable support, add
476+ <literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end of your
477+ <option>services.openssh.extraConfig</option>.
445478 </para>
446479 <para>
447− After updating the keys to be stronger, anyone still on a pre-17.03 version is safe to jump to 17.03, as vetted <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
480+ After updating the keys to be stronger, anyone still on a pre-17.03
481+ version is safe to jump to 17.03, as vetted
482+ <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
448483 </para>
449484 </listitem>
450485 <listitem>
451486 <para>
452− The <literal>openssh</literal> package now includes Kerberos support by default; the <literal>openssh_with_kerberos</literal> package is now a deprecated alias. If you do not want Kerberos support, you can do <literal>openssh.override { withKerberos = false; }</literal>. Note, this also applies to the <literal>openssh_hpn</literal> package.
487+ The <literal>openssh</literal> package now includes Kerberos support by
488+ default; the <literal>openssh_with_kerberos</literal> package is now a
489+ deprecated alias. If you do not want Kerberos support, you can do
490+ <literal>openssh.override { withKerberos = false; }</literal>. Note, this
491+ also applies to the <literal>openssh_hpn</literal> package.
453492 </para>
454493 </listitem>
455494 <listitem>
456495 <para>
457− <literal>cc-wrapper</literal> has been split in two; there is now also a <literal>bintools-wrapper</literal>. The most commonly used files in <filename>nix-support</filename> are now split between the two wrappers. Some commonly used ones, like <filename>nix-support/dynamic-linker</filename>, are duplicated for backwards compatability, even though they rightly belong only in <literal>bintools-wrapper</literal>. Other more obscure ones are just moved.
496+ <literal>cc-wrapper</literal> has been split in two; there is now also a
497+ <literal>bintools-wrapper</literal>. The most commonly used files in
498+ <filename>nix-support</filename> are now split between the two wrappers.
499+ Some commonly used ones, like
500+ <filename>nix-support/dynamic-linker</filename>, are duplicated for
501+ backwards compatability, even though they rightly belong only in
502+ <literal>bintools-wrapper</literal>. Other more obscure ones are just
503+ moved.
458504 </para>
459505 </listitem>
460506 <listitem>
461507 <para>
462− 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.
508+ The propagation logic has been changed. The new logic, along with new
509+ types of dependencies that go with, is thoroughly documented in the
510+ "Specifying dependencies" section of the "Standard Environment" chapter of
511+ the nixpkgs manual.
463512<!-- That's <xref linkend="ssec-stdenv-attributes"> were we to merge the manuals. -->
464− 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 <function>propagatedNativeBuildInputs</function> should instead be <function>propagatedBuildInputs</function>. Thankfully, that was and is the least used type of dependency. Also, it means that some <function>propagatedBuildInputs</function> should instead be <function>depsTargetTargetPropagated</function>. Other types dependencies should be unaffected.
513+ The old logic isn't but is easy to describe: dependencies were propagated
514+ as the same type of dependency no matter what. In practice, that means
515+ that many <function>propagatedNativeBuildInputs</function> should instead
516+ be <function>propagatedBuildInputs</function>. Thankfully, that was and is
517+ the least used type of dependency. Also, it means that some
518+ <function>propagatedBuildInputs</function> should instead be
519+ <function>depsTargetTargetPropagated</function>. Other types dependencies
520+ should be unaffected.
465521 </para>
466522 </listitem>
467523 <listitem>
468524 <para>
469− <literal>lib.addPassthru drv passthru</literal> is removed. Use <literal>lib.extendDerivation true passthru drv</literal> instead.
525+ <literal>lib.addPassthru drv passthru</literal> is removed. Use
526+ <literal>lib.extendDerivation true passthru drv</literal> instead.
470527 </para>
471528 </listitem>
472529 <listitem>
473530 <para>
474− The <literal>memcached</literal> service no longer accept dynamic socket paths via <option>services.memcached.socket</option>. Unix sockets can be still enabled by <option>services.memcached.enableUnixSocket</option> and will be accessible at <literal>/run/memcached/memcached.sock</literal>.
531+ The <literal>memcached</literal> service no longer accept dynamic socket
532+ paths via <option>services.memcached.socket</option>. Unix sockets can be
533+ still enabled by <option>services.memcached.enableUnixSocket</option> and
534+ will be accessible at <literal>/run/memcached/memcached.sock</literal>.
475535 </para>
476536 </listitem>
477537 <listitem>
478538 <para>
479− The <varname>hardware.amdHybridGraphics.disable</varname> 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.
539+ The <varname>hardware.amdHybridGraphics.disable</varname> option was
540+ removed for lack of a maintainer. If you still need this module, you may
541+ wish to include a copy of it from an older version of nixos in your
542+ imports.
480543 </para>
481544 </listitem>
482545 <listitem>
483546 <para>
484− The merging of config options for <varname>services.postfix.config</varname> was buggy. Previously, if other options in the Postfix module like <varname>services.postfix.useSrs</varname> 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, <literal>lib.mkForce</literal> or <literal>lib.mkOverride</literal> can be used.
547+ The merging of config options for
548+ <varname>services.postfix.config</varname> was buggy. Previously, if other
549+ options in the Postfix module like
550+ <varname>services.postfix.useSrs</varname> were set and the user set
551+ config options that were also set by such options, the resulting config
552+ wouldn't include all options that were needed. They are now merged
553+ correctly. If config options need to be overridden,
554+ <literal>lib.mkForce</literal> or <literal>lib.mkOverride</literal> can be
555+ used.
485556 </para>
486557 </listitem>
487558 <listitem>
488559 <para>
489− The following changes apply if the <literal>stateVersion</literal> is changed to 18.03 or higher. For <literal>stateVersion = "17.09"</literal> or lower the old behavior is preserved.
560+ The following changes apply if the <literal>stateVersion</literal> is
561+ changed to 18.03 or higher. For <literal>stateVersion = "17.09"</literal>
562+ or lower the old behavior is preserved.
490563 </para>
491564 <itemizedlist>
492565 <listitem>
493566 <para>
494− <literal>matrix-synapse</literal> uses postgresql by default instead of sqlite. Migration instructions can be found <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite"> here </link>.
567+ <literal>matrix-synapse</literal> uses postgresql by default instead of
568+ sqlite. Migration instructions can be found
569+ <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite">
570+ here </link>.
495571 </para>
496572 </listitem>
497573 </itemizedlist>
498574 </listitem>
499575 <listitem>
500576 <para>
501− The <literal>jid</literal> package has been removed, due to maintenance overhead of a go package having non-versioned dependencies.
577+ The <literal>jid</literal> package has been removed, due to maintenance
578+ overhead of a go package having non-versioned dependencies.
502579 </para>
503580 </listitem>
504581 <listitem>
505582 <para>
506− When using <option>services.xserver.libinput</option> (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, <literal>Option "XkbRules" "base"</literal> may result in broken keyboard layout.
583+ When using <option>services.xserver.libinput</option> (enabled by default
584+ in GNOME), it now handles all input devices, not just touchpads. As a
585+ result, you might need to re-evaluate any custom Xorg configuration. In
586+ particular, <literal>Option "XkbRules" "base"</literal> may result in
587+ broken keyboard layout.
507588 </para>
508589 </listitem>
509590 <listitem>
510591 <para>
511− The <literal>attic</literal> package was removed. A maintained fork called <link xlink:href="https://www.borgbackup.org/">Borg</link> should be used instead. Migration instructions can be found <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>.
592+ The <literal>attic</literal> package was removed. A maintained fork called
593+ <link xlink:href="https://www.borgbackup.org/">Borg</link> should be used
594+ instead. Migration instructions can be found
595+ <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>.
512596 </para>
513597 </listitem>
514598 <listitem>
@@ -517,32 +601,52 @@
517601 <itemizedlist>
518602 <listitem>
519603 <para>
520− The package <literal>pkgs.piwik</literal> was renamed to <literal>pkgs.matomo</literal>.
604+ The package <literal>pkgs.piwik</literal> was renamed to
605+ <literal>pkgs.matomo</literal>.
521606 </para>
522607 </listitem>
523608 <listitem>
524609 <para>
525− The service <literal>services.piwik</literal> was renamed to <literal>services.matomo</literal>.
610+ The service <literal>services.piwik</literal> was renamed to
611+ <literal>services.matomo</literal>.
526612 </para>
527613 </listitem>
528614 <listitem>
529615 <para>
530− The data directory <filename>/var/lib/piwik</filename> was renamed to <filename>/var/lib/matomo</filename>. All files will be moved automatically on first startup, but you might need to adjust your backup scripts.
616+ The data directory <filename>/var/lib/piwik</filename> was renamed to
617+ <filename>/var/lib/matomo</filename>. All files will be moved
618+ automatically on first startup, but you might need to adjust your
619+ backup scripts.
531620 </para>
532621 </listitem>
533622 <listitem>
534623 <para>
535− The default <option>serverName</option> for the nginx configuration changed from <literal>piwik.${config.networking.hostName}</literal> to <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal> if <option>config.networking.domain</option> is set, <literal>matomo.${config.networking.hostName}</literal> if it is not set. If you change your <option>serverName</option>, remember you'll need to update the <literal>trustedHosts[]</literal> array in <filename>/var/lib/matomo/config/config.ini.php</filename> as well.
624+ The default <option>serverName</option> for the nginx configuration
625+ changed from <literal>piwik.${config.networking.hostName}</literal> to
626+ <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal>
627+ if <option>config.networking.domain</option> is set,
628+ <literal>matomo.${config.networking.hostName}</literal> if it is not
629+ set. If you change your <option>serverName</option>, remember you'll
630+ need to update the <literal>trustedHosts[]</literal> array in
631+ <filename>/var/lib/matomo/config/config.ini.php</filename> as well.
536632 </para>
537633 </listitem>
538634 <listitem>
539635 <para>
540− The <literal>piwik</literal> user was renamed to <literal>matomo</literal>. The service will adjust ownership automatically for files in the data directory. If you use unix socket authentication, remember to give the new <literal>matomo</literal> user access to the database and to change the <literal>username</literal> to <literal>matomo</literal> in the <literal>[database]</literal> section of <filename>/var/lib/matomo/config/config.ini.php</filename>.
636+ The <literal>piwik</literal> user was renamed to
637+ <literal>matomo</literal>. The service will adjust ownership
638+ automatically for files in the data directory. If you use unix socket
639+ authentication, remember to give the new <literal>matomo</literal> user
640+ access to the database and to change the <literal>username</literal> to
641+ <literal>matomo</literal> in the <literal>[database]</literal> section
642+ of <filename>/var/lib/matomo/config/config.ini.php</filename>.
541643 </para>
542644 </listitem>
543645 <listitem>
544646 <para>
545− 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.
647+ If you named your database `piwik`, you might want to rename it to
648+ `matomo` to keep things clean, but this is neither enforced nor
649+ required.
546650 </para>
547651 </listitem>
548652 </itemizedlist>
@@ -550,43 +654,59 @@
550654 </listitem>
551655 <listitem>
552656 <para>
553− <literal>nodejs-4_x</literal> is end-of-life. <literal>nodejs-4_x</literal>, <literal>nodejs-slim-4_x</literal> and <literal>nodePackages_4_x</literal> are removed.
657+ <literal>nodejs-4_x</literal> is end-of-life.
658+ <literal>nodejs-4_x</literal>, <literal>nodejs-slim-4_x</literal> and
659+ <literal>nodePackages_4_x</literal> are removed.
554660 </para>
555661 </listitem>
556662 <listitem>
557663 <para>
558− The <literal>pump.io</literal> NixOS module was removed. It is now maintained as an <link xlink:href="https://github.com/rvl/pump.io-nixos">external module</link>.
664+ The <literal>pump.io</literal> NixOS module was removed. It is now
665+ maintained as an
666+ <link xlink:href="https://github.com/rvl/pump.io-nixos">external
667+ module</link>.
559668 </para>
560669 </listitem>
561670 <listitem>
562671 <para>
563− The Prosody XMPP server has received a major update. The following modules were renamed:
672+ The Prosody XMPP server has received a major update. The following modules
673+ were renamed:
564674 <itemizedlist>
565675 <listitem>
566676 <para>
567− <option>services.prosody.modules.httpserver</option> is now <option>services.prosody.modules.http_files</option>
677+ <option>services.prosody.modules.httpserver</option> is now
678+ <option>services.prosody.modules.http_files</option>
568679 </para>
569680 </listitem>
570681 <listitem>
571682 <para>
572− <option>services.prosody.modules.console</option> is now <option>services.prosody.modules.admin_telnet</option>
683+ <option>services.prosody.modules.console</option> is now
684+ <option>services.prosody.modules.admin_telnet</option>
573685 </para>
574686 </listitem>
575687 </itemizedlist>
576688 </para>
577689 <para>
578− Many new modules are now core modules, most notably <option>services.prosody.modules.carbons</option> and <option>services.prosody.modules.mam</option>.
690+ Many new modules are now core modules, most notably
691+ <option>services.prosody.modules.carbons</option> and
692+ <option>services.prosody.modules.mam</option>.
579693 </para>
580694 <para>
581− The better-performing <literal>libevent</literal> backend is now enabled by default.
695+ The better-performing <literal>libevent</literal> backend is now enabled
696+ by default.
582697 </para>
583698 <para>
584− <literal>withCommunityModules</literal> now passes through the modules to <option>services.prosody.extraModules</option>. Use <literal>withOnlyInstalledCommunityModules</literal> for modules that should not be enabled directly, e.g <literal>lib_ldap</literal>.
699+ <literal>withCommunityModules</literal> now passes through the modules to
700+ <option>services.prosody.extraModules</option>. Use
701+ <literal>withOnlyInstalledCommunityModules</literal> for modules that
702+ should not be enabled directly, e.g <literal>lib_ldap</literal>.
585703 </para>
586704 </listitem>
587705 <listitem>
588706 <para>
589− All prometheus exporter modules are now defined as submodules. The exporters are configured using <literal>services.prometheus.exporters</literal>.
707+ All prometheus exporter modules are now defined as submodules. The
708+ exporters are configured using
709+ <literal>services.prometheus.exporters</literal>.
590710 </para>
591711 </listitem>
592712 </itemizedlist>
@@ -602,17 +722,24 @@
602722 <itemizedlist>
603723 <listitem>
604724 <para>
605− ZNC option <option>services.znc.mutable</option> now defaults to <literal>true</literal>. That means that old configuration is not overwritten by default when update to the znc options are made.
725+ ZNC option <option>services.znc.mutable</option> now defaults to
726+ <literal>true</literal>. That means that old configuration is not
727+ overwritten by default when update to the znc options are made.
606728 </para>
607729 </listitem>
608730 <listitem>
609731 <para>
610− The option <option>networking.wireless.networks.&lt;name&gt;.auth</option> has been added for wireless networks with WPA-Enterprise authentication. There is also a new <option>extraConfig</option> option to directly configure <literal>wpa_supplicant</literal> and <option>hidden</option> to connect to hidden networks.
732+ The option <option>networking.wireless.networks.&lt;name&gt;.auth</option>
733+ has been added for wireless networks with WPA-Enterprise authentication.
734+ There is also a new <option>extraConfig</option> option to directly
735+ configure <literal>wpa_supplicant</literal> and <option>hidden</option> to
736+ connect to hidden networks.
611737 </para>
612738 </listitem>
613739 <listitem>
614740 <para>
615− In the module <option>networking.interfaces.&lt;name&gt;</option> the following options have been removed:
741+ In the module <option>networking.interfaces.&lt;name&gt;</option> the
742+ following options have been removed:
616743 <itemizedlist>
617744 <listitem>
618745 <para>
@@ -640,22 +767,34 @@
640767 </para>
641768 </listitem>
642769 </itemizedlist>
643− To assign static addresses to an interface the options <option>ipv4.addresses</option> and <option>ipv6.addresses</option> should be used instead. The options <option>ip4</option> and <option>ip6</option> have been renamed to <option>ipv4.addresses</option> <option>ipv6.addresses</option> respectively. The new options <option>ipv4.routes</option> and <option>ipv6.routes</option> have been added to set up static routing.
770+ To assign static addresses to an interface the options
771+ <option>ipv4.addresses</option> and <option>ipv6.addresses</option> should
772+ be used instead. The options <option>ip4</option> and <option>ip6</option>
773+ have been renamed to <option>ipv4.addresses</option>
774+ <option>ipv6.addresses</option> respectively. The new options
775+ <option>ipv4.routes</option> and <option>ipv6.routes</option> have been
776+ added to set up static routing.
644777 </para>
645778 </listitem>
646779 <listitem>
647780 <para>
648− The option <option>services.logstash.listenAddress</option> is now <literal>127.0.0.1</literal> by default. Previously the default behaviour was to listen on all interfaces.
781+ The option <option>services.logstash.listenAddress</option> is now
782+ <literal>127.0.0.1</literal> by default. Previously the default behaviour
783+ was to listen on all interfaces.
649784 </para>
650785 </listitem>
651786 <listitem>
652787 <para>
653− <literal>services.btrfs.autoScrub</literal> has been added, to periodically check btrfs filesystems for data corruption. If there's a correct copy available, it will automatically repair corrupted blocks.
788+ <literal>services.btrfs.autoScrub</literal> has been added, to
789+ periodically check btrfs filesystems for data corruption. If there's a
790+ correct copy available, it will automatically repair corrupted blocks.
654791 </para>
655792 </listitem>
656793 <listitem>
657794 <para>
658− <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal> has been added, the clock format string (as expected by strftime, e.g. <literal>%H:%M</literal>) to use with the lightdm gtk greeter panel.
795+ <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal> has
796+ been added, the clock format string (as expected by strftime, e.g.
797+ <literal>%H:%M</literal>) to use with the lightdm gtk greeter panel.
659798 </para>
660799 <para>
661800 If set to null the default clock format is used.
@@ -663,10 +802,17 @@
663802 </listitem>
664803 <listitem>
665804 <para>
666− <literal>displayManager.lightdm.greeters.gtk.indicators</literal> has been added, a list of allowed indicator modules to use with the lightdm gtk greeter panel.
805+ <literal>displayManager.lightdm.greeters.gtk.indicators</literal> has been
806+ added, a list of allowed indicator modules to use with the lightdm gtk
807+ greeter panel.
667808 </para>
668809 <para>
669− Built-in indicators include <literal>~a11y</literal>, <literal>~language</literal>, <literal>~session</literal>, <literal>~power</literal>, <literal>~clock</literal>, <literal>~host</literal>, <literal>~spacer</literal>. Unity indicators can be represented by short name (e.g. <literal>sound</literal>, <literal>power</literal>), service file name, or absolute path.
810+ Built-in indicators include <literal>~a11y</literal>,
811+ <literal>~language</literal>, <literal>~session</literal>,
812+ <literal>~power</literal>, <literal>~clock</literal>,
813+ <literal>~host</literal>, <literal>~spacer</literal>. Unity indicators can
814+ be represented by short name (e.g. <literal>sound</literal>,
815+ <literal>power</literal>), service file name, or absolute path.
670816 </para>
671817 <para>
672818 If set to <literal>null</literal> the default indicators are used.
@@ -688,12 +834,20 @@
688834 </listitem>
689835 <listitem>
690836 <para>
691− The NixOS test driver supports user services declared by <literal>systemd.user.services</literal>. The methods <literal>waitForUnit</literal>, <literal>getUnitInfo</literal>, <literal>startJob</literal> and <literal>stopJob</literal> provide an optional <literal>$user</literal> argument for that purpose.
837+ The NixOS test driver supports user services declared by
838+ <literal>systemd.user.services</literal>. The methods
839+ <literal>waitForUnit</literal>, <literal>getUnitInfo</literal>,
840+ <literal>startJob</literal> and <literal>stopJob</literal> provide an
841+ optional <literal>$user</literal> argument for that purpose.
692842 </para>
693843 </listitem>
694844 <listitem>
695845 <para>
696− Enabling bash completion on NixOS, <literal>programs.bash.enableCompletion</literal>, will now also enable completion for the Nix command line tools by installing the <link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link> package.
846+ Enabling bash completion on NixOS,
847+ <literal>programs.bash.enableCompletion</literal>, will now also enable
848+ completion for the Nix command line tools by installing the
849+ <link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link>
850+ package.
697851 </para>
698852 </listitem>
699853 </itemizedlist>
nixos/doc/manual/release-notes/rl-1809.xml+242−69
@@ -13,7 +13,8 @@
1313 <title>Highlights</title>
1414
1515 <para>
16− In addition to numerous new and upgraded packages, this release has the following notable updates:
16+ In addition to numerous new and upgraded packages, this release has the
17+ following notable updates:
1718 </para>
1819
1920 <itemizedlist>
@@ -24,22 +25,28 @@
2425 </listitem>
2526 <listitem>
2627 <para>
27− 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.
28+ Platform support: x86_64-linux and x86_64-darwin as always. Support for
29+ aarch64-linux is as with the previous releases, not equivalent to the
30+ x86-64-linux release, but with efforts to reach parity.
2831 </para>
2932 </listitem>
3033 <listitem>
3134 <para>
32− Nix has been updated to 2.1; see its <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.1">release notes</link>.
35+ Nix has been updated to 2.1; see its
36+ <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.1">release
37+ notes</link>.
3338 </para>
3439 </listitem>
3540 <listitem>
3641 <para>
37− Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7 (unchanged), systemd: 237 → 239.
42+ Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7
43+ (unchanged), systemd: 237 → 239.
3844 </para>
3945 </listitem>
4046 <listitem>
4147 <para>
42− Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12 → 5.13.
48+ Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12
49+ → 5.13.
4350 </para>
4451 </listitem>
4552 </itemizedlist>
@@ -51,7 +58,8 @@
5158 <itemizedlist>
5259 <listitem>
5360 <para>
54− Support for wrapping binaries using <literal>firejail</literal> has been added through <varname>programs.firejail.wrappedBinaries</varname>.
61+ Support for wrapping binaries using <literal>firejail</literal> has been
62+ added through <varname>programs.firejail.wrappedBinaries</varname>.
5563 </para>
5664 <para>
5765 For example
@@ -66,12 +74,17 @@ programs.firejail = {
6674};
6775</programlisting>
6876 <para>
69− This will place <literal>firefox</literal> and <literal>mpv</literal> binaries in the global path wrapped by firejail.
77+ This will place <literal>firefox</literal> and <literal>mpv</literal>
78+ binaries in the global path wrapped by firejail.
7079 </para>
7180 </listitem>
7281 <listitem>
7382 <para>
74− User channels are now in the default <literal>NIX_PATH</literal>, allowing users to use their personal <command>nix-channel</command> defined channels in <command>nix-build</command> and <command>nix-shell</command> commands, as well as in imports like <code>import &lt;mychannel&gt;</code>.
83+ User channels are now in the default <literal>NIX_PATH</literal>, allowing
84+ users to use their personal <command>nix-channel</command> defined
85+ channels in <command>nix-build</command> and <command>nix-shell</command>
86+ commands, as well as in imports like <code>import
87+ &lt;mychannel&gt;</code>.
7588 </para>
7689 <para>
7790 For example
@@ -101,31 +114,52 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
101114 <itemizedlist>
102115 <listitem>
103116 <para>
104− The <varname>services.cassandra</varname> 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 <link
105− xlink:href="https://cassandra.apache.org/">Apache Cassandra</link>.
117+ The <varname>services.cassandra</varname> module has been reworked and was
118+ rewritten from scratch. The service has succeeding tests for the versions
119+ 2.1, 2.2, 3.0 and 3.11 of
120+ <link
121+ xlink:href="https://cassandra.apache.org/">Apache
122+ Cassandra</link>.
106123 </para>
107124 </listitem>
108125 <listitem>
109126 <para>
110− There is a new <varname>services.foundationdb</varname> module for deploying <link xlink:href="https://www.foundationdb.org">FoundationDB</link> clusters.
127+ There is a new <varname>services.foundationdb</varname> module for
128+ deploying
129+ <link xlink:href="https://www.foundationdb.org">FoundationDB</link>
130+ clusters.
111131 </para>
112132 </listitem>
113133 <listitem>
114134 <para>
115− When enabled the <literal>iproute2</literal> will copy the files expected by ip route (e.g., <filename>rt_tables</filename>) in <filename>/etc/iproute2</filename>. This allows to write aliases for routing tables for instance.
135+ When enabled the <literal>iproute2</literal> will copy the files expected
136+ by ip route (e.g., <filename>rt_tables</filename>) in
137+ <filename>/etc/iproute2</filename>. This allows to write aliases for
138+ routing tables for instance.
116139 </para>
117140 </listitem>
118141 <listitem>
119142 <para>
120− <varname>services.strongswan-swanctl</varname> is a modern replacement for <varname>services.strongswan</varname>. You can use either one of them to setup IPsec VPNs but not both at the same time.
143+ <varname>services.strongswan-swanctl</varname> is a modern replacement for
144+ <varname>services.strongswan</varname>. You can use either one of them to
145+ setup IPsec VPNs but not both at the same time.
121146 </para>
122147 <para>
123− <varname>services.strongswan-swanctl</varname> uses the <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link> command which uses the modern <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link> <emphasis>Versatile IKE Configuration Interface</emphasis>. The deprecated <literal>ipsec</literal> command used in <varname>services.strongswan</varname> is using the legacy <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke configuration interface</link>.
148+ <varname>services.strongswan-swanctl</varname> uses the
149+ <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link>
150+ command which uses the modern
151+ <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link>
152+ <emphasis>Versatile IKE Configuration Interface</emphasis>. The deprecated
153+ <literal>ipsec</literal> command used in
154+ <varname>services.strongswan</varname> is using the legacy
155+ <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke
156+ configuration interface</link>.
124157 </para>
125158 </listitem>
126159 <listitem>
127160 <para>
128− The new <varname>services.elasticsearch-curator</varname> service periodically curates or manages, your Elasticsearch indices and snapshots.
161+ The new <varname>services.elasticsearch-curator</varname> service
162+ periodically curates or manages, your Elasticsearch indices and snapshots.
129163 </para>
130164 </listitem>
131165 </itemizedlist>
@@ -436,32 +470,38 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
436470 <title>Backward Incompatibilities</title>
437471
438472 <para>
439− When upgrading from a previous release, please be aware of the following incompatible changes:
473+ When upgrading from a previous release, please be aware of the following
474+ incompatible changes:
440475 </para>
441476
442477 <itemizedlist>
443478 <listitem>
444479 <para>
445− Some licenses that were incorrectly not marked as unfree now are. This is the case for:
480+ Some licenses that were incorrectly not marked as unfree now are. This is
481+ the case for:
446482 <itemizedlist>
447483 <listitem>
448484 <para>
449− cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike 2.0
485+ cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike
486+ 2.0
450487 </para>
451488 </listitem>
452489 <listitem>
453490 <para>
454− cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike 2.5
491+ cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike
492+ 2.5
455493 </para>
456494 </listitem>
457495 <listitem>
458496 <para>
459− cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike 3.0
497+ cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike
498+ 3.0
460499 </para>
461500 </listitem>
462501 <listitem>
463502 <para>
464− cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike 4.0
503+ cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike
504+ 4.0
465505 </para>
466506 </listitem>
467507 <listitem>
@@ -479,71 +519,128 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
479519 </listitem>
480520 <listitem>
481521 <para>
482− The deprecated <varname>services.cassandra</varname> module has seen a complete rewrite. (See above.)
522+ The deprecated <varname>services.cassandra</varname> module has seen a
523+ complete rewrite. (See above.)
483524 </para>
484525 </listitem>
485526 <listitem>
486527 <para>
487− <literal>lib.strict</literal> is removed. Use <literal>builtins.seq</literal> instead.
528+ <literal>lib.strict</literal> is removed. Use
529+ <literal>builtins.seq</literal> instead.
488530 </para>
489531 </listitem>
490532 <listitem>
491533 <para>
492− The <literal>clementine</literal> package points now to the free derivation. <literal>clementineFree</literal> is removed now and <literal>clementineUnfree</literal> points to the package which is bundled with the unfree <literal>libspotify</literal> package.
534+ The <literal>clementine</literal> package points now to the free
535+ derivation. <literal>clementineFree</literal> is removed now and
536+ <literal>clementineUnfree</literal> points to the package which is bundled
537+ with the unfree <literal>libspotify</literal> package.
493538 </para>
494539 </listitem>
495540 <listitem>
496541 <para>
497− The <literal>netcat</literal> package is now taken directly from OpenBSD's <literal>libressl</literal>, 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.
542+ The <literal>netcat</literal> package is now taken directly from OpenBSD's
543+ <literal>libressl</literal>, instead of relying on Debian's fork. The new
544+ version should be very close to the old version, but there are some minor
545+ differences. Importantly, flags like -b, -q, -C, and -Z are no longer
546+ accepted by the nc command.
498547 </para>
499548 </listitem>
500549 <listitem>
501550 <para>
502− The <varname>services.docker-registry.extraConfig</varname> 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 <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.
551+ The <varname>services.docker-registry.extraConfig</varname> object doesn't
552+ contain environment variables anymore. Instead it needs to provide an
553+ object structure that can be mapped onto the YAML configuration defined in
554+ <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the
555+ <varname>docker/distribution</varname> docs</link>.
503556 </para>
504557 </listitem>
505558 <listitem>
506559 <para>
507− <literal>gnucash</literal> has changed from version 2.4 to 3.x. If you've been using <literal>gnucash</literal> (version 2.4) instead of <literal>gnucash26</literal> (version 2.6) you must open your Gnucash data file(s) with <literal>gnucash26</literal> and then save them to upgrade the file format. Then you may use your data file(s) with Gnucash 3.x. See the upgrade <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>. Gnucash 2.4 is still available under the attribute <literal>gnucash24</literal>.
560+ <literal>gnucash</literal> has changed from version 2.4 to 3.x. If you've
561+ been using <literal>gnucash</literal> (version 2.4) instead of
562+ <literal>gnucash26</literal> (version 2.6) you must open your Gnucash data
563+ file(s) with <literal>gnucash26</literal> and then save them to upgrade
564+ the file format. Then you may use your data file(s) with Gnucash 3.x. See
565+ the upgrade
566+ <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>.
567+ Gnucash 2.4 is still available under the attribute
568+ <literal>gnucash24</literal>.
508569 </para>
509570 </listitem>
510571 <listitem>
511572 <para>
512− <varname>services.munge</varname> now runs as user (and group) <literal>munge</literal> instead of root. Make sure the key file is accessible to the daemon.
573+ <varname>services.munge</varname> now runs as user (and group)
574+ <literal>munge</literal> instead of root. Make sure the key file is
575+ accessible to the daemon.
513576 </para>
514577 </listitem>
515578 <listitem>
516579 <para>
517− <varname>dockerTools.buildImage</varname> now uses <literal>null</literal> as default value for <varname>tag</varname>, which indicates that the nix output hash will be used as tag.
580+ <varname>dockerTools.buildImage</varname> now uses <literal>null</literal>
581+ as default value for <varname>tag</varname>, which indicates that the nix
582+ output hash will be used as tag.
518583 </para>
519584 </listitem>
520585 <listitem>
521586 <para>
522− The ELK stack: <varname>elasticsearch</varname>, <varname>logstash</varname> and <varname>kibana</varname> has been upgraded from 2.* to 6.3.*. The 2.* versions have been <link xlink:href="https://www.elastic.co/support/eol">unsupported since last year</link> so they have been removed. You can still use the 5.* versions under the names <varname>elasticsearch5</varname>, <varname>logstash5</varname> and <varname>kibana5</varname>.
587+ The ELK stack: <varname>elasticsearch</varname>,
588+ <varname>logstash</varname> and <varname>kibana</varname> has been
589+ upgraded from 2.* to 6.3.*. The 2.* versions have been
590+ <link xlink:href="https://www.elastic.co/support/eol">unsupported since
591+ last year</link> so they have been removed. You can still use the 5.*
592+ versions under the names <varname>elasticsearch5</varname>,
593+ <varname>logstash5</varname> and <varname>kibana5</varname>.
523594 </para>
524595 <para>
525− The elastic beats: <varname>filebeat</varname>, <varname>heartbeat</varname>, <varname>metricbeat</varname> and <varname>packetbeat</varname> have had the same treatment: they now target 6.3.* as well. The 5.* versions are available under the names: <varname>filebeat5</varname>, <varname>heartbeat5</varname>, <varname>metricbeat5</varname> and <varname>packetbeat5</varname>
596+ The elastic beats: <varname>filebeat</varname>,
597+ <varname>heartbeat</varname>, <varname>metricbeat</varname> and
598+ <varname>packetbeat</varname> have had the same treatment: they now target
599+ 6.3.* as well. The 5.* versions are available under the names:
600+ <varname>filebeat5</varname>, <varname>heartbeat5</varname>,
601+ <varname>metricbeat5</varname> and <varname>packetbeat5</varname>
526602 </para>
527603 <para>
528− The ELK-6.3 stack now comes with <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by default</link>. Since X-Pack is licensed under the <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic License</link> the ELK packages now have an unfree license. To use them you need to specify <literal>allowUnfree = true;</literal> in your nixpkgs configuration.
604+ The ELK-6.3 stack now comes with
605+ <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by
606+ default</link>. Since X-Pack is licensed under the
607+ <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic
608+ License</link> the ELK packages now have an unfree license. To use them
609+ you need to specify <literal>allowUnfree = true;</literal> in your nixpkgs
610+ configuration.
529611 </para>
530612 <para>
531− Fortunately there is also a free variant of the ELK stack without X-Pack. The packages are available under the names: <varname>elasticsearch-oss</varname>, <varname>logstash-oss</varname> and <varname>kibana-oss</varname>.
613+ Fortunately there is also a free variant of the ELK stack without X-Pack.
614+ The packages are available under the names:
615+ <varname>elasticsearch-oss</varname>, <varname>logstash-oss</varname> and
616+ <varname>kibana-oss</varname>.
532617 </para>
533618 </listitem>
534619 <listitem>
535620 <para>
536− Options <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal> <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal> were removed. <literal>luksroot.nix</literal> 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.
621+ Options
622+ <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal>
623+ <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal>
624+ were removed. <literal>luksroot.nix</literal> module never supported more
625+ than one YubiKey at a time anyway, hence those options never had any
626+ effect. You should be able to remove them from your config without any
627+ issues.
537628 </para>
538629 </listitem>
539630 <listitem>
540631 <para>
541− <literal>stdenv.system</literal> and <literal>system</literal> 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 <literal>stdenv.buildPlatform.system</literal> can be used instead for the old behavior. They should be using that anyways for clarity.
632+ <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs
633+ now refer to the host platform instead of the build platform. For native
634+ builds this is not change, let alone a breaking one. For cross builds, it
635+ is a breaking change, and <literal>stdenv.buildPlatform.system</literal>
636+ can be used instead for the old behavior. They should be using that
637+ anyways for clarity.
542638 </para>
543639 </listitem>
544640 <listitem>
545641 <para>
546− Groups <literal>kvm</literal> and <literal>render</literal> are introduced now, as systemd requires them.
642+ Groups <literal>kvm</literal> and <literal>render</literal> are introduced
643+ now, as systemd requires them.
547644 </para>
548645 </listitem>
549646 </itemizedlist>
@@ -559,69 +656,92 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
559656 <itemizedlist>
560657 <listitem>
561658 <para>
562− <literal>dockerTools.pullImage</literal> relies on image digest instead of image tag to download the image. The <literal>sha256</literal> of a pulled image has to be updated.
659+ <literal>dockerTools.pullImage</literal> relies on image digest instead of
660+ image tag to download the image. The <literal>sha256</literal> of a pulled
661+ image has to be updated.
563662 </para>
564663 </listitem>
565664 <listitem>
566665 <para>
567− <literal>lib.attrNamesToStr</literal> has been deprecated. Use more specific concatenation (<literal>lib.concat(Map)StringsSep</literal>) instead.
666+ <literal>lib.attrNamesToStr</literal> has been deprecated. Use more
667+ specific concatenation (<literal>lib.concat(Map)StringsSep</literal>)
668+ instead.
568669 </para>
569670 </listitem>
570671 <listitem>
571672 <para>
572− <literal>lib.addErrorContextToAttrs</literal> has been deprecated. Use <literal>builtins.addErrorContext</literal> directly.
673+ <literal>lib.addErrorContextToAttrs</literal> has been deprecated. Use
674+ <literal>builtins.addErrorContext</literal> directly.
573675 </para>
574676 </listitem>
575677 <listitem>
576678 <para>
577− <literal>lib.showVal</literal> has been deprecated. Use <literal>lib.traceSeqN</literal> instead.
679+ <literal>lib.showVal</literal> has been deprecated. Use
680+ <literal>lib.traceSeqN</literal> instead.
578681 </para>
579682 </listitem>
580683 <listitem>
581684 <para>
582− <literal>lib.traceXMLVal</literal> has been deprecated. Use <literal>lib.traceValFn builtins.toXml</literal> instead.
685+ <literal>lib.traceXMLVal</literal> has been deprecated. Use
686+ <literal>lib.traceValFn builtins.toXml</literal> instead.
583687 </para>
584688 </listitem>
585689 <listitem>
586690 <para>
587− <literal>lib.traceXMLValMarked</literal> has been deprecated. Use <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> instead.
691+ <literal>lib.traceXMLValMarked</literal> has been deprecated. Use
692+ <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> instead.
588693 </para>
589694 </listitem>
590695 <listitem>
591696 <para>
592− The <literal>pkgs</literal> argument to NixOS modules can now be set directly using <literal>nixpkgs.pkgs</literal>. Previously, only the <literal>system</literal>, <literal>config</literal> and <literal>overlays</literal> arguments could be used to influence <literal>pkgs</literal>.
697+ The <literal>pkgs</literal> argument to NixOS modules can now be set
698+ directly using <literal>nixpkgs.pkgs</literal>. Previously, only the
699+ <literal>system</literal>, <literal>config</literal> and
700+ <literal>overlays</literal> arguments could be used to influence
701+ <literal>pkgs</literal>.
593702 </para>
594703 </listitem>
595704 <listitem>
596705 <para>
597− A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example:
706+ A NixOS system can now be constructed more easily based on a preexisting
707+ invocation of Nixpkgs. For example:
598708<programlisting>
599709inherit (pkgs.nixos {
600710 boot.loader.grub.enable = false;
601711 fileSystems."/".device = "/dev/xvda1";
602712}) toplevel kernel initialRamdisk manual;
603713 </programlisting>
604− 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.
714+ This benefits evaluation performance, lets you write Nixpkgs packages that
715+ depend on NixOS images and is consistent with a deployment architecture
716+ that would be centered around Nixpkgs overlays.
605717 </para>
606718 </listitem>
607719 <listitem>
608720 <para>
609− <literal>lib.traceValIfNot</literal> has been deprecated. Use <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal> instead.
721+ <literal>lib.traceValIfNot</literal> has been deprecated. Use
722+ <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal>
723+ instead.
610724 </para>
611725 </listitem>
612726 <listitem>
613727 <para>
614− <literal>lib.traceCallXml</literal> has been deprecated. Please complain if you use the function regularly.
728+ <literal>lib.traceCallXml</literal> has been deprecated. Please complain
729+ if you use the function regularly.
615730 </para>
616731 </listitem>
617732 <listitem>
618733 <para>
619− The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in favor of <literal>lib.version</literal>. Please refer to the discussion in <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link> for further reference.
734+ The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in
735+ favor of <literal>lib.version</literal>. Please refer to the discussion in
736+ <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link>
737+ for further reference.
620738 </para>
621739 </listitem>
622740 <listitem>
623741 <para>
624− <literal>lib.recursiveUpdateUntil</literal> was not acting according to its specification. It has been fixed to act according to the docstring, and a test has been added.
742+ <literal>lib.recursiveUpdateUntil</literal> was not acting according to
743+ its specification. It has been fixed to act according to the docstring,
744+ and a test has been added.
625745 </para>
626746 </listitem>
627747 <listitem>
@@ -635,7 +755,9 @@ inherit (pkgs.nixos {
635755 </term>
636756 <listitem>
637757 <para>
638− Puts the generated Diffie-Hellman parameters into the Nix store instead of managing them in a stateful manner in <filename class="directory">/var/lib/dhparams</filename>.
758+ Puts the generated Diffie-Hellman parameters into the Nix store instead
759+ of managing them in a stateful manner in
760+ <filename class="directory">/var/lib/dhparams</filename>.
639761 </para>
640762 </listitem>
641763 </varlistentry>
@@ -645,20 +767,27 @@ inherit (pkgs.nixos {
645767 </term>
646768 <listitem>
647769 <para>
648− The default bit size to use for the generated Diffie-Hellman parameters.
770+ The default bit size to use for the generated Diffie-Hellman
771+ parameters.
649772 </para>
650773 </listitem>
651774 </varlistentry>
652775 </variablelist>
653776 <note>
654777 <para>
655− The path to the actual generated parameter files should now be queried using <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal> because it might be either in the Nix store or in a directory configured by <option>security.dhparams.path</option>.
778+ The path to the actual generated parameter files should now be queried
779+ using
780+ <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>
781+ because it might be either in the Nix store or in a directory configured
782+ by <option>security.dhparams.path</option>.
656783 </para>
657784 </note>
658785 <note>
659786 <title>For developers:</title>
660787 <para>
661− 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).
788+ Module implementers should not set a specific bit size in order to let
789+ users configure it by themselves if they want to have a different bit
790+ size than the default (2048).
662791 </para>
663792 <para>
664793 An example usage of this would be:
@@ -677,82 +806,126 @@ inherit (pkgs.nixos {
677806 </listitem>
678807 <listitem>
679808 <para>
680− <literal>networking.networkmanager.useDnsmasq</literal> has been deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
809+ <literal>networking.networkmanager.useDnsmasq</literal> has been
810+ deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
681811 </para>
682812 </listitem>
683813 <listitem>
684814 <para>
685− The Kubernetes package has been bumped to major version 1.11. Please consult the <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release notes</link> for details on new features and api changes.
815+ The Kubernetes package has been bumped to major version 1.11. Please
816+ consult the
817+ <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release
818+ notes</link> for details on new features and api changes.
686819 </para>
687820 </listitem>
688821 <listitem>
689822 <para>
690− The option <varname>services.kubernetes.apiserver.admissionControl</varname> was renamed to <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.
823+ The option
824+ <varname>services.kubernetes.apiserver.admissionControl</varname> was
825+ renamed to
826+ <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.
691827 </para>
692828 </listitem>
693829 <listitem>
694830 <para>
695− 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.
831+ Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS)
832+ Therefore; public service port for the dashboard has changed to 443
833+ (container port 8443) and scheme to https.
696834 </para>
697835 </listitem>
698836 <listitem>
699837 <para>
700− The option <varname>services.kubernetes.apiserver.address</varname> was renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>. Note that the default value has changed from 127.0.0.1 to 0.0.0.0.
838+ The option <varname>services.kubernetes.apiserver.address</varname> was
839+ renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>.
840+ Note that the default value has changed from 127.0.0.1 to 0.0.0.0.
701841 </para>
702842 </listitem>
703843 <listitem>
704844 <para>
705− The option <varname>services.kubernetes.apiserver.publicAddress</varname> was not used and thus has been removed.
845+ The option <varname>services.kubernetes.apiserver.publicAddress</varname>
846+ was not used and thus has been removed.
706847 </para>
707848 </listitem>
708849 <listitem>
709850 <para>
710− The option <varname>services.kubernetes.addons.dashboard.enableRBAC</varname> was renamed to <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
851+ The option
852+ <varname>services.kubernetes.addons.dashboard.enableRBAC</varname> was
853+ renamed to
854+ <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
711855 </para>
712856 </listitem>
713857 <listitem>
714858 <para>
715− The Kubernetes Dashboard now has only minimal RBAC permissions by default. If dashboard cluster-admin rights are desired, set <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname> 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: <literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal>
859+ The Kubernetes Dashboard now has only minimal RBAC permissions by default.
860+ If dashboard cluster-admin rights are desired, set
861+ <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname>
862+ to true. On existing clusters, in order for the revocation of privileges
863+ to take effect, the current ClusterRoleBinding for kubernetes-dashboard
864+ must be manually removed: <literal>kubectl delete clusterrolebinding
865+ kubernetes-dashboard</literal>
716866 </para>
717867 </listitem>
718868 <listitem>
719869 <para>
720− The <varname>programs.screen</varname> module provides allows to configure <literal>/etc/screenrc</literal>, however the module behaved fairly counterintuitive as the config exists, but the package wasn't available. Since 18.09 <literal>pkgs.screen</literal> will be added to <literal>environment.systemPackages</literal>.
870+ The <varname>programs.screen</varname> module provides allows to configure
871+ <literal>/etc/screenrc</literal>, however the module behaved fairly
872+ counterintuitive as the config exists, but the package wasn't available.
873+ Since 18.09 <literal>pkgs.screen</literal> will be added to
874+ <literal>environment.systemPackages</literal>.
721875 </para>
722876 </listitem>
723877 <listitem>
724878 <para>
725− The module <option>services.networking.hostapd</option> now uses WPA2 by default.
879+ The module <option>services.networking.hostapd</option> now uses WPA2 by
880+ default.
726881 </para>
727882 </listitem>
728883 <listitem>
729884 <para>
730− <varname>s6Dns</varname>, <varname>s6Networking</varname>, <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname> renamed to <varname>s6-dns</varname>, <varname>s6-networking</varname>, <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname> respectively.
885+ <varname>s6Dns</varname>, <varname>s6Networking</varname>,
886+ <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname>
887+ renamed to <varname>s6-dns</varname>, <varname>s6-networking</varname>,
888+ <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname>
889+ respectively.
731890 </para>
732891 </listitem>
733892 <listitem>
734893 <para>
735− The module option <option>nix.useSandbox</option> is now defaulted to <literal>true</literal>.
894+ The module option <option>nix.useSandbox</option> is now defaulted to
895+ <literal>true</literal>.
736896 </para>
737897 </listitem>
738898 <listitem>
739899 <para>
740− The config activation script of <literal>nixos-rebuild</literal> now <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link> all user units for each authenticated user.
900+ The config activation script of <literal>nixos-rebuild</literal> now
901+ <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link>
902+ all user units for each authenticated user.
741903 </para>
742904 </listitem>
743905 <listitem>
744906 <para>
745− The default display manager is now LightDM. To use SLiM set <literal>services.xserver.displayManager.slim.enable</literal> to <literal>true</literal>.
907+ The default display manager is now LightDM. To use SLiM set
908+ <literal>services.xserver.displayManager.slim.enable</literal> to
909+ <literal>true</literal>.
746910 </para>
747911 </listitem>
748912 <listitem>
749913 <para>
750− 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 <code>&lt;/para&gt;&lt;para&gt;</code> to start a new paragraph.
914+ NixOS option descriptions are now automatically broken up into individual
915+ paragraphs if the text contains two consecutive newlines, so it's no
916+ longer necessary to use <code>&lt;/para&gt;&lt;para&gt;</code> to start a
917+ new paragraph.
751918 </para>
752919 </listitem>
753920 <listitem>
754921 <para>
755− Top-level <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in Nixpkgs are deprecated. Please use their equivalents in <literal>stdenv</literal> instead: <literal>stdenv.buildPlatform</literal>, <literal>stdenv.hostPlatform</literal>, and <literal>stdenv.targetPlatform</literal>.
922+ Top-level <literal>buildPlatform</literal>,
923+ <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in
924+ Nixpkgs are deprecated. Please use their equivalents in
925+ <literal>stdenv</literal> instead:
926+ <literal>stdenv.buildPlatform</literal>,
927+ <literal>stdenv.hostPlatform</literal>, and
928+ <literal>stdenv.targetPlatform</literal>.
756929 </para>
757930 </listitem>
758931 </itemizedlist>
nixos/doc/manual/release-notes/rl-1903.xml+366−82
@@ -13,7 +13,8 @@
1313 <title>Highlights</title>
1414
1515 <para>
16− In addition to numerous new and upgraded packages, this release has the following highlights:
16+ In addition to numerous new and upgraded packages, this release has the
17+ following highlights:
1718 </para>
1819
1920 <itemizedlist>
@@ -24,36 +25,53 @@
2425 </listitem>
2526 <listitem>
2627 <para>
27− The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
28+ The default Python 3 interpreter is now CPython 3.7 instead of CPython
29+ 3.6.
2830 </para>
2931 </listitem>
3032 <listitem>
3133 <para>
32− Added the Pantheon desktop environment. It can be enabled through <varname>services.xserver.desktopManager.pantheon.enable</varname>.
34+ Added the Pantheon desktop environment. It can be enabled through
35+ <varname>services.xserver.desktopManager.pantheon.enable</varname>.
3336 </para>
3437 <note>
3538 <para>
36− By default, <varname>services.xserver.desktopManager.pantheon</varname> enables LightDM as a display manager, as pantheon's screen locking implementation relies on it.
39+ By default, <varname>services.xserver.desktopManager.pantheon</varname>
40+ enables LightDM as a display manager, as pantheon's screen locking
41+ implementation relies on it.
3742 </para>
3843 <para>
39− Because of that it is recommended to leave LightDM enabled. If you'd like to disable it anyway, set <option>services.xserver.displayManager.lightdm.enable</option> to <literal>false</literal> and enable your preferred display manager.
44+ Because of that it is recommended to leave LightDM enabled. If you'd like
45+ to disable it anyway, set
46+ <option>services.xserver.displayManager.lightdm.enable</option> to
47+ <literal>false</literal> and enable your preferred display manager.
4048 </para>
4149 </note>
4250 <para>
43− 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.
51+ Also note that Pantheon's LightDM greeter is not enabled by default,
52+ because it has numerous issues in NixOS and isn't optimal for use here
53+ yet.
4454 </para>
4555 </listitem>
4656 <listitem>
4757 <para>
48− 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: <xref linkend="sec-kubernetes"/> for details.
58+ A major refactoring of the Kubernetes module has been completed.
59+ Refactorings primarily focus on decoupling components and enhancing
60+ security. Two-way TLS and RBAC has been enabled by default for all
61+ components, which slightly changes the way the module is configured. See:
62+ <xref linkend="sec-kubernetes"/> for details.
4963 </para>
5064 </listitem>
5165 <listitem>
52− <para>
53− There is now a set of <option>confinement</option> options for <option>systemd.services</option>, which allows to restrict services into a <citerefentry>
54− <refentrytitle>chroot</refentrytitle>
55− <manvolnum>2</manvolnum> </citerefentry>ed environment that only contains the store paths from the runtime closure of the service.
56− </para>
66+ <para>
67+ There is now a set of <option>confinement</option> options for
68+ <option>systemd.services</option>, which allows to restrict services
69+ into a <citerefentry>
70+ <refentrytitle>chroot</refentrytitle>
71+ <manvolnum>2</manvolnum>
72+ </citerefentry>ed environment that only contains the store paths from
73+ the runtime closure of the service.
74+ </para>
5775 </listitem>
5876 </itemizedlist>
5977 </section>
@@ -77,7 +95,12 @@
7795 </listitem>
7896 <listitem>
7997 <para>
80− There is a new <varname>security.googleOsLogin</varname> module for using <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS Login</link> to manage SSH access to Google Compute Engine instances, which supersedes the imperative and broken <literal>google-accounts-daemon</literal> used in <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
98+ There is a new <varname>security.googleOsLogin</varname> module for using
99+ <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS
100+ Login</link> to manage SSH access to Google Compute Engine instances,
101+ which supersedes the imperative and broken
102+ <literal>google-accounts-daemon</literal> used in
103+ <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
81104 </para>
82105 </listitem>
83106 <listitem>
@@ -87,7 +110,10 @@
87110 </listitem>
88111 <listitem>
89112 <para>
90− There is a new <varname>services.cockroachdb</varname> module for running CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, available on <literal>x86_64-linux</literal> and <literal>aarch64-linux</literal>.
113+ There is a new <varname>services.cockroachdb</varname> module for running
114+ CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well,
115+ available on <literal>x86_64-linux</literal> and
116+ <literal>aarch64-linux</literal>.
91117 </para>
92118 </listitem>
93119 </itemizedlist>
@@ -100,7 +126,11 @@
100126 </listitem>
101127 <listitem>
102128 <para>
103− The <link xlink:href="https://duo.com/docs/duounix">PAM module for Duo Security</link> has been enabled for use. One can configure it using the <option>security.duosec</option> options along with the corresponding PAM option in <option>security.pam.services.&lt;name?&gt;.duoSecurity.enable</option>.
129+ The <link xlink:href="https://duo.com/docs/duounix">PAM module for Duo
130+ Security</link> has been enabled for use. One can configure it using the
131+ <option>security.duosec</option> options along with the corresponding PAM
132+ option in
133+ <option>security.pam.services.&lt;name?&gt;.duoSecurity.enable</option>.
104134 </para>
105135 </listitem>
106136 </itemizedlist>
@@ -114,7 +144,8 @@
114144 <title>Backward Incompatibilities</title>
115145
116146 <para>
117− When upgrading from a previous release, please be aware of the following incompatible changes:
147+ When upgrading from a previous release, please be aware of the following
148+ incompatible changes:
118149 </para>
119150
120151 <itemizedlist>
@@ -125,131 +156,233 @@
125156 <itemizedlist>
126157 <listitem>
127158 <para>
128− For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but supports using Nix 1.11 by setting <literal>nix.package = pkgs.nix1;</literal>. 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.
159+ For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but
160+ supports using Nix 1.11 by setting <literal>nix.package =
161+ pkgs.nix1;</literal>. If this option is set to a Nix 1.11 package, you
162+ will need to either unset the option or upgrade it to Nix 2.0.
129163 </para>
130164 </listitem>
131165 <listitem>
132166 <para>
133− For users of NixOS 17.09, you will first need to upgrade Nix by setting <literal>nix.package = pkgs.nixStable2;</literal> and run <command>nixos-rebuild switch</command> as the <literal>root</literal> user.
167+ For users of NixOS 17.09, you will first need to upgrade Nix by setting
168+ <literal>nix.package = pkgs.nixStable2;</literal> and run
169+ <command>nixos-rebuild switch</command> as the <literal>root</literal>
170+ user.
134171 </para>
135172 </listitem>
136173 <listitem>
137174 <para>
138− For users of a daemon-less Nix installation on Linux or macOS, you can upgrade Nix by running <command>curl https://nixos.org/nix/install | sh</command>, or prior to doing a channel update, running <command>nix-env -iA nix</command>.
175+ For users of a daemon-less Nix installation on Linux or macOS, you can
176+ upgrade Nix by running <command>curl https://nixos.org/nix/install |
177+ sh</command>, or prior to doing a channel update, running
178+ <command>nix-env -iA nix</command>.
139179 </para>
140180 <para>
141− 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.
181+ If you have already run a channel update and Nix is no longer able to
182+ evaluate Nixpkgs, the error message printed should provide adequate
183+ directions for upgrading Nix.
142184 </para>
143185 </listitem>
144186 <listitem>
145187 <para>
146− For users of the Nix daemon on macOS, you can upgrade Nix by running <command>sudo -i sh -c 'nix-channel --update &amp;&amp; nix-env -iA nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl start org.nixos.nix-daemon</command>.
188+ For users of the Nix daemon on macOS, you can upgrade Nix by running
189+ <command>sudo -i sh -c 'nix-channel --update &amp;&amp; nix-env -iA
190+ nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl
191+ start org.nixos.nix-daemon</command>.
147192 </para>
148193 </listitem>
149194 </itemizedlist>
150195 </listitem>
151196 <listitem>
152197 <para>
153− The <varname>buildPythonPackage</varname> function now sets <varname>strictDeps = true</varname> to help distinguish between native and non-native dependencies in order to improve cross-compilation compatibility. Note however that this may break user expressions.
198+ The <varname>buildPythonPackage</varname> function now sets
199+ <varname>strictDeps = true</varname> to help distinguish between native
200+ and non-native dependencies in order to improve cross-compilation
201+ compatibility. Note however that this may break user expressions.
154202 </para>
155203 </listitem>
156204 <listitem>
157205 <para>
158− The <varname>buildPythonPackage</varname> function now sets <varname>LANG = C.UTF-8</varname> to enable Unicode support. The <varname>glibcLocales</varname> package is no longer needed as a build input.
206+ The <varname>buildPythonPackage</varname> function now sets <varname>LANG
207+ = C.UTF-8</varname> to enable Unicode support. The
208+ <varname>glibcLocales</varname> package is no longer needed as a build
209+ input.
159210 </para>
160211 </listitem>
161212 <listitem>
162213 <para>
163− The Syncthing state and configuration data has been moved from <varname>services.syncthing.dataDir</varname> to the newly defined <varname>services.syncthing.configDir</varname>, which default to <literal>/var/lib/syncthing/.config/syncthing</literal>. This change makes possible to share synced directories using ACLs without Syncthing resetting the permission on every start.
214+ The Syncthing state and configuration data has been moved from
215+ <varname>services.syncthing.dataDir</varname> to the newly defined
216+ <varname>services.syncthing.configDir</varname>, which default to
217+ <literal>/var/lib/syncthing/.config/syncthing</literal>. This change makes
218+ possible to share synced directories using ACLs without Syncthing
219+ resetting the permission on every start.
164220 </para>
165221 </listitem>
166222 <listitem>
167223 <para>
168− The <literal>ntp</literal> 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 <varname>services.ntp.restrictDefault</varname> and <varname>services.ntp.restrictSource</varname> to <literal>[]</literal>.
224+ The <literal>ntp</literal> module now has sane default restrictions. If
225+ you're relying on the previous defaults, which permitted all queries and
226+ commands from all firewall-permitted sources, you can set
227+ <varname>services.ntp.restrictDefault</varname> and
228+ <varname>services.ntp.restrictSource</varname> to <literal>[]</literal>.
169229 </para>
170230 </listitem>
171231 <listitem>
172232 <para>
173− Package <varname>rabbitmq_server</varname> is renamed to <varname>rabbitmq-server</varname>.
233+ Package <varname>rabbitmq_server</varname> is renamed to
234+ <varname>rabbitmq-server</varname>.
174235 </para>
175236 </listitem>
176237 <listitem>
177238 <para>
178− The <literal>light</literal> module no longer uses setuid binaries, but udev rules. As a consequence users of that module have to belong to the <literal>video</literal> group in order to use the executable (i.e. <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
239+ The <literal>light</literal> module no longer uses setuid binaries, but
240+ udev rules. As a consequence users of that module have to belong to the
241+ <literal>video</literal> group in order to use the executable (i.e.
242+ <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
179243 </para>
180244 </listitem>
181245 <listitem>
182246 <para>
183− Buildbot now supports Python 3 and its packages have been moved to <literal>pythonPackages</literal>. The options <option>services.buildbot-master.package</option> and <option>services.buildbot-worker.package</option> can be used to select the Python 2 or 3 version of the package.
247+ Buildbot now supports Python 3 and its packages have been moved to
248+ <literal>pythonPackages</literal>. The options
249+ <option>services.buildbot-master.package</option> and
250+ <option>services.buildbot-worker.package</option> can be used to select
251+ the Python 2 or 3 version of the package.
184252 </para>
185253 </listitem>
186254 <listitem>
187255 <para>
188− Options <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.userName</literal> and <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.modulePackages</literal> were removed. They were never used for anything and can therefore safely be removed.
256+ Options
257+ <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.userName</literal>
258+ and
259+ <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.modulePackages</literal>
260+ were removed. They were never used for anything and can therefore safely
261+ be removed.
189262 </para>
190263 </listitem>
191264 <listitem>
192265 <para>
193− Package <literal>wasm</literal> has been renamed <literal>proglodyte-wasm</literal>. The package <literal>wasm</literal> will be pointed to <literal>ocamlPackages.wasm</literal> in 19.09, so make sure to update your configuration if you want to keep <literal>proglodyte-wasm</literal>
266+ Package <literal>wasm</literal> has been renamed
267+ <literal>proglodyte-wasm</literal>. The package <literal>wasm</literal>
268+ will be pointed to <literal>ocamlPackages.wasm</literal> in 19.09, so make
269+ sure to update your configuration if you want to keep
270+ <literal>proglodyte-wasm</literal>
194271 </para>
195272 </listitem>
196273 <listitem>
197274 <para>
198− When the <literal>nixpkgs.pkgs</literal> option is set, NixOS will no longer ignore the <literal>nixpkgs.overlays</literal> option. The old behavior can be recovered by setting <literal>nixpkgs.overlays = lib.mkForce [];</literal>.
275+ When the <literal>nixpkgs.pkgs</literal> option is set, NixOS will no
276+ longer ignore the <literal>nixpkgs.overlays</literal> option. The old
277+ behavior can be recovered by setting <literal>nixpkgs.overlays =
278+ lib.mkForce [];</literal>.
199279 </para>
200280 </listitem>
201281 <listitem>
202282 <para>
203− OpenSMTPD has been upgraded to version 6.4.0p1. This release makes backwards-incompatible changes to the configuration file format. See <command>man smtpd.conf</command> for more information on the new file format.
283+ OpenSMTPD has been upgraded to version 6.4.0p1. This release makes
284+ backwards-incompatible changes to the configuration file format. See
285+ <command>man smtpd.conf</command> for more information on the new file
286+ format.
204287 </para>
205288 </listitem>
206289 <listitem>
207290 <para>
208− The versioned <varname>postgresql</varname> have been renamed to use underscore number seperators. For example, <varname>postgresql96</varname> has been renamed to <varname>postgresql_9_6</varname>.
291+ The versioned <varname>postgresql</varname> have been renamed to use
292+ underscore number seperators. For example, <varname>postgresql96</varname>
293+ has been renamed to <varname>postgresql_9_6</varname>.
209294 </para>
210295 </listitem>
211296 <listitem>
212297 <para>
213− Package <literal>consul-ui</literal> and passthrough <literal>consul.ui</literal> have been removed. The package <literal>consul</literal> now uses upstream releases that vendor the UI into the binary. See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link> for details.
298+ Package <literal>consul-ui</literal> and passthrough
299+ <literal>consul.ui</literal> have been removed. The package
300+ <literal>consul</literal> now uses upstream releases that vendor the UI
301+ into the binary. See
302+ <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link>
303+ for details.
214304 </para>
215305 </listitem>
216306 <listitem>
217307 <para>
218− Slurm introduces the new option <literal>services.slurm.stateSaveLocation</literal>, which is now set to <literal>/var/spool/slurm</literal> by default (instead of <literal>/var/spool</literal>). Make sure to move all files to the new directory or to set the option accordingly.
308+ Slurm introduces the new option
309+ <literal>services.slurm.stateSaveLocation</literal>, which is now set to
310+ <literal>/var/spool/slurm</literal> by default (instead of
311+ <literal>/var/spool</literal>). Make sure to move all files to the new
312+ directory or to set the option accordingly.
219313 </para>
220314 <para>
221− The slurmctld now runs as user <literal>slurm</literal> instead of <literal>root</literal>. If you want to keep slurmctld running as <literal>root</literal>, set <literal>services.slurm.user = root</literal>.
315+ The slurmctld now runs as user <literal>slurm</literal> instead of
316+ <literal>root</literal>. If you want to keep slurmctld running as
317+ <literal>root</literal>, set <literal>services.slurm.user =
318+ root</literal>.
222319 </para>
223320 <para>
224− The options <literal>services.slurm.nodeName</literal> and <literal>services.slurm.partitionName</literal> are now sets of strings to correctly reflect that fact that each of these options can occour more than once in the configuration.
321+ The options <literal>services.slurm.nodeName</literal> and
322+ <literal>services.slurm.partitionName</literal> are now sets of strings to
323+ correctly reflect that fact that each of these options can occour more
324+ than once in the configuration.
225325 </para>
226326 </listitem>
227327 <listitem>
228328 <para>
229− The <literal>solr</literal> package has been upgraded from 4.10.3 to 7.5.0 and has undergone some major changes. The <literal>services.solr</literal> module has been updated to reflect these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading.
329+ The <literal>solr</literal> package has been upgraded from 4.10.3 to 7.5.0
330+ and has undergone some major changes. The <literal>services.solr</literal>
331+ module has been updated to reflect these changes. Please review
332+ http://lucene.apache.org/solr/ carefully before upgrading.
230333 </para>
231334 </listitem>
232335 <listitem>
233336 <para>
234− Package <literal>ckb</literal> is renamed to <literal>ckb-next</literal>, and options <literal>hardware.ckb.*</literal> are renamed to <literal>hardware.ckb-next.*</literal>.
337+ Package <literal>ckb</literal> is renamed to <literal>ckb-next</literal>,
338+ and options <literal>hardware.ckb.*</literal> are renamed to
339+ <literal>hardware.ckb-next.*</literal>.
235340 </para>
236341 </listitem>
237342 <listitem>
238343 <para>
239− The option <literal>services.xserver.displayManager.job.logToFile</literal> which was previously set to <literal>true</literal> when using the display managers <literal>lightdm</literal>, <literal>sddm</literal> or <literal>xpra</literal> has been reset to the default value (<literal>false</literal>).
344+ The option
345+ <literal>services.xserver.displayManager.job.logToFile</literal> which was
346+ previously set to <literal>true</literal> when using the display managers
347+ <literal>lightdm</literal>, <literal>sddm</literal> or
348+ <literal>xpra</literal> has been reset to the default value
349+ (<literal>false</literal>).
240350 </para>
241351 </listitem>
242352 <listitem>
243353 <para>
244− Network interface indiscriminate NixOS firewall options (<literal>networking.firewall.allow*</literal>) are now preserved when also setting interface specific rules such as <literal>networking.firewall.interfaces.en0.allow*</literal>. These rules continue to use the pseudo device "default" (<literal>networking.firewall.interfaces.default.*</literal>), and assigning to this pseudo device will override the (<literal>networking.firewall.allow*</literal>) options.
354+ Network interface indiscriminate NixOS firewall options
355+ (<literal>networking.firewall.allow*</literal>) are now preserved when
356+ also setting interface specific rules such as
357+ <literal>networking.firewall.interfaces.en0.allow*</literal>. These rules
358+ continue to use the pseudo device "default"
359+ (<literal>networking.firewall.interfaces.default.*</literal>), and
360+ assigning to this pseudo device will override the
361+ (<literal>networking.firewall.allow*</literal>) options.
245362 </para>
246363 </listitem>
247364 <listitem>
248365 <para>
249− The <literal>nscd</literal> service now disables all caching of <literal>passwd</literal> and <literal>group</literal> databases by default. This was interferring with the correct functioning of the <literal>libnss_systemd.so</literal> module which is used by <literal>systemd</literal> to manage uids and usernames in the presence of <literal>DynamicUser=</literal> in systemd services. This was already the default behaviour in presence of <literal>services.sssd.enable = true</literal> because nscd caching would interfere with <literal>sssd</literal> 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.
366+ The <literal>nscd</literal> service now disables all caching of
367+ <literal>passwd</literal> and <literal>group</literal> databases by
368+ default. This was interferring with the correct functioning of the
369+ <literal>libnss_systemd.so</literal> module which is used by
370+ <literal>systemd</literal> to manage uids and usernames in the presence of
371+ <literal>DynamicUser=</literal> in systemd services. This was already the
372+ default behaviour in presence of <literal>services.sssd.enable =
373+ true</literal> because nscd caching would interfere with
374+ <literal>sssd</literal> in unpredictable ways as well. Because we're using
375+ nscd not for caching, but for convincing glibc to find NSS modules in the
376+ nix store instead of an absolute path, we have decided to disable caching
377+ globally now, as it's usually not the behaviour the user wants and can
378+ lead to surprising behaviour. Furthermore, negative caching of host
379+ lookups is also disabled now by default. This should fix the issue of dns
380+ lookups failing in the presence of an unreliable network.
250381 </para>
251382 <para>
252− If the old behaviour is desired, this can be restored by setting the <literal>services.nscd.config</literal> option with the desired caching parameters.
383+ If the old behaviour is desired, this can be restored by setting the
384+ <literal>services.nscd.config</literal> option with the desired caching
385+ parameters.
253386<programlisting>
254387 services.nscd.config =
255388 ''
@@ -283,65 +416,124 @@
283416 shared hosts yes
284417 '';
285418 </programlisting>
286− See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/50316">#50316</link> for details.
419+ See
420+ <link xlink:href="https://github.com/NixOS/nixpkgs/pull/50316">#50316</link>
421+ for details.
287422 </para>
288423 </listitem>
289424 <listitem>
290425 <para>
291− GitLab Shell previously used the nix store paths for the <literal>gitlab-shell</literal> command in its <literal>authorized_keys</literal> file, which might stop working after garbage collection. To circumvent that, we regenerated that file on each startup. As <literal>gitlab-shell</literal> has now been changed to use <literal>/var/run/current-system/sw/bin/gitlab-shell</literal>, this is not necessary anymore, but there might be leftover lines with a nix store path. Regenerate the <literal>authorized_keys</literal> file via <command>sudo -u git -H gitlab-rake gitlab:shell:setup</command> in that case.
426+ GitLab Shell previously used the nix store paths for the
427+ <literal>gitlab-shell</literal> command in its
428+ <literal>authorized_keys</literal> file, which might stop working after
429+ garbage collection. To circumvent that, we regenerated that file on each
430+ startup. As <literal>gitlab-shell</literal> has now been changed to use
431+ <literal>/var/run/current-system/sw/bin/gitlab-shell</literal>, this is
432+ not necessary anymore, but there might be leftover lines with a nix store
433+ path. Regenerate the <literal>authorized_keys</literal> file via
434+ <command>sudo -u git -H gitlab-rake gitlab:shell:setup</command> in that
435+ case.
292436 </para>
293437 </listitem>
294438 <listitem>
295439 <para>
296− The <literal>pam_unix</literal> account module is now loaded with its control field set to <literal>required</literal> instead of <literal>sufficient</literal>, 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 <literal>pam_unix</literal>. 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 <literal>
440+ The <literal>pam_unix</literal> account module is now loaded with its
441+ control field set to <literal>required</literal> instead of
442+ <literal>sufficient</literal>, so that later PAM account modules that
443+ might do more extensive checks are being executed. Previously, the whole
444+ account module verification was exited prematurely in case a nss module
445+ provided the account name to <literal>pam_unix</literal>. The LDAP and
446+ SSSD NixOS modules already add their NSS modules when enabled. In case
447+ your setup breaks due to some later PAM account module previosuly
448+ shadowed, or failing NSS lookups, please file a bug. You can get back the
449+ old behaviour by manually setting <literal>
297450<![CDATA[security.pam.services.<name?>.text]]>
298451 </literal>.
299452 </para>
300453 </listitem>
301454 <listitem>
302455 <para>
303− The <literal>pam_unix</literal> password module is now loaded with its control field set to <literal>sufficient</literal> instead of <literal>required</literal>, 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 <literal>pam_unix</literal>, preventing <literal>pam_ldap</literal> to manage the password as it should.
456+ The <literal>pam_unix</literal> password module is now loaded with its
457+ control field set to <literal>sufficient</literal> instead of
458+ <literal>required</literal>, so that password managed only by later PAM
459+ password modules are being executed. Previously, for example, changing an
460+ LDAP account's password through PAM was not possible: the whole password
461+ module verification was exited prematurely by <literal>pam_unix</literal>,
462+ preventing <literal>pam_ldap</literal> to manage the password as it
463+ should.
304464 </para>
305465 </listitem>
306466 <listitem>
307467 <para>
308− <literal>fish</literal> has been upgraded to 3.0. It comes with a number of improvements and backwards incompatible changes. See the <literal>fish</literal> <link xlink:href="https://github.com/fish-shell/fish-shell/releases/tag/3.0.0">release notes</link> for more information.
468+ <literal>fish</literal> has been upgraded to 3.0. It comes with a number
469+ of improvements and backwards incompatible changes. See the
470+ <literal>fish</literal>
471+ <link xlink:href="https://github.com/fish-shell/fish-shell/releases/tag/3.0.0">release
472+ notes</link> for more information.
309473 </para>
310474 </listitem>
311475 <listitem>
312476 <para>
313− The ibus-table input method has had a change in config format, which causes all previous settings to be lost. See <link xlink:href="https://github.com/mike-fabian/ibus-table/commit/f9195f877c5212fef0dfa446acb328c45ba5852b">this commit message</link> for details.
477+ The ibus-table input method has had a change in config format, which
478+ causes all previous settings to be lost. See
479+ <link xlink:href="https://github.com/mike-fabian/ibus-table/commit/f9195f877c5212fef0dfa446acb328c45ba5852b">this
480+ commit message</link> for details.
314481 </para>
315482 </listitem>
316483 <listitem>
317484 <para>
318− NixOS module system type <literal>types.optionSet</literal> and <literal>lib.mkOption</literal> argument <literal>options</literal> are deprecated. Use <literal>types.submodule</literal> instead. (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/54637">#54637</link>)
485+ NixOS module system type <literal>types.optionSet</literal> and
486+ <literal>lib.mkOption</literal> argument <literal>options</literal> are
487+ deprecated. Use <literal>types.submodule</literal> instead.
488+ (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/54637">#54637</link>)
319489 </para>
320490 </listitem>
321491 <listitem>
322492 <para>
323− <literal>matrix-synapse</literal> has been updated to version 0.99. It will <link xlink:href="https://github.com/matrix-org/synapse/pull/4509">no longer generate a self-signed certificate on first launch</link> and will be <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the last version to accept self-signed certificates</link>. As such, it is now recommended to use a proper certificate verified by a root CA (for example Let's Encrypt). The new <link linkend="module-services-matrix">manual chapter on Matrix</link> contains a working example of using nginx as a reverse proxy in front of <literal>matrix-synapse</literal>, using Let's Encrypt certificates.
493+ <literal>matrix-synapse</literal> has been updated to version 0.99. It
494+ will <link xlink:href="https://github.com/matrix-org/synapse/pull/4509">no
495+ longer generate a self-signed certificate on first launch</link> and will
496+ be
497+ <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the
498+ last version to accept self-signed certificates</link>. As such, it is now
499+ recommended to use a proper certificate verified by a root CA (for example
500+ Let's Encrypt). The new <link linkend="module-services-matrix">manual
501+ chapter on Matrix</link> contains a working example of using nginx as a
502+ reverse proxy in front of <literal>matrix-synapse</literal>, using Let's
503+ Encrypt certificates.
324504 </para>
325505 </listitem>
326506 <listitem>
327507 <para>
328− <literal>mailutils</literal> now works by default when <literal>sendmail</literal> is not in a setuid wrapper. As a consequence, the <literal>sendmailPath</literal> argument, having lost its main use, has been removed.
508+ <literal>mailutils</literal> now works by default when
509+ <literal>sendmail</literal> is not in a setuid wrapper. As a consequence,
510+ the <literal>sendmailPath</literal> argument, having lost its main use,
511+ has been removed.
329512 </para>
330513 </listitem>
331514 <listitem>
332515 <para>
333− <literal>graylog</literal> 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 <link xlink:href="http://docs.graylog.org/en/3.0/pages/upgrade/graylog-3.0.html#simplified-http-interface-configuration">Upgrading Graylog</link> for details.
516+ <literal>graylog</literal> has been upgraded from version 2.* to 3.*. Some
517+ setups making use of extraConfig (especially those exposing Graylog via
518+ reverse proxies) need to be updated as upstream removed/replaced some
519+ settings. See
520+ <link xlink:href="http://docs.graylog.org/en/3.0/pages/upgrade/graylog-3.0.html#simplified-http-interface-configuration">Upgrading
521+ Graylog</link> for details.
334522 </para>
335523 </listitem>
336524 <listitem>
337525 <para>
338− The option <literal>users.ldap.bind.password</literal> was renamed to <literal>users.ldap.bind.passwordFile</literal>, and needs to be readable by the <literal>nslcd</literal> user. Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option.
526+ The option <literal>users.ldap.bind.password</literal> was renamed to <literal>users.ldap.bind.passwordFile</literal>,
527+ and needs to be readable by the <literal>nslcd</literal> user.
528+ Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option.
339529 </para>
340530 </listitem>
341531 <listitem>
342− <para>
343− <literal>nodejs-6_x</literal> is end-of-life. <literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and <literal>nodePackages_6_x</literal> are removed.
344− </para>
532+ <para>
533+ <literal>nodejs-6_x</literal> is end-of-life.
534+ <literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and
535+ <literal>nodePackages_6_x</literal> are removed.
536+ </para>
345537 </listitem>
346538 </itemizedlist>
347539 </section>
@@ -356,122 +548,214 @@
356548 <itemizedlist>
357549 <listitem>
358550 <para>
359− The <option>services.matomo</option> module gained the option <option>services.matomo.package</option> which determines the used Matomo version.
551+ The <option>services.matomo</option> module gained the option
552+ <option>services.matomo.package</option> which determines the used Matomo
553+ version.
360554 </para>
361555 <para>
362− The Matomo module now also comes with the systemd service <literal>matomo-archive-processing.service</literal> and a timer that automatically triggers archive processing every hour. This means that you can safely <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour"> disable browser triggers for Matomo archiving </link> at <literal>Administration > System > General Settings</literal>.
556+ The Matomo module now also comes with the systemd service
557+ <literal>matomo-archive-processing.service</literal> and a timer that
558+ automatically triggers archive processing every hour. This means that you
559+ can safely
560+ <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour">
561+ disable browser triggers for Matomo archiving </link> at
562+ <literal>Administration > System > General Settings</literal>.
363563 </para>
364564 <para>
365− Additionally, you can enable to <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs"> delete old visitor logs </link> at <literal>Administration > System > Privacy</literal>, but make sure that you run <literal>systemctl start matomo-archive-processing.service</literal> at least once without errors if you have already collected data before, so that the reports get archived before the source data gets deleted.
565+ Additionally, you can enable to
566+ <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs">
567+ delete old visitor logs </link> at <literal>Administration > System >
568+ Privacy</literal>, but make sure that you run <literal>systemctl start
569+ matomo-archive-processing.service</literal> at least once without errors
570+ if you have already collected data before, so that the reports get
571+ archived before the source data gets deleted.
366572 </para>
367573 </listitem>
368574 <listitem>
369575 <para>
370− <literal>composableDerivation</literal> along with supporting library functions has been removed.
576+ <literal>composableDerivation</literal> along with supporting library
577+ functions has been removed.
371578 </para>
372579 </listitem>
373580 <listitem>
374581 <para>
375− The deprecated <literal>truecrypt</literal> package has been removed and <literal>truecrypt</literal> attribute is now an alias for <literal>veracrypt</literal>. VeraCrypt is backward-compatible with TrueCrypt volumes. Note that <literal>cryptsetup</literal> also supports loading TrueCrypt volumes.
582+ The deprecated <literal>truecrypt</literal> package has been removed and
583+ <literal>truecrypt</literal> attribute is now an alias for
584+ <literal>veracrypt</literal>. VeraCrypt is backward-compatible with
585+ TrueCrypt volumes. Note that <literal>cryptsetup</literal> also supports
586+ loading TrueCrypt volumes.
376587 </para>
377588 </listitem>
378589 <listitem>
379590 <para>
380− 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 <link xlink:href="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#sig-cluster-lifecycle">Kubernetes v1.11</link>. 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: <option>services.kubernetes.addons.dns.replicas</option>.
591+ The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. This
592+ change is made in accordance with Kubernetes making CoreDNS the official
593+ default starting from
594+ <link xlink:href="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#sig-cluster-lifecycle">Kubernetes
595+ v1.11</link>. Please beware that upgrading DNS-addon on existing clusters
596+ might induce minor downtime while the DNS-addon terminates and
597+ re-initializes. Also note that the DNS-service now runs with 2 pod
598+ replicas by default. The desired number of replicas can be configured
599+ using: <option>services.kubernetes.addons.dns.replicas</option>.
381600 </para>
382601 </listitem>
383602 <listitem>
384603 <para>
385− The quassel-webserver package and module was removed from nixpkgs due to the lack of maintainers.
604+ The quassel-webserver package and module was removed from nixpkgs due to
605+ the lack of maintainers.
386606 </para>
387607 </listitem>
388608 <listitem>
389609 <para>
390− The manual gained a <link linkend="module-services-matrix"> new chapter on self-hosting <literal>matrix-synapse</literal> and <literal>riot-web</literal> </link>, the most prevalent server and client implementations for the <link xlink:href="https://matrix.org/">Matrix</link> federated communication network.
610+ The manual gained a <link linkend="module-services-matrix"> new chapter on
611+ self-hosting <literal>matrix-synapse</literal> and
612+ <literal>riot-web</literal> </link>, the most prevalent server and client
613+ implementations for the
614+ <link xlink:href="https://matrix.org/">Matrix</link> federated
615+ communication network.
391616 </para>
392617 </listitem>
393618 <listitem>
394619 <para>
395− The astah-community package was removed from nixpkgs due to it being discontinued and the downloads not being available anymore.
620+ The astah-community package was removed from nixpkgs due to it being
621+ discontinued and the downloads not being available anymore.
396622 </para>
397623 </listitem>
398624 <listitem>
399625 <para>
400− The httpd service now saves log files with a .log file extension by default for easier integration with the logrotate service.
626+ The httpd service now saves log files with a .log file extension by
627+ default for easier integration with the logrotate service.
401628 </para>
402629 </listitem>
403630 <listitem>
404631 <para>
405− The owncloud server packages and httpd subservice module were removed from nixpkgs due to the lack of maintainers.
632+ The owncloud server packages and httpd subservice module were removed from
633+ nixpkgs due to the lack of maintainers.
406634 </para>
407635 </listitem>
408636 <listitem>
409637 <para>
410− 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 <literal>zramSwap.swapDevices</literal> explicitly.
638+ It is possible now to uze ZRAM devices as general purpose ephemeral block
639+ devices, not only as swap. Using more than 1 device as ZRAM swap is no
640+ longer recommended, but is still possible by setting
641+ <literal>zramSwap.swapDevices</literal> explicitly.
411642 </para>
412643 <para>
413644 ZRAM algorithm can be changed now.
414645 </para>
415646 <para>
416− Changes to ZRAM algorithm are applied during <literal>nixos-rebuild switch</literal>, so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively, use <literal>nixos-rebuild boot; reboot</literal>.
647+ Changes to ZRAM algorithm are applied during <literal>nixos-rebuild
648+ switch</literal>, so make sure you have enough swap space on disk to
649+ survive ZRAM device rebuild. Alternatively, use <literal>nixos-rebuild
650+ boot; reboot</literal>.
417651 </para>
418652 </listitem>
419653 <listitem>
420654 <para>
421− Flat volumes are now disabled by default in <literal>hardware.pulseaudio</literal>. 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.
655+ Flat volumes are now disabled by default in
656+ <literal>hardware.pulseaudio</literal>. This has been done to prevent
657+ applications, which are unaware of this feature, setting their volumes to
658+ 100% on startup causing harm to your audio hardware and potentially your
659+ ears.
422660 </para>
423661 <note>
424662 <para>
425− 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.
663+ With this change application specific volumes are relative to the master
664+ volume which can be adjusted independently, whereas before they were
665+ absolute; meaning that in effect, it scaled the device-volume with the
666+ volume of the loudest application.
426667 </para>
427668 </note>
428669 </listitem>
429670 <listitem>
430671 <para>
431− The <link xlink:href="https://github.com/DanielAdolfsson/ndppd"><literal>ndppd</literal></link> module now supports <link linkend="opt-services.ndppd.enable">all config options</link> provided by the current upstream version as service options. Additionally the <literal>ndppd</literal> package doesn't contain the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now.
672+ The
673+ <link xlink:href="https://github.com/DanielAdolfsson/ndppd"><literal>ndppd</literal></link>
674+ module now supports <link linkend="opt-services.ndppd.enable">all config
675+ options</link> provided by the current upstream version as service
676+ options. Additionally the <literal>ndppd</literal> package doesn't contain
677+ the systemd unit configuration from upstream anymore, the unit is
678+ completely configured by the NixOS module now.
432679 </para>
433680 </listitem>
434681 <listitem>
435682 <para>
436− New installs of NixOS will default to the Redmine 4.x series unless otherwise specified in <literal>services.redmine.package</literal> while existing installs of NixOS will default to the Redmine 3.x series.
683+ New installs of NixOS will default to the Redmine 4.x series unless
684+ otherwise specified in <literal>services.redmine.package</literal> while
685+ existing installs of NixOS will default to the Redmine 3.x series.
437686 </para>
438687 </listitem>
439688 <listitem>
440689 <para>
441− The <link linkend="opt-services.grafana.enable">Grafana module</link> now supports declarative <link xlink:href="http://docs.grafana.org/administration/provisioning/">datasource and dashboard</link> provisioning.
690+ The <link linkend="opt-services.grafana.enable">Grafana module</link> now
691+ supports declarative
692+ <link xlink:href="http://docs.grafana.org/administration/provisioning/">datasource
693+ and dashboard</link> provisioning.
442694 </para>
443695 </listitem>
444696 <listitem>
445697 <para>
446− The use of insecure ports on kubernetes has been deprecated. Thus options: <varname>services.kubernetes.apiserver.port</varname> and <varname>services.kubernetes.controllerManager.port</varname> has been renamed to <varname>.insecurePort</varname>, and default of both options has changed to 0 (disabled).
698+ The use of insecure ports on kubernetes has been deprecated. Thus options:
699+ <varname>services.kubernetes.apiserver.port</varname> and
700+ <varname>services.kubernetes.controllerManager.port</varname> has been
701+ renamed to <varname>.insecurePort</varname>, and default of both options
702+ has changed to 0 (disabled).
447703 </para>
448704 </listitem>
449705 <listitem>
450706 <para>
451− Note that the default value of <varname>services.kubernetes.apiserver.bindAddress</varname> 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: <varname>services.kubernetes.apiserver.insecurebindAddress</varname>.
707+ Note that the default value of
708+ <varname>services.kubernetes.apiserver.bindAddress</varname> has changed
709+ from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be accessible from
710+ outside the master node itself. If the apiserver insecurePort is enabled,
711+ it is strongly recommended to only bind on the loopback interface. See:
712+ <varname>services.kubernetes.apiserver.insecurebindAddress</varname>.
452713 </para>
453714 </listitem>
454715 <listitem>
455716 <para>
456− The option <varname>services.kubernetes.apiserver.allowPrivileged</varname> and <varname>services.kubernetes.kubelet.allowPrivileged</varname> now defaults to false. Disallowing privileged containers on the cluster.
717+ The option
718+ <varname>services.kubernetes.apiserver.allowPrivileged</varname> and
719+ <varname>services.kubernetes.kubelet.allowPrivileged</varname> now
720+ defaults to false. Disallowing privileged containers on the cluster.
457721 </para>
458722 </listitem>
459723 <listitem>
460724 <para>
461− The kubernetes module does no longer add the kubernetes package to <varname>environment.systemPackages</varname> implicitly.
725+ The kubernetes module does no longer add the kubernetes package to
726+ <varname>environment.systemPackages</varname> implicitly.
462727 </para>
463728 </listitem>
464729 <listitem>
465730 <para>
466− The <literal>intel</literal> driver has been removed from the default list of <link linkend="opt-services.xserver.videoDrivers">X.org video drivers</link>. The <literal>modesetting</literal> 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 <literal>xrandr</literal>. 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 <literal>modesetting</literal> driver, too). Kernel mode setting API does not support backlight control, so <literal>xbacklight</literal> tool will not work; backlight level can be controlled directly via <literal>/sys/</literal> or with <literal>brightnessctl</literal>. 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)
731+ The <literal>intel</literal> driver has been removed from the default list
732+ of <link linkend="opt-services.xserver.videoDrivers">X.org video
733+ drivers</link>. The <literal>modesetting</literal> driver should take over
734+ automatically, it is better maintained upstream and has less problems with
735+ advanced X11 features. This can lead to a change in the output names used
736+ by <literal>xrandr</literal>. Some performance regressions on some GPU
737+ models might happen. Some OpenCL and VA-API applications might also break
738+ (Beignet seems to provide OpenCL support with
739+ <literal>modesetting</literal> driver, too). Kernel mode setting API does
740+ not support backlight control, so <literal>xbacklight</literal> tool will
741+ not work; backlight level can be controlled directly via
742+ <literal>/sys/</literal> or with <literal>brightnessctl</literal>. Users
743+ who need this functionality more than multi-output XRandR are advised to
744+ add `intel` to `videoDrivers` and report an issue (or provide additional
745+ details in an existing one)
467746 </para>
468747 </listitem>
469748 <listitem>
470749 <para>
471− 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 <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
750+ Openmpi has been updated to version 4.0.0, which removes some deprecated
751+ MPI-1 symbols. This may break some older applications that still rely on
752+ those symbols. An upgrade guide can be found
753+ <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
472754 </para>
473755 <para>
474− 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 <xref linkend="opt-services.nginx.sslProtocols"/>.
756+ The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by
757+ default. You can set the protocols used by the nginx service using
758+ <xref linkend="opt-services.nginx.sslProtocols"/>.
475759 </para>
476760 </listitem>
477761 <listitem>
nixos/doc/manual/release-notes/rl-1909.xml+406−325
@@ -13,7 +13,8 @@
1313 <title>Highlights</title>
1414
1515 <para>
16− In addition to numerous new and upgraded packages, this release has the following highlights:
16+ In addition to numerous new and upgraded packages, this release has the
17+ following highlights:
1718 </para>
1819
1920 <itemizedlist>
@@ -33,155 +34,85 @@
3334 </para>
3435 </listitem>
3536 <listitem>
36− <para>
37− The binfmt module is now easier to use. Additional systems can be added through <option>boot.binfmt.emulatedSystems</option>. For instance, <literal>boot.binfmt.emulatedSystems = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ];</literal> will set up binfmt interpreters for each of those listed systems.
38− </para>
37+ <para>
38+ The binfmt module is now easier to use. Additional systems can
39+ be added through <option>boot.binfmt.emulatedSystems</option>.
40+ For instance, <literal>boot.binfmt.emulatedSystems = [
41+ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ];</literal> will
42+ set up binfmt interpreters for each of those listed systems.
43+ </para>
3944 </listitem>
4045 <listitem>
41− <para>
42− The installer now uses a less privileged <literal>nixos</literal> user whereas before we logged in as root. To gain root privileges use <literal>sudo -i</literal> without a password.
46+ <para>
47+ The installer now uses a less privileged <literal>nixos</literal> user whereas before we logged in as root.
48+ To gain root privileges use <literal>sudo -i</literal> without a password.
4349 </para>
4450 </listitem>
4551 <listitem>
4652 <para>
47− We've updated to Xfce 4.14, which brings a new module <option>services.xserver.desktopManager.xfce4-14</option>. If you'd like to upgrade, please switch from the <option>services.xserver.desktopManager.xfce</option> module as it will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support <option>thunarPlugins</option> and it isn't recommended to use <option>services.xserver.desktopManager.xfce</option> and <option>services.xserver.desktopManager.xfce4-14</option> simultaneously or to downgrade from Xfce 4.14 after upgrading.
53+ We've updated to Xfce 4.14, which brings a new module <option>services.xserver.desktopManager.xfce4-14</option>.
54+ If you'd like to upgrade, please switch from the <option>services.xserver.desktopManager.xfce</option> module as it
55+ will be deprecated in a future release. They're incompatibilities with the current Xfce module; it doesn't support
56+ <option>thunarPlugins</option> and it isn't recommended to use <option>services.xserver.desktopManager.xfce</option>
57+ and <option>services.xserver.desktopManager.xfce4-14</option> simultaneously or to downgrade from Xfce 4.14 after upgrading.
4858 </para>
4959 </listitem>
5060 <listitem>
5161 <para>
52− The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages like games.
53− <itemizedlist>
54− <para>
55− This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.
56− </para>
57− <listitem>
58− <para>
59− <xref linkend="opt-services.gnome3.core-os-services.enable"/>
60− </para>
61− </listitem>
62− <listitem>
63− <para>
64− <xref linkend="opt-services.gnome3.core-shell.enable"/>
65− </para>
66− </listitem>
67− <listitem>
68− <para>
69− <xref linkend="opt-services.gnome3.core-utilities.enable"/>
70− </para>
71− </listitem>
72− <listitem>
73− <para>
74− <xref linkend="opt-services.gnome3.games.enable"/>
75− </para>
76− </listitem>
77− </itemizedlist>
78− 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 <option>environment.gnome3.excludePackages</option> which only excluded the optional applications. <option>environment.gnome3.excludePackages</option> is now unguarded, it can exclude any package installed with <option>environment.systemPackages</option> in the GNOME 3 module.
62+ The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages
63+ like games.
64+ <itemizedlist>
65+ <para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para>
66+ <listitem><para><xref linkend="opt-services.gnome3.core-os-services.enable"/></para></listitem>
67+ <listitem><para><xref linkend="opt-services.gnome3.core-shell.enable"/></para></listitem>
68+ <listitem><para><xref linkend="opt-services.gnome3.core-utilities.enable"/></para></listitem>
69+ <listitem><para><xref linkend="opt-services.gnome3.games.enable"/></para></listitem>
70+ </itemizedlist>
71+ With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
72+ disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications.
73+ <option>environment.gnome3.excludePackages</option> is now unguarded, it can exclude any package installed with <option>environment.systemPackages</option>
74+ in the GNOME 3 module.
7975 </para>
8076 </listitem>
8177 <listitem>
8278 <para>
83− 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.
79+ Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications
80+ to match as close as possible to a default reference GNOME 3 experience.
8481 </para>
85− <bridgehead>The following changes were enacted in <option>services.gnome3.core-utilities.enable</option>
86− </bridgehead>
82+
83+ <bridgehead>The following changes were enacted in <option>services.gnome3.core-utilities.enable</option></bridgehead>
84+
8785 <itemizedlist>
8886 <title>Applications removed from defaults:</title>
89− <listitem>
90− <para>
91− <literal>accerciser</literal>
92− </para>
93− </listitem>
94− <listitem>
95− <para>
96− <literal>dconf-editor</literal>
97− </para>
98− </listitem>
99− <listitem>
100− <para>
101− <literal>evolution</literal>
102− </para>
103− </listitem>
104− <listitem>
105− <para>
106− <literal>gnome-documents</literal>
107− </para>
108− </listitem>
109− <listitem>
110− <para>
111− <literal>gnome-nettool</literal>
112− </para>
113− </listitem>
114− <listitem>
115− <para>
116− <literal>gnome-power-manager</literal>
117− </para>
118− </listitem>
119− <listitem>
120− <para>
121− <literal>gnome-todo</literal>
122− </para>
123− </listitem>
124− <listitem>
125− <para>
126− <literal>gnome-tweaks</literal>
127− </para>
128− </listitem>
129− <listitem>
130− <para>
131− <literal>gnome-usage</literal>
132− </para>
133− </listitem>
134− <listitem>
135− <para>
136− <literal>gucharmap</literal>
137− </para>
138− </listitem>
139− <listitem>
140− <para>
141− <literal>nautilus-sendto</literal>
142− </para>
143− </listitem>
144− <listitem>
145− <para>
146− <literal>vinagre</literal>
147− </para>
148− </listitem>
87+ <listitem><para><literal>accerciser</literal></para></listitem>
88+ <listitem><para><literal>dconf-editor</literal></para></listitem>
89+ <listitem><para><literal>evolution</literal></para></listitem>
90+ <listitem><para><literal>gnome-documents</literal></para></listitem>
91+ <listitem><para><literal>gnome-nettool</literal></para></listitem>
92+ <listitem><para><literal>gnome-power-manager</literal></para></listitem>
93+ <listitem><para><literal>gnome-todo</literal></para></listitem>
94+ <listitem><para><literal>gnome-tweaks</literal></para></listitem>
95+ <listitem><para><literal>gnome-usage</literal></para></listitem>
96+ <listitem><para><literal>gucharmap</literal></para></listitem>
97+ <listitem><para><literal>nautilus-sendto</literal></para></listitem>
98+ <listitem><para><literal>vinagre</literal></para></listitem>
14999 </itemizedlist>
150100 <itemizedlist>
151101 <title>Applications added to defaults:</title>
152− <listitem>
153− <para>
154− <literal>cheese</literal>
155− </para>
156− </listitem>
157− <listitem>
158− <para>
159− <literal>geary</literal>
160− </para>
161− </listitem>
102+ <listitem><para><literal>cheese</literal></para></listitem>
103+ <listitem><para><literal>geary</literal></para></listitem>
162104 </itemizedlist>
163− <bridgehead>The following changes were enacted in <option>services.gnome3.core-shell.enable</option>
164− </bridgehead>
105+
106+ <bridgehead>The following changes were enacted in <option>services.gnome3.core-shell.enable</option></bridgehead>
107+
165108 <itemizedlist>
166109 <title>Applications added to defaults:</title>
167− <listitem>
168− <para>
169− <literal>gnome-color-manager</literal>
170− </para>
171− </listitem>
172− <listitem>
173− <para>
174− <literal>orca</literal>
175− </para>
176− </listitem>
110+ <listitem><para><literal>gnome-color-manager</literal></para></listitem>
111+ <listitem><para><literal>orca</literal></para></listitem>
177112 </itemizedlist>
178113 <itemizedlist>
179114 <title>Services enabled:</title>
180− <listitem>
181− <para>
182− <option>services.avahi.enable</option>
183− </para>
184− </listitem>
115+ <listitem><para><option>services.avahi.enable</option></para></listitem>
185116 </itemizedlist>
186117 </listitem>
187118 </itemizedlist>
@@ -206,43 +137,41 @@
206137 </listitem>
207138 <listitem>
208139 <para>
209− The new <varname>hardware.printers</varname> module allows to declaratively configure CUPS printers via the <varname>ensurePrinters</varname> and <varname>ensureDefaultPrinter</varname> options. <varname>ensurePrinters</varname> will never delete existing printers, but will make sure that the given printers are configured as declared.
140+ The new <varname>hardware.printers</varname> module allows to declaratively configure CUPS printers
141+ via the <varname>ensurePrinters</varname> and
142+ <varname>ensureDefaultPrinter</varname> options.
143+ <varname>ensurePrinters</varname> will never delete existing printers,
144+ but will make sure that the given printers are configured as declared.
210145 </para>
211146 </listitem>
212147 <listitem>
213148 <para>
214− There is a new <xref linkend="opt-services.system-config-printer.enable"/> and <xref linkend="opt-programs.system-config-printer.enable"/> module for the program of the same name. If you previously had <literal>system-config-printer</literal> enabled through some other means you should migrate to using one of these modules.
149+ There is a new <xref linkend="opt-services.system-config-printer.enable"/> and <xref linkend="opt-programs.system-config-printer.enable"/> module
150+ for the program of the same name. If you previously had <literal>system-config-printer</literal> enabled through some other
151+ means you should migrate to using one of these modules.
215152 </para>
216153 <itemizedlist>
217− <para>
218− If you're a user of the following desktopManager modules no action is needed:
219− </para>
154+ <para>If you're a user of the following desktopManager modules no action is needed:</para>
220155 <listitem>
221− <para>
222− <option>services.xserver.desktopManager.plasma5</option>
223− </para>
156+ <para><option>services.xserver.desktopManager.plasma5</option></para>
224157 </listitem>
225158 <listitem>
226− <para>
227− <option>services.xserver.desktopManager.gnome3</option>
228− </para>
159+ <para><option>services.xserver.desktopManager.gnome3</option></para>
229160 </listitem>
230161 <listitem>
231− <para>
232− <option>services.xserver.desktopManager.pantheon</option>
233− </para>
162+ <para><option>services.xserver.desktopManager.pantheon</option></para>
234163 </listitem>
235164 <listitem>
165+ <para><option>services.xserver.desktopManager.mate</option></para>
236166 <para>
237− <option>services.xserver.desktopManager.mate</option>
238− </para>
239− <para>
240− Note Mate uses <literal>programs.system-config-printer</literal> as it doesn't use it as a service, but its graphical interface directly.
167+ Note Mate uses <literal>programs.system-config-printer</literal> as it doesn't
168+ use it as a service, but its graphical interface directly.
241169 </para>
242170 </listitem>
243171 </itemizedlist>
244172 </listitem>
245173 </itemizedlist>
174+
246175 </section>
247176
248177 <section xmlns="http://docbook.org/ns/docbook"
@@ -253,18 +182,26 @@
253182 <title>Backward Incompatibilities</title>
254183
255184 <para>
256− When upgrading from a previous release, please be aware of the following incompatible changes:
185+ When upgrading from a previous release, please be aware of the following
186+ incompatible changes:
257187 </para>
258188
259189 <itemizedlist>
260190 <listitem>
261191 <para>
262− 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.
192+ Buildbot no longer supports Python 2, as support was dropped upstream in
193+ version 2.0.0. Configurations may need to be modified to make them
194+ compatible with Python 3.
263195 </para>
264196 </listitem>
265197 <listitem>
266198 <para>
267− PostgreSQL now uses <filename class="directory">/run/postgresql</filename> as its socket directory instead of <filename class="directory">/tmp</filename>. 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.
199+ PostgreSQL now uses
200+ <filename class="directory">/run/postgresql</filename> as its socket
201+ directory instead of <filename class="directory">/tmp</filename>. So
202+ if you run an application like eg. Nextcloud, where you need to use
203+ the Unix socket path as the database host name, you need to change it
204+ accordingly.
268205 </para>
269206 </listitem>
270207 <listitem>
@@ -274,212 +211,278 @@
274211 </listitem>
275212 <listitem>
276213 <para>
277− The options <option>services.prometheus.alertmanager.user</option> and <option>services.prometheus.alertmanager.group</option> have been removed because the alertmanager service is now using systemd's <link
278− xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html"> DynamicUser mechanism</link> which obviates these options.
214+ The options <option>services.prometheus.alertmanager.user</option> and
215+ <option>services.prometheus.alertmanager.group</option> have been removed
216+ because the alertmanager service is now using systemd's <link
217+ xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html">
218+ DynamicUser mechanism</link> which obviates these options.
279219 </para>
280220 </listitem>
281221 <listitem>
282222 <para>
283− 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.
223+ The NetworkManager systemd unit was renamed back from network-manager.service to
224+ NetworkManager.service for better compatibility with other applications expecting this name.
225+ The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
284226 </para>
285227 </listitem>
286228 <listitem>
287229 <para>
288− The <option>services.nzbget.configFile</option> and <option>services.nzbget.openFirewall</option> options were removed as they are managed internally by the nzbget. The <option>services.nzbget.dataDir</option> option hadn't actually been used by the module for some time and so was removed as cleanup.
230+ The <option>services.nzbget.configFile</option> and <option>services.nzbget.openFirewall</option>
231+ options were removed as they are managed internally by the nzbget. The
232+ <option>services.nzbget.dataDir</option> option hadn't actually been used by
233+ the module for some time and so was removed as cleanup.
289234 </para>
290235 </listitem>
291236 <listitem>
292237 <para>
293− The <option>services.mysql.pidDir</option> 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) <filename>/run/mysqld/mysql.sock</filename> file to appear.
238+ The <option>services.mysql.pidDir</option> option was removed, as it was only used by the wordpress
239+ apache-httpd service to wait for mysql to have started up.
240+ This can be accomplished by either describing a dependency on mysql.service (preferred)
241+ or waiting for the (hardcoded) <filename>/run/mysqld/mysql.sock</filename> file to appear.
294242 </para>
295243 </listitem>
296244 <listitem>
297245 <para>
298− The <option>services.emby.enable</option> module has been removed, see <option>services.jellyfin.enable</option> instead for a free software fork of Emby. See the Jellyfin documentation: <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/"> Migrating from Emby to Jellyfin </link>
246+ The <option>services.emby.enable</option> module has been removed, see
247+ <option>services.jellyfin.enable</option> instead for a free software fork of Emby.
248+
249+ See the Jellyfin documentation:
250+ <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/">
251+ Migrating from Emby to Jellyfin
252+ </link>
299253 </para>
300254 </listitem>
301255 <listitem>
302− <para>
303− IPv6 Privacy Extensions are now enabled by default for undeclared interfaces. The previous behaviour was quite misleading — even though the default value for <option>networking.interfaces.*.preferTempAddress</option> was <literal>true</literal>, 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 <literal>false</literal> for the interface in question.
256+ <para>
257+ IPv6 Privacy Extensions are now enabled by default for undeclared
258+ interfaces. The previous behaviour was quite misleading — even though
259+ the default value for
260+ <option>networking.interfaces.*.preferTempAddress</option> was
261+ <literal>true</literal>, undeclared interfaces would not prefer temporary
262+ addresses. Now, interfaces not mentioned in the config will prefer
263+ temporary addresses. EUI64 addresses can still be set as preferred by
264+ explicitly setting the option to <literal>false</literal> for the
265+ interface in question.
304266 </para>
305267 </listitem>
306268 <listitem>
307269 <para>
308− Since Bittorrent Sync was superseded by Resilio Sync in 2016, the <literal>bittorrentSync</literal>, <literal>bittorrentSync14</literal>, and <literal>bittorrentSync16</literal> packages have been removed in favor of <literal>resilio-sync</literal>.
270+ Since Bittorrent Sync was superseded by Resilio Sync in 2016, the
271+ <literal>bittorrentSync</literal>, <literal>bittorrentSync14</literal>,
272+ and <literal>bittorrentSync16</literal> packages have been removed in
273+ favor of <literal>resilio-sync</literal>.
309274 </para>
310275 <para>
311− The corresponding module, <option>services.btsync</option> has been replaced by the <option>services.resilio</option> module.
276+ The corresponding module, <option>services.btsync</option> has been
277+ replaced by the <option>services.resilio</option> module.
312278 </para>
313279 </listitem>
314280 <listitem>
315281 <para>
316− 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: <literal>systemd.services.httpd.after = [ "postgresql.service" ];</literal>
282+ The httpd service no longer attempts to start the postgresql service. If you have come to depend
283+ on this behaviour then you can preserve the behavior with the following configuration:
284+ <literal>systemd.services.httpd.after = [ "postgresql.service" ];</literal>
317285 </para>
318286 <para>
319− The option <option>services.httpd.extraSubservices</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.
287+ The option <option>services.httpd.extraSubservices</option> has been
288+ marked as deprecated. You may still use this feature, but it will be
289+ removed in a future release of NixOS. You are encouraged to convert any
290+ httpd subservices you may have written to a full NixOS module.
320291 </para>
321292 <para>
322− 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 <option>services.limesurvey.enable</option>, <option>services.mediawiki.enable</option>, <option>services.wordpress.enable</option>, and <option>services.zabbixWeb.enable</option> options.
293+ Most of the httpd subservices packaged with NixOS have been replaced with
294+ full NixOS modules including LimeSurvey, WordPress, and Zabbix. These
295+ modules can be enabled using the <option>services.limesurvey.enable</option>,
296+ <option>services.mediawiki.enable</option>, <option>services.wordpress.enable</option>,
297+ and <option>services.zabbixWeb.enable</option> options.
323298 </para>
324299 </listitem>
325300 <listitem>
326301 <para>
327− The option <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnlink</option> was renamed to <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnLink</option> (capital <literal>L</literal>). This follows <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c"> upstreams renaming </link> of the setting.
302+ The option <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnlink</option>
303+ was renamed to <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnLink</option>
304+ (capital <literal>L</literal>). This follows
305+ <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c">
306+ upstreams renaming
307+ </link> of the setting.
328308 </para>
329309 </listitem>
330310 <listitem>
331311 <para>
332− As of this release the NixOps feature <literal>autoLuks</literal> is deprecated. It no longer works with our systemd version without manual intervention.
312+ As of this release the NixOps feature <literal>autoLuks</literal> is deprecated. It no longer works
313+ with our systemd version without manual intervention.
333314 </para>
334315 <para>
335− Whenever the usage of the module is detected the evaluation will fail with a message explaining why and how to deal with the situation.
316+ Whenever the usage of the module is detected the evaluation will fail with a message
317+ explaining why and how to deal with the situation.
336318 </para>
337319 <para>
338− A new knob named <literal>nixops.enableDeprecatedAutoLuks</literal> 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.
320+ A new knob named <literal>nixops.enableDeprecatedAutoLuks</literal>
321+ has been introduced to disable the eval failure and to acknowledge the notice was received and read.
322+ If you plan on using the feature please note that it might break with subsequent updates.
339323 </para>
340324 <para>
341− Make sure you set the <literal>_netdev</literal> 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.
325+ Make sure you set the <literal>_netdev</literal> option for each of the file systems referring to block
326+ devices provided by the autoLuks module. Not doing this might render the system in a
327+ state where it doesn't boot anymore.
342328 </para>
343329 <para>
344− If you are actively using the <literal>autoLuks</literal> module please let us know in <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>.
330+ If you are actively using the <literal>autoLuks</literal> module please let us know in
331+ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>.
345332 </para>
346333 </listitem>
347334 <listitem>
348335 <para>
349− The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />, <xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
336+ The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />,
337+ <xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
350338 </para>
351339 </listitem>
352340 <listitem>
353341 <para>
354− The <literal>prometheus-nginx-exporter</literal> 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 <link xlink:href="https://github.com/nginxinc/nginx-prometheus-exporter">official repo</link>.
342+ The <literal>prometheus-nginx-exporter</literal> package now uses the offical exporter provided by NGINX Inc.
343+ Its metrics are differently structured and are incompatible to the old ones. For information about the metrics,
344+ have a look at the <link xlink:href="https://github.com/nginxinc/nginx-prometheus-exporter">official repo</link>.
355345 </para>
356346 </listitem>
357347 <listitem>
358348 <para>
359− The <literal>shibboleth-sp</literal> package has been updated to version 3. It is largely backward compatible, for further information refer to the <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes">release notes</link> and <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2">upgrade guide</link>.
360− </para>
361− <para>
362− Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
349+ The <literal>shibboleth-sp</literal> package has been updated to version 3.
350+ It is largely backward compatible, for further information refer to the
351+ <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes">release notes</link>
352+ and <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2">upgrade guide</link>.
363353 </para>
354+ <para>
355+ Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
356+ </para>
364357 </listitem>
365358 <listitem>
366− <para>
367− By default, prometheus exporters are now run with <literal>DynamicUser</literal> enabled. Exporters that need a real user, now run under a seperate user and group which follow the pattern <literal>&lt;exporter-name&gt;-exporter</literal>, instead of the previous default <literal>nobody</literal> and <literal>nogroup</literal>. Only some exporters are affected by the latter, namely the exporters <literal>dovecot</literal>, <literal>node</literal>, <literal>postfix</literal> and <literal>varnish</literal>.
368− </para>
359+ <para>
360+ By default, prometheus exporters are now run with <literal>DynamicUser</literal> enabled.
361+ Exporters that need a real user, now run under a seperate user and group which follow the pattern <literal>&lt;exporter-name&gt;-exporter</literal>, instead of the previous default <literal>nobody</literal> and <literal>nogroup</literal>.
362+ Only some exporters are affected by the latter, namely the exporters <literal>dovecot</literal>, <literal>node</literal>, <literal>postfix</literal> and <literal>varnish</literal>.
363+ </para>
369364 </listitem>
370365 <listitem>
371− <para>
372− The <literal>ibus-qt</literal> package is not installed by default anymore when <xref linkend="opt-i18n.inputMethod.enabled" /> is set to <literal>ibus</literal>. If IBus support in Qt 4.x applications is required, add the <literal>ibus-qt</literal> package to your <xref linkend="opt-environment.systemPackages" /> manually.
373− </para>
366+ <para>
367+ The <literal>ibus-qt</literal> package is not installed by default anymore when <xref linkend="opt-i18n.inputMethod.enabled" /> is set to <literal>ibus</literal>.
368+ If IBus support in Qt 4.x applications is required, add the <literal>ibus-qt</literal> package to your <xref linkend="opt-environment.systemPackages" /> manually.
369+ </para>
374370 </listitem>
375371 <listitem>
376− <para>
377− The CUPS Printing service now uses socket-based activation by default, only starting when needed. The previous behavior can be restored by setting <option>services.cups.startWhenNeeded</option> to <literal>false</literal>.
378− </para>
372+ <para>
373+ The CUPS Printing service now uses socket-based activation by
374+ default, only starting when needed. The previous behavior can
375+ be restored by setting
376+ <option>services.cups.startWhenNeeded</option> to
377+ <literal>false</literal>.
378+ </para>
379379 </listitem>
380380 <listitem>
381− <para>
382− The <option>services.systemhealth</option> module has been removed from nixpkgs due to lack of maintainer.
383− </para>
381+ <para>
382+ The <option>services.systemhealth</option> module has been removed from nixpkgs due to lack of maintainer.
383+ </para>
384384 </listitem>
385385 <listitem>
386− <para>
387− The <option>services.mantisbt</option> module has been removed from nixpkgs due to lack of maintainer.
388− </para>
386+ <para>
387+ The <option>services.mantisbt</option> module has been removed from nixpkgs due to lack of maintainer.
388+ </para>
389389 </listitem>
390390 <listitem>
391− <para>
392− Squid 3 has been removed and the <option>squid</option> derivation now refers to Squid 4.
393− </para>
391+ <para>
392+ Squid 3 has been removed and the <option>squid</option> derivation now refers to Squid 4.
393+ </para>
394394 </listitem>
395395 <listitem>
396− <para>
397− The <option>services.pdns-recursor.extraConfig</option> option has been replaced by <option>services.pdns-recursor.settings</option>. The new option allows setting extra configuration while being better type-checked and mergeable.
398− </para>
396+ <para>
397+ The <option>services.pdns-recursor.extraConfig</option> option has been replaced by
398+ <option>services.pdns-recursor.settings</option>. The new option allows setting extra
399+ configuration while being better type-checked and mergeable.
400+ </para>
399401 </listitem>
400402 <listitem>
401403 <para>
402− No service depends on <literal>keys.target</literal> anymore which is a systemd target that indicates if all <link xlink:href="https://nixos.org/nixops/manual/#idm140737322342384">NixOps keys</link> were successfully uploaded. Instead, <literal>&lt;key-name&gt;-key.service</literal> should be used to define a dependency of a key in a service. The full issue behind the <literal>keys.target</literal> dependency is described at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/67265">NixOS/nixpkgs#67265</link>.
404+ No service depends on <literal>keys.target</literal> anymore which is a systemd
405+ target that indicates if all <link xlink:href="https://nixos.org/nixops/manual/#idm140737322342384">NixOps keys</link> were successfully uploaded.
406+ Instead, <literal>&lt;key-name&gt;-key.service</literal> should be used to define
407+ a dependency of a key in a service. The full issue behind the <literal>keys.target</literal>
408+ dependency is described at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/67265">NixOS/nixpkgs#67265</link>.
403409 </para>
404410 <para>
405411 The following services are affected by this:
406412 <itemizedlist>
407− <listitem>
408− <para>
409− <link linkend="opt-services.dovecot2.enable"><literal>services.dovecot2</literal></link>
410− </para>
411− </listitem>
412− <listitem>
413− <para>
414− <link linkend="opt-services.nsd.enable"><literal>services.nsd</literal></link>
415− </para>
416− </listitem>
417− <listitem>
418− <para>
419− <link linkend="opt-services.softether.enable"><literal>services.softether</literal></link>
420− </para>
421− </listitem>
422− <listitem>
423− <para>
424− <link linkend="opt-services.strongswan.enable"><literal>services.strongswan</literal></link>
425− </para>
426− </listitem>
427− <listitem>
428− <para>
429− <link linkend="opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link>
430− </para>
431− </listitem>
432− <listitem>
433− <para>
434− <link linkend="opt-services.httpd.enable"><literal>services.httpd</literal></link>
435− </para>
436− </listitem>
413+ <listitem><para><link linkend="opt-services.dovecot2.enable"><literal>services.dovecot2</literal></link></para></listitem>
414+ <listitem><para><link linkend="opt-services.nsd.enable"><literal>services.nsd</literal></link></para></listitem>
415+ <listitem><para><link linkend="opt-services.softether.enable"><literal>services.softether</literal></link></para></listitem>
416+ <listitem><para><link linkend="opt-services.strongswan.enable"><literal>services.strongswan</literal></link></para></listitem>
417+ <listitem><para><link linkend="opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link></para></listitem>
418+ <listitem><para><link linkend="opt-services.httpd.enable"><literal>services.httpd</literal></link></para></listitem>
437419 </itemizedlist>
438420 </para>
439421 </listitem>
440422 <listitem>
441− <para>
442− The <option>security.acme.directory</option> option has been replaced by a read-only <option>security.acme.certs.&lt;cert&gt;.directory</option> option for each certificate you define. This will be a subdirectory of <literal>/var/lib/acme</literal>. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example, the <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> option will use this directory option to find the certs for the virtual host.
443− </para>
444− <para>
445− <option>security.acme.preDelay</option> and <option>security.acme.activationDelay</option> options have been removed. To execute a service before certificates are provisioned or renewed add a <literal>RequiredBy=acme-${cert}.service</literal> to any service.
446− </para>
447− <para>
448− Furthermore, the acme module will not automatically add a dependency on <literal>lighttpd.service</literal> anymore. If you are using certficates provided by letsencrypt for lighttpd, then you should depend on the certificate service <literal>acme-${cert}.service></literal> manually.
449− </para>
450− <para>
451− For nginx, the dependencies are still automatically managed when <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> 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 <literal>acme-certificates.target</literal>. 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 <link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>.
452− </para>
423+ <para>
424+ The <option>security.acme.directory</option> option has been replaced by a read-only <option>security.acme.certs.&lt;cert&gt;.directory</option> option for each certificate you define. This will be
425+ a subdirectory of <literal>/var/lib/acme</literal>. You can use this read-only option to figure out where the certificates are stored for a specific certificate. For example,
426+ the <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> option will use this directory option to find the certs for the virtual host.
427+ </para>
428+ <para>
429+ <option>security.acme.preDelay</option> and <option>security.acme.activationDelay</option> options have been removed. To execute a service before certificates
430+ are provisioned or renewed add a <literal>RequiredBy=acme-${cert}.service</literal> to any service.
431+ </para>
432+ <para>
433+ Furthermore, the acme module will not automatically add a dependency on <literal>lighttpd.service</literal> anymore. If you are using certficates provided by letsencrypt
434+ for lighttpd, then you should depend on the certificate service <literal>acme-${cert}.service></literal> manually.
435+ </para>
436+ <para>
437+ For nginx, the dependencies are still automatically managed when <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs,
438+ instead of depending on the catch-all <literal>acme-certificates.target</literal>. This target unit was also removed from the codebase.
439+ This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal
440+ ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at
441+ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>.
442+ </para>
453443 </listitem>
454444 <listitem>
455− <para>
456− The old deprecated <literal>emacs</literal> package sets have been dropped. What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
457− </para>
445+ <para>
446+ The old deprecated <literal>emacs</literal> package sets have been dropped.
447+ What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
448+ </para>
458449 </listitem>
459450 <listitem>
460− <para>
461− <option>services.xserver.desktopManager.xterm</option> is now disabled by default if <literal>stateVersion</literal> 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.
462− </para>
451+ <para>
452+ <option>services.xserver.desktopManager.xterm</option> is now disabled by default if <literal>stateVersion</literal> is 19.09 or higher.
453+ 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
454+ have any desktopManager enabled default.
455+ </para>
463456 </listitem>
464457 <listitem>
465458 <para>
466− The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive any updates from upstream and depends on outdated Python2-based modules.
459+ The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive
460+ any updates from upstream and depends on outdated Python2-based modules.
467461 </para>
468462 </listitem>
469463 <listitem>
470464 <para>
471− Old unsupported versions (<literal>logstash5</literal>, <literal>kibana5</literal>, <literal>filebeat5</literal>, <literal>heartbeat5</literal>, <literal>metricbeat5</literal>, <literal>packetbeat5</literal>) of the ELK-stack and Elastic beats have been removed.
465+ Old unsupported versions (<literal>logstash5</literal>,
466+ <literal>kibana5</literal>,
467+ <literal>filebeat5</literal>,
468+ <literal>heartbeat5</literal>,
469+ <literal>metricbeat5</literal>,
470+ <literal>packetbeat5</literal>) of the ELK-stack and Elastic beats have been removed.
472471 </para>
473472 </listitem>
474473 <listitem>
475474 <para>
476− 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 <literal>services.prometheus</literal>.
475+ For NixOS 19.03, both Prometheus 1 and 2 were available to allow for
476+ a seamless transition from version 1 to 2 with existing setups.
477+ Because Prometheus 1 is no longer developed, it was removed.
478+ Prometheus 2 is now configured with <literal>services.prometheus</literal>.
477479 </para>
478480 </listitem>
479481 <listitem>
480− <para>
481− Citrix Receiver (<literal>citrix_receiver</literal>) has been dropped in favor of Citrix Workspace (<literal>citrix_workspace</literal>).
482− </para>
482+ <para>
483+ Citrix Receiver (<literal>citrix_receiver</literal>) has been dropped in favor of Citrix Workspace
484+ (<literal>citrix_workspace</literal>).
485+ </para>
483486 </listitem>
484487 </itemizedlist>
485488 </section>
@@ -494,74 +497,122 @@
494497 <itemizedlist>
495498 <listitem>
496499 <para>
497− The <option>documentation</option> module gained an option named <option>documentation.nixos.includeAllModules</option> which makes the generated <citerefentry>
500+ The <option>documentation</option> module gained an option named
501+ <option>documentation.nixos.includeAllModules</option> which makes the
502+ generated <citerefentry>
498503 <refentrytitle>configuration.nix</refentrytitle>
499− <manvolnum>5</manvolnum></citerefentry> manual page include all options from all NixOS modules included in a given <literal>configuration.nix</literal> configuration file. Currently, it is set to <literal>false</literal> by default as enabling it frequently prevents evaluation. But the plan is to eventually have it set to <literal>true</literal> by default. Please set it to <literal>true</literal> now in your <literal>configuration.nix</literal> and fix all the bugs it uncovers.
504+ <manvolnum>5</manvolnum></citerefentry> manual page include all options
505+ from all NixOS modules included in a given
506+ <literal>configuration.nix</literal> configuration file. Currently, it is
507+ set to <literal>false</literal> by default as enabling it frequently
508+ prevents evaluation. But the plan is to eventually have it set to
509+ <literal>true</literal> by default. Please set it to
510+ <literal>true</literal> now in your <literal>configuration.nix</literal>
511+ and fix all the bugs it uncovers.
500512 </para>
501513 </listitem>
502514 <listitem>
503515 <para>
504− The <literal>vlc</literal> package gained support for Chromecast streaming, enabled by default. TCP port 8010 must be open for it to work, so something like <literal>networking.firewall.allowedTCPPorts = [ 8010 ];</literal> may be required in your configuration. Also consider enabling <link xlink:href="https://nixos.wiki/wiki/Accelerated_Video_Playback"> Accelerated Video Playback</link> for better transcoding performance.
516+ The <literal>vlc</literal> package gained support for Chromecast
517+ streaming, enabled by default. TCP port 8010 must be open for it to work,
518+ so something like <literal>networking.firewall.allowedTCPPorts = [ 8010
519+ ];</literal> may be required in your configuration. Also consider enabling
520+ <link xlink:href="https://nixos.wiki/wiki/Accelerated_Video_Playback">
521+ Accelerated Video Playback</link> for better transcoding performance.
505522 </para>
506523 </listitem>
507524 <listitem>
508525 <para>
509− The following changes apply if the <literal>stateVersion</literal> is changed to 19.09 or higher. For <literal>stateVersion = "19.03"</literal> or lower the old behavior is preserved.
526+ The following changes apply if the <literal>stateVersion</literal> is
527+ changed to 19.09 or higher. For <literal>stateVersion = "19.03"</literal>
528+ or lower the old behavior is preserved.
510529 </para>
511530 <itemizedlist>
512531 <listitem>
513532 <para>
514− <literal>solr.package</literal> defaults to <literal>pkgs.solr_8</literal>.
533+ <literal>solr.package</literal> defaults to
534+ <literal>pkgs.solr_8</literal>.
515535 </para>
516536 </listitem>
517537 </itemizedlist>
518538 </listitem>
519539 <listitem>
520540 <para>
521− The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal> which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>.
541+ The <literal>hunspellDicts.fr-any</literal> dictionary now ships with <literal>fr_FR.{aff,dic}</literal>
542+ which is linked to <literal>fr-toutesvariantes.{aff,dic}</literal>.
522543 </para>
523544 </listitem>
524545 <listitem>
525546 <para>
526− The <literal>mysql</literal> service now runs as <literal>mysql</literal> user. Previously, systemd did execute it as root, and mysql dropped privileges itself. This includes <literal>ExecStartPre=</literal> and <literal>ExecStartPost=</literal> phases. To accomplish that, runtime and data directory setup was delegated to RuntimeDirectory and tmpfiles.
547+ The <literal>mysql</literal> service now runs as <literal>mysql</literal>
548+ user. Previously, systemd did execute it as root, and mysql dropped privileges
549+ itself.
550+ This includes <literal>ExecStartPre=</literal> and
551+ <literal>ExecStartPost=</literal> phases.
552+ To accomplish that, runtime and data directory setup was delegated to
553+ RuntimeDirectory and tmpfiles.
527554 </para>
528555 </listitem>
529556 <listitem>
530557 <para>
531− With the upgrade to systemd version 242 the <literal>systemd-timesyncd</literal> service is no longer using <literal>DynamicUser=yes</literal>. 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 <literal>19.09</literal>) was <literal>/var/lib/private/systemd/timesync</literal>.
558+ With the upgrade to systemd version 242 the <literal>systemd-timesyncd</literal>
559+ service is no longer using <literal>DynamicUser=yes</literal>. In order for the
560+ upgrade to work we rely on an activation script to move the state from the old
561+ to the new directory. The older directory (prior <literal>19.09</literal>) was
562+ <literal>/var/lib/private/systemd/timesync</literal>.
532563 </para>
533564 <para>
534− As long as the <literal>system.config.stateVersion</literal> is below <literal>19.09</literal> the state folder will migrated to its proper location (<literal>/var/lib/systemd/timesync</literal>), if required.
565+ As long as the <literal>system.config.stateVersion</literal> is below
566+ <literal>19.09</literal> the state folder will migrated to its proper location
567+ (<literal>/var/lib/systemd/timesync</literal>), if required.
535568 </para>
536569 </listitem>
537570 <listitem>
538571 <para>
539− The package <literal>avahi</literal> is now built to look up service definitions from <literal>/etc/avahi/services</literal> instead of its output directory in the nix store. Accordingly the module <option>avahi</option> now supports custom service definitions via <option>services.avahi.extraServiceFiles</option>, which are then placed in the aforementioned directory. See <citerefentry>
540− <refentrytitle>avahi.service</refentrytitle>
541− <manvolnum>5</manvolnum> </citerefentry> for more information on custom service definitions.
572+ The package <literal>avahi</literal> is now built to look up service
573+ definitions from <literal>/etc/avahi/services</literal> instead of its
574+ output directory in the nix store. Accordingly the module
575+ <option>avahi</option> now supports custom service definitions via
576+ <option>services.avahi.extraServiceFiles</option>, which are then placed
577+ in the aforementioned directory. See <citerefentry>
578+ <refentrytitle>avahi.service</refentrytitle><manvolnum>5</manvolnum>
579+ </citerefentry> for more information on custom service definitions.
542580 </para>
543581 </listitem>
544582 <listitem>
545583 <para>
546− Since version 0.1.19, <literal>cargo-vendor</literal> honors package includes that are specified in the <filename>Cargo.toml</filename> file of Rust crates. <literal>rustPlatform.buildRustPackage</literal> uses <literal>cargo-vendor</literal> to collect and build dependent crates. Since this change in <literal>cargo-vendor</literal> changes the set of vendored files for most Rust packages, the hash that use used to verify the dependencies, <literal>cargoSha256</literal>, also changes.
584+ Since version 0.1.19, <literal>cargo-vendor</literal> honors package
585+ includes that are specified in the <filename>Cargo.toml</filename>
586+ file of Rust crates. <literal>rustPlatform.buildRustPackage</literal> uses
587+ <literal>cargo-vendor</literal> to collect and build dependent crates.
588+ Since this change in <literal>cargo-vendor</literal> changes the set of
589+ vendored files for most Rust packages, the hash that use used to verify
590+ the dependencies, <literal>cargoSha256</literal>, also changes.
547591 </para>
548592 <para>
549− The <literal>cargoSha256</literal> hashes of all in-tree derivations that use <literal>buildRustPackage</literal> have been updated to reflect this change. However, third-party derivations that use <literal>buildRustPackage</literal> may have to be updated as well.
593+ The <literal>cargoSha256</literal> hashes of all in-tree derivations that
594+ use <literal>buildRustPackage</literal> have been updated to reflect this
595+ change. However, third-party derivations that use
596+ <literal>buildRustPackage</literal> may have to be updated as well.
550597 </para>
551598 </listitem>
552599 <listitem>
553600 <para>
554− The <literal>consul</literal> package was upgraded past version <literal>1.5</literal>, so its deprecated legacy UI is no longer available.
601+ The <literal>consul</literal> package was upgraded past version <literal>1.5</literal>,
602+ so its deprecated legacy UI is no longer available.
555603 </para>
556604 </listitem>
557605 <listitem>
558606 <para>
559− The default resample-method for PulseAudio has been changed from the upstream default <literal>speex-float-1</literal> to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>.
607+ The default resample-method for PulseAudio has been changed from the upstream default <literal>speex-float-1</literal>
608+ to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this
609+ so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>.
560610 </para>
561611 </listitem>
562612 <listitem>
563613 <para>
564− The <literal>phabricator</literal> package and associated <literal>httpd.extraSubservice</literal>, as well as the <literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
614+ The <literal>phabricator</literal> package and associated <literal>httpd.extraSubservice</literal>, as well as the
615+ <literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
565616 </para>
566617 </listitem>
567618 <listitem>
@@ -576,7 +627,8 @@
576627 </listitem>
577628 <listitem>
578629 <para>
579− The <literal>foswiki</literal> package and associated <literal>httpd.extraSubservice</literal> have been removed from nixpkgs due to lack of maintainer.
630+ The <literal>foswiki</literal> package and associated <literal>httpd.extraSubservice</literal> have been removed
631+ from nixpkgs due to lack of maintainer.
580632 </para>
581633 </listitem>
582634 <listitem>
@@ -586,126 +638,155 @@
586638 </listitem>
587639 <listitem>
588640 <para>
589− It's now possible to change configuration in <link linkend="opt-services.nextcloud.enable">services.nextcloud</link> 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 <literal>/var/lib/nextcloud</literal>.
641+ It's now possible to change configuration in
642+ <link linkend="opt-services.nextcloud.enable">services.nextcloud</link> after the initial deploy
643+ since all config parameters are persisted in an additional config file generated by the module.
644+ Previously core configuration like database parameters were set using their imperative
645+ installer after creating <literal>/var/lib/nextcloud</literal>.
590646 </para>
591647 </listitem>
592648 <listitem>
593649 <para>
594− There exists now <literal>lib.forEach</literal>, which is like <literal>map</literal>, but with arguments flipped. When mapping function body spans many lines (or has nested <literal>map</literal>s), it is often hard to follow which list is modified.
650+ There exists now <literal>lib.forEach</literal>, which is like <literal>map</literal>, but with
651+ arguments flipped. When mapping function body spans many lines (or has nested
652+ <literal>map</literal>s), it is often hard to follow which list is modified.
595653 </para>
596654 <para>
597− Previous solution to this problem was either to use <literal>lib.flip map</literal> idiom or extract that anonymous mapping function to a named one. Both can still be used but <literal>lib.forEach</literal> is preferred over <literal>lib.flip map</literal>.
655+ Previous solution to this problem was either to use <literal>lib.flip map</literal>
656+ idiom or extract that anonymous mapping function to a named one. Both can still be used
657+ but <literal>lib.forEach</literal> is preferred over <literal>lib.flip map</literal>.
598658 </para>
599659 <para>
600− The <literal>/etc/sysctl.d/nixos.conf</literal> file containing all the options set via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> was moved to <literal>/etc/sysctl.d/60-nixos.conf</literal>, as <citerefentry>
601− <refentrytitle>sysctl.d</refentrytitle>
602− <manvolnum>5</manvolnum></citerefentry> recommends prefixing all filenames in <literal>/etc/sysctl.d</literal> with a two-digit number and a dash to simplify the ordering of the files.
660+ The <literal>/etc/sysctl.d/nixos.conf</literal> file containing all the options set via
661+ <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> was moved to
662+ <literal>/etc/sysctl.d/60-nixos.conf</literal>, as
663+ <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
664+ recommends prefixing all filenames in <literal>/etc/sysctl.d</literal> with a
665+ two-digit number and a dash to simplify the ordering of the files.
603666 </para>
604667 </listitem>
605668 <listitem>
606669 <para>
607− We now install the sysctl snippets shipped with systemd.
608− <itemizedlist>
670+ We now install the sysctl snippets shipped with systemd.
671+ <itemizedlist>
672+ <para>This enables:</para>
673+ <listitem>
674+ <para>Loose reverse path filtering</para>
675+ </listitem>
676+ <listitem>
677+ <para>Source route filtering</para>
678+ </listitem>
679+ <listitem>
609680 <para>
610− This enables:
681+ <literal>fq_codel</literal> as a packet scheduler (this helps to fight bufferbloat)
611682 </para>
612− <listitem>
613− <para>
614− Loose reverse path filtering
615− </para>
616− </listitem>
617− <listitem>
618− <para>
619− Source route filtering
620− </para>
621− </listitem>
622− <listitem>
623− <para>
624− <literal>fq_codel</literal> as a packet scheduler (this helps to fight bufferbloat)
625− </para>
626− </listitem>
627− </itemizedlist>
628− This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>, and restricts the SysRq key combinations to the sync command only. These sysctl snippets can be found in <literal>/etc/sysctl.d/50-*.conf</literal>, and overridden via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link> (which will place the parameters in <literal>/etc/sysctl.d/60-nixos.conf</literal>).
629− </para>
683+ </listitem>
684+ </itemizedlist>
685+ This also configures the kernel to pass coredumps to <literal>systemd-coredump</literal>,
686+ and restricts the SysRq key combinations to the sync command only.
687+ These sysctl snippets can be found in <literal>/etc/sysctl.d/50-*.conf</literal>,
688+ and overridden via <link linkend="opt-boot.kernel.sysctl">boot.kernel.sysctl</link>
689+ (which will place the parameters in <literal>/etc/sysctl.d/60-nixos.conf</literal>).
690+ </para>
630691 </listitem>
631692 <listitem>
632693 <para>
633− Coredumps are now acquired by <literal>systemd-coredump</literal> by default. <literal>systemd-coredump</literal> behaviour can still be modified via <option>systemd.coredump.extraConfig</option>. To stick to the old behaviour (having the kernel dump to a file called <literal>core</literal> in the working directory), without piping it through <literal>systemd-coredump</literal>, set <option>boot.kernel.sysctl."kernel.core_pattern"</option> to <literal>"core"</literal>.
694+ Coredumps are now acquired by <literal>systemd-coredump</literal> by default.
695+ <literal>systemd-coredump</literal> behaviour can still be modified via
696+ <option>systemd.coredump.extraConfig</option>.
697+ To stick to the old behaviour (having the kernel dump to a file called <literal>core</literal>
698+ in the working directory), without piping it through <literal>systemd-coredump</literal>, set
699+ <option>boot.kernel.sysctl."kernel.core_pattern"</option> to <literal>"core"</literal>.
634700 </para>
635701 </listitem>
636702 <listitem>
637703 <para>
638− <literal>systemd.packages</literal> option now also supports generators and shutdown scripts. Old <literal>systemd.generator-packages</literal> option has been removed.
704+ <literal>systemd.packages</literal> option now also supports generators and
705+ shutdown scripts. Old <literal>systemd.generator-packages</literal> option has
706+ been removed.
639707 </para>
640708 </listitem>
641709 <listitem>
642710 <para>
643− The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer. Use <literal>rspamd</literal> in proxy mode instead.
711+ The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer.
712+ Use <literal>rspamd</literal> in proxy mode instead.
644713 </para>
645714 </listitem>
646715 <listitem>
647716 <para>
648− systemd cgroup accounting via the <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link> option is now enabled by default. It now also enables the more recent Block IO and IP accounting features.
717+ systemd cgroup accounting via the
718+ <link linkend="opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link>
719+ option is now enabled by default. It now also enables the more recent Block IO and IP accounting
720+ features.
649721 </para>
650722 </listitem>
651723 <listitem>
652724 <para>
653− We no longer enable custom font rendering settings with <option>fonts.fontconfig.penultimate.enable</option> by default. The defaults from fontconfig are sufficient.
725+ We no longer enable custom font rendering settings with <option>fonts.fontconfig.penultimate.enable</option> by default.
726+ The defaults from fontconfig are sufficient.
654727 </para>
655728 </listitem>
656729 <listitem>
657730 <para>
658− The <literal>crashplan</literal> package and the <literal>crashplan</literal> service have been removed from nixpkgs due to crashplan shutting down the service, while the <literal>crashplansb</literal> package and <literal>crashplan-small-business</literal> service have been removed from nixpkgs due to lack of maintainer.
731+ The <literal>crashplan</literal> package and the
732+ <literal>crashplan</literal> service have been removed from nixpkgs due to
733+ crashplan shutting down the service, while the <literal>crashplansb</literal>
734+ package and <literal>crashplan-small-business</literal> service have been
735+ removed from nixpkgs due to lack of maintainer.
659736 </para>
660737 <para>
661− The <link linkend="opt-services.redis.enable">redis module</link> was hardcoded to use the <literal>redis</literal> user, <filename class="directory">/run/redis</filename> as runtime directory and <filename class="directory">/var/lib/redis</filename> 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).
738+ The <link linkend="opt-services.redis.enable">redis module</link> was hardcoded to use the <literal>redis</literal> user,
739+ <filename class="directory">/run/redis</filename> as runtime directory and
740+ <filename class="directory">/var/lib/redis</filename> as state directory.
741+ Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP),
742+ because this features causes major performance problems for Redis,
743+ e.g. (https://redis.io/topics/latency).
662744 </para>
663745 </listitem>
664746 <listitem>
665747 <para>
666748 Using <option>fonts.enableDefaultFonts</option> adds a default emoji font <literal>noto-fonts-emoji</literal>.
667749 <itemizedlist>
668− <para>
669− Users of the following options will have this enabled by default:
670− </para>
750+ <para>Users of the following options will have this enabled by default:</para>
671751 <listitem>
672− <para>
673− <option>services.xserver.enable</option>
674− </para>
752+ <para><option>services.xserver.enable</option></para>
675753 </listitem>
676754 <listitem>
677− <para>
678− <option>programs.sway.enable</option>
679− </para>
755+ <para><option>programs.sway.enable</option></para>
680756 </listitem>
681757 <listitem>
682− <para>
683− <option>programs.way-cooler.enable</option>
684− </para>
758+ <para><option>programs.way-cooler.enable</option></para>
685759 </listitem>
686760 <listitem>
687− <para>
688− <option>services.xrdp.enable</option>
689− </para>
761+ <para><option>services.xrdp.enable</option></para>
690762 </listitem>
691763 </itemizedlist>
692764 </para>
693765 </listitem>
694766 <listitem>
695− <para>
696− The <literal>altcoins</literal> categorization of packages has been removed. You now access these packages at the top level, ie. <literal>nix-shell -p dogecoin</literal> instead of <literal>nix-shell -p altcoins.dogecoin</literal>, etc.
697− </para>
698− </listitem>
699− <listitem>
700− <para>
701− Ceph has been upgraded to v14.2.1. See the <link xlink:href="https://ceph.com/releases/v14-2-0-nautilus-released/">release notes</link> 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.
702− </para>
767+ <para>
768+ The <literal>altcoins</literal> categorization of packages has
769+ been removed. You now access these packages at the top level,
770+ ie. <literal>nix-shell -p dogecoin</literal> instead of
771+ <literal>nix-shell -p altcoins.dogecoin</literal>, etc.
772+ </para>
703773 </listitem>
704774 <listitem>
705− <para>
706− <literal>pkgs.weechat</literal> is now compiled against <literal>pkgs.python3</literal>. Weechat also recommends <link xlink:href="https://weechat.org/scripts/python3/">to use Python3 in their docs.</link>
707− </para>
708− </listitem>
775+ <para>
776+ Ceph has been upgraded to v14.2.1.
777+ See the <link xlink:href="https://ceph.com/releases/v14-2-0-nautilus-released/">release notes</link> for details.
778+ The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module.
779+ Note: There's been some issues with python-cherrypy, which is used by the dashboard
780+ and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch.
781+ </para>
782+ </listitem>
783+ <listitem>
784+ <para>
785+ <literal>pkgs.weechat</literal> is now compiled against <literal>pkgs.python3</literal>.
786+ Weechat also recommends <link xlink:href="https://weechat.org/scripts/python3/">to use Python3
787+ in their docs.</link>
788+ </para>
789+ </listitem>
709790 </itemizedlist>
710791 </section>
711792</section>
nixos/doc/manual/release-notes/rl-2003.xml+5−2
@@ -13,7 +13,8 @@
1313 <title>Highlights</title>
1414
1515 <para>
16− In addition to numerous new and upgraded packages, this release has the following highlights:
16+ In addition to numerous new and upgraded packages, this release has the
17+ following highlights:
1718 </para>
1819
1920 <itemizedlist>
@@ -41,6 +42,7 @@
4142 <para />
4243 </listitem>
4344 </itemizedlist>
45+
4446 </section>
4547
4648 <section xmlns="http://docbook.org/ns/docbook"
@@ -51,7 +53,8 @@
5153 <title>Backward Incompatibilities</title>
5254
5355 <para>
54− When upgrading from a previous release, please be aware of the following incompatible changes:
56+ When upgrading from a previous release, please be aware of the following
57+ incompatible changes:
5558 </para>
5659
5760 <itemizedlist>
nixos/modules/i18n/input-method/default.xml+54−20
@@ -5,7 +5,11 @@
55 xml:id="module-services-input-methods">
66 <title>Input Methods</title>
77 <para>
8− 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.
8+ Input methods are an operating system component that allows any data, such as
9+ keyboard strokes or mouse movements, to be received as input. In this way
10+ users can enter characters and symbols not found on their input devices.
11+ Using an input method is obligatory for any language that has more graphemes
12+ than there are keys on the keyboard.
913 </para>
1014 <para>
1115 The following input methods are available in NixOS:
@@ -36,7 +40,8 @@
3640 <title>IBus</title>
3741
3842 <para>
39− IBus is an Intelligent Input Bus. It provides full featured and user friendly input method user interface.
43+ IBus is an Intelligent Input Bus. It provides full featured and user
44+ friendly input method user interface.
4045 </para>
4146
4247 <para>
@@ -51,7 +56,8 @@ i18n.inputMethod = {
5156</programlisting>
5257
5358 <para>
54− <literal>i18n.inputMethod.ibus.engines</literal> is optional and can be used to add extra IBus engines.
59+ <literal>i18n.inputMethod.ibus.engines</literal> is optional and can be used
60+ to add extra IBus engines.
5561 </para>
5662
5763 <para>
@@ -61,7 +67,8 @@ i18n.inputMethod = {
6167 <itemizedlist>
6268 <listitem>
6369 <para>
64− Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
70+ Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a system for
71+ Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
6572 </para>
6673 </listitem>
6774 <listitem>
@@ -71,22 +78,28 @@ i18n.inputMethod = {
7178 </listitem>
7279 <listitem>
7380 <para>
74− m17n (<literal>ibus-engines.m17n</literal>): m17n is an input method that uses input methods and corresponding icons in the m17n database.
81+ m17n (<literal>ibus-engines.m17n</literal>): m17n is an input method that
82+ uses input methods and corresponding icons in the m17n database.
7583 </para>
7684 </listitem>
7785 <listitem>
7886 <para>
79− mozc (<literal>ibus-engines.mozc</literal>): A Japanese input method from Google.
87+ mozc (<literal>ibus-engines.mozc</literal>): A Japanese input method from
88+ Google.
8089 </para>
8190 </listitem>
8291 <listitem>
8392 <para>
84− Table (<literal>ibus-engines.table</literal>): An input method that load tables of input methods.
93+ Table (<literal>ibus-engines.table</literal>): An input method that load
94+ tables of input methods.
8595 </para>
8696 </listitem>
8797 <listitem>
8898 <para>
89− table-others (<literal>ibus-engines.table-others</literal>): 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 <literal>table</literal>. For example:
99+ table-others (<literal>ibus-engines.table-others</literal>): Various
100+ table-based input methods. To use this, and any other table-based input
101+ methods, it must appear in the list of engines along with
102+ <literal>table</literal>. For example:
90103<programlisting>
91104ibus.engines = with pkgs.ibus-engines; [ table table-others ];
92105</programlisting>
@@ -95,13 +108,22 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
95108 </itemizedlist>
96109
97110 <para>
98− To use any input method, the package must be added in the configuration, as shown above, and also (after running <literal>nixos-rebuild</literal>) the input method must be added from IBus' preference dialog.
111+ To use any input method, the package must be added in the configuration, as
112+ shown above, and also (after running <literal>nixos-rebuild</literal>) the
113+ input method must be added from IBus' preference dialog.
99114 </para>
100115
101116 <simplesect xml:id="module-services-input-methods-troubleshooting">
102117 <title>Troubleshooting</title>
103118 <para>
104− If IBus works in some applications but not others, a likely cause of this is that IBus is depending on a different version of <literal>glib</literal> to what the applications are depending on. This can be checked by running <literal>nix-store -q --requisites &lt;path&gt; | grep glib</literal>, where <literal>&lt;path&gt;</literal> is the path of either IBus or an application in the Nix store. The <literal>glib</literal> packages must match exactly. If they do not, uninstalling and reinstalling the application is a likely fix.
119+ If IBus works in some applications but not others, a likely cause of this
120+ is that IBus is depending on a different version of <literal>glib</literal>
121+ to what the applications are depending on. This can be checked by running
122+ <literal>nix-store -q --requisites &lt;path&gt; | grep glib</literal>,
123+ where <literal>&lt;path&gt;</literal> is the path of either IBus or an
124+ application in the Nix store. The <literal>glib</literal> packages must
125+ match exactly. If they do not, uninstalling and reinstalling the
126+ application is a likely fix.
105127 </para>
106128 </simplesect>
107129 </section>
@@ -109,7 +131,8 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
109131 <title>Fcitx</title>
110132
111133 <para>
112− Fcitx is an input method framework with extension support. It has three built-in Input Method Engine, Pinyin, QuWei and Table-based input methods.
134+ Fcitx is an input method framework with extension support. It has three
135+ built-in Input Method Engine, Pinyin, QuWei and Table-based input methods.
113136 </para>
114137
115138 <para>
@@ -124,7 +147,8 @@ i18n.inputMethod = {
124147</programlisting>
125148
126149 <para>
127− <literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be used to add extra Fcitx engines.
150+ <literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be
151+ used to add extra Fcitx engines.
128152 </para>
129153
130154 <para>
@@ -134,12 +158,15 @@ i18n.inputMethod = {
134158 <itemizedlist>
135159 <listitem>
136160 <para>
137− Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
161+ Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a system for
162+ Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
138163 </para>
139164 </listitem>
140165 <listitem>
141166 <para>
142− Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is an intelligent Zhuyin input method. It is one of the most popular input methods among Traditional Chinese Unix users.
167+ Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is an
168+ intelligent Zhuyin input method. It is one of the most popular input
169+ methods among Traditional Chinese Unix users.
143170 </para>
144171 </listitem>
145172 <listitem>
@@ -154,17 +181,20 @@ i18n.inputMethod = {
154181 </listitem>
155182 <listitem>
156183 <para>
157− m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input method that uses input methods and corresponding icons in the m17n database.
184+ m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input method that
185+ uses input methods and corresponding icons in the m17n database.
158186 </para>
159187 </listitem>
160188 <listitem>
161189 <para>
162− mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input method from Google.
190+ mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input method from
191+ Google.
163192 </para>
164193 </listitem>
165194 <listitem>
166195 <para>
167− table-others (<literal>fcitx-engines.table-others</literal>): Various table-based input methods.
196+ table-others (<literal>fcitx-engines.table-others</literal>): Various
197+ table-based input methods.
168198 </para>
169199 </listitem>
170200 </itemizedlist>
@@ -173,7 +203,9 @@ i18n.inputMethod = {
173203 <title>Nabi</title>
174204
175205 <para>
176− Nabi is an easy to use Korean X input method. It allows you to enter phonetic Korean characters (hangul) and pictographic Korean characters (hanja).
206+ Nabi is an easy to use Korean X input method. It allows you to enter
207+ phonetic Korean characters (hangul) and pictographic Korean characters
208+ (hanja).
177209 </para>
178210
179211 <para>
@@ -190,7 +222,8 @@ i18n.inputMethod = {
190222 <title>Uim</title>
191223
192224 <para>
193− Uim (short for "universal input method") is a multilingual input method framework. Applications can use it through so-called bridges.
225+ Uim (short for "universal input method") is a multilingual input method
226+ framework. Applications can use it through so-called bridges.
194227 </para>
195228
196229 <para>
@@ -204,7 +237,8 @@ i18n.inputMethod = {
204237</programlisting>
205238
206239 <para>
207− Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be used to choose uim toolbar.
240+ Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be
241+ used to choose uim toolbar.
208242 </para>
209243 </section>
210244</chapter>
nixos/modules/installer/cd-dvd/sd-image.nix+3−1
@@ -174,8 +174,10 @@ in
174174 boot.postBootCommands = ''
175175 # On the first boot do some maintenance tasks
176176 if [ -f /nix-path-registration ]; then
177+ set -euo pipefail
178+ set -x
177179 # Figure out device names for the boot device and root filesystem.
178− rootPart=$(readlink -f /dev/disk/by-label/NIXOS_SD)
180+ rootPart=$(${pkgs.utillinux}/bin/findmnt -n -o SOURCE /)
179181 bootDevice=$(lsblk -npo PKNAME $rootPart)
180182
181183 # Resize the root partition and the filesystem to fit the disk
nixos/modules/module-list.nix+1
@@ -938,6 +938,7 @@
938938 ./virtualisation/anbox.nix
939939 ./virtualisation/container-config.nix
940940 ./virtualisation/containers.nix
941+ ./virtualisation/cri-o.nix
941942 ./virtualisation/docker.nix
942943 ./virtualisation/docker-containers.nix
943944 ./virtualisation/ecs-agent.nix
nixos/modules/programs/digitalbitbox/doc.xml+24−9
@@ -8,25 +8,37 @@
88 Digital Bitbox is a hardware wallet and second-factor authenticator.
99 </para>
1010 <para>
11− The <literal>digitalbitbox</literal> programs module may be installed by setting <literal>programs.digitalbitbox</literal> to <literal>true</literal> in a manner similar to
11+ The <literal>digitalbitbox</literal> programs module may be installed by
12+ setting <literal>programs.digitalbitbox</literal> to <literal>true</literal>
13+ in a manner similar to
1214<programlisting>
1315<xref linkend="opt-programs.digitalbitbox.enable"/> = true;
1416</programlisting>
15− and bundles the <literal>digitalbitbox</literal> package (see <xref
16− linkend="sec-digitalbitbox-package" />), which contains the <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, along with the hardware module (see <xref
17− linkend="sec-digitalbitbox-hardware-module" />) which sets up the necessary udev rules to access the device.
17+ and bundles the <literal>digitalbitbox</literal> package (see
18+ <xref
19+ linkend="sec-digitalbitbox-package" />), which contains the
20+ <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, along
21+ with the hardware module (see
22+ <xref
23+ linkend="sec-digitalbitbox-hardware-module" />) which sets up the
24+ necessary udev rules to access the device.
1825 </para>
1926 <para>
20− Enabling the digitalbitbox module is pretty much the easiest way to get a Digital Bitbox device working on your system.
27+ Enabling the digitalbitbox module is pretty much the easiest way to get a
28+ Digital Bitbox device working on your system.
2129 </para>
2230 <para>
23− For more information, see <link xlink:href="https://digitalbitbox.com/start_linux" />.
31+ For more information, see
32+ <link xlink:href="https://digitalbitbox.com/start_linux" />.
2433 </para>
2534 <section xml:id="sec-digitalbitbox-package">
2635 <title>Package</title>
2736
2837 <para>
29− The binaries, <literal>dbb-app</literal> (a GUI tool) and <literal>dbb-cli</literal> (a CLI tool), are available through the <literal>digitalbitbox</literal> package which could be installed as follows:
38+ The binaries, <literal>dbb-app</literal> (a GUI tool) and
39+ <literal>dbb-cli</literal> (a CLI tool), are available through the
40+ <literal>digitalbitbox</literal> package which could be installed as
41+ follows:
3042<programlisting>
3143<xref linkend="opt-environment.systemPackages"/> = [
3244 pkgs.digitalbitbox
@@ -38,14 +50,17 @@
3850 <title>Hardware</title>
3951
4052 <para>
41− The digitalbitbox hardware package enables the udev rules for Digital Bitbox devices and may be installed as follows:
53+ The digitalbitbox hardware package enables the udev rules for Digital Bitbox
54+ devices and may be installed as follows:
4255<programlisting>
4356<xref linkend="opt-hardware.digitalbitbox.enable"/> = true;
4457</programlisting>
4558 </para>
4659
4760 <para>
48− In order to alter the udev rules, one may provide different values for the <literal>udevRule51</literal> and <literal>udevRule52</literal> attributes by means of overriding as follows:
61+ In order to alter the udev rules, one may provide different values for the
62+ <literal>udevRule51</literal> and <literal>udevRule52</literal> attributes
63+ by means of overriding as follows:
4964<programlisting>
5065programs.digitalbitbox = {
5166 <link linkend="opt-programs.digitalbitbox.enable">enable</link> = true;
nixos/modules/programs/plotinus.xml+9−4
@@ -5,19 +5,24 @@
55 xml:id="module-program-plotinus">
66 <title>Plotinus</title>
77 <para>
8− <emphasis>Source:</emphasis> <filename>modules/programs/plotinus.nix</filename>
8+ <emphasis>Source:</emphasis>
9+ <filename>modules/programs/plotinus.nix</filename>
910 </para>
1011 <para>
11− <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/p-e-w/plotinus"/>
12+ <emphasis>Upstream documentation:</emphasis>
13+ <link xlink:href="https://github.com/p-e-w/plotinus"/>
1214 </para>
1315 <para>
1416 Plotinus is a searchable command palette in every modern GTK application.
1517 </para>
1618 <para>
17− When in a GTK 3 application and Plotinus is enabled, you can press <literal>Ctrl+Shift+P</literal> to open the command palette. The command palette provides a searchable list of of all menu items in the application.
19+ When in a GTK 3 application and Plotinus is enabled, you can press
20+ <literal>Ctrl+Shift+P</literal> to open the command palette. The command
21+ palette provides a searchable list of of all menu items in the application.
1822 </para>
1923 <para>
20− To enable Plotinus, add the following to your <filename>configuration.nix</filename>:
24+ To enable Plotinus, add the following to your
25+ <filename>configuration.nix</filename>:
2126<programlisting>
2227<xref linkend="opt-programs.plotinus.enable"/> = true;
2328</programlisting>
nixos/modules/programs/zsh/oh-my-zsh.xml+49−13
@@ -5,13 +5,18 @@
55 xml:id="module-programs-zsh-ohmyzsh">
66 <title>Oh my ZSH</title>
77 <para>
8− <literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a framework to manage your <link xlink:href="https://www.zsh.org/">ZSH</link> configuration including completion scripts for several CLI tools or custom prompt themes.
8+ <literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a
9+ framework to manage your <link xlink:href="https://www.zsh.org/">ZSH</link>
10+ configuration including completion scripts for several CLI tools or custom
11+ prompt themes.
912 </para>
1013 <section xml:id="module-programs-oh-my-zsh-usage">
1114 <title>Basic usage</title>
1215
1316 <para>
14− The module uses the <literal>oh-my-zsh</literal> package with all available features. The initial setup using Nix expressions is fairly similar to the configuration format of <literal>oh-my-zsh</literal>.
17+ The module uses the <literal>oh-my-zsh</literal> package with all available
18+ features. The initial setup using Nix expressions is fairly similar to the
19+ configuration format of <literal>oh-my-zsh</literal>.
1520<programlisting>
1621{
1722 programs.zsh.ohMyZsh = {
@@ -21,18 +26,25 @@
2126 };
2227}
2328</programlisting>
24− For a detailed explanation of these arguments please refer to the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal> docs</link>.
29+ For a detailed explanation of these arguments please refer to the
30+ <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal>
31+ docs</link>.
2532 </para>
2633
2734 <para>
28− The expression generates the needed configuration and writes it into your <literal>/etc/zshrc</literal>.
35+ The expression generates the needed configuration and writes it into your
36+ <literal>/etc/zshrc</literal>.
2937 </para>
3038 </section>
3139 <section xml:id="module-programs-oh-my-zsh-additions">
3240 <title>Custom additions</title>
3341
3442 <para>
35− Sometimes third-party or custom scripts such as a modified theme may be needed. <literal>oh-my-zsh</literal> provides the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link> environment variable for this which points to a directory with additional scripts.
43+ Sometimes third-party or custom scripts such as a modified theme may be
44+ needed. <literal>oh-my-zsh</literal> provides the
45+ <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link>
46+ environment variable for this which points to a directory with additional
47+ scripts.
3648 </para>
3749
3850 <para>
@@ -48,11 +60,16 @@
4860 <title>Custom environments</title>
4961
5062 <para>
51− There are several extensions for <literal>oh-my-zsh</literal> packaged in <literal>nixpkgs</literal>. One of them is <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link> which bundles completion scripts and a plugin for <literal>oh-my-zsh</literal>.
63+ There are several extensions for <literal>oh-my-zsh</literal> packaged in
64+ <literal>nixpkgs</literal>. One of them is
65+ <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link>
66+ which bundles completion scripts and a plugin for
67+ <literal>oh-my-zsh</literal>.
5268 </para>
5369
5470 <para>
55− Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>, it's also possible to generate this path from a list of Nix packages:
71+ Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>,
72+ it's also possible to generate this path from a list of Nix packages:
5673<programlisting>
5774{ pkgs, ... }:
5875{
@@ -62,34 +79,53 @@
6279 ];
6380}
6481</programlisting>
65− Internally a single store path will be created using <literal>buildEnv</literal>. Please refer to the docs of <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link> for further reference.
82+ Internally a single store path will be created using
83+ <literal>buildEnv</literal>. Please refer to the docs of
84+ <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link>
85+ for further reference.
6686 </para>
6787
6888 <para>
69− <emphasis>Please keep in mind that this is not compatible with <literal>programs.zsh.ohMyZsh.custom</literal> as it requires an immutable store path while <literal>custom</literal> shall remain mutable! An evaluation failure will be thrown if both <literal>custom</literal> and <literal>customPkgs</literal> are set.</emphasis>
89+ <emphasis>Please keep in mind that this is not compatible with
90+ <literal>programs.zsh.ohMyZsh.custom</literal> as it requires an immutable
91+ store path while <literal>custom</literal> shall remain mutable! An
92+ evaluation failure will be thrown if both <literal>custom</literal> and
93+ <literal>customPkgs</literal> are set.</emphasis>
7094 </para>
7195 </section>
7296 <section xml:id="module-programs-oh-my-zsh-packaging-customizations">
7397 <title>Package your own customizations</title>
7498
7599 <para>
76− If third-party customizations (e.g. new themes) are supposed to be added to <literal>oh-my-zsh</literal> there are several pitfalls to keep in mind:
100+ If third-party customizations (e.g. new themes) are supposed to be added to
101+ <literal>oh-my-zsh</literal> there are several pitfalls to keep in mind:
77102 </para>
78103
79104 <itemizedlist>
80105 <listitem>
81106 <para>
82− To comply with the default structure of <literal>ZSH</literal> the entire output needs to be written to <literal>$out/share/zsh.</literal>
107+ To comply with the default structure of <literal>ZSH</literal> the entire
108+ output needs to be written to <literal>$out/share/zsh.</literal>
83109 </para>
84110 </listitem>
85111 <listitem>
86112 <para>
87− Completion scripts are supposed to be stored at <literal>$out/share/zsh/site-functions</literal>. This directory is part of the <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal> and the package should be compatible with pure <literal>ZSH</literal> setups. The module will automatically link the contents of <literal>site-functions</literal> to completions directory in the proper store path.
113+ Completion scripts are supposed to be stored at
114+ <literal>$out/share/zsh/site-functions</literal>. This directory is part
115+ of the
116+ <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal>
117+ and the package should be compatible with pure <literal>ZSH</literal>
118+ setups. The module will automatically link the contents of
119+ <literal>site-functions</literal> to completions directory in the proper
120+ store path.
88121 </para>
89122 </listitem>
90123 <listitem>
91124 <para>
92− The <literal>plugins</literal> directory needs the structure <literal>pluginname/pluginname.plugin.zsh</literal> as structured in the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream repo.</link>
125+ The <literal>plugins</literal> directory needs the structure
126+ <literal>pluginname/pluginname.plugin.zsh</literal> as structured in the
127+ <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream
128+ repo.</link>
93129 </para>
94130 </listitem>
95131 </itemizedlist>
nixos/modules/security/acme.xml+23−7
@@ -5,13 +5,19 @@
55 xml:id="module-security-acme">
66 <title>SSL/TLS Certificates with ACME</title>
77 <para>
8− NixOS supports automatic domain validation &amp; certificate retrieval and renewal using the ACME protocol. This is currently only implemented by and for Let's Encrypt. The alternative ACME client <literal>simp_le</literal> is used under the hood.
8+ NixOS supports automatic domain validation &amp; certificate retrieval and
9+ renewal using the ACME protocol. This is currently only implemented by and
10+ for Let's Encrypt. The alternative ACME client <literal>simp_le</literal> is
11+ used under the hood.
912 </para>
1013 <section xml:id="module-security-acme-prerequisites">
1114 <title>Prerequisites</title>
1215
1316 <para>
14− You need to have a running HTTP server for verification. The server must have a webroot defined that can serve <filename>.well-known/acme-challenge</filename>. This directory must be writeable by the user that will run the ACME client.
17+ You need to have a running HTTP server for verification. The server must
18+ have a webroot defined that can serve
19+ <filename>.well-known/acme-challenge</filename>. This directory must be
20+ writeable by the user that will run the ACME client.
1521 </para>
1622
1723 <para>
@@ -39,7 +45,9 @@ http {
3945 <title>Configuring</title>
4046
4147 <para>
42− To enable ACME certificate retrieval &amp; renewal for a certificate for <literal>foo.example.com</literal>, add the following in your <filename>configuration.nix</filename>:
48+ To enable ACME certificate retrieval &amp; renewal for a certificate for
49+ <literal>foo.example.com</literal>, add the following in your
50+ <filename>configuration.nix</filename>:
4351<programlisting>
4452<xref linkend="opt-security.acme.certs"/>."foo.example.com" = {
4553 <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/www/challenges";
@@ -49,18 +57,26 @@ http {
4957 </para>
5058
5159 <para>
52− The private key <filename>key.pem</filename> and certificate <filename>fullchain.pem</filename> will be put into <filename>/var/lib/acme/foo.example.com</filename>.
60+ The private key <filename>key.pem</filename> and certificate
61+ <filename>fullchain.pem</filename> will be put into
62+ <filename>/var/lib/acme/foo.example.com</filename>.
5363 </para>
54−
5564 <para>
56− Refer to <xref linkend="ch-options" /> for all available configuration options for the <link linkend="opt-security.acme.certs">security.acme</link> module.
65+ Refer to <xref linkend="ch-options" /> for all available configuration
66+ options for the <link linkend="opt-security.acme.certs">security.acme</link>
67+ module.
5768 </para>
5869 </section>
5970 <section xml:id="module-security-acme-nginx">
6071 <title>Using ACME certificates in Nginx</title>
6172
6273 <para>
63− NixOS supports fetching ACME certificates for you by setting <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;</literal> 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 <literal>foo.example.com</literal> the config would look like.
74+ NixOS supports fetching ACME certificates for you by setting
75+ <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link>
76+ = true;</literal> in a virtualHost config. We first create self-signed
77+ placeholder certificates in place of the real ACME certs. The placeholder
78+ certs are overwritten when the ACME certs arrive. For
79+ <literal>foo.example.com</literal> the config would look like.
6480 </para>
6581
6682<programlisting>
nixos/modules/security/hidepid.xml+8−3
@@ -9,13 +9,18 @@
99<programlisting>
1010<xref linkend="opt-security.hideProcessInformation"/> = true;
1111</programlisting>
12− 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.
12+ ensures that access to process information is restricted to the owning user.
13+ This implies, among other things, that command-line arguments remain private.
14+ Unless your deployment relies on unprivileged users being able to inspect the
15+ process information of other users, this option should be safe to enable.
1316 </para>
1417 <para>
15− Members of the <literal>proc</literal> group are exempt from process information hiding.
18+ Members of the <literal>proc</literal> group are exempt from process
19+ information hiding.
1620 </para>
1721 <para>
18− To allow a service <replaceable>foo</replaceable> to run without process information hiding, set
22+ To allow a service <replaceable>foo</replaceable> to run without process
23+ information hiding, set
1924<programlisting>
2025<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.<replaceable>foo</replaceable>.serviceConfig</link>.SupplementaryGroups = [ "proc" ];
2126</programlisting>
nixos/modules/services/audio/spotifyd.nix+1−1
@@ -28,7 +28,7 @@ in
2828 after = [ "network-online.target" "sound.target" ];
2929 description = "spotifyd, a Spotify playing daemon";
3030 serviceConfig = {
31− ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache_path /var/cache/spotifyd --config ${spotifydConf}";
31+ ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
3232 Restart = "always";
3333 RestartSec = 12;
3434 DynamicUser = true;
nixos/modules/services/databases/foundationdb.xml+158−39
@@ -5,10 +5,12 @@
55 xml:id="module-services-foundationdb">
66 <title>FoundationDB</title>
77 <para>
8− <emphasis>Source:</emphasis> <filename>modules/services/databases/foundationdb.nix</filename>
8+ <emphasis>Source:</emphasis>
9+ <filename>modules/services/databases/foundationdb.nix</filename>
910 </para>
1011 <para>
11− <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://apple.github.io/foundationdb/"/>
12+ <emphasis>Upstream documentation:</emphasis>
13+ <link xlink:href="https://apple.github.io/foundationdb/"/>
1214 </para>
1315 <para>
1416 <emphasis>Maintainer:</emphasis> Austin Seipp
@@ -17,13 +19,15 @@
1719 <emphasis>Available version(s):</emphasis> 5.1.x, 5.2.x, 6.0.x
1820 </para>
1921 <para>
20− FoundationDB (or "FDB") is an open source, distributed, transactional key-value store.
22+ FoundationDB (or "FDB") is an open source, distributed, transactional
23+ key-value store.
2124 </para>
2225 <section xml:id="module-services-foundationdb-configuring">
2326 <title>Configuring and basic setup</title>
2427
2528 <para>
26− To enable FoundationDB, add the following to your <filename>configuration.nix</filename>:
29+ To enable FoundationDB, add the following to your
30+ <filename>configuration.nix</filename>:
2731<programlisting>
2832services.foundationdb.enable = true;
2933services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
@@ -31,11 +35,18 @@ services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
3135 </para>
3236
3337 <para>
34− The <option>services.foundationdb.package</option> 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.
38+ The <option>services.foundationdb.package</option> option is required, and
39+ must always be specified. Due to the fact FoundationDB network protocols and
40+ on-disk storage formats may change between (major) versions, and upgrades
41+ must be explicitly handled by the user, you must always manually specify
42+ this yourself so that the NixOS module will use the proper version. Note
43+ that minor, bugfix releases are always compatible.
3544 </para>
3645
3746 <para>
38− After running <command>nixos-rebuild</command>, you can verify whether FoundationDB is running by executing <command>fdbcli</command> (which is added to <option>environment.systemPackages</option>):
47+ After running <command>nixos-rebuild</command>, you can verify whether
48+ FoundationDB is running by executing <command>fdbcli</command> (which is
49+ added to <option>environment.systemPackages</option>):
3950<screen>
4051<prompt>$ </prompt>sudo -u foundationdb fdbcli
4152Using cluster file `/etc/foundationdb/fdb.cluster'.
@@ -66,7 +77,11 @@ Cluster:
6677 </para>
6778
6879 <para>
69− 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 <command>nix-shell</command> shebang support to automatically supply the necessary Python modules).
80+ You can also write programs using the available client libraries. For
81+ example, the following Python program can be run in order to grab the
82+ cluster status, as a quick example. (This example uses
83+ <command>nix-shell</command> shebang support to automatically supply the
84+ necessary Python modules).
7085<screen>
7186<prompt>a@link> </prompt>cat fdb-status.py
7287#! /usr/bin/env nix-shell
@@ -96,56 +111,91 @@ FoundationDB available: True
96111 </para>
97112
98113 <para>
99− FoundationDB is run under the <command>foundationdb</command> user and group by default, but this may be changed in the NixOS configuration. The systemd unit <command>foundationdb.service</command> controls the <command>fdbmonitor</command> process.
114+ FoundationDB is run under the <command>foundationdb</command> user and group
115+ by default, but this may be changed in the NixOS configuration. The systemd
116+ unit <command>foundationdb.service</command> controls the
117+ <command>fdbmonitor</command> process.
100118 </para>
101119
102120 <para>
103− 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 <command>fdbcli</command>.)
121+ By default, the NixOS module for FoundationDB creates a single SSD-storage
122+ based database for development and basic usage. This storage engine is
123+ designed for SSDs and will perform poorly on HDDs; however it can handle far
124+ more data than the alternative "memory" engine and is a better default
125+ choice for most deployments. (Note that you can change the storage backend
126+ on-the-fly for a given FoundationDB cluster using
127+ <command>fdbcli</command>.)
104128 </para>
105129
106130 <para>
107− Furthermore, only 1 server process and 1 backup agent are started in the default configuration. See below for more on scaling to increase this.
131+ Furthermore, only 1 server process and 1 backup agent are started in the
132+ default configuration. See below for more on scaling to increase this.
108133 </para>
109134
110135 <para>
111− FoundationDB stores all data for all server processes under <filename>/var/lib/foundationdb</filename>. You can override this using <option>services.foundationdb.dataDir</option>, e.g.
136+ FoundationDB stores all data for all server processes under
137+ <filename>/var/lib/foundationdb</filename>. You can override this using
138+ <option>services.foundationdb.dataDir</option>, e.g.
112139<programlisting>
113140services.foundationdb.dataDir = "/data/fdb";
114141</programlisting>
115142 </para>
116143
117144 <para>
118− Similarly, logs are stored under <filename>/var/log/foundationdb</filename> by default, and there is a corresponding <option>services.foundationdb.logDir</option> as well.
145+ Similarly, logs are stored under <filename>/var/log/foundationdb</filename>
146+ by default, and there is a corresponding
147+ <option>services.foundationdb.logDir</option> as well.
119148 </para>
120149 </section>
121150 <section xml:id="module-services-foundationdb-scaling">
122151 <title>Scaling processes and backup agents</title>
123152
124153 <para>
125− Scaling the number of server processes is quite easy; simply specify <option>services.foundationdb.serverProcesses</option> to be the number of FoundationDB worker processes that should be started on the machine.
154+ Scaling the number of server processes is quite easy; simply specify
155+ <option>services.foundationdb.serverProcesses</option> to be the number of
156+ FoundationDB worker processes that should be started on the machine.
126157 </para>
127158
128159 <para>
129− 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.
160+ FoundationDB worker processes typically require 4GB of RAM per-process at
161+ minimum for good performance, so this option is set to 1 by default since
162+ the maximum amount of RAM is unknown. You're advised to abide by this
163+ restriction, so pick a number of processes so that each has 4GB or more.
130164 </para>
131165
132166 <para>
133− A similar option exists in order to scale backup agent processes, <option>services.foundationdb.backupProcesses</option>. Backup agents are not as performance/RAM sensitive, so feel free to experiment with the number of available backup processes.
167+ A similar option exists in order to scale backup agent processes,
168+ <option>services.foundationdb.backupProcesses</option>. Backup agents are
169+ not as performance/RAM sensitive, so feel free to experiment with the number
170+ of available backup processes.
134171 </para>
135172 </section>
136173 <section xml:id="module-services-foundationdb-clustering">
137174 <title>Clustering</title>
138175
139176 <para>
140− 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.
177+ FoundationDB on NixOS works similarly to other Linux systems, so this
178+ section will be brief. Please refer to the full FoundationDB documentation
179+ for more on clustering.
141180 </para>
142181
143182 <para>
144− FoundationDB organizes clusters using a set of <emphasis>coordinators</emphasis>, 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 <command>localhost</command>.
183+ FoundationDB organizes clusters using a set of
184+ <emphasis>coordinators</emphasis>, which are just specially-designated
185+ worker processes. By default, every installation of FoundationDB on NixOS
186+ will start as its own individual cluster, with a single coordinator: the
187+ first worker process on <command>localhost</command>.
145188 </para>
146189
147190 <para>
148− Coordinators are specified globally using the <command>/etc/foundationdb/fdb.cluster</command> file, which all servers and client applications will use to find and join coordinators. Note that this file <emphasis>can not</emphasis> 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.
191+ Coordinators are specified globally using the
192+ <command>/etc/foundationdb/fdb.cluster</command> file, which all servers and
193+ client applications will use to find and join coordinators. Note that this
194+ file <emphasis>can not</emphasis> be managed by NixOS so easily:
195+ FoundationDB is designed so that it will rewrite the file at runtime for all
196+ clients and nodes when cluster coordinators change, with clients
197+ transparently handling this without intervention. It is fundamentally a
198+ mutable file, and you should not try to manage it in any way in NixOS.
149199 </para>
150200
151201 <para>
@@ -166,7 +216,9 @@ services.foundationdb.dataDir = "/data/fdb";
166216 </itemizedlist>
167217
168218 <para>
169− 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.
219+ A node must already be a member of the cluster in order to properly be
220+ promoted to a coordinator, so you must always add it first if you wish to
221+ promote it.
170222 </para>
171223
172224 <para>
@@ -181,26 +233,37 @@ services.foundationdb.dataDir = "/data/fdb";
181233 </listitem>
182234 <listitem>
183235 <para>
184− Copy the <command>/etc/foundationdb/fdb.cluster</command> file from this server to all the other servers. Restart FoundationDB on all of these other servers, so they join the cluster.
236+ Copy the <command>/etc/foundationdb/fdb.cluster</command> file from this
237+ server to all the other servers. Restart FoundationDB on all of these
238+ other servers, so they join the cluster.
185239 </para>
186240 </listitem>
187241 <listitem>
188242 <para>
189− All of these servers are now connected and working together in the cluster, under the chosen coordinator.
243+ All of these servers are now connected and working together in the
244+ cluster, under the chosen coordinator.
190245 </para>
191246 </listitem>
192247 </itemizedlist>
193248
194249 <para>
195− 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 <command>fdbcli</command> to change this and add new coordinators.
250+ At this point, you can add as many nodes as you want by just repeating the
251+ above steps. By default there will still be a single coordinator: you can
252+ use <command>fdbcli</command> to change this and add new coordinators.
196253 </para>
197254
198255 <para>
199− 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 <command>coordinators auto</command> command
256+ As a convenience, FoundationDB can automatically assign coordinators based
257+ on the redundancy mode you wish to achieve for the cluster. Once all the
258+ nodes have been joined, simply set the replication policy, and then issue
259+ the <command>coordinators auto</command> command
200260 </para>
201261
202262 <para>
203− 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 <emphasis>every</emphasis> node a coordinator automatically:
263+ For example, assuming we have 3 nodes available, we can enable double
264+ redundancy mode, then auto-select coordinators. For double redundancy, 3
265+ coordinators is ideal: therefore FoundationDB will make
266+ <emphasis>every</emphasis> node a coordinator automatically:
204267 </para>
205268
206269<screen>
@@ -209,33 +272,58 @@ services.foundationdb.dataDir = "/data/fdb";
209272</screen>
210273
211274 <para>
212− This will transparently update all the servers within seconds, and appropriately rewrite the <command>fdb.cluster</command> file, as well as informing all client processes to do the same.
275+ This will transparently update all the servers within seconds, and
276+ appropriately rewrite the <command>fdb.cluster</command> file, as well as
277+ informing all client processes to do the same.
213278 </para>
214279 </section>
215280 <section xml:id="module-services-foundationdb-connectivity">
216281 <title>Client connectivity</title>
217282
218283 <para>
219− By default, all clients must use the current <command>fdb.cluster</command> file to access a given FoundationDB cluster. This file is located by default in <command>/etc/foundationdb/fdb.cluster</command> 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.
284+ By default, all clients must use the current <command>fdb.cluster</command>
285+ file to access a given FoundationDB cluster. This file is located by default
286+ in <command>/etc/foundationdb/fdb.cluster</command> on all machines with the
287+ FoundationDB service enabled, so you may copy the active one from your
288+ cluster to a new node in order to connect, if it is not part of the cluster.
220289 </para>
221290 </section>
222291 <section xml:id="module-services-foundationdb-authorization">
223292 <title>Client authorization and TLS</title>
224293
225294 <para>
226− 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 <emphasis>Acme Co</emphasis> in the <emphasis>Research and Development</emphasis> unit.
295+ By default, any user who can connect to a FoundationDB process with the
296+ correct cluster configuration can access anything. FoundationDB uses a
297+ pluggable design to transport security, and out of the box it supports a
298+ LibreSSL-based plugin for TLS support. This plugin not only does in-flight
299+ encryption, but also performs client authorization based on the given
300+ endpoint's certificate chain. For example, a FoundationDB server may be
301+ configured to only accept client connections over TLS, where the client TLS
302+ certificate is from organization <emphasis>Acme Co</emphasis> in the
303+ <emphasis>Research and Development</emphasis> unit.
227304 </para>
228305
229306 <para>
230− Configuring TLS with FoundationDB is done using the <option>services.foundationdb.tls</option> options in order to control the peer verification string, as well as the certificate and its private key.
307+ Configuring TLS with FoundationDB is done using the
308+ <option>services.foundationdb.tls</option> options in order to control the
309+ peer verification string, as well as the certificate and its private key.
231310 </para>
232311
233312 <para>
234− 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.
313+ Note that the certificate and its private key must be accessible to the
314+ FoundationDB user account that the server runs under. These files are also
315+ NOT managed by NixOS, as putting them into the store may reveal private
316+ information.
235317 </para>
236318
237319 <para>
238− 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 <command>fdb.cluster</command> file to specify that a given set of coordinators use TLS. This is as simple as adding the suffix <command>:tls</command> to your cluster coordinator configuration, after the port number. For example, assuming you have a coordinator on localhost with the default configuration, simply specifying:
320+ After you have a key and certificate file in place, it is not enough to
321+ simply set the NixOS module options -- you must also configure the
322+ <command>fdb.cluster</command> file to specify that a given set of
323+ coordinators use TLS. This is as simple as adding the suffix
324+ <command>:tls</command> to your cluster coordinator configuration, after the
325+ port number. For example, assuming you have a coordinator on localhost with
326+ the default configuration, simply specifying:
239327 </para>
240328
241329<programlisting>
@@ -250,19 +338,36 @@ XXXXXX:XXXXXX@127.0.0.1:4500:tls
250338 <title>Backups and Disaster Recovery</title>
251339
252340 <para>
253− 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 <command>foundationdb</command> systemd unit uses <emphasis>Linux namespaces</emphasis> to restrict write access to the system, except for the log directory, data directory, and the <command>/etc/foundationdb/</command> directory. This is enforced by default and cannot be disabled.
341+ The usual rules for doing FoundationDB backups apply on NixOS as written in
342+ the FoundationDB manual. However, one important difference is the security
343+ profile for NixOS: by default, the <command>foundationdb</command> systemd
344+ unit uses <emphasis>Linux namespaces</emphasis> to restrict write access to
345+ the system, except for the log directory, data directory, and the
346+ <command>/etc/foundationdb/</command> directory. This is enforced by default
347+ and cannot be disabled.
254348 </para>
255349
256350 <para>
257− However, a side effect of this is that the <command>fdbbackup</command> 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.
351+ However, a side effect of this is that the <command>fdbbackup</command>
352+ command doesn't work properly for local filesystem backups: FoundationDB
353+ uses a server process alongside the database processes to perform backups
354+ and copy the backups to the filesystem. As a result, this process is put
355+ under the restricted namespaces above: the backup process can only write to
356+ a limited number of paths.
258357 </para>
259358
260359 <para>
261− In order to allow flexible backup locations on local disks, the FoundationDB NixOS module supports a <option>services.foundationdb.extraReadWritePaths</option> 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.
360+ In order to allow flexible backup locations on local disks, the FoundationDB
361+ NixOS module supports a
362+ <option>services.foundationdb.extraReadWritePaths</option> option. This
363+ option takes a list of paths, and adds them to the systemd unit, allowing
364+ the processes inside the service to write (and read) the specified
365+ directories.
262366 </para>
263367
264368 <para>
265− For example, to create backups in <command>/opt/fdb-backups</command>, first set up the paths in the module options:
369+ For example, to create backups in <command>/opt/fdb-backups</command>, first
370+ set up the paths in the module options:
266371 </para>
267372
268373<programlisting>
@@ -270,7 +375,11 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
270375</programlisting>
271376
272377 <para>
273− 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 <emphasis>must</emphasis> 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).
378+ Restart the FoundationDB service, and it will now be able to write to this
379+ directory (even if it does not yet exist.) Note: this path
380+ <emphasis>must</emphasis> exist before restarting the unit. Otherwise,
381+ systemd will not include it in the private FoundationDB namespace (and it
382+ will not add it dynamically at runtime).
274383 </para>
275384
276385 <para>
@@ -286,13 +395,17 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
286395 <title>Known limitations</title>
287396
288397 <para>
289− 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.
398+ The FoundationDB setup for NixOS should currently be considered beta.
399+ FoundationDB is not new software, but the NixOS compilation and integration
400+ has only undergone fairly basic testing of all the available functionality.
290401 </para>
291402
292403 <itemizedlist>
293404 <listitem>
294405 <para>
295− There is no way to specify individual parameters for individual <command>fdbserver</command> processes. Currently, all server processes inherit all the global <command>fdbmonitor</command> settings.
406+ There is no way to specify individual parameters for individual
407+ <command>fdbserver</command> processes. Currently, all server processes
408+ inherit all the global <command>fdbmonitor</command> settings.
296409 </para>
297410 </listitem>
298411 <listitem>
@@ -311,14 +424,20 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
311424 <title>Options</title>
312425
313426 <para>
314− NixOS's FoundationDB module allows you to configure all of the most relevant configuration options for <command>fdbmonitor</command>, matching it quite closely. A complete list of options for the FoundationDB module may be found <link linkend="opt-services.foundationdb.enable">here</link>. You should also read the FoundationDB documentation as well.
427+ NixOS's FoundationDB module allows you to configure all of the most relevant
428+ configuration options for <command>fdbmonitor</command>, matching it quite
429+ closely. A complete list of options for the FoundationDB module may be found
430+ <link linkend="opt-services.foundationdb.enable">here</link>. You should
431+ also read the FoundationDB documentation as well.
315432 </para>
316433 </section>
317434 <section xml:id="module-services-foundationdb-full-docs">
318435 <title>Full documentation</title>
319436
320437 <para>
321− FoundationDB is a complex piece of software, and requires careful administration to properly use. Full documentation for administration can be found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.
438+ FoundationDB is a complex piece of software, and requires careful
439+ administration to properly use. Full documentation for administration can be
440+ found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.
322441 </para>
323442 </section>
324443</chapter>
nixos/modules/services/databases/postgresql.xml+26−13
@@ -7,10 +7,12 @@
77<!-- FIXME: render nicely -->
88<!-- FIXME: source can be added automatically -->
99 <para>
10− <emphasis>Source:</emphasis> <filename>modules/services/databases/postgresql.nix</filename>
10+ <emphasis>Source:</emphasis>
11+ <filename>modules/services/databases/postgresql.nix</filename>
1112 </para>
1213 <para>
13− <emphasis>Upstream documentation:</emphasis> <link xlink:href="http://www.postgresql.org/docs/"/>
14+ <emphasis>Upstream documentation:</emphasis>
15+ <link xlink:href="http://www.postgresql.org/docs/"/>
1416 </para>
1517<!-- FIXME: more stuff, like maintainer? -->
1618 <para>
@@ -21,12 +23,18 @@
2123 <title>Configuring</title>
2224
2325 <para>
24− To enable PostgreSQL, add the following to your <filename>configuration.nix</filename>:
26+ To enable PostgreSQL, add the following to your
27+ <filename>configuration.nix</filename>:
2528<programlisting>
2629<xref linkend="opt-services.postgresql.enable"/> = true;
2730<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11;
2831</programlisting>
29− Note that you are required to specify the desired version of PostgreSQL (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for <xref linkend="opt-services.postgresql.package"/> such as the most recent release of PostgreSQL.
32+ Note that you are required to specify the desired version of PostgreSQL
33+ (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your
34+ PostgreSQL version requires a database dump and reload (see below), NixOS
35+ cannot provide a default value for
36+ <xref linkend="opt-services.postgresql.package"/> such as the most recent
37+ release of PostgreSQL.
3038 </para>
3139
3240<!--
@@ -43,7 +51,9 @@ Type "help" for help.
4351-->
4452
4553 <para>
46− By default, PostgreSQL stores its databases in <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using <xref linkend="opt-services.postgresql.dataDir"/>, e.g.
54+ By default, PostgreSQL stores its databases in
55+ <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using
56+ <xref linkend="opt-services.postgresql.dataDir"/>, e.g.
4757<programlisting>
4858<xref linkend="opt-services.postgresql.dataDir"/> = "/data/postgresql";
4959</programlisting>
@@ -60,14 +70,18 @@ Type "help" for help.
6070 <title>Options</title>
6171
6272 <para>
63− A complete list of options for the PostgreSQL module may be found <link linkend="opt-services.postgresql.enable">here</link>.
73+ A complete list of options for the PostgreSQL module may be found
74+ <link linkend="opt-services.postgresql.enable">here</link>.
6475 </para>
6576 </section>
6677 <section xml:id="module-services-postgres-plugins">
6778 <title>Plugins</title>
6879
6980 <para>
70− Plugins collection for each PostgreSQL version can be accessed with <literal>.pkgs</literal>. For example, for <literal>pkgs.postgresql_11</literal> package, its plugin collection is accessed by <literal>pkgs.postgresql_11.pkgs</literal>:
81+ Plugins collection for each PostgreSQL version can be accessed with
82+ <literal>.pkgs</literal>. For example, for
83+ <literal>pkgs.postgresql_11</literal> package, its plugin collection is
84+ accessed by <literal>pkgs.postgresql_11.pkgs</literal>:
7185<screen>
7286<prompt>$ </prompt>nix repl '&lt;nixpkgs&gt;'
7387
@@ -84,9 +98,8 @@ postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga
8498...
8599</screen>
86100 </para>
87−
88101 <para>
89− To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>:
102+ To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>:
90103<programlisting>
91104<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11;
92105<xref linkend="opt-services.postgresql.extraPlugins"/> = with pkgs.postgresql_11.pkgs; [
@@ -95,9 +108,10 @@ postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga
95108];
96109</programlisting>
97110 </para>
98−
99111 <para>
100− You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function <literal>.withPackages</literal>. For example, creating a custom PostgreSQL package in an overlay can look like:
112+ You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using
113+ function <literal>.withPackages</literal>. For example, creating a custom
114+ PostgreSQL package in an overlay can look like:
101115<programlisting>
102116self: super: {
103117 postgresql_custom = self.postgresql_11.withPackages (ps: [
@@ -107,9 +121,8 @@ self: super: {
107121}
108122</programlisting>
109123 </para>
110−
111124 <para>
112− Here's a recipe on how to override a particular plugin through an overlay:
125+ Here's a recipe on how to override a particular plugin through an overlay:
113126<programlisting>
114127self: super: {
115128 postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // {
nixos/modules/services/desktops/flatpak.xml+18−7
@@ -5,33 +5,44 @@
55 xml:id="module-services-flatpak">
66 <title>Flatpak</title>
77 <para>
8− <emphasis>Source:</emphasis> <filename>modules/services/desktop/flatpak.nix</filename>
8+ <emphasis>Source:</emphasis>
9+ <filename>modules/services/desktop/flatpak.nix</filename>
910 </para>
1011 <para>
11− <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/flatpak/flatpak/wiki"/>
12+ <emphasis>Upstream documentation:</emphasis>
13+ <link xlink:href="https://github.com/flatpak/flatpak/wiki"/>
1214 </para>
1315 <para>
14− Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.
16+ Flatpak is a system for building, distributing, and running sandboxed desktop
17+ applications on Linux.
1518 </para>
1619 <para>
17− To enable Flatpak, add the following to your <filename>configuration.nix</filename>:
20+ To enable Flatpak, add the following to your
21+ <filename>configuration.nix</filename>:
1822<programlisting>
1923 <xref linkend="opt-services.flatpak.enable"/> = true;
2024</programlisting>
2125 </para>
2226 <para>
23− 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 <filename>configuration.nix</filename>:
27+ For the sandboxed apps to work correctly, desktop integration portals need to
28+ be installed. If you run GNOME, this will be handled automatically for you;
29+ in other cases, you will need to add something like the following to your
30+ <filename>configuration.nix</filename>:
2431<programlisting>
2532 <xref linkend="opt-xdg.portal.extraPortals"/> = [ pkgs.xdg-desktop-portal-gtk ];
2633</programlisting>
2734 </para>
2835 <para>
29− Then, you will need to add a repository, for example, <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, either using the following commands:
36+ Then, you will need to add a repository, for example,
37+ <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>,
38+ either using the following commands:
3039<screen>
3140<prompt>$ </prompt>flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
3241<prompt>$ </prompt>flatpak update
3342</screen>
34− or by opening the <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository file</link> in GNOME Software.
43+ or by opening the
44+ <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository
45+ file</link> in GNOME Software.
3546 </para>
3647 <para>
3748 Finally, you can search and install programs:
nixos/modules/services/editors/emacs.xml+170−51
@@ -12,26 +12,41 @@
1212 Adam Hoese @adisbladis
1313 -->
1414 <para>
15− <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> 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.
15+ <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> is an
16+ extensible, customizable, self-documenting real-time display editor — and
17+ more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp
18+ programming language with extensions to support text editing.
1619 </para>
1720 <para>
18− Emacs runs within a graphical desktop environment using the X Window System, but works equally well on a text terminal. Under <productname>macOS</productname>, a "Mac port" edition is available, which uses Apple's native GUI frameworks.
21+ Emacs runs within a graphical desktop environment using the X Window System,
22+ but works equally well on a text terminal. Under
23+ <productname>macOS</productname>, a "Mac port" edition is available, which
24+ uses Apple's native GUI frameworks.
1925 </para>
2026 <para>
21− <productname>Nixpkgs</productname> provides a superior environment for running <application>Emacs</application>. 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. <productname>NixOS</productname> even provides a <command>systemd</command> user service for automatically starting the Emacs daemon.
27+ <productname>Nixpkgs</productname> provides a superior environment for
28+ running <application>Emacs</application>. It's simple to create custom builds
29+ by overriding the default packages. Chaotic collections of Emacs Lisp code
30+ and extensions can be brought under control using declarative package
31+ management. <productname>NixOS</productname> even provides a
32+ <command>systemd</command> user service for automatically starting the Emacs
33+ daemon.
2234 </para>
2335 <section xml:id="module-services-emacs-installing">
2436 <title>Installing <application>Emacs</application></title>
2537
2638 <para>
27− Emacs can be installed in the normal way for Nix (see <xref linkend="sec-package-management" />). In addition, a NixOS <emphasis>service</emphasis> can be enabled.
39+ Emacs can be installed in the normal way for Nix (see
40+ <xref linkend="sec-package-management" />). In addition, a NixOS
41+ <emphasis>service</emphasis> can be enabled.
2842 </para>
2943
3044 <section xml:id="module-services-emacs-releases">
3145 <title>The Different Releases of Emacs</title>
3246
3347 <para>
34− <productname>Nixpkgs</productname> defines several basic Emacs packages. The following are attributes belonging to the <varname>pkgs</varname> set:
48+ <productname>Nixpkgs</productname> defines several basic Emacs packages.
49+ The following are attributes belonging to the <varname>pkgs</varname> set:
3550 <variablelist>
3651 <varlistentry>
3752 <term>
@@ -42,8 +57,10 @@
4257 </term>
4358 <listitem>
4459 <para>
45− The latest stable version of Emacs 25 using the <link
46− xlink:href="http://www.gtk.org">GTK 2</link> widget toolkit.
60+ The latest stable version of Emacs 25 using the
61+ <link
62+ xlink:href="http://www.gtk.org">GTK 2</link>
63+ widget toolkit.
4764 </para>
4865 </listitem>
4966 </varlistentry>
@@ -66,7 +83,8 @@
6683 </term>
6784 <listitem>
6885 <para>
69− Emacs 25 with the "Mac port" patches, providing a more native look and feel under macOS.
86+ Emacs 25 with the "Mac port" patches, providing a more native look and
87+ feel under macOS.
7088 </para>
7189 </listitem>
7290 </varlistentry>
@@ -74,7 +92,12 @@
7492 </para>
7593
7694 <para>
77− If those aren't suitable, then the following imitation Emacs editors are also available in Nixpkgs: <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>, <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>, <link xlink:href="http://yi-editor.github.io/">Yi</link>, <link xlink:href="https://joe-editor.sourceforge.io/">jmacs</link>.
95+ If those aren't suitable, then the following imitation Emacs editors are
96+ also available in Nixpkgs:
97+ <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>,
98+ <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>,
99+ <link xlink:href="http://yi-editor.github.io/">Yi</link>,
100+ <link xlink:href="https://joe-editor.sourceforge.io/">jmacs</link>.
78101 </para>
79102 </section>
80103
@@ -82,20 +105,36 @@
82105 <title>Adding Packages to Emacs</title>
83106
84107 <para>
85− Emacs includes an entire ecosystem of functionality beyond text editing, including a project planner, mail and news reader, debugger interface, calendar, and more.
108+ Emacs includes an entire ecosystem of functionality beyond text editing,
109+ including a project planner, mail and news reader, debugger interface,
110+ calendar, and more.
86111 </para>
87112
88113 <para>
89− Most extensions are gotten with the Emacs packaging system (<filename>package.el</filename>) from <link
90− xlink:href="https://elpa.gnu.org/">Emacs Lisp Package Archive (<acronym>ELPA</acronym>)</link>, <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>, <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>, and <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. Nixpkgs is regularly updated to mirror all these archives.
114+ Most extensions are gotten with the Emacs packaging system
115+ (<filename>package.el</filename>) from
116+ <link
117+ xlink:href="https://elpa.gnu.org/">Emacs Lisp Package Archive
118+ (<acronym>ELPA</acronym>)</link>,
119+ <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>,
120+ <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>, and
121+ <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. Nixpkgs is
122+ regularly updated to mirror all these archives.
91123 </para>
92124
93125 <para>
94− Under NixOS, you can continue to use <function>package-list-packages</function> and <function>package-install</function> 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.
126+ Under NixOS, you can continue to use
127+ <function>package-list-packages</function> and
128+ <function>package-install</function> to install packages. You can also
129+ declare the set of Emacs packages you need using the derivations from
130+ Nixpkgs. The rest of this section discusses declarative installation of
131+ Emacs packages through nixpkgs.
95132 </para>
96133
97134 <para>
98− 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 <filename>emacs.nix</filename> file such as:
135+ The first step to declare the list of packages you want in your Emacs
136+ installation is to create a dedicated derivation. This can be done in a
137+ dedicated <filename>emacs.nix</filename> file such as:
99138 <example xml:id="ex-emacsNix">
100139 <title>Nix expression to build Emacs with packages (<filename>emacs.nix</filename>)</title>
101140<programlisting language="nix">
@@ -137,27 +176,36 @@ in
137176 <calloutlist>
138177 <callout arearefs="ex-emacsNix-1">
139178 <para>
140− The first non-comment line in this file (<literal>{ pkgs ? ... }</literal>) indicates that the whole file represents a function.
179+ The first non-comment line in this file (<literal>{ pkgs ? ...
180+ }</literal>) indicates that the whole file represents a function.
141181 </para>
142182 </callout>
143183 <callout arearefs="ex-emacsNix-2">
144184 <para>
145− The <varname>let</varname> expression below defines a <varname>myEmacs</varname> 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.
185+ The <varname>let</varname> expression below defines a
186+ <varname>myEmacs</varname> binding pointing to the current stable
187+ version of Emacs. This binding is here to separate the choice of the
188+ Emacs binary from the specification of the required packages.
146189 </para>
147190 </callout>
148191 <callout arearefs="ex-emacsNix-3">
149192 <para>
150− This generates an <varname>emacsWithPackages</varname> 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).
193+ This generates an <varname>emacsWithPackages</varname> function. It
194+ takes a single argument: a function from a package set to a list of
195+ packages (the packages that will be available in Emacs).
151196 </para>
152197 </callout>
153198 <callout arearefs="ex-emacsNix-4">
154199 <para>
155− The rest of the file specifies the list of packages to install. In the example, two packages (<varname>magit</varname> and <varname>zerodark-theme</varname>) are taken from MELPA stable.
200+ The rest of the file specifies the list of packages to install. In the
201+ example, two packages (<varname>magit</varname> and
202+ <varname>zerodark-theme</varname>) are taken from MELPA stable.
156203 </para>
157204 </callout>
158205 <callout arearefs="ex-emacsNix-5">
159206 <para>
160− Two packages (<varname>undo-tree</varname> and <varname>zoom-frm</varname>) are taken from MELPA.
207+ Two packages (<varname>undo-tree</varname> and
208+ <varname>zoom-frm</varname>) are taken from MELPA.
161209 </para>
162210 </callout>
163211 <callout arearefs="ex-emacsNix-6">
@@ -167,14 +215,17 @@ in
167215 </callout>
168216 <callout arearefs="ex-emacsNix-7">
169217 <para>
170− <varname>notmuch</varname> is taken from a nixpkgs derivation which contains an Emacs mode.
218+ <varname>notmuch</varname> is taken from a nixpkgs derivation which
219+ contains an Emacs mode.
171220 </para>
172221 </callout>
173222 </calloutlist>
174223 </para>
175224
176225 <para>
177− The result of this configuration will be an <command>emacs</command> command which launches Emacs with all of your chosen packages in the <varname>load-path</varname>.
226+ The result of this configuration will be an <command>emacs</command>
227+ command which launches Emacs with all of your chosen packages in the
228+ <varname>load-path</varname>.
178229 </para>
179230
180231 <para>
@@ -183,17 +234,23 @@ in
183234<prompt>$ </prompt>nix-build emacs.nix
184235<prompt>$ </prompt>./result/bin/emacs -q
185236</screen>
186− and then typing <literal>M-x package-initialize</literal>. Check that you can use all the packages you want in this Emacs instance. For example, try switching to the zerodark theme through <literal>M-x load-theme &lt;RET&gt; zerodark &lt;RET&gt; y</literal>.
237+ and then typing <literal>M-x package-initialize</literal>. Check that you
238+ can use all the packages you want in this Emacs instance. For example, try
239+ switching to the zerodark theme through <literal>M-x load-theme &lt;RET&gt;
240+ zerodark &lt;RET&gt; y</literal>.
187241 </para>
188242
189243 <tip>
190244 <para>
191− A few popular extensions worth checking out are: auctex, company, edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile, and yasnippet.
245+ A few popular extensions worth checking out are: auctex, company,
246+ edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile,
247+ and yasnippet.
192248 </para>
193249 </tip>
194250
195251 <para>
196− The list of available packages in the various ELPA repositories can be seen with the following commands:
252+ The list of available packages in the various ELPA repositories can be seen
253+ with the following commands:
197254 <example xml:id="module-services-emacs-querying-packages">
198255 <title>Querying Emacs packages</title>
199256<programlisting><![CDATA[
@@ -206,7 +263,10 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages
206263 </para>
207264
208265 <para>
209− If you are on NixOS, you can install this particular Emacs for all users by adding it to the list of system packages (see <xref linkend="sec-declarative-package-mgmt" />). Simply modify your file <filename>configuration.nix</filename> to make it contain:
266+ If you are on NixOS, you can install this particular Emacs for all users by
267+ adding it to the list of system packages (see
268+ <xref linkend="sec-declarative-package-mgmt" />). Simply modify your file
269+ <filename>configuration.nix</filename> to make it contain:
210270 <example xml:id="module-services-emacs-configuration-nix">
211271 <title>Custom Emacs in <filename>configuration.nix</filename></title>
212272<programlisting><![CDATA[
@@ -221,7 +281,9 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages
221281 </para>
222282
223283 <para>
224− In this case, the next <command>nixos-rebuild switch</command> will take care of adding your <command>emacs</command> to the <varname>PATH</varname> environment variable (see <xref linkend="sec-changing-config" />).
284+ In this case, the next <command>nixos-rebuild switch</command> will take
285+ care of adding your <command>emacs</command> to the <varname>PATH</varname>
286+ environment variable (see <xref linkend="sec-changing-config" />).
225287 </para>
226288
227289<!-- fixme: i think the following is better done with config.nix
@@ -229,7 +291,11 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
229291-->
230292
231293 <para>
232− 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 <filename>~/.config/nixpkgs/config.nix</filename> (see <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>):
294+ If you are not on NixOS or want to install this particular Emacs only for
295+ yourself, you can do so by adding it to your
296+ <filename>~/.config/nixpkgs/config.nix</filename> (see
297+ <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs
298+ manual</link>):
233299 <example xml:id="module-services-emacs-config-nix">
234300 <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title>
235301<programlisting><![CDATA[
@@ -243,7 +309,9 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
243309 </para>
244310
245311 <para>
246− In this case, the next <literal>nix-env -f '&lt;nixpkgs&gt;' -iA myemacs</literal> will take care of adding your emacs to the <varname>PATH</varname> environment variable.
312+ In this case, the next <literal>nix-env -f '&lt;nixpkgs&gt;' -iA
313+ myemacs</literal> will take care of adding your emacs to the
314+ <varname>PATH</varname> environment variable.
247315 </para>
248316 </section>
249317
@@ -251,7 +319,12 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
251319 <title>Advanced Emacs Configuration</title>
252320
253321 <para>
254− If you want, you can tweak the Emacs package itself from your <filename>emacs.nix</filename>. 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 <filename>emacs.desktop</filename> (useful is you only use <command>emacsclient</command>), you can change your file <filename>emacs.nix</filename> in this way:
322+ If you want, you can tweak the Emacs package itself from your
323+ <filename>emacs.nix</filename>. For example, if you want to have a
324+ GTK 3-based Emacs instead of the default GTK 2-based binary and remove the
325+ automatically generated <filename>emacs.desktop</filename> (useful is you
326+ only use <command>emacsclient</command>), you can change your file
327+ <filename>emacs.nix</filename> in this way:
255328 </para>
256329
257330 <example xml:id="ex-emacsGtk3Nix">
@@ -275,7 +348,8 @@ in [...]
275348 </example>
276349
277350 <para>
278− After building this file as shown in <xref linkend="ex-emacsNix" />, you will get an GTK 3-based Emacs binary pre-loaded with your favorite packages.
351+ After building this file as shown in <xref linkend="ex-emacsNix" />, you
352+ will get an GTK 3-based Emacs binary pre-loaded with your favorite packages.
279353 </para>
280354 </section>
281355 </section>
@@ -283,18 +357,23 @@ in [...]
283357 <title>Running Emacs as a Service</title>
284358
285359 <para>
286− <productname>NixOS</productname> provides an optional <command>systemd</command> service which launches <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html"> Emacs daemon </link> with the user's login session.
360+ <productname>NixOS</productname> provides an optional
361+ <command>systemd</command> service which launches
362+ <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html">
363+ Emacs daemon </link> with the user's login session.
287364 </para>
288365
289366 <para>
290− <emphasis>Source:</emphasis> <filename>modules/services/editors/emacs.nix</filename>
367+ <emphasis>Source:</emphasis>
368+ <filename>modules/services/editors/emacs.nix</filename>
291369 </para>
292370
293371 <section xml:id="module-services-emacs-enabling">
294372 <title>Enabling the Service</title>
295373
296374 <para>
297− To install and enable the <command>systemd</command> user service for Emacs daemon, add the following to your <filename>configuration.nix</filename>:
375+ To install and enable the <command>systemd</command> user service for Emacs
376+ daemon, add the following to your <filename>configuration.nix</filename>:
298377<programlisting>
299378<xref linkend="opt-services.emacs.enable"/> = true;
300379<xref linkend="opt-services.emacs.package"/> = import /home/cassou/.emacs.d { pkgs = pkgs; };
@@ -302,11 +381,16 @@ in [...]
302381 </para>
303382
304383 <para>
305− The <varname>services.emacs.package</varname> option allows a custom derivation to be used, for example, one created by <function>emacsWithPackages</function>.
384+ The <varname>services.emacs.package</varname> option allows a custom
385+ derivation to be used, for example, one created by
386+ <function>emacsWithPackages</function>.
306387 </para>
307388
308389 <para>
309− Ensure that the Emacs server is enabled for your user's Emacs configuration, either by customizing the <varname>server-mode</varname> variable, or by adding <literal>(server-start)</literal> to <filename>~/.emacs.d/init.el</filename>.
390+ Ensure that the Emacs server is enabled for your user's Emacs
391+ configuration, either by customizing the <varname>server-mode</varname>
392+ variable, or by adding <literal>(server-start)</literal> to
393+ <filename>~/.emacs.d/init.el</filename>.
310394 </para>
311395
312396 <para>
@@ -324,7 +408,9 @@ in [...]
324408 <title>Starting the client</title>
325409
326410 <para>
327− Ensure that the emacs server is enabled, either by customizing the <varname>server-mode</varname> variable, or by adding <literal>(server-start)</literal> to <filename>~/.emacs</filename>.
411+ Ensure that the emacs server is enabled, either by customizing the
412+ <varname>server-mode</varname> variable, or by adding
413+ <literal>(server-start)</literal> to <filename>~/.emacs</filename>.
328414 </para>
329415
330416 <para>
@@ -343,15 +429,23 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
343429<!--<title><command>emacsclient</command> as the Default Editor</title>-->
344430
345431 <para>
346− If <xref linkend="opt-services.emacs.defaultEditor"/> is <literal>true</literal>, the <varname>EDITOR</varname> variable will be set to a wrapper script which launches <command>emacsclient</command>.
432+ If <xref linkend="opt-services.emacs.defaultEditor"/> is
433+ <literal>true</literal>, the <varname>EDITOR</varname> variable will be set
434+ to a wrapper script which launches <command>emacsclient</command>.
347435 </para>
348436
349437 <para>
350− Any setting of <varname>EDITOR</varname> in the shell config files will override <varname>services.emacs.defaultEditor</varname>. To make sure <varname>EDITOR</varname> refers to the Emacs wrapper script, remove any existing <varname>EDITOR</varname> assignment from <filename>.profile</filename>, <filename>.bashrc</filename>, <filename>.zshenv</filename> or any other shell config file.
438+ Any setting of <varname>EDITOR</varname> in the shell config files will
439+ override <varname>services.emacs.defaultEditor</varname>. To make sure
440+ <varname>EDITOR</varname> refers to the Emacs wrapper script, remove any
441+ existing <varname>EDITOR</varname> assignment from
442+ <filename>.profile</filename>, <filename>.bashrc</filename>,
443+ <filename>.zshenv</filename> or any other shell config file.
351444 </para>
352445
353446 <para>
354− If you have formed certain bad habits when editing files, these can be corrected with a shell alias to the wrapper script:
447+ If you have formed certain bad habits when editing files, these can be
448+ corrected with a shell alias to the wrapper script:
355449<programlisting>alias vi=$EDITOR</programlisting>
356450 </para>
357451 </section>
@@ -360,7 +454,10 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
360454 <title>Per-User Enabling of the Service</title>
361455
362456 <para>
363− In general, <command>systemd</command> user services are globally enabled by symlinks in <filename>/etc/systemd/user</filename>. In the case where Emacs daemon is not wanted for all users, it is possible to install the service but not globally enable it:
457+ In general, <command>systemd</command> user services are globally enabled
458+ by symlinks in <filename>/etc/systemd/user</filename>. In the case where
459+ Emacs daemon is not wanted for all users, it is possible to install the
460+ service but not globally enable it:
364461<programlisting>
365462<xref linkend="opt-services.emacs.enable"/> = false;
366463<xref linkend="opt-services.emacs.install"/> = true;
@@ -368,9 +465,11 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
368465 </para>
369466
370467 <para>
371− To enable the <command>systemd</command> user service for just the currently logged in user, run:
468+ To enable the <command>systemd</command> user service for just the
469+ currently logged in user, run:
372470<programlisting>systemctl --user enable emacs</programlisting>
373− This will add the symlink <filename>~/.config/systemd/user/emacs.service</filename>.
471+ This will add the symlink
472+ <filename>~/.config/systemd/user/emacs.service</filename>.
374473 </para>
375474 </section>
376475 </section>
@@ -378,7 +477,8 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
378477 <title>Configuring Emacs</title>
379478
380479 <para>
381− The Emacs init file should be changed to load the extension packages at startup:
480+ The Emacs init file should be changed to load the extension packages at
481+ startup:
382482 <example xml:id="module-services-emacs-package-initialisation">
383483 <title>Package initialization in <filename>.emacs</filename></title>
384484<programlisting><![CDATA[
@@ -394,7 +494,10 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
394494 </para>
395495
396496 <para>
397− After the declarative emacs package configuration has been tested, previously downloaded packages can be cleaned up by removing <filename>~/.emacs.d/elpa</filename> (do make a backup first, in case you forgot a package).
497+ After the declarative emacs package configuration has been tested,
498+ previously downloaded packages can be cleaned up by removing
499+ <filename>~/.emacs.d/elpa</filename> (do make a backup first, in case you
500+ forgot a package).
398501 </para>
399502
400503<!--
@@ -406,7 +509,9 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
406509 <title>A Major Mode for Nix Expressions</title>
407510
408511 <para>
409− Of interest may be <varname>melpaPackages.nix-mode</varname>, which provides syntax highlighting for the Nix language. This is particularly convenient if you regularly edit Nix files.
512+ Of interest may be <varname>melpaPackages.nix-mode</varname>, which
513+ provides syntax highlighting for the Nix language. This is particularly
514+ convenient if you regularly edit Nix files.
410515 </para>
411516 </section>
412517
@@ -414,7 +519,9 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
414519 <title>Accessing man pages</title>
415520
416521 <para>
417− You can use <function>woman</function> to get completion of all available man pages. For example, type <literal>M-x woman &lt;RET&gt; nixos-rebuild &lt;RET&gt;.</literal>
522+ You can use <function>woman</function> to get completion of all available
523+ man pages. For example, type <literal>M-x woman &lt;RET&gt; nixos-rebuild
524+ &lt;RET&gt;.</literal>
418525 </para>
419526 </section>
420527
@@ -422,17 +529,29 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal
422529 <title>Editing DocBook 5 XML Documents</title>
423530
424531 <para>
425− Emacs includes <link
426− xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>, a major-mode for validating and editing XML documents. When editing DocBook 5.0 documents, such as <link linkend="book-nixos-manual">this one</link>, nXML needs to be configured with the relevant schema, which is not included.
532+ Emacs includes
533+ <link
534+ xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>,
535+ a major-mode for validating and editing XML documents. When editing DocBook
536+ 5.0 documents, such as <link linkend="book-nixos-manual">this one</link>,
537+ nXML needs to be configured with the relevant schema, which is not
538+ included.
427539 </para>
428540
429541 <para>
430− To install the DocBook 5.0 schemas, either add <varname>pkgs.docbook5</varname> to <xref linkend="opt-environment.systemPackages"/> (<link
431− linkend="sec-declarative-package-mgmt">NixOS</link>), or run <literal>nix-env -f '&lt;nixpkgs&gt;' -iA docbook5</literal> (<link linkend="sec-ad-hoc-packages">Nix</link>).
542+ To install the DocBook 5.0 schemas, either add
543+ <varname>pkgs.docbook5</varname> to
544+ <xref linkend="opt-environment.systemPackages"/>
545+ (<link
546+ linkend="sec-declarative-package-mgmt">NixOS</link>), or run
547+ <literal>nix-env -f '&lt;nixpkgs&gt;' -iA docbook5</literal>
548+ (<link linkend="sec-ad-hoc-packages">Nix</link>).
432549 </para>
433550
434551 <para>
435− Then customize the variable <varname>rng-schema-locating-files</varname> to include <filename>~/.emacs.d/schemas.xml</filename> and put the following text into that file:
552+ Then customize the variable <varname>rng-schema-locating-files</varname> to
553+ include <filename>~/.emacs.d/schemas.xml</filename> and put the following
554+ text into that file:
436555 <example xml:id="ex-emacs-docbook-xml">
437556 <title>nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>)</title>
438557<programlisting language="xml"><![CDATA[
nixos/modules/services/hardware/trezord.xml+8−2
@@ -5,10 +5,16 @@
55 xml:id="trezor">
66 <title>Trezor</title>
77 <para>
8− Trezor is an open-source cryptocurrency hardware wallet and security token allowing secure storage of private keys.
8+ Trezor is an open-source cryptocurrency hardware wallet and security token
9+ allowing secure storage of private keys.
910 </para>
1011 <para>
11− It offers advanced features such U2F two-factor authorization, SSH login through <link xlink:href="https://wiki.trezor.io/Apps:SSH_agent">Trezor SSH agent</link>, <link xlink:href="https://wiki.trezor.io/GPG">GPG</link> and a <link xlink:href="https://wiki.trezor.io/Trezor_Password_Manager">password manager</link>. For more information, guides and documentation, see <link xlink:href="https://wiki.trezor.io"/>.
12+ It offers advanced features such U2F two-factor authorization, SSH login
13+ through
14+ <link xlink:href="https://wiki.trezor.io/Apps:SSH_agent">Trezor SSH agent</link>,
15+ <link xlink:href="https://wiki.trezor.io/GPG">GPG</link> and a
16+ <link xlink:href="https://wiki.trezor.io/Trezor_Password_Manager">password manager</link>.
17+ For more information, guides and documentation, see <link xlink:href="https://wiki.trezor.io"/>.
1218 </para>
1319 <para>
1420 To enable Trezor support, add the following to your <filename>configuration.nix</filename>:
nixos/modules/services/misc/gitea.nix+1
@@ -322,6 +322,7 @@ in
322322 "d '${cfg.stateDir}/conf' - ${cfg.user} gitea - -"
323323 "d '${cfg.stateDir}/custom' - ${cfg.user} gitea - -"
324324 "d '${cfg.stateDir}/custom/conf' - ${cfg.user} gitea - -"
325+ "d '${cfg.stateDir}/log' - ${cfg.user} gitea - -"
325326 "d '${cfg.repositoryRoot}' - ${cfg.user} gitea - -"
326327 "Z '${cfg.stateDir}' - ${cfg.user} gitea - -"
327328
nixos/modules/services/misc/gitlab.xml+26−8
@@ -11,11 +11,14 @@
1111 <title>Prerequisites</title>
1212
1313 <para>
14− The gitlab service exposes only an Unix socket at <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to configure a webserver to proxy HTTP requests to the socket.
14+ The gitlab service exposes only an Unix socket at
15+ <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to
16+ configure a webserver to proxy HTTP requests to the socket.
1517 </para>
1618
1719 <para>
18− For instance, the following configuration could be used to use nginx as frontend proxy:
20+ For instance, the following configuration could be used to use nginx as
21+ frontend proxy:
1922<programlisting>
2023<link linkend="opt-services.nginx.enable">services.nginx</link> = {
2124 <link linkend="opt-services.nginx.enable">enable</link> = true;
@@ -36,11 +39,14 @@
3639 <title>Configuring</title>
3740
3841 <para>
39− Gitlab depends on both PostgreSQL and Redis and will automatically enable both services. In the case of PostgreSQL, a database and a role will be created.
42+ Gitlab depends on both PostgreSQL and Redis and will automatically enable
43+ both services. In the case of PostgreSQL, a database and a role will be
44+ created.
4045 </para>
4146
4247 <para>
43− The default state dir is <literal>/var/gitlab/state</literal>. This is where all data like the repositories and uploads will be stored.
48+ The default state dir is <literal>/var/gitlab/state</literal>. This is where
49+ all data like the repositories and uploads will be stored.
4450 </para>
4551
4652 <para>
@@ -79,19 +85,31 @@ services.gitlab = {
7985 </para>
8086
8187 <para>
82− If you're setting up a new Gitlab instance, generate new secrets. You for instance use <literal>tr -dc A-Za-z0-9 &lt; /dev/urandom | head -c 128 &gt; /var/keys/gitlab/db</literal> to generate a new db secret. Make sure the files can be read by, and only by, the user specified by <link
83− linkend="opt-services.gitlab.user">services.gitlab.user</link>. Gitlab encrypts sensitive data stored in the database. If you're restoring an existing Gitlab instance, you must specify the secrets secret from <literal>config/secrets.yml</literal> located in your Gitlab state folder.
88+ If you're setting up a new Gitlab instance, generate new
89+ secrets. You for instance use <literal>tr -dc A-Za-z0-9 &lt;
90+ /dev/urandom | head -c 128 &gt; /var/keys/gitlab/db</literal> to
91+ generate a new db secret. Make sure the files can be read by, and
92+ only by, the user specified by <link
93+ linkend="opt-services.gitlab.user">services.gitlab.user</link>. Gitlab
94+ encrypts sensitive data stored in the database. If you're restoring
95+ an existing Gitlab instance, you must specify the secrets secret
96+ from <literal>config/secrets.yml</literal> located in your Gitlab
97+ state folder.
8498 </para>
8599
86100 <para>
87− Refer to <xref linkend="ch-options" /> for all available configuration options for the <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.
101+ Refer to <xref linkend="ch-options" /> for all available configuration
102+ options for the
103+ <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.
88104 </para>
89105 </section>
90106 <section xml:id="module-services-gitlab-maintenance">
91107 <title>Maintenance</title>
92108
93109 <para>
94− You can run Gitlab's rake tasks with <literal>gitlab-rake</literal> which will be available on the system when gitlab is enabled. You will have to run the command as the user that you configured to run gitlab with.
110+ You can run Gitlab's rake tasks with <literal>gitlab-rake</literal> which
111+ will be available on the system when gitlab is enabled. You will have to run
112+ the command as the user that you configured to run gitlab with.
95113 </para>
96114
97115 <para>
nixos/modules/services/misc/taskserver/doc.xml+56−18
@@ -4,58 +4,87 @@
44 xml:id="module-taskserver">
55 <title>Taskserver</title>
66 <para>
7− Taskserver is the server component of <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and open source todo list application.
7+ Taskserver is the server component of
8+ <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and
9+ open source todo list application.
810 </para>
911 <para>
10− <emphasis>Upstream documentation:</emphasis> <link xlink:href="https://taskwarrior.org/docs/#taskd"/>
12+ <emphasis>Upstream documentation:</emphasis>
13+ <link xlink:href="https://taskwarrior.org/docs/#taskd"/>
1114 </para>
1215 <section xml:id="module-services-taskserver-configuration">
1316 <title>Configuration</title>
1417
1518 <para>
16− Taskserver does all of its authentication via TLS using client certificates, so you either need to roll your own CA or purchase a certificate from a known CA, which allows creation of client certificates. These certificates are usually advertised as <quote>server certificates</quote>.
19+ Taskserver does all of its authentication via TLS using client certificates,
20+ so you either need to roll your own CA or purchase a certificate from a
21+ known CA, which allows creation of client certificates. These certificates
22+ are usually advertised as <quote>server certificates</quote>.
1723 </para>
1824
1925 <para>
20− So in order to make it easier to handle your own CA, there is a helper tool called <command>nixos-taskserver</command> which manages the custom CA along with Taskserver organisations, users and groups.
26+ So in order to make it easier to handle your own CA, there is a helper tool
27+ called <command>nixos-taskserver</command> which manages the custom CA along
28+ with Taskserver organisations, users and groups.
2129 </para>
2230
2331 <para>
24− While the client certificates in Taskserver only authenticate whether a user is allowed to connect, every user has its own UUID which identifies it as an entity.
32+ While the client certificates in Taskserver only authenticate whether a user
33+ is allowed to connect, every user has its own UUID which identifies it as an
34+ entity.
2535 </para>
2636
2737 <para>
28− With <command>nixos-taskserver</command> the client certificate is created along with the UUID of the user, so it handles all of the credentials needed in order to setup the Taskwarrior client to work with a Taskserver.
38+ With <command>nixos-taskserver</command> the client certificate is created
39+ along with the UUID of the user, so it handles all of the credentials needed
40+ in order to setup the Taskwarrior client to work with a Taskserver.
2941 </para>
3042 </section>
3143 <section xml:id="module-services-taskserver-nixos-taskserver-tool">
3244 <title>The nixos-taskserver tool</title>
3345
3446 <para>
35− Because Taskserver by default only provides scripts to setup users imperatively, the <command>nixos-taskserver</command> tool is used for addition and deletion of organisations along with users and groups defined by <xref linkend="opt-services.taskserver.organisations"/> and as well for imperative set up.
47+ Because Taskserver by default only provides scripts to setup users
48+ imperatively, the <command>nixos-taskserver</command> tool is used for
49+ addition and deletion of organisations along with users and groups defined
50+ by <xref linkend="opt-services.taskserver.organisations"/> and as well for
51+ imperative set up.
3652 </para>
3753
3854 <para>
39− The tool is designed to not interfere if the command is used to manually set up some organisations, users or groups.
55+ The tool is designed to not interfere if the command is used to manually set
56+ up some organisations, users or groups.
4057 </para>
4158
4259 <para>
43− For example if you add a new organisation using <command>nixos-taskserver org add foo</command>, the organisation is not modified and deleted no matter what you define in <option>services.taskserver.organisations</option>, even if you're adding the same organisation in that option.
60+ For example if you add a new organisation using <command>nixos-taskserver
61+ org add foo</command>, the organisation is not modified and deleted no
62+ matter what you define in
63+ <option>services.taskserver.organisations</option>, even if you're adding
64+ the same organisation in that option.
4465 </para>
4566
4667 <para>
47− The tool is modelled to imitate the official <command>taskd</command> command, documentation for each subcommand can be shown by using the <option>--help</option> switch.
68+ The tool is modelled to imitate the official <command>taskd</command>
69+ command, documentation for each subcommand can be shown by using the
70+ <option>--help</option> switch.
4871 </para>
4972 </section>
5073 <section xml:id="module-services-taskserver-declarative-ca-management">
5174 <title>Declarative/automatic CA management</title>
5275
5376 <para>
54− Everything is done according to what you specify in the module options, however in order to set up a Taskwarrior client for synchronisation with a Taskserver instance, you have to transfer the keys and certificates to the client machine.
77+ Everything is done according to what you specify in the module options,
78+ however in order to set up a Taskwarrior client for synchronisation with a
79+ Taskserver instance, you have to transfer the keys and certificates to the
80+ client machine.
5581 </para>
5682
5783 <para>
58− This is done using <command>nixos-taskserver user export $orgname $username</command> which is printing a shell script fragment to stdout which can either be used verbatim or adjusted to import the user on the client machine.
84+ This is done using <command>nixos-taskserver user export $orgname
85+ $username</command> which is printing a shell script fragment to stdout
86+ which can either be used verbatim or adjusted to import the user on the
87+ client machine.
5988 </para>
6089
6190 <para>
@@ -68,30 +97,39 @@
6897 <link linkend="opt-services.taskserver.organisations._name_.users">services.taskserver.organisations.my-company.users</link> = [ "alice" ];
6998}
7099</screen>
71− This creates an organisation called <literal>my-company</literal> with the user <literal>alice</literal>.
100+ This creates an organisation called <literal>my-company</literal> with the
101+ user <literal>alice</literal>.
72102 </para>
73103
74104 <para>
75− Now in order to import the <literal>alice</literal> user to another machine <literal>alicebox</literal>, all we need to do is something like this:
105+ Now in order to import the <literal>alice</literal> user to another machine
106+ <literal>alicebox</literal>, all we need to do is something like this:
76107<screen>
77108<prompt>$ </prompt>ssh server nixos-taskserver user export my-company alice | sh
78109</screen>
79− Of course, if no SSH daemon is available on the server you can also copy &amp; paste it directly into a shell.
110+ Of course, if no SSH daemon is available on the server you can also copy
111+ &amp; paste it directly into a shell.
80112 </para>
81113
82114 <para>
83− After this step the user should be set up and you can start synchronising your tasks for the first time with <command>task sync init</command> on <literal>alicebox</literal>.
115+ After this step the user should be set up and you can start synchronising
116+ your tasks for the first time with <command>task sync init</command> on
117+ <literal>alicebox</literal>.
84118 </para>
85119
86120 <para>
87− Subsequent synchronisation requests merely require the command <command>task sync</command> after that stage.
121+ Subsequent synchronisation requests merely require the command <command>task
122+ sync</command> after that stage.
88123 </para>
89124 </section>
90125 <section xml:id="module-services-taskserver-manual-ca-management">
91126 <title>Manual CA management</title>
92127
93128 <para>
94− If you set any options within <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*, <command>nixos-taskserver</command> won't issue certificates, but you can still use it for adding or removing user accounts.
129+ If you set any options within
130+ <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*,
131+ <command>nixos-taskserver</command> won't issue certificates, but you can
132+ still use it for adding or removing user accounts.
95133 </para>
96134 </section>
97135</chapter>
nixos/modules/services/misc/weechat.xml+16−5
@@ -5,13 +5,18 @@
55 xml:id="module-services-weechat">
66 <title>WeeChat</title>
77 <para>
8− <link xlink:href="https://weechat.org/">WeeChat</link> is a fast and extensible IRC client.
8+ <link xlink:href="https://weechat.org/">WeeChat</link> is a fast and
9+ extensible IRC client.
910 </para>
1011 <section xml:id="module-services-weechat-basic-usage">
1112 <title>Basic Usage</title>
1213
1314 <para>
14− By default, the module creates a <literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal> unit which runs the chat client in a detached <literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal> session.
15+ By default, the module creates a
16+ <literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal>
17+ unit which runs the chat client in a detached
18+ <literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal>
19+ session.
1520 </para>
1621
1722 <para>
@@ -26,14 +31,19 @@
2631 </para>
2732
2833 <para>
29− The service is managed by a dedicated user named <literal>weechat</literal> in the state directory <literal>/var/lib/weechat</literal>.
34+ The service is managed by a dedicated user named <literal>weechat</literal>
35+ in the state directory <literal>/var/lib/weechat</literal>.
3036 </para>
3137 </section>
3238 <section xml:id="module-services-weechat-reattach">
3339 <title>Re-attaching to WeeChat</title>
3440
3541 <para>
36− WeeChat runs in a screen session owned by a dedicated user. To explicitly allow your another user to attach to this session, the <literal>screenrc</literal> needs to be tweaked by adding <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link> support:
42+ WeeChat runs in a screen session owned by a dedicated user. To explicitly
43+ allow your another user to attach to this session, the
44+ <literal>screenrc</literal> needs to be tweaked by adding
45+ <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link>
46+ support:
3747<programlisting>
3848{
3949 <link linkend="opt-programs.screen.screenrc">programs.screen.screenrc</link> = ''
@@ -49,7 +59,8 @@ screen -x weechat/weechat-screen
4959 </para>
5060
5161 <para>
52− <emphasis>The session name can be changed using <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis>
62+ <emphasis>The session name can be changed using
63+ <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis>
5364 </para>
5465 </section>
5566</chapter>
nixos/modules/services/monitoring/prometheus/exporters.xml+39−12
@@ -5,13 +5,17 @@
55 xml:id="module-services-prometheus-exporters">
66 <title>Prometheus exporters</title>
77 <para>
8− Prometheus exporters provide metrics for the <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.
8+ Prometheus exporters provide metrics for the
9+ <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.
910 </para>
1011 <section xml:id="module-services-prometheus-exporters-configuration">
1112 <title>Configuration</title>
1213
1314 <para>
14− One of the most common exporters is the <link xlink:href="https://github.com/prometheus/node_exporter">node exporter</link>, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows:
15+ One of the most common exporters is the
16+ <link xlink:href="https://github.com/prometheus/node_exporter">node
17+ exporter</link>, it provides hardware and OS metrics from the host it's
18+ running on. The exporter could be configured as follows:
1519<programlisting>
1620 services.prometheus.exporters.node = {
1721 enable = true;
@@ -26,20 +30,34 @@
2630 firewallFilter = "-i br0 -p tcp -m tcp --dport 9100";
2731 };
2832</programlisting>
29− It should now serve all metrics from the collectors that are explicitly enabled and the ones that are <link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled by default</link>, via http under <literal>/metrics</literal>. In this example the firewall should just allow incoming connections to the exporter's port on the bridge interface <literal>br0</literal> (this would have to be configured seperately of course). For more information about configuration see <literal>man configuration.nix</literal> or search through the <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available options</link>.
33+ It should now serve all metrics from the collectors that are explicitly
34+ enabled and the ones that are
35+ <link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled
36+ by default</link>, via http under <literal>/metrics</literal>. In this
37+ example the firewall should just allow incoming connections to the
38+ exporter's port on the bridge interface <literal>br0</literal> (this would
39+ have to be configured seperately of course). For more information about
40+ configuration see <literal>man configuration.nix</literal> or search through
41+ the
42+ <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available
43+ options</link>.
3044 </para>
3145 </section>
3246 <section xml:id="module-services-prometheus-exporters-new-exporter">
3347 <title>Adding a new exporter</title>
3448
3549 <para>
36− To add a new exporter, it has to be packaged first (see <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for examples), then a module can be added. The postfix exporter is used in this example:
50+ To add a new exporter, it has to be packaged first (see
51+ <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for
52+ examples), then a module can be added. The postfix exporter is used in this
53+ example:
3754 </para>
3855
3956 <itemizedlist>
4057 <listitem>
4158 <para>
42− Some default options for all exporters are provided by <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>:
59+ Some default options for all exporters are provided by
60+ <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>:
4361 </para>
4462 </listitem>
4563 <listitem override='none'>
@@ -88,7 +106,11 @@
88106 </listitem>
89107 <listitem>
90108 <para>
91− As there is already a package available, the module can now be added. This is accomplished by adding a new file to the <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal> directory, which will be called postfix.nix and contains all exporter specific options and configuration:
109+ As there is already a package available, the module can now be added. This
110+ is accomplished by adding a new file to the
111+ <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal>
112+ directory, which will be called postfix.nix and contains all exporter
113+ specific options and configuration:
92114<programlisting>
93115# nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix
94116{ config, lib, pkgs, options }:
@@ -155,16 +177,21 @@ in
155177 </listitem>
156178 <listitem>
157179 <para>
158− This should already be enough for the postfix exporter. Additionally one could now add assertions and conditional default values. This can be done in the 'meta-module' that combines all exporter definitions and generates the submodules: <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal>
180+ This should already be enough for the postfix exporter. Additionally one
181+ could now add assertions and conditional default values. This can be done
182+ in the 'meta-module' that combines all exporter definitions and generates
183+ the submodules:
184+ <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal>
159185 </para>
160186 </listitem>
161187 </itemizedlist>
162188 </section>
163189 <section xml:id="module-services-prometheus-exporters-update-exporter-module">
164190 <title>Updating an exporter module</title>
165−
166− <para>
167− Should an exporter option change at some point, it is possible to add information about the change to the exporter definition similar to <literal>nixpkgs/nixos/modules/rename.nix</literal>:
191+ <para>
192+ Should an exporter option change at some point, it is possible to add
193+ information about the change to the exporter definition similar to
194+ <literal>nixpkgs/nixos/modules/rename.nix</literal>:
168195<programlisting>
169196{ config, lib, pkgs, options }:
170197
@@ -195,6 +222,6 @@ in
195222 ];
196223}
197224</programlisting>
198− </para>
199− </section>
225+ </para>
226+ </section>
200227</chapter>
nixos/modules/services/networking/dnscrypt-proxy.xml+11−3
@@ -5,7 +5,11 @@
55 xml:id="sec-dnscrypt-proxy">
66 <title>DNSCrypt client proxy</title>
77 <para>
8− The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled upstream resolver. The traffic between the client and the upstream resolver is encrypted and authenticated, mitigating the risk of MITM attacks, DNS poisoning attacks, and third-party snooping (assuming the upstream is trustworthy).
8+ The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled upstream
9+ resolver. The traffic between the client and the upstream resolver is
10+ encrypted and authenticated, mitigating the risk of MITM attacks, DNS
11+ poisoning attacks, and third-party snooping (assuming the upstream is
12+ trustworthy).
913 </para>
1014 <sect1 xml:id="sec-dnscrypt-proxy-configuration">
1115 <title>Basic configuration</title>
@@ -18,14 +22,18 @@
1822 </para>
1923
2024 <para>
21− Enabling the client proxy does not alter the system nameserver; to relay local queries, prepend <literal>127.0.0.1</literal> to <option>networking.nameservers</option>.
25+ Enabling the client proxy does not alter the system nameserver; to relay
26+ local queries, prepend <literal>127.0.0.1</literal> to
27+ <option>networking.nameservers</option>.
2228 </para>
2329 </sect1>
2430 <sect1 xml:id="sec-dnscrypt-proxy-forwarder">
2531 <title>As a forwarder for another DNS client</title>
2632
2733 <para>
28− To run the DNSCrypt proxy client as a forwarder for another DNS client, change the default proxy listening port to a non-standard value and point the other client to it:
34+ To run the DNSCrypt proxy client as a forwarder for another DNS client,
35+ change the default proxy listening port to a non-standard value and point
36+ the other client to it:
2937<programlisting>
3038<xref linkend="opt-services.dnscrypt-proxy.localPort"/> = 43;
3139</programlisting>
nixos/modules/services/networking/networkmanager.nix−5
@@ -468,16 +468,12 @@ in {
468468 mkdir -m 700 -p /etc/ipsec.d
469469 mkdir -m 755 -p ${stateDirs}
470470 '';
471−
472− aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
473471 };
474472
475473 systemd.services.NetworkManager-wait-online = {
476474 wantedBy = [ "network-online.target" ];
477475 };
478476
479− systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
480−
481477 systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
482478 wantedBy = [ "NetworkManager.service" ];
483479 before = [ "NetworkManager.service" ];
@@ -499,7 +495,6 @@ in {
499495
500496 # useful binaries for user-specified hooks
501497 path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
502− aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
503498 };
504499
505500 # Turn off NixOS' network management when networking is managed entirely by NetworkManager
nixos/modules/services/web-apps/matomo-doc.xml+45−11
@@ -5,16 +5,21 @@
55 xml:id="module-services-matomo">
66 <title>Matomo</title>
77 <para>
8− Matomo is a real-time web analytics application. This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
8+ Matomo is a real-time web analytics application. This module configures
9+ php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
910 </para>
1011 <para>
11− An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup.
12+ An automatic setup is not suported by Matomo, so you need to configure Matomo
13+ itself in the browser-based Matomo setup.
1214 </para>
1315 <section xml:id="module-services-matomo-database-setup">
1416 <title>Database Setup</title>
1517
1618 <para>
17− You also need to configure a MariaDB or MySQL database and -user for Matomo yourself, and enter those credentials in your browser. You can use passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands:
19+ You also need to configure a MariaDB or MySQL database and -user for Matomo
20+ yourself, and enter those credentials in your browser. You can use
21+ passwordless database authentication via the UNIX_SOCKET authentication
22+ plugin with the following SQL commands:
1823<programlisting>
1924# For MariaDB
2025INSTALL PLUGIN unix_socket SONAME 'auth_socket';
@@ -28,29 +33,51 @@ CREATE DATABASE matomo;
2833CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket;
2934GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
3035</programlisting>
31− Then fill in <literal>matomo</literal> as database user and database name, and leave the password field blank. This authentication works by allowing only the <literal>matomo</literal> unix user to authenticate as the <literal>matomo</literal> database user (without needing a password), but no other users. For more information on passwordless login, see <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
36+ Then fill in <literal>matomo</literal> as database user and database name,
37+ and leave the password field blank. This authentication works by allowing
38+ only the <literal>matomo</literal> unix user to authenticate as the
39+ <literal>matomo</literal> database user (without needing a password), but no
40+ other users. For more information on passwordless login, see
41+ <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
3242 </para>
3343
3444 <para>
35− Of course, you can use password based authentication as well, e.g. when the database is not on the same host.
45+ Of course, you can use password based authentication as well, e.g. when the
46+ database is not on the same host.
3647 </para>
3748 </section>
3849 <section xml:id="module-services-matomo-archive-processing">
3950 <title>Archive Processing</title>
4051
4152 <para>
42− This module comes with the systemd service <literal>matomo-archive-processing.service</literal> and a timer that automatically triggers archive processing every hour. This means that you can safely <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour"> disable browser triggers for Matomo archiving </link> at <literal>Administration > System > General Settings</literal>.
53+ This module comes with the systemd service
54+ <literal>matomo-archive-processing.service</literal> and a timer that
55+ automatically triggers archive processing every hour. This means that you
56+ can safely
57+ <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour">
58+ disable browser triggers for Matomo archiving </link> at
59+ <literal>Administration > System > General Settings</literal>.
4360 </para>
4461
4562 <para>
46− With automatic archive processing, you can now also enable to <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs"> delete old visitor logs </link> at <literal>Administration > System > Privacy</literal>, but make sure that you run <literal>systemctl start matomo-archive-processing.service</literal> at least once without errors if you have already collected data before, so that the reports get archived before the source data gets deleted.
63+ With automatic archive processing, you can now also enable to
64+ <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs">
65+ delete old visitor logs </link> at <literal>Administration > System >
66+ Privacy</literal>, but make sure that you run <literal>systemctl start
67+ matomo-archive-processing.service</literal> at least once without errors if
68+ you have already collected data before, so that the reports get archived
69+ before the source data gets deleted.
4770 </para>
4871 </section>
4972 <section xml:id="module-services-matomo-backups">
5073 <title>Backup</title>
5174
5275 <para>
53− You only need to take backups of your MySQL database and the <filename>/var/lib/matomo/config/config.ini.php</filename> file. Use a user in the <literal>matomo</literal> group or root to access the file. For more information, see <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
76+ You only need to take backups of your MySQL database and the
77+ <filename>/var/lib/matomo/config/config.ini.php</filename> file. Use a user
78+ in the <literal>matomo</literal> group or root to access the file. For more
79+ information, see
80+ <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
5481 </para>
5582 </section>
5683 <section xml:id="module-services-matomo-issues">
@@ -59,12 +86,15 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
5986 <itemizedlist>
6087 <listitem>
6188 <para>
62− Matomo's file integrity check will warn you. This is due to the patches necessary for NixOS, you can safely ignore this.
89+ Matomo's file integrity check will warn you. This is due to the patches
90+ necessary for NixOS, you can safely ignore this.
6391 </para>
6492 </listitem>
6593 <listitem>
6694 <para>
67− Matomo will warn you that the JavaScript tracker is not writable. This is because it's located in the read-only nix store. You can safely ignore this, unless you need a plugin that needs JavaScript tracker access.
95+ Matomo will warn you that the JavaScript tracker is not writable. This is
96+ because it's located in the read-only nix store. You can safely ignore
97+ this, unless you need a plugin that needs JavaScript tracker access.
6898 </para>
6999 </listitem>
70100 </itemizedlist>
@@ -73,7 +103,11 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
73103 <title>Using other Web Servers than nginx</title>
74104
75105 <para>
76− You can use other web servers by forwarding calls for <filename>index.php</filename> and <filename>piwik.php</filename> to the <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. You can use the nginx configuration in the module code as a reference to what else should be configured.
106+ You can use other web servers by forwarding calls for
107+ <filename>index.php</filename> and <filename>piwik.php</filename> to the
108+ <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. You can use
109+ the nginx configuration in the module code as a reference to what else
110+ should be configured.
77111 </para>
78112 </section>
79113</chapter>
nixos/modules/services/web-apps/nextcloud.xml+41−14
@@ -5,13 +5,21 @@
55 xml:id="module-services-nextcloud">
66 <title>Nextcloud</title>
77 <para>
8− <link xlink:href="https://nextcloud.com/">Nextcloud</link> is an open-source, self-hostable cloud platform. The server setup can be automated using <link linkend="opt-services.nextcloud.enable">services.nextcloud</link>. A desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
8+ <link xlink:href="https://nextcloud.com/">Nextcloud</link> is an open-source,
9+ self-hostable cloud platform. The server setup can be automated using
10+ <link linkend="opt-services.nextcloud.enable">services.nextcloud</link>. A
11+ desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
912 </para>
1013 <section xml:id="module-services-nextcloud-basic-usage">
1114 <title>Basic usage</title>
1215
1316 <para>
14− Nextcloud is a PHP-based application which requires an HTTP server (<literal><link linkend="opt-services.nextcloud.enable">services.nextcloud</link></literal> optionally supports <literal><link linkend="opt-services.nginx.enable">services.nginx</link></literal>) and a database (it's recommended to use <literal><link linkend="opt-services.postgresql.enable">services.postgresql</link></literal>).
17+ Nextcloud is a PHP-based application which requires an HTTP server
18+ (<literal><link linkend="opt-services.nextcloud.enable">services.nextcloud</link></literal>
19+ optionally supports
20+ <literal><link linkend="opt-services.nginx.enable">services.nginx</link></literal>)
21+ and a database (it's recommended to use
22+ <literal><link linkend="opt-services.postgresql.enable">services.postgresql</link></literal>).
1523 </para>
1624
1725 <para>
@@ -53,38 +61,57 @@
5361 </para>
5462
5563 <para>
56− The options <literal>hostName</literal> and <literal>nginx.enable</literal> are used internally to configure an HTTP server using <literal><link xlink:href="https://php-fpm.org/">PHP-FPM</link></literal> and <literal>nginx</literal>. The <literal>config</literal> attribute set is used by the imperative installer and all values are written to an additional file to ensure that changes can be applied by changing the module's options.
64+ The options <literal>hostName</literal> and <literal>nginx.enable</literal>
65+ are used internally to configure an HTTP server using
66+ <literal><link xlink:href="https://php-fpm.org/">PHP-FPM</link></literal>
67+ and <literal>nginx</literal>. The <literal>config</literal> attribute set is
68+ used by the imperative installer and all values are written to an additional file
69+ to ensure that changes can be applied by changing the module's options.
5770 </para>
5871
5972 <para>
60− In case the application serves multiple domains (those are checked with <literal><link xlink:href="http://php.net/manual/en/reserved.variables.server.php">$_SERVER['HTTP_HOST']</link></literal>) it's needed to add them to <literal><link linkend="opt-services.nextcloud.config.extraTrustedDomains">services.nextcloud.config.extraTrustedDomains</link></literal>.
73+ In case the application serves multiple domains (those are checked with
74+ <literal><link xlink:href="http://php.net/manual/en/reserved.variables.server.php">$_SERVER['HTTP_HOST']</link></literal>)
75+ it's needed to add them to
76+ <literal><link linkend="opt-services.nextcloud.config.extraTrustedDomains">services.nextcloud.config.extraTrustedDomains</link></literal>.
6177 </para>
6278
6379 <para>
64− Auto updates for Nextcloud apps can be enabled using <literal><link linkend="opt-services.nextcloud.autoUpdateApps.enable">services.nextcloud.autoUpdateApps</link></literal>.
65− </para>
80+ Auto updates for Nextcloud apps can be enabled using
81+ <literal><link linkend="opt-services.nextcloud.autoUpdateApps.enable">services.nextcloud.autoUpdateApps</link></literal>.
82+</para>
83+
6684 </section>
6785 <section xml:id="module-services-nextcloud-pitfalls-during-upgrade">
6886 <title>Pitfalls</title>
6987
7088 <para>
71− Unfortunately Nextcloud appears to be very stateful when it comes to managing its own configuration. The config file lives in the home directory of the <literal>nextcloud</literal> user (by default <literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to track several states of the application (e.g. whether installed or not).
89+ Unfortunately Nextcloud appears to be very stateful when it comes to
90+ managing its own configuration. The config file lives in the home directory
91+ of the <literal>nextcloud</literal> user (by default
92+ <literal>/var/lib/nextcloud/config/config.php</literal>) and is also used to
93+ track several states of the application (e.g. whether installed or not).
7294 </para>
7395
7496 <para>
75− All configuration parameters are also stored in <literal>/var/lib/nextcloud/config/override.config.php</literal> which is generated by the module and linked from the store to ensure that all values from <literal>config.php</literal> can be modified by the module. However <literal>config.php</literal> manages the application's state and shouldn't be touched manually because of that.
97+ All configuration parameters are also stored in
98+ <literal>/var/lib/nextcloud/config/override.config.php</literal> which is generated by
99+ the module and linked from the store to ensure that all values from <literal>config.php</literal>
100+ can be modified by the module.
101+ However <literal>config.php</literal> manages the application's state and shouldn't be touched
102+ manually because of that.
76103 </para>
77104
78105 <warning>
79− <para>
80− Don't delete <literal>config.php</literal>! This file tracks the application's state and a deletion can cause unwanted side-effects!
81− </para>
106+ <para>Don't delete <literal>config.php</literal>! This file
107+ tracks the application's state and a deletion can cause unwanted
108+ side-effects!</para>
82109 </warning>
83110
84111 <warning>
85− <para>
86− Don't rerun <literal>nextcloud-occ maintenance:install</literal>! This command tries to install the application and can cause unwanted side-effects!
87− </para>
112+ <para>Don't rerun <literal>nextcloud-occ
113+ maintenance:install</literal>! This command tries to install the application
114+ and can cause unwanted side-effects!</para>
88115 </warning>
89116 </section>
90117</chapter>
nixos/modules/services/x11/desktop-managers/xfce4-14.nix+11−5
@@ -53,6 +53,7 @@ in
5353 glib # for gsettings
5454 gtk3.out # gtk-update-icon-cache
5555
56+ gnome3.gnome-themes-extra
5657 gnome3.adwaita-icon-theme
5758 hicolor-icon-theme
5859 tango-icon-theme
@@ -69,16 +70,17 @@ in
6970
7071 exo
7172 garcon
72− gtk-xfce-engine
7373 libxfce4ui
7474 xfconf
7575
7676 mousepad
77+ parole
7778 ristretto
7879 xfce4-appfinder
7980 xfce4-screenshooter
8081 xfce4-session
8182 xfce4-settings
83+ xfce4-taskmanager
8284 xfce4-terminal
8385
8486 # TODO: resync patch for plugins
@@ -86,12 +88,16 @@ in
8688 thunar
8789 ] # TODO: NetworkManager doesn't belong here
8890 ++ optional config.networking.networkmanager.enable networkmanagerapplet
89− ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin
9091 ++ optional config.powerManagement.enable xfce4-power-manager
91− ++ optional cfg.enableXfwm xfwm4
92− ++ optionals (!cfg.noDesktop) [
93− xfce4-panel
92+ ++ optionals config.hardware.pulseaudio.enable [
93+ pavucontrol
94+ xfce4-pulseaudio-plugin
95+ ] ++ optionals cfg.enableXfwm [
96+ xfwm4
97+ xfwm4-themes
98+ ] ++ optionals (!cfg.noDesktop) [
9499 xfce4-notifyd
100+ xfce4-panel
95101 xfdesktop
96102 ];
97103
nixos/modules/services/x11/desktop-managers/xterm.nix+3−1
@@ -5,6 +5,7 @@ with lib;
55let
66
77 cfg = config.services.xserver.desktopManager.xterm;
8+ xSessionEnabled = config.services.xserver.enable;
89
910in
1011
@@ -13,7 +14,8 @@ in
1314
1415 services.xserver.desktopManager.xterm.enable = mkOption {
1516 type = types.bool;
16− default = (versionOlder config.system.stateVersion "19.09");
17+ default = (versionOlder config.system.stateVersion "19.09") && xSessionEnabled;
18+ defaultText = if versionOlder config.system.stateVersion "19.09" then "config.services.xserver.enable" else "false";
1719 description = "Enable a xterm terminal as a desktop manager.";
1820 };
1921
nixos/modules/virtualisation/cri-o.nixnew file+106
@@ -0,0 +1,106 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.virtualisation.cri-o;
7+in
8+{
9+ options.virtualisation.cri-o = {
10+ enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)";
11+
12+ storageDriver = mkOption {
13+ type = types.enum ["btrfs" "overlay" "vfs"];
14+ default = "overlay";
15+ description = "Storage driver to be used";
16+ };
17+
18+ logLevel = mkOption {
19+ type = types.enum ["trace" "debug" "info" "warn" "error" "fatal"];
20+ default = "info";
21+ description = "Log level to be used";
22+ };
23+
24+ pauseImage = mkOption {
25+ type = types.str;
26+ default = "k8s.gcr.io/pause:3.1";
27+ description = "Pause image for pod sandboxes to be used";
28+ };
29+
30+ pauseCommand = mkOption {
31+ type = types.str;
32+ default = "/pause";
33+ description = "Pause command to be executed";
34+ };
35+
36+ registries = mkOption {
37+ type = types.listOf types.str;
38+ default = [ "docker.io" "quay.io" ];
39+ description = "Registries to be configured for unqualified image pull";
40+ };
41+ };
42+
43+ config = mkIf cfg.enable {
44+ environment.systemPackages = with pkgs;
45+ [ cri-o cri-tools conmon cni-plugins iptables runc utillinux ];
46+ environment.etc."crictl.yaml".text = ''
47+ runtime-endpoint: unix:///var/run/crio/crio.sock
48+ '';
49+ environment.etc."crio/crio.conf".text = ''
50+ [crio]
51+ storage_driver = "${cfg.storageDriver}"
52+
53+ [crio.image]
54+ pause_image = "${cfg.pauseImage}"
55+ pause_command = "${cfg.pauseCommand}"
56+ registries = [
57+ ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries}
58+ ]
59+
60+ [crio.runtime]
61+ conmon = "${pkgs.conmon}/bin/conmon"
62+ log_level = "${cfg.logLevel}"
63+ manage_network_ns_lifecycle = true
64+ '';
65+ environment.etc."containers/policy.json".text = ''
66+ {"default": [{"type": "insecureAcceptAnything"}]}
67+ '';
68+ environment.etc."cni/net.d/20-cri-o-bridge.conf".text = ''
69+ {
70+ "cniVersion": "0.3.1",
71+ "name": "crio-bridge",
72+ "type": "bridge",
73+ "bridge": "cni0",
74+ "isGateway": true,
75+ "ipMasq": true,
76+ "ipam": {
77+ "type": "host-local",
78+ "subnet": "10.88.0.0/16",
79+ "routes": [
80+ { "dst": "0.0.0.0/0" }
81+ ]
82+ }
83+ }
84+ '';
85+
86+ systemd.services.crio = {
87+ description = "Container Runtime Interface for OCI (CRI-O)";
88+ documentation = [ "https://github.com/cri-o/cri-o" ];
89+ wantedBy = [ "multi-user.target" ];
90+ after = [ "network.target" ];
91+ path = [ pkgs.utillinux pkgs.runc pkgs.iptables ];
92+ serviceConfig = {
93+ Type = "notify";
94+ ExecStart = "${pkgs.cri-o}/bin/crio";
95+ ExecReload = "/bin/kill -s HUP $MAINPID";
96+ TasksMax = "infinity";
97+ LimitNOFILE = "1048576";
98+ LimitNPROC = "1048576";
99+ LimitCORE = "infinity";
100+ OOMScoreAdjust = "-999";
101+ TimeoutStartSec = "0";
102+ Restart = "on-abnormal";
103+ };
104+ };
105+ };
106+}
pkgs/applications/audio/osmid/default.nixnew file+37
@@ -0,0 +1,37 @@
1+{ stdenv
2+, fetchFromGitHub
3+, cmake
4+, alsaLib
5+, libX11
6+}:
7+
8+stdenv.mkDerivation rec {
9+ pname = "osmid";
10+ version = "0.6.8";
11+
12+ src = fetchFromGitHub {
13+ owner = "llloret";
14+ repo = "osmid";
15+ rev = "v${version}";
16+ sha256 = "1yl25abf343yvd49nfsgxsz7jf956zrsi5n4xyqb5ldlp2hifk15";
17+ };
18+
19+ nativeBuildInputs = [ cmake ];
20+
21+ buildInputs = [ alsaLib libX11 ];
22+
23+ installPhase = ''
24+ runHook preInstall
25+ mkdir -p $out/bin
26+ cp {m2o,o2m} $out/bin/
27+ runHook postInstall
28+ '';
29+
30+ meta = with stdenv.lib; {
31+ homepage = "https://github.com/llloret/osmid";
32+ description = "A lightweight, portable, easy to use tool to convert MIDI to OSC and OSC to MIDI";
33+ license = licenses.mit;
34+ maintainers = with maintainers; [ c0deaddict ];
35+ platforms = platforms.linux;
36+ };
37+}
pkgs/applications/audio/spotifyd/default.nix+6−4
@@ -6,16 +6,16 @@
66
77rustPlatform.buildRustPackage rec {
88 pname = "spotifyd";
9− version = "0.2.11";
9+ version = "0.2.14";
1010
1111 src = fetchFromGitHub {
1212 owner = "Spotifyd";
1313 repo = "spotifyd";
14− rev = version;
15− sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1";
14+ rev = "v${version}";
15+ sha256 = "1hbcyc5rdrvdnvvsgaykqamq4i0yq8wqq5qjp6zjf4jlaxxif4nz";
1616 };
1717
18− cargoSha256 = "1dzg4sb95ixjfhx6n4w2rgrq4481vw01nsdrbm746mz7nm71csk3";
18+ cargoSha256 = "15gd8shg0mn4vsma2hckj6w8gkwr58iniyfw1vjrh4clw4x7ibb4";
1919
2020 cargoBuildFlags = [
2121 "--no-default-features"
@@ -30,6 +30,8 @@ rustPlatform.buildRustPackage rec {
3030 ++ stdenv.lib.optional withPulseAudio libpulseaudio
3131 ++ stdenv.lib.optional withPortAudio portaudio;
3232
33+ doCheck = false;
34+
3335 meta = with stdenv.lib; {
3436 description = "An open source Spotify client running as a UNIX daemon";
3537 homepage = "https://github.com/Spotifyd/spotifyd";
pkgs/applications/blockchains/jormungandr/default.nix+3−2
@@ -10,12 +10,12 @@
1010
1111rustPlatform.buildRustPackage rec {
1212 pname = "jormungandr";
13− version = "0.3.1415";
13+ version = "0.3.9999";
1414
1515 src = fetchgit {
1616 url = "https://github.com/input-output-hk/${pname}";
1717 rev = "v${version}";
18− sha256 = "1kg20570ri3bj99gicpp2z272igj9s7m2qw0z1ndk60bxcyghi2x";
18+ sha256 = "11lr533fpispwbk4vsq9bnv40gkpybvpa7ajwczv9ky6afh8np5b";
1919 fetchSubmodules = true;
2020 };
2121
@@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec {
3232 install -d $out/bin $out/templates
3333 install -m755 target/*/release/jormungandr $out/bin/
3434 install -m755 target/*/release/jcli $out/bin/
35+ install -m755 target/*/release/jormungandr-scenario-tests $out/bin/
3536 install -m755 scripts/send-transaction $out/templates
3637 install -m755 scripts/jcli-helpers $out/bin/
3738 install -m755 scripts/bootstrap $out/bin/jormungandr-bootstrap
pkgs/applications/editors/android-studio/default.nix+3−3
@@ -14,9 +14,9 @@ let
1414 };
1515 betaVersion = stableVersion;
1616 latestVersion = { # canary & dev
17− version = "3.6.0.11"; # "Android Studio 3.6 Canary 11"
18− build = "192.5863777";
19− sha256Hash = "1wz4vcdj4225vffsq0ji4zgg9qaqlfd21x7c6nczhqvydbyrjzg8";
17+ version = "3.6.0.12"; # "Android Studio 3.6 Canary 12"
18+ build = "192.5871855";
19+ sha256Hash = "0pxvpxqdxv37sl72p7gml70k6kl717k6avw9p0l00cys0zbvb3zq";
2020 };
2121in {
2222 # Attributes are named by their corresponding release channels
pkgs/applications/editors/jetbrains/common.nix+2
@@ -77,4 +77,6 @@ with stdenv; lib.makeOverridable mkDerivation rec {
7777 ln -s "$item/share/applications" $out/share
7878 '';
7979
80+} // stdenv.lib.optionalAttrs (!(meta.license.free or true)) {
81+ preferLocalBuild = true;
8082}
pkgs/applications/editors/jetbrains/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, callPackage, fetchurl
22, python
3−, jdk, cmake, libxml2, zlib, python3, ncurses
3+, jdk, cmake, libxml2, zlib, python3, ncurses5
44}:
55
66with stdenv.lib;
@@ -34,7 +34,7 @@ let
3434
3535 lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib
3636 interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
37− ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5
37+ ln -s ${ncurses5.out}/lib/libtinfo.so.5 $lldbLibPath/libtinfo.so.5
3838
3939 patchelf --set-interpreter $interp \
4040 --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
pkgs/applications/editors/neovim/neovim-remote.nix+2−2
@@ -4,14 +4,14 @@ with stdenv.lib;
44
55pythonPackages.buildPythonApplication rec {
66 pname = "neovim-remote";
7− version = "2.2.0";
7+ version = "2.2.1";
88 disabled = !pythonPackages.isPy3k;
99
1010 src = fetchFromGitHub {
1111 owner = "mhinz";
1212 repo = "neovim-remote";
1313 rev = "v${version}";
14− sha256 = "0vvwygyar835z947d5zgjywyhl7ajj63z0l8sb7w9kj1w5snb43x";
14+ sha256 = "0f9x053yr8wq35l2s2dsnb0iygd4g4yya2h3iv0yh3440jjj5vfj";
1515 };
1616
1717 propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];
pkgs/applications/editors/typora/default.nix+16−3
@@ -1,4 +1,16 @@
1−{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:
1+{ stdenv
2+, lib
3+, fetchurl
4+, makeWrapper
5+, electron_5
6+, dpkg
7+, gtk3
8+, glib
9+, gsettings-desktop-schemas
10+, wrapGAppsHook
11+, withPandoc ? false
12+, pandoc
13+}:
214
315stdenv.mkDerivation rec {
416 pname = "typora";
@@ -42,10 +54,11 @@ stdenv.mkDerivation rec {
4254 makeWrapper ${electron_5}/bin/electron $out/bin/typora \
4355 --add-flags $out/share/typora \
4456 "''${gappsWrapperArgs[@]}" \
45− --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
57+ ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \
58+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
4659 '';
4760
48− meta = with stdenv.lib; {
61+ meta = with lib; {
4962 description = "A minimal Markdown reading & writing app";
5063 homepage = https://typora.io;
5164 license = licenses.unfree;
pkgs/applications/gis/grass/default.nix+4−4
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
22, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
3−, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
3+, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid
44}:
55
66stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ pkgconfig ];
1818 buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
19− readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
19+ readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas
2020 libLAS proj-datumgrid ]
2121 ++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
2222
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
3737 "--with-postgres-libs=${postgresql.lib}/lib/"
3838 # it complains about missing libmysqld but doesn't really seem to need it
3939 "--with-mysql"
40− "--with-mysql-includes=${libmysqlclient}/include/mysql"
41− "--with-mysql-libs=${libmysqlclient}/lib/mysql"
40+ "--with-mysql-includes=${mysql.connector-c}/include/mysql"
41+ "--with-mysql-libs=${mysql.connector-c}/lib/mysql"
4242 "--with-blas"
4343 "--with-liblas=${libLAS}/bin/liblas-config"
4444 ];
pkgs/applications/graphics/gnome-photos/default.nix+1−1
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
102102 '';
103103
104104 postFixup = ''
105− wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py"
105+ wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" "''${gappsWrapperArgs[@]}"
106106 '';
107107
108108 passthru = {
pkgs/applications/graphics/mcomix/default.nix+1−1
@@ -9,7 +9,7 @@ python27Packages.buildPythonApplication rec {
99 sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy";
1010 };
1111
12− propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
12+ propagatedBuildInputs = with python27Packages; [ pygtk pillow setuptools ];
1313
1414 doCheck = false;
1515
pkgs/applications/misc/mysql-workbench/default.nix+2−2
@@ -85,8 +85,8 @@ in stdenv.mkDerivation rec {
8585 find -L "$out/bin" -type f -executable -print0 \
8686 | while IFS= read -r -d ''' file; do
8787 if [[ "''${file}" != *-bin ]]; then
88− echo "Wrapping program $file"
89− wrapGApp "$file"
88+ echo "Wrapping program ''${file}"
89+ wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
9090 fi
9191 done
9292 '';
pkgs/applications/misc/pdfsam-basic/default.nixnew file+49
@@ -0,0 +1,49 @@
1+{ stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "pdfsam-basic";
5+ version = "4.0.4";
6+
7+ src = fetchurl {
8+ url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
9+ sha256 = "17lhzxlgr4l4dljy0b0avfrgbj9rsfzk1dzg0abqvld4w4igkqbq";
10+ };
11+
12+ unpackPhase = ''
13+ ar vx ${src}
14+ tar xvf data.tar.gz
15+ '';
16+
17+ nativeBuildInputs = [ wrapGAppsHook ];
18+ buildInputs = [ glib ];
19+
20+ preFixup = ''
21+ gappsWrapperArgs+=(--set JAVA_HOME "${jdk11}" --set PDFSAM_JAVA_PATH "${jdk11}")
22+ '';
23+
24+ installPhase = ''
25+ cp -R opt/pdfsam-basic/ $out/
26+ mkdir -p "$out"/share/icons
27+ cp --recursive ${desktopItem}/share/applications $out/share
28+ cp $out/icon.svg "$out"/share/icons/pdfsam-basic.svg
29+ '';
30+
31+ desktopItem = makeDesktopItem {
32+ name = pname;
33+ exec = pname;
34+ icon = pname;
35+ comment = meta.description;
36+ desktopName = "PDFsam Basic";
37+ genericName = "PDF Split and Merge";
38+ mimeType = "application/pdf;";
39+ categories = "Office;Application;";
40+ };
41+
42+ meta = with stdenv.lib; {
43+ homepage = "https://github.com/torakiki/pdfsam";
44+ description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files";
45+ license = licenses.agpl3;
46+ platforms = platforms.all;
47+ maintainers = with maintainers; [ maintainers."1000101" ];
48+ };
49+}
pkgs/applications/misc/xmind/default.nix+2
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515 sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f";
1616 };
1717
18+ preferLocalBuild = true;
19+
1820 patches = [ ./java-env-config-fixes.patch ];
1921
2022 nativeBuildInputs = [ makeWrapper ];
pkgs/applications/networking/browsers/chromium/common.nix+10−2
@@ -138,6 +138,13 @@ let
138138 ./patches/jumbo-sorted.patch
139139 ./patches/no-build-timestamps.patch
140140 ./patches/widevine.patch
141+ # Revert "Implement GetFallbackFont on Linux" to fix a performance regression
142+ # Remove after https://bugs.chromium.org/p/chromium/issues/detail?id=1003997 is fixed
143+ (fetchpatch {
144+ url = "https://github.com/chromium/chromium/commit/5a32abe4247f80fdb55c55a289b906b0e42faa5f.patch";
145+ sha256 = "1a4jqmki6cyi2dwvaszh01db2diqnz1d50mhpdpby3dd1cw0xmfy";
146+ revert = true;
147+ })
141148
142149 # Unfortunately, chromium regularly breaks on major updates and
143150 # then needs various patches backported in order to be compiled with GCC.
@@ -227,8 +234,9 @@ let
227234 use_gold = true;
228235 gold_path = "${stdenv.cc}/bin";
229236 is_debug = false;
230− # at least 2X compilation speedup
231− use_jumbo_build = true;
237+ # Use jumbo for a 2x (at least) compilation speedup, except where it is currently broken:
238+ # https://gist.github.com/ivan/6fe7014c1b1cc35dec133fa6de0549d9
239+ use_jumbo_build = (version != "78.0.3904.17");
232240
233241 proprietary_codecs = false;
234242 use_sysroot = false;
pkgs/applications/networking/browsers/chromium/default.nix+29−15
@@ -50,6 +50,7 @@ in let
5050 widevine = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation {
5151 name = "chromium-binary-plugin-widevine";
5252
53+ # The .deb file for Google Chrome
5354 src = upstream-info.binary;
5455
5556 nativeBuildInputs = [ patchelfUnstable ];
@@ -57,14 +58,21 @@ in let
5758 phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
5859
5960 unpackCmd = let
60− chan = if upstream-info.channel == "dev" then "chrome-unstable"
61− else if upstream-info.channel == "stable" then "chrome"
62− else if upstream-info.channel == "beta" then "chrome-beta"
63− else throw "Unknown chromium channel.";
61+ soPath =
62+ if upstream-info.channel == "stable" then
63+ "./opt/google/chrome/libwidevinecdm.so"
64+ else if upstream-info.channel == "beta" then
65+ "./opt/google/chrome-beta/libwidevinecdm.so"
66+ else if upstream-info.channel == "dev" then
67+ "./opt/google/chrome-unstable/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"
68+ else
69+ throw "Unknown chromium channel.";
6470 in ''
6571 mkdir -p plugins
66− ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \
67− ./opt/google/${chan}/libwidevinecdm.so
72+ # Extract just libwidevinecdm.so from upstream's .deb file
73+ ar p "$src" data.tar.xz | tar xJ -C plugins ${soPath}
74+ mv plugins/${soPath} plugins/
75+ rm -rf plugins/opt
6876 '';
6977
7078 doCheck = true;
@@ -83,7 +91,10 @@ in let
8391 "$out/lib/libwidevinecdm.so"
8492 '';
8593
86− meta.platforms = lib.platforms.x86_64;
94+ meta = {
95+ platforms = [ "x86_64-linux" ];
96+ license = lib.licenses.unfree;
97+ };
8798 };
8899
89100 suffix = if channel != "stable" then "-" + channel else "";
@@ -92,18 +103,21 @@ in let
92103
93104 version = chromium.browser.version;
94105
95− # This is here because we want to add the widevine shared object at the last
96− # minute in order to avoid a full rebuild of chromium. Additionally, this
97− # isn't in `browser.nix` so we can avoid having to re-expose attributes of
98− # the chromium derivation (see above: we introspect `sandboxExecutableName`).
106+ # We want users to be able to enableWideVine without rebuilding all of
107+ # chromium, so we have a separate derivation here that copies chromium
108+ # and adds the unfree libwidevinecdm.so.
99109 chromiumWV = let browser = chromium.browser; in if enableWideVine then
100110 runCommand (browser.name + "-wv") { version = browser.version; }
101111 ''
102112 mkdir -p $out
103− cp -R ${browser}/* $out/
104− chmod u+w $out/libexec/chromium*
105− cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/
106− # patchelf?
113+ cp -a ${browser}/* $out/
114+ chmod u+w $out/libexec/chromium
115+ if [[ ${channel} != "dev" ]]; then
116+ cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/
117+ else
118+ mkdir -p $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64
119+ cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64/
120+ fi
107121 ''
108122 else browser;
109123in stdenv.mkDerivation {
pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9
@@ -1,18 +1,18 @@
11# This file is autogenerated from update.sh in the same directory.
22{
33 beta = {
4− sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb";
5− sha256bin64 = "0d9w869qqwbmw3qjvxkfm37i7dvrgmrwm5y96sm1dg2jnxqj4bdz";
6− version = "77.0.3865.75";
4+ sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00";
5+ sha256bin64 = "0p3275ii8800swlfmljbdrvyqjd5nlw0vgv2my4r8ccszgbhidbd";
6+ version = "77.0.3865.90";
77 };
88 dev = {
9− sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k";
10− sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6";
11− version = "78.0.3887.7";
9+ sha256 = "0zka01ml3hbximswzkkqbqq8wpiz8f4fq4wx5fys002hi69l296l";
10+ sha256bin64 = "0nrip45s0ylri34vlpf16xlwv3ybmy2jg7dz8l9rvgbdwwdzdb75";
11+ version = "78.0.3904.17";
1212 };
1313 stable = {
14− sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb";
15− sha256bin64 = "1wp5g09czyslkkhw3nhbp39fxfcz0pprsgj8h0aggghpdbvzph3d";
16− version = "77.0.3865.75";
14+ sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00";
15+ sha256bin64 = "1npx867j39mdyivf8nlkcfwgq7j34hl7s948vf6h2kqni0y50hzl";
16+ version = "77.0.3865.90";
1717 };
1818}
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+373−373
@@ -1,935 +1,935 @@
11{
2− version = "69.0";
2+ version = "69.0.1";
33 sources = [
4− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ach/firefox-69.0.tar.bz2";
4+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ach/firefox-69.0.1.tar.bz2";
55 locale = "ach";
66 arch = "linux-x86_64";
7− sha512 = "300639491b6ca69d7f594df35fbaae3f0e452f8c5280aee71f64ebfdb2592f3948ea2b936f04f01660e3b296e07650b72c583771a90902e62ca3efaea67d291e";
7+ sha512 = "100d7c9523102d3c4fc07ccb3950a9bf6caa096061c9b5e49d960f89ad6e2a8aa032e8a91ddd4bdda1d4eb8442ceb393dc6b31da11c5a86bfe9c7907bdf3a566";
88 }
9− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/af/firefox-69.0.tar.bz2";
9+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/af/firefox-69.0.1.tar.bz2";
1010 locale = "af";
1111 arch = "linux-x86_64";
12− sha512 = "5da9dee3ec659045f282dd76c821cc62ac20fda014ce04fdd756ad0ebbba73f054f520f89e227c5b6590255e275d0cdece2c2c16e42733c7395ecde18f42f2f4";
12+ sha512 = "ed6e066bd58d84d8e9a240e02b984ab7a52e1646dc4bad7470666e26aebb004b6ef5d43397457c82b4a7b0fa04ad0cc7dcbb662ad721e3c82563104955502627";
1313 }
14− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/an/firefox-69.0.tar.bz2";
14+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/an/firefox-69.0.1.tar.bz2";
1515 locale = "an";
1616 arch = "linux-x86_64";
17− sha512 = "7ef4a311136988c57194e9388862f68b30cc4e5f9c4303da4105389188abb4453f592e9d0819b337e7ef9b482a76df19a9d84a06eeb287f93dbc7e43a41bda15";
17+ sha512 = "7b75c42de08df56741778a0b01345238fa276ef2012b06cdfa54159b8559b37910b50277335d68d7b0870de36a04c24fcd83132999faa9d7c4e089511018acce";
1818 }
19− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ar/firefox-69.0.tar.bz2";
19+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ar/firefox-69.0.1.tar.bz2";
2020 locale = "ar";
2121 arch = "linux-x86_64";
22− sha512 = "a16636cfced17bccf2932e14c6b4c2260c713c538d774802c1dc8598bc47635238549a4332c4cf69b3d3946397bc8f2ba5b330be5716dbb8a81570bea1acc5e1";
22+ sha512 = "7f0266be9bb2b34189ee2891be11907720a248fbd11855d5a99bf54ef439756ecbd201a4d52a21b24b89ec23f1254b4ab15fd02d7511fcfb7d71eca9adf3a852";
2323 }
24− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ast/firefox-69.0.tar.bz2";
24+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ast/firefox-69.0.1.tar.bz2";
2525 locale = "ast";
2626 arch = "linux-x86_64";
27− sha512 = "2239a47cd8869cb7cd50820e1faef0eae66245f04cab81e36250b4be1ae3e7619a994b68c2256777636f8da8fb10aee781715b11bbd7ea857300b7a5afcb085f";
27+ sha512 = "d4681a2280549b3fb0384b5ae6a98ad9785921fa65d4a83fa967fe2d05363ed0ba8348a7621c0cc104a2da9efd97feddb38ef1ac6901c08ae3d9dd649e5ad30b";
2828 }
29− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/az/firefox-69.0.tar.bz2";
29+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/az/firefox-69.0.1.tar.bz2";
3030 locale = "az";
3131 arch = "linux-x86_64";
32− sha512 = "d79ad1be25e9eb3123ba89a5589abfdc58e161bf3ab0c90ff3306639f1a43bd80b9175695f7d5a24aad7c3fb16a616bb90eeb67d2f3f820db5b5b5556e774cf8";
32+ sha512 = "c19cedc18719ad6d5723a546be1e9d3aac2e408fcb94fba28aec9e1856250257422407cb945cf516bd0f86ebc1ebd1c06c28713cc6ff49691542fde660fab53b";
3333 }
34− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/be/firefox-69.0.tar.bz2";
34+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/be/firefox-69.0.1.tar.bz2";
3535 locale = "be";
3636 arch = "linux-x86_64";
37− sha512 = "38b340353be185502214945665b846ca73f1ace1528f0426ae702d8dda88a104f79a879e99873bc9f418a753572ab3bd597a9f820f0e0e94daeb21e05793b90a";
37+ sha512 = "e6e4ae0eae225ff64595df0c7038c750c8b3b245c9aa76afdf3e8a2ad9fbb6e324630c73801974f515ccbe315fffe797df3e087412c46e2507507c88311c8a82";
3838 }
39− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bg/firefox-69.0.tar.bz2";
39+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bg/firefox-69.0.1.tar.bz2";
4040 locale = "bg";
4141 arch = "linux-x86_64";
42− sha512 = "addf46d8ac6a823d9f1a00e55bd814abb27732484560399aacc7f704fcfbc7d239380c0857df7a4d445fac8724caada49981c2dd4ee288f47c63a7613aefed9a";
42+ sha512 = "4d2869b82e4f577acc0933e828f72856c55c4d0771bd938a888cbcb6af5ca319f03510cc96249f220d31b6786426c40726e1509beb40633d995bcdeae8299c7b";
4343 }
44− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bn/firefox-69.0.tar.bz2";
44+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bn/firefox-69.0.1.tar.bz2";
4545 locale = "bn";
4646 arch = "linux-x86_64";
47− sha512 = "3d0e90b85b5d91f01ae4e84182d071f9b07436a3d9f088ca9178a72140a7d3fcd6c1506b7899ec7bc6ef82a6dd132ea5345c2c8b41c1e2977a5d1aa95f916453";
47+ sha512 = "b01ecf839f6c1e028593c0338132931b39af29b2cbb414d08b29379832300abf4a423566935946b52d4ad4aa04d9d670e41cc11f1989b1e913201f8bc631f786";
4848 }
49− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/br/firefox-69.0.tar.bz2";
49+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/br/firefox-69.0.1.tar.bz2";
5050 locale = "br";
5151 arch = "linux-x86_64";
52− sha512 = "aae8493b79569b0e096193c05de56197e01c9f8f7e89b8db2d021bed6ab6e553af4e44c36ad66d427e80840e631d7b85f8c9d1c5ca17fd0bb94a0bfdaab94d7d";
52+ sha512 = "62e0603e9fec08ff0babf25ad38aad703806b43f8b1aa4b986f41a74623fd59dc18b6b230219ac93767924264a45f7ffdc6c41243e888bef786e0e14d6631718";
5353 }
54− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bs/firefox-69.0.tar.bz2";
54+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/bs/firefox-69.0.1.tar.bz2";
5555 locale = "bs";
5656 arch = "linux-x86_64";
57− sha512 = "19efd698f911401b32b3affa6e5a371566eca8aaafde96e38704e48871f69d4e6c4c3a8f189519f8b8022ad2782ea5076e53e75db9c1c12e504eb31c827c243a";
57+ sha512 = "c2020ea412b0852f7904ea9371bd3851bda9e0cf006a582a1427e8c9e412991bce7a0a6febf0632ee58a9da10c7b329cafc30caa8dcb5a2b12837465886be175";
5858 }
59− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ca/firefox-69.0.tar.bz2";
59+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ca/firefox-69.0.1.tar.bz2";
6060 locale = "ca";
6161 arch = "linux-x86_64";
62− sha512 = "527d672c469bbea18d727e276fd53ca26d65a169f665b32190c6db47c549e7e3155dd04c65fb2720e1d45658a3c8c1f2567f62fc807a8993bf00a2cf280db548";
62+ sha512 = "35c4a61866b37d7afb1cb5e78997b5467bf1d9810db7d4b651d4144132c6b52b6dc5091217787a6a71088b814c3454757eb4f741ec3c3c24462892da77600f73";
6363 }
64− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cak/firefox-69.0.tar.bz2";
64+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cak/firefox-69.0.1.tar.bz2";
6565 locale = "cak";
6666 arch = "linux-x86_64";
67− sha512 = "def5f01b180c354ecf2248d36f12778a2dbb5df8e376bc1eff4eefe3cb3b383cdb1b03b7a83784325ecbef330e5449687b36cbd239090973f1bb3098717bc2ff";
67+ sha512 = "273c8f0e40187f88368e4049a66052b230594939c85ee00e48dfd7760a4093735f91bf4e3eeb14d1c92266068c9994599d3a3cc271206e449e715c1c3d038aad";
6868 }
69− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cs/firefox-69.0.tar.bz2";
69+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cs/firefox-69.0.1.tar.bz2";
7070 locale = "cs";
7171 arch = "linux-x86_64";
72− sha512 = "5490aff5d9c693e22104607dd8ef342fb3ed79905995854930c7eee876cb2da3f940bf339570b68f008557ea16312af614ef65895a6831c22849e9818ea91b52";
72+ sha512 = "3dc3657c494f3b954236dd330e2c2137b5500bea5a0b4ef2052c7050c0ab23e9b773090843d459c9c259d0eceae0524b0e4ebf6f02883d8419bd05901943d9f0";
7373 }
74− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cy/firefox-69.0.tar.bz2";
74+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/cy/firefox-69.0.1.tar.bz2";
7575 locale = "cy";
7676 arch = "linux-x86_64";
77− sha512 = "9b5e9518f89a9777150fecb25951ca02c232b526784161a8b55aa09b4cab9ed23743dbf62c5f365802beffab4c62d5991da83b138889d7894e5f1b1dc2edcb17";
77+ sha512 = "9ba021a9df417c36b8ee10afaa95595d19897d11485407e9e3fb446c16a1cd31c683014917da608a721a583efd008c0771d13c642c8d94913bcc21227966ae6e";
7878 }
79− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/da/firefox-69.0.tar.bz2";
79+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/da/firefox-69.0.1.tar.bz2";
8080 locale = "da";
8181 arch = "linux-x86_64";
82− sha512 = "9482ccaa5e3ab92522f60a28571c020c3acce55acbd7c38d7d4f7559396cb71ea96a47210213d1ff15a0d97fbb1a3b6e07453d09ace9cdbee13381fb68829bed";
82+ sha512 = "c6eb2a98e0dd59dfe196d0b8f149aff109e1272199e215fd09d14a614697bc8652fb0442505cfae8a9f2bc0dbeec00bbbe73a7bc737e534f2f230a356137835b";
8383 }
84− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/de/firefox-69.0.tar.bz2";
84+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/de/firefox-69.0.1.tar.bz2";
8585 locale = "de";
8686 arch = "linux-x86_64";
87− sha512 = "055948aa2b9ef551d0348b4a24437648cf7613446cabf1290ce429c0ed70c7f2b81ca82f0dbbe9359a0bdb6cce673f9472a3fe74e1ef8359ff3fb8903763a7a3";
87+ sha512 = "a689581f54c278d217c7ae12d770ad1caa686db1fb5138ab3a34c14848b717256d0f09ba8cb5bbcb2472fec73b01e0a5aa4d5b869c7a2f388d8d54b2216b68da";
8888 }
89− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/dsb/firefox-69.0.tar.bz2";
89+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/dsb/firefox-69.0.1.tar.bz2";
9090 locale = "dsb";
9191 arch = "linux-x86_64";
92− sha512 = "a19cc34132f07635eebfc0d521c0177cd24f8c800f9be2750e2e653e8732fb93b39343eceefffacfbebed5656ad4ba0fb05557bd55e993f27c3327b171020f81";
92+ sha512 = "d33f730bb3727756f982bdcd35e0858cd0d5252594e14ed670324c9d5a1b4a87aa1391bf1e58759a0adf9fae896aa8de7a3258267b40dd96e957efaeeb9abd4b";
9393 }
94− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/el/firefox-69.0.tar.bz2";
94+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/el/firefox-69.0.1.tar.bz2";
9595 locale = "el";
9696 arch = "linux-x86_64";
97− sha512 = "f70a195f748c546fd76f5f2e73a379eda8a079475b3e03e67af41c8b0da1ddeb70c335ffa3f6019b406e49944c329eee1ac600d8fcd2daf393d0348d8bbb8048";
97+ sha512 = "4d040b92aa3f06e718ffe0f2dcd477d915dd3959087d0e98bffa7b14fcdd86a74b50be23df1f47ceb4ff9c63564d09a22217bb91f4eb3419b77c0dca12a1bebf";
9898 }
99− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-CA/firefox-69.0.tar.bz2";
99+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-CA/firefox-69.0.1.tar.bz2";
100100 locale = "en-CA";
101101 arch = "linux-x86_64";
102− sha512 = "eac808b225a6ef8162ddf82d8f975d8c0c77a4f8aec110fec017dad38ee4070d4a754f74566cbfe4d8dbbd65a022e1f168c2ffbac3f8ce84f10fb3eafcd114e8";
102+ sha512 = "390700c7d7fb2c38d6082e91b6c5ad4d1cc4912eb88ae3f207745e88c72ca6a169612be19d984438dd784e8b2e56ca2ea6ab9a3fa1fe6e8253f3e96278eb3dd3";
103103 }
104− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-GB/firefox-69.0.tar.bz2";
104+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-GB/firefox-69.0.1.tar.bz2";
105105 locale = "en-GB";
106106 arch = "linux-x86_64";
107− sha512 = "ba5d57b5596aef987b07354db04bd930fee66a58672c246c9769b2205f96f8d80360d1d212e560a7897ecca95f0b10385eb9d947c4b71126cae5d4893a2a7a47";
107+ sha512 = "d719c4c84a62fbaac67ee90812e6922f5b5b7ba08916740d06bf4780d818698a3c46e82c483d0ecd8b4ea040c53a69aebf31ce8c8c4e68dc32e0e27032704c74";
108108 }
109− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-US/firefox-69.0.tar.bz2";
109+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/en-US/firefox-69.0.1.tar.bz2";
110110 locale = "en-US";
111111 arch = "linux-x86_64";
112− sha512 = "f4f57ec920bed699a986512dac01adff30fa446ffc35b50039f9b321d4c5a1ede9ccd311f81aa3b7a0ed844a5ba4de1e676ce50bfe138f69f786e6d86afa790f";
112+ sha512 = "ccf48f7ef61bebabe3e583e2d08a5c9ced3ea4c10b7d4febd64108cb89c9905076d69482056ee5a20dcc6c2e9bba9fee6d3f02eb54a390f0df444e24b3fd8443";
113113 }
114− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eo/firefox-69.0.tar.bz2";
114+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/eo/firefox-69.0.1.tar.bz2";
115115 locale = "eo";
116116 arch = "linux-x86_64";
117− sha512 = "0697adf7b3b68b1b11018c690868a28389c2579f96886d5e2d70c7a66abd14778291e2f7efacb3467022dfcb0368bd2d04814aadc7356a536791e0613026db2e";
117+ sha512 = "4ddb06d38c53e24fba796a16676b85d74713a3c324b8f44bc66cd2ab8d3a26204627e0be0b0fddb27ff414360330fba78dcba2ee0cc9691621a1e4ccd7a3d046";
118118 }
119− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-AR/firefox-69.0.tar.bz2";
119+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-AR/firefox-69.0.1.tar.bz2";
120120 locale = "es-AR";
121121 arch = "linux-x86_64";
122− sha512 = "0adc717397ddac8b49e5d86bbd702d122ce0f09add74b2246a98d2b686cdebfecef1011dfca5b54752671c7019b153ef9994e983cdcb78023b35e166177bd6c0";
122+ sha512 = "e00e8bccd62a45ea959d0d826dc814964b4953343284e4d54d0acb4623d2369e7efdc96cf61028f8309bfcddb9deec4ce20ba10c3613e4a6e686ded9617ec1bc";
123123 }
124− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-CL/firefox-69.0.tar.bz2";
124+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-CL/firefox-69.0.1.tar.bz2";
125125 locale = "es-CL";
126126 arch = "linux-x86_64";
127− sha512 = "fa5fbee9d58121faeb0d3a2d17375410e7eea9e7a92b0f803c7b922c936b78cb8db55f9dc6745d9fbe12474a5baba5e7c11e2a83426b19c29bad0262cd046fd3";
127+ sha512 = "63bbce2c62e331ac92c7501e80d661edd686ff7feae714c32e1dcb8afec829bbfb0ed188138b5655ce5ba479767a58ffae1a367703f80c683c371f707286623e";
128128 }
129− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-ES/firefox-69.0.tar.bz2";
129+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-ES/firefox-69.0.1.tar.bz2";
130130 locale = "es-ES";
131131 arch = "linux-x86_64";
132− sha512 = "40d61b149da156b3008b131a9a4cb46a00c05a700e72a84575ce33f0b6dcf0bf317f64f54c1b0a0e6b03e817afdead048c530ff068da3cf8cb4ef53d60e57ea9";
132+ sha512 = "90c11f172ecb14a38e851558ace78ffd81a0ad10966e9b338c2394485c6460f81ab9f83824e204cab212d77cc56d066d8ddfd9686a3f6791ae9a8d99009d6b0b";
133133 }
134− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-MX/firefox-69.0.tar.bz2";
134+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/es-MX/firefox-69.0.1.tar.bz2";
135135 locale = "es-MX";
136136 arch = "linux-x86_64";
137− sha512 = "518bec00e953c8adb7f5c7a0ea460b9d92b0b001f960e31ca5ef1771e74309782056760593f7f976795acfe020498b67d94f80f87fab37469b0c219e86c0158e";
137+ sha512 = "13660d6449512791b4e8cf2b5d7f658d5716c1de5ae80f43893be351ee0de71ad21b135902056422325f9367e778ee31006f9120bbaeed19e9e3af36a20a7a4c";
138138 }
139− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/et/firefox-69.0.tar.bz2";
139+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/et/firefox-69.0.1.tar.bz2";
140140 locale = "et";
141141 arch = "linux-x86_64";
142− sha512 = "7a5fd6b36dee306446d94d33150004115da55002ee11ba1daebc6cef7d1485e023dc08d9cfdc419d76b7c1335bd7e0f24f3cf197a31003c71569111f5edcc316";
142+ sha512 = "db6ae24e866a32802e9ba9fd35b5fb7bdb63e1f0c8c3aa74d97d6d3e732123a10260794e03af30bac13c71d82b71d72057c0c32697f5efb78d35f55c088f6514";
143143 }
144− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eu/firefox-69.0.tar.bz2";
144+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/eu/firefox-69.0.1.tar.bz2";
145145 locale = "eu";
146146 arch = "linux-x86_64";
147− sha512 = "5ac8e602ee20afaba5b7501ecb3af0cc4358d61a729299eb6189a932af19d86f409b66853576ae4c259bb14df43003b395dae7f713572babce62bc549b7ef0e6";
147+ sha512 = "da166bd2be438b767af8c3566a7721a50df66572182c5504654be234b486027e1044186e3d2dcb43b2505ccb989f91556d19228f5e30ff4a05beb6f18911cb3a";
148148 }
149− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fa/firefox-69.0.tar.bz2";
149+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fa/firefox-69.0.1.tar.bz2";
150150 locale = "fa";
151151 arch = "linux-x86_64";
152− sha512 = "7e0e98538caae2345b88e9e9921b1eb3e8d4e226950aebe6a9b6d927aab47d40e59ef93fa33b0b175460db44e906e64e3f4974706ec0b3d85a3e6ed1adc99a52";
152+ sha512 = "c05f526f70225dd91bd38b1d74fbf0217b12919173582262739fbd97b4b556c3d820ee38bb0c33da37cfb26996a882ebc3498faa21141290722eb07dc586b878";
153153 }
154− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ff/firefox-69.0.tar.bz2";
154+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ff/firefox-69.0.1.tar.bz2";
155155 locale = "ff";
156156 arch = "linux-x86_64";
157− sha512 = "02cfea4fe949c4105d5cf2836de867c21c9ca8fb73cf0b3702493d409cb36a70f9f195c53d755840d7696500ea7e1a03f4bdeeafaa67833ff60aa96d854b14c1";
157+ sha512 = "15385e03ad168f2be63fc30c871617d7d673b53181bea0d592b48d52c172d74b978e84cf1403272e5fa9fe03900f8d1118f9ccf1dd70cf0a7da7af7ddd6fad4a";
158158 }
159− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fi/firefox-69.0.tar.bz2";
159+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fi/firefox-69.0.1.tar.bz2";
160160 locale = "fi";
161161 arch = "linux-x86_64";
162− sha512 = "470e499c26f9120d68904775e9ec2396020b91dfae504bdd6219d2932e5588240f9f25458425895c2d74fd6aa4c9c525f117f0a0f69adf98703af2570cec40b5";
162+ sha512 = "fca2397499ab573ff33f14dc2ad61ccd4d0ca711493545e39fba143e65e2d883d9b7317330ca8b8bc7345d74ee5eaea277cef5f1b88b1456b99c8b5f6bc5ad52";
163163 }
164− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fr/firefox-69.0.tar.bz2";
164+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fr/firefox-69.0.1.tar.bz2";
165165 locale = "fr";
166166 arch = "linux-x86_64";
167− sha512 = "44f4df351b0a34bd3126753a785f9a36856686d9df9648c9a3a1f678dcbca9585c19b576d6deb31967aa9448ef45aaf602558e87040ef19d1cb812d42c5894d1";
167+ sha512 = "262f3abd56f9f5b1b6a90f779c1ec233c684a1a71b783eb8fdace2bcd323fa8328dff5312e43458be1418d77109f7e677e9442dc10289064179955015f076fb4";
168168 }
169− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fy-NL/firefox-69.0.tar.bz2";
169+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/fy-NL/firefox-69.0.1.tar.bz2";
170170 locale = "fy-NL";
171171 arch = "linux-x86_64";
172− sha512 = "1f336759e304747cfb6932dd433c31123b153a04b4600952d0dc622b442901e1642acba220508373b915caff68e87e026ef54e24eb5c001a1e6e3f4d1b9736d7";
172+ sha512 = "3159e601d22b6b3f5e0d80d0950d03f9f707903a378abe622acc88c1dfccd7bb3d439b370d186460ad4197dade467fa153573da2efef31825f757bc5f5aa1912";
173173 }
174− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ga-IE/firefox-69.0.tar.bz2";
174+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ga-IE/firefox-69.0.1.tar.bz2";
175175 locale = "ga-IE";
176176 arch = "linux-x86_64";
177− sha512 = "dc0109a75094fe53caa78bb5c02257118aa9c992b4633cecf8a6e60a5daf4fdf488aa5e5309233aa1882bf69e3c8a01a527c2e2878ab9655c4810b3e54244ba9";
177+ sha512 = "46ac2bd25b600d801d2ff34b9b802a5830ec69fa69315c98217350462104eb73215ef8130f2987fdf8900ef45c91ea0618ba40ee8916406fb579b41462dc1a26";
178178 }
179− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gd/firefox-69.0.tar.bz2";
179+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gd/firefox-69.0.1.tar.bz2";
180180 locale = "gd";
181181 arch = "linux-x86_64";
182− sha512 = "69362cd2b58066646dc62ad0022d82ce6b010ade0abbf779d7d3ed7b9bf6ee808c848a9404c3beb966751d3aed0d3a5da2be3f2b262580e8b6211a3f8444727d";
182+ sha512 = "ad36cd4d42a29c9ab9d9e7e15e1827fd2ee7799f0484698c62bfba5acd2b0db89f66f7d40a5cf55012708e756cee43653211dff95c28a5a04173c83c45b0e4e1";
183183 }
184− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gl/firefox-69.0.tar.bz2";
184+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gl/firefox-69.0.1.tar.bz2";
185185 locale = "gl";
186186 arch = "linux-x86_64";
187− sha512 = "787a3a454d59daabd81cc734f15232622f3e2cd0253c98c10fcfc5eb47b8d329f89740474f7f754ab6f17bcb50e1fee38012df9183e061629490582c677da68f";
187+ sha512 = "46ce314704d19f6572568b3a01e975a01c63bb075f8d99c7e04ae01982ac42d61cde92619beb30c04a778f009c56f98e2c05d7549d4ab9843349f85321532755";
188188 }
189− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gn/firefox-69.0.tar.bz2";
189+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gn/firefox-69.0.1.tar.bz2";
190190 locale = "gn";
191191 arch = "linux-x86_64";
192− sha512 = "cf05696e4b0e3ba6c9316166f56e99505d4419062d77cc0438d0fbb66729d354c59026018828ec7d46db4f99e6367dea9911d4bdf7e80ba68fe32f8e0d5c09c3";
192+ sha512 = "ec4afbcb087157ee7c0b487ba72fbc3469e53522cee6a3e53d0dd88bb063d2ba6811da51dcefc696924ad79bb352440d2c5d91fecd87a72436508ad37ba9e86b";
193193 }
194− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gu-IN/firefox-69.0.tar.bz2";
194+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/gu-IN/firefox-69.0.1.tar.bz2";
195195 locale = "gu-IN";
196196 arch = "linux-x86_64";
197− sha512 = "0b38a698358012e0cc3ff1091b82d1eb82673f124b34ee4156cc36bb49d5d69efc32874de2a2050339e73d6f386f6d4a468e6d906be0b22567b867dde7e0ff9c";
197+ sha512 = "a736f01bad98b99efb41d7d516f156ff6806b5e1489cbaf799c651efe641b5191742c1372459081abfc8e75c63d0832ab33037e3ef7a5fd07d943a02af60aa4e";
198198 }
199− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/he/firefox-69.0.tar.bz2";
199+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/he/firefox-69.0.1.tar.bz2";
200200 locale = "he";
201201 arch = "linux-x86_64";
202− sha512 = "8250cf4c8b18edb35e8c601cb6df8bc7825a96064064b6d46a6dfb77e297c64dcc7a2f7937750d4734ab56f843a65b6174b4c9d523f9b5877e0e26ce9fecae01";
202+ sha512 = "73a56b235d0c5a7c69e51a52ded8477b606c2a3eca9686f1f07a2407de1c3e00ea06364912b8f8f90734a33d7d6f68b64b7693876b1b47426713bc49355cbf86";
203203 }
204− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hi-IN/firefox-69.0.tar.bz2";
204+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hi-IN/firefox-69.0.1.tar.bz2";
205205 locale = "hi-IN";
206206 arch = "linux-x86_64";
207− sha512 = "a0262214be3ebae877300b54720b4b74defe46bb641b989a1d65df02c62d78d51274386b0997a45189fa86d5974e56670a852d24d76a655baebd3c5aad8149db";
207+ sha512 = "1d531f68e03763d49c03308d2cd04a84ad36afb3d19f7abed8528c39e7ac089912e569e20d3f6e177db5b17344d7c5389b7f0b2c9cdea5cc1be03983b2016c4b";
208208 }
209− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hr/firefox-69.0.tar.bz2";
209+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hr/firefox-69.0.1.tar.bz2";
210210 locale = "hr";
211211 arch = "linux-x86_64";
212− sha512 = "a5254f81f1ae432b50ac9b0a1732134b32bd460502baf51eef7242c37b37f2a6f0cfb6ce9c10bc3ce6ce509287fde824bede15534b010ab2f55721e43d85a8f0";
212+ sha512 = "cef89e675a547a753db64861e4d6c65ca6faf87e573099907aabbc6f7fa1a4b9f8e3fcb0de44956fc95ae95a9bab98432879c3273c800ed4cc5e363cbbfe5e02";
213213 }
214− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hsb/firefox-69.0.tar.bz2";
214+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hsb/firefox-69.0.1.tar.bz2";
215215 locale = "hsb";
216216 arch = "linux-x86_64";
217− sha512 = "7081a889a6689e2d6fb4550474840085724cb4a583a9618a03a88ebca706ebdd32ccadd64ec8491332e342293634903ee52122ec9a5e49efb0f3cc8c09ac891c";
217+ sha512 = "f038d4752c3eee035cb95a657ce4588c20ac32438d578ecc86520f3a0da6f89135a55b3afccb7aca833a9845742ef7cfed7638a4954697b3826fc97582190de8";
218218 }
219− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hu/firefox-69.0.tar.bz2";
219+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hu/firefox-69.0.1.tar.bz2";
220220 locale = "hu";
221221 arch = "linux-x86_64";
222− sha512 = "0a6bd225ee22562da294a0a6753949f6e627d1076579c514b4c93719cd0acfab90ce28c241d05cfa58a9b723610169f7e3a8b65dcf3bce7615e56cede10f0064";
222+ sha512 = "e66afc6d0108a36081f18d18c59f87b529ecad7d97b14916f2bcf38f19edfd61d6bae7c0c7fcee211484abe9ab003f432b7c56be32889c129fcace827e592c03";
223223 }
224− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hy-AM/firefox-69.0.tar.bz2";
224+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/hy-AM/firefox-69.0.1.tar.bz2";
225225 locale = "hy-AM";
226226 arch = "linux-x86_64";
227− sha512 = "dc21bc95a2ef7e66b04fe9900458754db5fe51047b3e166a48bfc1c6c7d8048846049356778515556be0184b5f40a08b29bffb27eca2d85cf90e47c42a9ff086";
227+ sha512 = "6ed9a940ed6c5c699b0647ff340f3b81a68cd99c3c8e6acaa7f0b7c2f35a9eb41402951834769426cafecfc44f5e3b66d21f046ac470b43d2507165d01c7ec3a";
228228 }
229− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ia/firefox-69.0.tar.bz2";
229+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ia/firefox-69.0.1.tar.bz2";
230230 locale = "ia";
231231 arch = "linux-x86_64";
232− sha512 = "b2ab4096778dab01ec722c90daabdd8b0a892de1cd01ffc2bf5b6c403a74bbb6ab1180b1331635861c29b05db9662ec1d973d8506170c7227d574848a6281678";
232+ sha512 = "f617f7077ed05f72c1eae5677691e5a62e6728d1c9d4fc92684306c072d96b6459eb014e23738e589d132f1e798ef36356fc40ce1f55972f43205a332a0e173e";
233233 }
234− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/id/firefox-69.0.tar.bz2";
234+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/id/firefox-69.0.1.tar.bz2";
235235 locale = "id";
236236 arch = "linux-x86_64";
237− sha512 = "a416e7ff14facaf80a8edec2b1100f65bd4ca13b6ba10ebd8ca181c65683deba962c276b4b32372f9d8aca33213ffdc882ede3c8bf6dac883c819b85ae84789a";
237+ sha512 = "8d08c251b0890b378fe46c2527a089ad80b33e550ad3e91e2461d6de11e3f7c00959350cf9b61baefbfb8f663064ccc6ffb489ec65ae7f05cae8995b388fa6c3";
238238 }
239− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/is/firefox-69.0.tar.bz2";
239+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/is/firefox-69.0.1.tar.bz2";
240240 locale = "is";
241241 arch = "linux-x86_64";
242− sha512 = "f5b0e2b1bf63db7a3e4bb14b0332d5b365be87f7c256c7c4a34dc4d4107a139bbe0415c757d7274209e82a1219863db3862426621cd2453d24864776c0ffbd83";
242+ sha512 = "ac4500d36d78330f569287a48197c927ebb8b73ad295d035137f682a7e51dbd58e6b7da7fe76997f538de71c0175627128e8860ec690c7e34d9e05027ad6b2a4";
243243 }
244− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/it/firefox-69.0.tar.bz2";
244+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/it/firefox-69.0.1.tar.bz2";
245245 locale = "it";
246246 arch = "linux-x86_64";
247− sha512 = "655def933c7a17d5417fd319158a3a8f21a0263bb7aa539641b1f3d3eb0087148198975a9961a789b3e944c812c857a35afd5e973018a82e409ae438c160aead";
247+ sha512 = "7e848f6827d8d169d6f00bd9f74bd041a6f81cc9eb5c77658ba6ad66d2640bb3fc615a7b5aad867dfb55496f464ebca41c38fb59aa410bc6b7c7b76867531dec";
248248 }
249− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ja/firefox-69.0.tar.bz2";
249+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ja/firefox-69.0.1.tar.bz2";
250250 locale = "ja";
251251 arch = "linux-x86_64";
252− sha512 = "19b9a42561727da209614222f618512a8ff714f0edb21baae1efab69fc384d3ba0766475fa76e0f1fb4cf298cfec01c0e3bf3879e1b730cd0254d6174f764df4";
252+ sha512 = "45e31ec74e866bffe4fae630b8d2d183ba2caea16b53f3447e0ffbe6b24a1db35faf834c6dbba6d248713812d4023302bef4a815b050240a5995f1fb435cc0cc";
253253 }
254− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ka/firefox-69.0.tar.bz2";
254+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ka/firefox-69.0.1.tar.bz2";
255255 locale = "ka";
256256 arch = "linux-x86_64";
257− sha512 = "4949b620ef6ca2e23472d721bded35091028048633f8393ef9a68b780928e11e779527b8b62f02e27288456fd939a5d273dd3dc6096ead80107b3c4266deee2a";
257+ sha512 = "10264908a24ffd4362e3ad0c766a60fa1eadf69c68e387482273427aacd19b2a2729cef28a2e32c99a924c31d88fb4b1642c570d7fe171f9475bf3ef9b9353b4";
258258 }
259− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kab/firefox-69.0.tar.bz2";
259+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kab/firefox-69.0.1.tar.bz2";
260260 locale = "kab";
261261 arch = "linux-x86_64";
262− sha512 = "a1e9f7afe4c09a1056ad0f9f81dd30af5c6a62582a19c5ab437e42281b312f8cbf9f3ddc5e4e9e6553d4c68ac268f5cfd6080d8aeeef51032387b8bf1915382d";
262+ sha512 = "7ff9328a0d475d1134c511555e9f0e163506b86008b8bfd649b98edca4d62321f10990c3d71910d97d5cdd0f355f2ffd47907d120fe15b54a2f8ae153c489147";
263263 }
264− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kk/firefox-69.0.tar.bz2";
264+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kk/firefox-69.0.1.tar.bz2";
265265 locale = "kk";
266266 arch = "linux-x86_64";
267− sha512 = "47b2963dbc9333b30627ef1583a87adb23962dbbd71e01be2b58f6ff7a6d226076f9193310038884000c6ff7a4f96bd1eaa33767bf96bea3ecbd0715ccdcfd37";
267+ sha512 = "67d5394f0f2eb4621c830ba679e2957448862b616c625f47be89b951d387015049bf5fe100173480c6f12b9b60a7688388b9118422777ac1b082fbc510a874b0";
268268 }
269− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/km/firefox-69.0.tar.bz2";
269+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/km/firefox-69.0.1.tar.bz2";
270270 locale = "km";
271271 arch = "linux-x86_64";
272− sha512 = "758c7dd7eb7a91e09bc7f921e0506a4e719ae818b5794abe7a090e9af230c6d5240ab7077a9ca4636599566faab83dac92c64e1f97bcd3515e27a2ccf4e9f6ab";
272+ sha512 = "71b7d9cf1f161d2f3264c36872071751d19e15d71ab8b7fd4b34c4a3dccb24641de20ea202ab7f6bd34641f2e209c58b1b26425df4e24961e8b545ca274fa505";
273273 }
274− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kn/firefox-69.0.tar.bz2";
274+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/kn/firefox-69.0.1.tar.bz2";
275275 locale = "kn";
276276 arch = "linux-x86_64";
277− sha512 = "fe0c88f827e0b4581e3f72367c19ddf2396cb654eaf2d5457babcc1be8761ca6fd7a7cedc79c580abd7e9a336439ce24d84ad37a6f1d0907bbd548232a9c3d81";
277+ sha512 = "e8babd31e5ba80af0c4bb397ad6cd995c7f7c3e5b9c07a14ee1b8fe707b7d1a92154cbb3ae9a4e0c4266e2fbd3497ee70ca854a417799a508e4453e28a06284b";
278278 }
279− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ko/firefox-69.0.tar.bz2";
279+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ko/firefox-69.0.1.tar.bz2";
280280 locale = "ko";
281281 arch = "linux-x86_64";
282− sha512 = "52d0cf33a3a6d083f63c03c5076be9e68829560ece3c5729c5694c989a1179df8ba6f9c5ad4c3d720394cae351ff078af13e07d194b175a364e3f529dd7983f3";
282+ sha512 = "30db8bf846c844e3e246fab62aa35ce71a2762d2e364bc7d54e967ce970188dcef23dbb70f1e9d030b18e1fa3f20bd698fc9e1965d3acb46411430617304cb0c";
283283 }
284− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lij/firefox-69.0.tar.bz2";
284+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lij/firefox-69.0.1.tar.bz2";
285285 locale = "lij";
286286 arch = "linux-x86_64";
287− sha512 = "7acba227856b3bb015745f5239bbdd06a88e30ae7f17129e8b104ff800fe7b60f24646962348177e7efef71144a7cdf2415b6daebd2eb75574cd6ca6b708c892";
287+ sha512 = "f76d3b05b31173cbff091a731513ff213ea0f6868352983b02d9495203d454478a3f78633e2a8452eee331157c759daae28295d77657faa9bee2a7053525cb7d";
288288 }
289− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lt/firefox-69.0.tar.bz2";
289+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lt/firefox-69.0.1.tar.bz2";
290290 locale = "lt";
291291 arch = "linux-x86_64";
292− sha512 = "0829cd18857660588330c306ec7db6e64d52346ead593ffc7e4022c25d8ea5451329e7bb70667645b0bc4894f20d8d6251111449dd3f48362165e9f583f89e92";
292+ sha512 = "b941a48ae9dceb7689c82a670711cf37af0229d8472f6006887cb2adc519262ead9471b23ad1503a9d1be5096769a58894821ccc7ba72de0fa820df9df1d2449";
293293 }
294− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lv/firefox-69.0.tar.bz2";
294+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/lv/firefox-69.0.1.tar.bz2";
295295 locale = "lv";
296296 arch = "linux-x86_64";
297− sha512 = "3c19e724d31b20bbec4a9a4267c5cb9ce1e4aa5ff522beefdf35b468d220964eb547ed1b3a4354624cc653764f62d41a294eac10d90bdafacd290e192786a73a";
297+ sha512 = "89da4afe8892513ec831bc8f565409513d65dc314ac1cdb6e267940de6e572e93b10859b3ea05558a1aa7732b94fedc37dec18a069d3498077dcd20a04fdecb6";
298298 }
299− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mk/firefox-69.0.tar.bz2";
299+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/mk/firefox-69.0.1.tar.bz2";
300300 locale = "mk";
301301 arch = "linux-x86_64";
302− sha512 = "1223ff81d9162d87db9d71948d34b677eae86d3ea06953a939cd18836c8b820c0fcbc468d124a3b0ab37346716db06fec7a4510806b7f2f98caaa0a30642746b";
302+ sha512 = "3d42d641ee18b664af649e16458984c13b61c7c208ece86035aba3f5f1165eaf074e17ea7030ac43c3603e55dfa8a739c6f4b7f482ef469577c420f732ee883a";
303303 }
304− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mr/firefox-69.0.tar.bz2";
304+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/mr/firefox-69.0.1.tar.bz2";
305305 locale = "mr";
306306 arch = "linux-x86_64";
307− sha512 = "202bf4f9b7250a73f70f0503e53f1f55b9466d4daa13092d9674b21edfc61a0dc6af3daee4cc229372eb2e3e3d97e13f686d9f6d8d702f4dfdad19ff52792eb8";
307+ sha512 = "fb71aae70bfa56a876f4d2d033f533087bf4da146245d8ec3601f340ccfbcf4c37d2c5a0702191c0f0f6337405f40b069c0fcde90e1bc208a1631cad78c251b8";
308308 }
309− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ms/firefox-69.0.tar.bz2";
309+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ms/firefox-69.0.1.tar.bz2";
310310 locale = "ms";
311311 arch = "linux-x86_64";
312− sha512 = "7c1e2b00ead7cb7b2a3ef516c0137f1cb2fcdc4fddd44c5b5887e949797b42218ae66fd58a4b207ec9519704ad8b26a71edd2fe3a36ae152e589fad48a4e2754";
312+ sha512 = "d3cf1b0401cf0787240c39cd31f523d41272ceaced2c219a81173a2ab746d7b0003f919c43fbeae4aea187c0c048b8af71f9e338ca2f4e7049d65d767df950ec";
313313 }
314− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/my/firefox-69.0.tar.bz2";
314+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/my/firefox-69.0.1.tar.bz2";
315315 locale = "my";
316316 arch = "linux-x86_64";
317− sha512 = "bd92ec45173af70a10715f16e8043e7d41900607bbf2acbef566002f8ae8855cb604963d2cf2a1e5a9c610120c24b6d192c0e32c7ba29c635c2d92d1fe4b73bb";
317+ sha512 = "10b4272df10d520202299702aff5a0075a51df982225d9e8c826c8822367de6d8598cccec394c057d18ea5e9b965a6d2b6bf3c4f11a52b142d6998c2690212fc";
318318 }
319− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nb-NO/firefox-69.0.tar.bz2";
319+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nb-NO/firefox-69.0.1.tar.bz2";
320320 locale = "nb-NO";
321321 arch = "linux-x86_64";
322− sha512 = "c032c4d91c67d11ced6b47caad8ed04554e08fa78e7bb49c2ee1176ca192131b9372e35c121d5747f59672d1c9f8f1fd7f2d29ab24ce3b6e681eafae7a821e02";
322+ sha512 = "e73d077e21bdd3305b85454a256fa07c481f377edcc4efb2b743d51ddd125bdc494d3741138e8b576ae1c155abc8ff7e059803df1566c49a269a522086e35e6c";
323323 }
324− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ne-NP/firefox-69.0.tar.bz2";
324+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ne-NP/firefox-69.0.1.tar.bz2";
325325 locale = "ne-NP";
326326 arch = "linux-x86_64";
327− sha512 = "5c6a5e7cd3555bef6de3f02e566349a5e4797efed99c0b161e0de38f8391657c963446ab7e9b57a3728a81350bd98a7de66029bc0fcbe611b39f93e804cb1302";
327+ sha512 = "63c0f1f8bad1dcf2dd1203383577923b9eb5e3dc87d4b1d7891fc93b145327eb538b7399994f6868e7c998acf58f2cf8ae69f57722bf68743900abe8c058f2f6";
328328 }
329− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nl/firefox-69.0.tar.bz2";
329+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nl/firefox-69.0.1.tar.bz2";
330330 locale = "nl";
331331 arch = "linux-x86_64";
332− sha512 = "a1ae9b567eb05c28443886b49351532c92d5e29d65386e3c3d0d842574be355f49544de1302a485d71b9962483eeba4d7f8c855089b5fb8fc3dd1b86e47f70c8";
332+ sha512 = "a2b3c2e791dd9d984b1772cc5db4c492aa530b389c03f234604c592749f7e0e689f10f563c4b9b2daab0ac71361bc77258c8278c0de7703820ede4b130dd69f9";
333333 }
334− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nn-NO/firefox-69.0.tar.bz2";
334+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/nn-NO/firefox-69.0.1.tar.bz2";
335335 locale = "nn-NO";
336336 arch = "linux-x86_64";
337− sha512 = "3926a8efcbe5cf785cf687e10b5d7a846cafcc5e9a09fb77f517ec071c5b2afec954fa6f870c3688d07ecc17d64fd71080201b4646d8547cb3446201ffc30944";
337+ sha512 = "8b348a4fac00a9490966032c425f469ead22af7eda989e49080ca548e875b24d050a2e0447ab75934a4440341edbf7d2ec8dd04dd227c1dcdc7099fa160e5a90";
338338 }
339− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/oc/firefox-69.0.tar.bz2";
339+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/oc/firefox-69.0.1.tar.bz2";
340340 locale = "oc";
341341 arch = "linux-x86_64";
342− sha512 = "05ce37349d320e94547531cabd995d21107c64b87d52b0e08c465abc709526e4504019657ee2c49079fd8bef012f1ea7c55f595828602ca1d74f8a18940eee2a";
342+ sha512 = "8a94a5a3753689c66cc103bcbc31c9c4e943414c27fae9c64390699eed8e00ce30c904a60b83e0c19ab2fe626d981a33f85bb473c3f54b19e1cc225eb122adc9";
343343 }
344− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pa-IN/firefox-69.0.tar.bz2";
344+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pa-IN/firefox-69.0.1.tar.bz2";
345345 locale = "pa-IN";
346346 arch = "linux-x86_64";
347− sha512 = "48f6a34384b79b6a0104b33073c32589a9a66da64c83c0f205f7cdbf940ff75a162c9612ab7f457377f018c4508ff398c2410239efe0a22862d36aecc7b409af";
347+ sha512 = "c1fa222416168e97452c0e50894d257f5e13b50728fd3cd53331043248b111961b9fc0f106f375295a79ea48af31f082a2463aa25eddb5f668258dde1c299480";
348348 }
349− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pl/firefox-69.0.tar.bz2";
349+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pl/firefox-69.0.1.tar.bz2";
350350 locale = "pl";
351351 arch = "linux-x86_64";
352− sha512 = "912149f85fd055d5e9ee3ec9f40ce9308bef4580a265f6ff8a782b5db1dbc8e82bc6ab6cb40df14968b3d00e11aeb539c6768d755acc3e5a96bf2bb952b86f1a";
352+ sha512 = "01ca1ee21d42f093e3d0393443a91e7c5cb92e6cd9f90889e1d68f0690514fb0bef6cc295299856a5f13a58cae396e80c970cdc55e90853593e4fba285c066d6";
353353 }
354− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-BR/firefox-69.0.tar.bz2";
354+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pt-BR/firefox-69.0.1.tar.bz2";
355355 locale = "pt-BR";
356356 arch = "linux-x86_64";
357− sha512 = "e167770aa356ab88af89d1ff8de492ff0e31c9e45b64bcdbc3ed76749bf2027b70085c34b95490047f3a71f72fb29da5d771dddb7b445b70a2986d22088c7964";
357+ sha512 = "341a9c074476fe17b917047a362775438dc5cce42a989d10695c248db5f1467f9a5dd41cd2ecc9b83132920bd85ba424bbeb5141597a95ab8098b6e6e3b0db05";
358358 }
359− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-PT/firefox-69.0.tar.bz2";
359+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/pt-PT/firefox-69.0.1.tar.bz2";
360360 locale = "pt-PT";
361361 arch = "linux-x86_64";
362− sha512 = "a06e26bc1285a39ccc4399e98ba523c39b9f7573444f5793bc5278908454c717dc3198be5f3985280af4869bd68987f5cc0d4c4a4000eb65d6eff4c7d3e61a15";
362+ sha512 = "4ff64a3091999d5171193be0022fc239fc61c0fbf4487754be4ef9b3f7f8f16055ce302617c68f66c8c0a0fcee5b8cdc5f91e5bbd0ffd9500809d1566436f2d9";
363363 }
364− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/rm/firefox-69.0.tar.bz2";
364+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/rm/firefox-69.0.1.tar.bz2";
365365 locale = "rm";
366366 arch = "linux-x86_64";
367− sha512 = "41e9519e6e10cbdf20eec17ccdcf7120417c477a3358a0fd0f6b770dce64b5528a51271b9257cf981ac21dd0e118e8193c0885c5039955b84d331d29e881455c";
367+ sha512 = "b7d109e8bcf9eec1757c14ae1bf693ac7616296a112961cac39b5466609af5050cfc2dcb4b68801dca7a4a2b00f76c4b4f31bc325163aac88a012f0a318898b4";
368368 }
369− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ro/firefox-69.0.tar.bz2";
369+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ro/firefox-69.0.1.tar.bz2";
370370 locale = "ro";
371371 arch = "linux-x86_64";
372− sha512 = "63845db9011089101b6350e5b13c3e614a198ba24343d386e46b4219f0e006c346b6ef103791dbd5013a89138c1facfbd81b3e144e04cb8690c996969af6afe7";
372+ sha512 = "e8eae3c374b4ea0940e256946a21ed7f317bd9e37115a0b471ff656f194eaef8bf8205a8385b1d5e22f3aefab1be67cfea314b77483c6d9facfe58d757932804";
373373 }
374− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ru/firefox-69.0.tar.bz2";
374+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ru/firefox-69.0.1.tar.bz2";
375375 locale = "ru";
376376 arch = "linux-x86_64";
377− sha512 = "ba844bebc9469c2372815821d751fe3146d8f7d0c4c18002ae617f1d42a03369a13eb3a2cbe2087135164a30784bd476a4512867145a57613a8611f1af47227b";
377+ sha512 = "567db4e146fde58297868a7ae7bbe55f658e49578951513d6e0728b82349ebb7b631bff8abe9ea2305ca0ff3f12d6c4b1507cb6df10b45f7763b3a505caf9ac1";
378378 }
379− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/si/firefox-69.0.tar.bz2";
379+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/si/firefox-69.0.1.tar.bz2";
380380 locale = "si";
381381 arch = "linux-x86_64";
382− sha512 = "67df7f6a6d32c37db778237b2cde1418d8b4d19360f752960129c94dc3ed4736a8b1eeef73966b54a531e3e3c6ddceb5cab33d758124ba375a2a46a7768b99e8";
382+ sha512 = "24db969220444eddd0251ec1f17ccb30ce73050f1efcffb5dff3475c69bbba46735236c41f1bf2910a4c283b1ffe8f0195894f57350031c7519c8080e6ab0958";
383383 }
384− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sk/firefox-69.0.tar.bz2";
384+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sk/firefox-69.0.1.tar.bz2";
385385 locale = "sk";
386386 arch = "linux-x86_64";
387− sha512 = "5d748ec7f889e8465cfdf6304db6403a346ed6b9c433fa482365b82bdf39cd600a9926b5e3355e4e8cb911bfb03bb9ed14df83ac0b4cfc2019b71b2006e1ef51";
387+ sha512 = "921d440d44adc69fde5a68e177b1d2cc7ba224e67f4688a4643887516ceaf713913bbab6e9b04a1ff01bf89f83a3b77709edcd603951f1a6d9b7b327a8c91152";
388388 }
389− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sl/firefox-69.0.tar.bz2";
389+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sl/firefox-69.0.1.tar.bz2";
390390 locale = "sl";
391391 arch = "linux-x86_64";
392− sha512 = "f870acdda0da2fb373718d2218d0db79de90c6153d7dcab4163102b220c265d502691f525f9db77ab2403e528e578b9e45d839c2296f16665179c838703aef23";
392+ sha512 = "9b56d90ff8b53615a0356fc593c236ee577b8fc2ed751345da4961ddeb10c039bd54285aaf72c193bb6deb27e4aa88960d61b68dda892acd4995c70c44e7c7ba";
393393 }
394− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/son/firefox-69.0.tar.bz2";
394+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/son/firefox-69.0.1.tar.bz2";
395395 locale = "son";
396396 arch = "linux-x86_64";
397− sha512 = "f8c702a54be2f9b15ffc183de2853b8da7d7809d2c02e3a7a2a2d001878236102c35383879c0f66ceeaefcd6a676adf23d766a80682af4122c82561fe7eaf36d";
397+ sha512 = "3bf49dd6a56efd4e855170de6964181fa3cb6e43eee637bb8458d841f863043ce845d17683b1fb2ca6b906dcbd2c9f4acda733c7fcb48a6718fff2f11b38590e";
398398 }
399− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sq/firefox-69.0.tar.bz2";
399+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sq/firefox-69.0.1.tar.bz2";
400400 locale = "sq";
401401 arch = "linux-x86_64";
402− sha512 = "4da3b8e0c0a012e5f78ef1c10f9f462b9e5a716c95e9d8134da274dc1461d60d094af2de314987c6a68c1a50c17f09dc00ce9cd039553b406efc2306968b38a0";
402+ sha512 = "da7d3a5c5615a187d4bd8f8eda41c42060038ee545a578b31d9f0f2cb2f77c4f36f1ef3911230c09dc2d995444aa2867190c2b95ff399caecefa2f29f5cc9be7";
403403 }
404− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sr/firefox-69.0.tar.bz2";
404+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sr/firefox-69.0.1.tar.bz2";
405405 locale = "sr";
406406 arch = "linux-x86_64";
407− sha512 = "1a41de2409ecf00fd94690c0f452395c3318590e9b9f2164f2d82112e51057680d2c758d1e0b9d9a372e3080afdb611d30a2c74b9bb6377da63352cdddcd1099";
407+ sha512 = "753a31f6c534d7faeb775bac52087ca59321fb18d6c3c456e7d84ed67f81fdb12d666e5e481886aacf5e59b22249fb10ad75d2e149cc1f8307e6362058d00aa4";
408408 }
409− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sv-SE/firefox-69.0.tar.bz2";
409+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/sv-SE/firefox-69.0.1.tar.bz2";
410410 locale = "sv-SE";
411411 arch = "linux-x86_64";
412− sha512 = "f09d3024b2f9032512aa10ce9b5c72b44a673f324190e1e971ad3c09837545b79a784e6a10e5cd9997f701903c4445284f64a9eec7d40b857a8386b2b72eaeb1";
412+ sha512 = "84ba83794b6d6be38f4268ed0c2d8e0dee4a543de1244f7ab88ea6944f1485d0f6383d029a24c5ec08a3d2e78174e6292ac5c641abdad5f452a95786636a7aec";
413413 }
414− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ta/firefox-69.0.tar.bz2";
414+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ta/firefox-69.0.1.tar.bz2";
415415 locale = "ta";
416416 arch = "linux-x86_64";
417− sha512 = "60666bb1ec53979b6b614a4c31a04085b1542deec9908bd485db2e0f09ad833a2dbd81f84f483f24d73689cde5fdad2554079b3a54e4b98e148d3f6f144b8de0";
417+ sha512 = "b9d10d22b3ddaeb9ca5536399494b8a51029dc37e04cbf352850122e988f8e04fe77e834f8cb0fb80ac1cad842ab1617207c8c643dceaedca07e23da44f38020";
418418 }
419− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/te/firefox-69.0.tar.bz2";
419+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/te/firefox-69.0.1.tar.bz2";
420420 locale = "te";
421421 arch = "linux-x86_64";
422− sha512 = "03fb5b9cb18402657b77cee2f7bfff3474a84c32204ce5163e028680cff75ad0faefc398975fb98378fbaaa86ad247cb43970cf86bfb383512fc4e890a928842";
422+ sha512 = "76a2367fd1913a5ffcbc4072701448880ee5319e46b82bb99bc12b84649cbe09464447504f4a8ffe40695c1ae76a2e0bc6f46d797811592c2409e2acb95783c4";
423423 }
424− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/th/firefox-69.0.tar.bz2";
424+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/th/firefox-69.0.1.tar.bz2";
425425 locale = "th";
426426 arch = "linux-x86_64";
427− sha512 = "53d525b0309e5f0d02314c0ceb568f067e858588befa64047a3163fc0623d0afbc05167df34fffbcf97b1f5fb127dcb8fb45c05ef117de42d42e8e7d37a04a6e";
427+ sha512 = "41a16d4d1ebb7e12cf43c748aa6eb44069cdfd6bb10482518d23f5e4886b10b01c103a0c1b53210fdb86bcc369ad4e2451fab6b4a4d3810b8dd7b3e8059a9de6";
428428 }
429− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/tr/firefox-69.0.tar.bz2";
429+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/tr/firefox-69.0.1.tar.bz2";
430430 locale = "tr";
431431 arch = "linux-x86_64";
432− sha512 = "ef3c0a7f2ef67b92cf22bd6a69b237db8b9d1d85a018cc7c33f767fe71f483ab479bead36af874f4c6bdf99f7eb58b86b564825de897abbf8809aef41d95ff4a";
432+ sha512 = "e0602d3b4ccaaed09fdc740b8d445cf4d9d4661bf8680c3ab8cbce002add211e2f64a127dfd010624ccb13fe81270ff8e1679ec6cc0b96b25c81b4fcd1a9314e";
433433 }
434− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uk/firefox-69.0.tar.bz2";
434+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/uk/firefox-69.0.1.tar.bz2";
435435 locale = "uk";
436436 arch = "linux-x86_64";
437− sha512 = "bece51aaa6fa0131f55364b3a8079382db4d8415e19f3b5ee7333b4111ecd282012f55343b44df95cfe3006f3226c7ec6b6d4bc71d1f30aefbf203e24c282b5d";
437+ sha512 = "bdda18234e4d38484746a06b254fef51139ef0022474b2bc3a21c8ddc0fef62d13ca6c7829d24605ad04aada6a6ed4e9e4e029014d6e6a4cc56b4256da443163";
438438 }
439− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ur/firefox-69.0.tar.bz2";
439+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/ur/firefox-69.0.1.tar.bz2";
440440 locale = "ur";
441441 arch = "linux-x86_64";
442− sha512 = "1f5373231283004843f8d87a53ee5eb92c7c79d4c15cdd611baaa5ec56ea6ba6eefc5ed63ad66e0a3b66b4748eb21af201fd98dea645754bcca3731e8643dec6";
442+ sha512 = "7018f8f9c34e430acd461610e488968df3f0b0dd6ad53701582644413cf7e3efe0e83e04abeb6b931ce8755769baecb9cc25a2a94a4934f491079df968b824c9";
443443 }
444− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uz/firefox-69.0.tar.bz2";
444+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/uz/firefox-69.0.1.tar.bz2";
445445 locale = "uz";
446446 arch = "linux-x86_64";
447− sha512 = "31708d41970b7184bca2686b8ee048afa732e24f05ed84bc7dfee1fa18c86ca8f3bfc27002f306bfd71423331567be2c952addd1af50ed85ca7377a87b1c91cd";
447+ sha512 = "dcb88a105c8ed02534b4f54dc9265330035c0ebc3a34326c8a73acc96455a63956c665f4240589b10682e06acd0b4302c144045c77cd98484a35b273168f4a04";
448448 }
449− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/vi/firefox-69.0.tar.bz2";
449+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/vi/firefox-69.0.1.tar.bz2";
450450 locale = "vi";
451451 arch = "linux-x86_64";
452− sha512 = "f1abfcf9142310c6362b429d8d58f370c3fa9af20d7261e0e3328b37d4cc33b88d764d108167ae9b3aea6dde7593bf92591d41e71eaa233cd01d8583e1d8542f";
452+ sha512 = "43d695edaaa3c98e3607267115f1fec358c6b93bf79b2dbb5433ff98abadd6af54bc40f1fbe7e6fd7ee5a11558dc3266749b2cfaac47f8db818e554722052949";
453453 }
454− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/xh/firefox-69.0.tar.bz2";
454+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/xh/firefox-69.0.1.tar.bz2";
455455 locale = "xh";
456456 arch = "linux-x86_64";
457− sha512 = "cbc4ec3f78d47276b1cc67948645b92fc891a0089bb81151d1b4ff8ec20b5ea7db714c7a386ef094a05040fb399d8de7a98d3c7ae7dc212c64955004474c4466";
457+ sha512 = "ed78cda83cc9207a84a013c01535a423b8c315464b0339fa684fc0c3c64b4d014d097816b115a6d80c79c725f3b376bf996d980284b75a774418f9999dcf6e3c";
458458 }
459− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-CN/firefox-69.0.tar.bz2";
459+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/zh-CN/firefox-69.0.1.tar.bz2";
460460 locale = "zh-CN";
461461 arch = "linux-x86_64";
462− sha512 = "5ca30257e96e8e7770fe8a7d626433932a06e56789cf6d84a09b633348570c59cf904707a2c6737267d111929830df8b1556d84c6dbccd62e4146926a87e68d7";
462+ sha512 = "079dec7bf78a3f1e8b3dc392cb30916f70fde6e1092a5fd4ac26719448a5ce8c3f3b86296b585c8d9c4941e5a106976967348021aefc37fc8b18e352091e0664";
463463 }
464− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-TW/firefox-69.0.tar.bz2";
464+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-x86_64/zh-TW/firefox-69.0.1.tar.bz2";
465465 locale = "zh-TW";
466466 arch = "linux-x86_64";
467− sha512 = "bd3ddc2e9da6f1e47648ac4054c6568e48e3c01422623947f745016bd624350885a194b7dad600fcdeb0fc64cebf10b8f694764da0575332618cc948dad33cce";
467+ sha512 = "24a30c8a29ae61a3a3b96c68cc56086985be110da3cfc10210c3365fb6ead7dad9450888c15151fa782f0f47326fa3611478dc4ac265dad63bcaf3e1a654d20b";
468468 }
469− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ach/firefox-69.0.tar.bz2";
469+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ach/firefox-69.0.1.tar.bz2";
470470 locale = "ach";
471471 arch = "linux-i686";
472− sha512 = "9f5876b495e56d195c01a278fa602c7686c52c662145d46dd4e7a9ab143801a26822c5a084683b74819fec15d66b21644ab6adcf160deb1d48fcb381fb395187";
472+ sha512 = "9523e53ce15887c713ed5664cafc89c41a9edb0430374cb7e15321e51f5f5f626e27f626f4a2475113f2c4dae9d3fefe18d498fb47166da59e7c4fbce7ae5bb5";
473473 }
474− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/af/firefox-69.0.tar.bz2";
474+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/af/firefox-69.0.1.tar.bz2";
475475 locale = "af";
476476 arch = "linux-i686";
477− sha512 = "13516530c77ddd90e9a5380817acedd7d1843908f4cca8cbe523f2390236c7f37b50a5ea6286ed9a944a4de141d911af0ce425d557af338e8f7be20581717077";
477+ sha512 = "2eb5ec7b08ab03d99e40b1147878211be92592213e568fe1770b8a1e570c012a43e60ebbf708012b138a615587dc28e12d9512b732b3434c6144c21ef30cae29";
478478 }
479− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/an/firefox-69.0.tar.bz2";
479+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/an/firefox-69.0.1.tar.bz2";
480480 locale = "an";
481481 arch = "linux-i686";
482− sha512 = "f947a2e74a8a1afcdfa64d4d70f123efc490403879037ac31bf082874a90cf4a40e143539bfdc5fed10a406cc1b446dfaa99e7c4c3c805ae37d23ebb420bbcfa";
482+ sha512 = "5eb5a56a0171f4ca0430d453c797d0a5de608ef947d1be3a471df85572658c631be78c70d90542ceb488f6f23986439acf101ac35949b55994fba1d4b7f353d0";
483483 }
484− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ar/firefox-69.0.tar.bz2";
484+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ar/firefox-69.0.1.tar.bz2";
485485 locale = "ar";
486486 arch = "linux-i686";
487− sha512 = "d050acc7f518b00c231112364bc9a678c64905175c111380488adea3633945b3acd285195b10f6c7a0b624effb7006f742451df5ae95583e3e20990b9639145a";
487+ sha512 = "9cbf0bb2f75426361a015bae999e86c4cf033136f86f942def26f05ee91bdda8552f93f3fccdedfc01f2ce3366adbe7a89a5a49dc99394f57d95dae658df18e4";
488488 }
489− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ast/firefox-69.0.tar.bz2";
489+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ast/firefox-69.0.1.tar.bz2";
490490 locale = "ast";
491491 arch = "linux-i686";
492− sha512 = "33b64ed51cbf24703433087bf869a3ecbf16591ea4d870b902bc775c0a9d027b91d3d161e11be075072363da178f7ed02103fd57915ba43c2f21904f32709f4f";
492+ sha512 = "c7dbf2fa1e9dc77a57259678a09242dd17d5246afecb395406e0f11f4b3d00f899e331c8e8ffec8f1b8487c710ae8adbde5b57366c029d8d2aa53a73c07df38a";
493493 }
494− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/az/firefox-69.0.tar.bz2";
494+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/az/firefox-69.0.1.tar.bz2";
495495 locale = "az";
496496 arch = "linux-i686";
497− sha512 = "5f281e9f1bcddf149c30266ebd80199c2c6c6645f5ac46c118f6aae13c87e61f34d84077f44bcc93fdf03d9c02fdf1e3e8c34fa124260e0b3da3cba7b02021f4";
497+ sha512 = "de4deb88d31748410c77994091faee898d08ec211f2c55a92c7b2fc447758175311c6324f35e1753f483351a76616944392a5e9201fe03fbf50ed6e8f11ece5e";
498498 }
499− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/be/firefox-69.0.tar.bz2";
499+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/be/firefox-69.0.1.tar.bz2";
500500 locale = "be";
501501 arch = "linux-i686";
502− sha512 = "e912b6e121cfc3702585a68e8140c0a9ccfccd2f2a614f3b72bba2ba0794d665c0cc2596bacd2ac64e30b87837551e1b7758554b379301af650df1929003dfa3";
502+ sha512 = "64a94634bddda83e516586b89feb329f93dd26b98da690f46367c31f42b2b7cc6a9ccc3f339c4cfcfc507b8380b57bc81244db41cd07407acdc82ff455f84241";
503503 }
504− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bg/firefox-69.0.tar.bz2";
504+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bg/firefox-69.0.1.tar.bz2";
505505 locale = "bg";
506506 arch = "linux-i686";
507− sha512 = "9f7c3afbda97498d2377ebcfd6417801054018a7752b7c0e4bc03fd349d80779d43202139423f48adc3af14d71fe8203a144d567bf5b051484847321ba223fea";
507+ sha512 = "b1740cd77fe9871e580557c2d81ee6f8d944cd823f5949fc25685e7a7c886e960a70cf7f86d6404f4b33d5c1da4622ed452d217f7c8fd1cfcc2062531948f0a5";
508508 }
509− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bn/firefox-69.0.tar.bz2";
509+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bn/firefox-69.0.1.tar.bz2";
510510 locale = "bn";
511511 arch = "linux-i686";
512− sha512 = "97f1e4bec660cd573717524b42490d84bbbc93976a973fba5dfe4ccf3a745b76a494f6386ffb3060e8bc0ede9a32e69a87fd28b9fef33bfae0294a4d8e08069a";
512+ sha512 = "5a61525960b05d788b03f58445e78050680c7101b70c017d07f9144f911697f2cb113f0a99a6898ee738bb927bfbfdec73714b3e7820a3f5d10484f9526dce97";
513513 }
514− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/br/firefox-69.0.tar.bz2";
514+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/br/firefox-69.0.1.tar.bz2";
515515 locale = "br";
516516 arch = "linux-i686";
517− sha512 = "99e8bd11f12189b66e9f79c7b197b7b149d274e813a090e118e1823b159e87a335c890f3f257d39bc7ceab7089cf64d4665d2732919cd1ad29c7365ca2f5ca8e";
517+ sha512 = "9791d88c4c3a3ccef9fc59e4ffe74ef4b16ff25866643cf1ad43cc727d3880568d1d76c1f5ef4598c3fafb83f9e1c53ca43fa614af572525351a46ba646c5c11";
518518 }
519− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bs/firefox-69.0.tar.bz2";
519+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/bs/firefox-69.0.1.tar.bz2";
520520 locale = "bs";
521521 arch = "linux-i686";
522− sha512 = "5b3947dafa7e7c1d0c7c47a1ee09de3b9cafb47bf39d4ffe536a9f35f56c7ca2a265289f1729b760f09cd3befef2fdedc1e5f7afbdabf03f3c3c0e553da8d925";
522+ sha512 = "a75b91887962a52b9a24a7bd7d268baf54c5d65e03f444563f2d12af36f01fcf9ef3af17b642eb1a2dcb365ab58cc0c6e25bbbe94aee2c3c9ce487f57a0f5031";
523523 }
524− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ca/firefox-69.0.tar.bz2";
524+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ca/firefox-69.0.1.tar.bz2";
525525 locale = "ca";
526526 arch = "linux-i686";
527− sha512 = "3d83e71c9f3acfe3ac2838eaeba4134ba8cf9ddd6c7be2218e5200ab2507228f3af5ab7930a6a08f368c1c3a31a22b9816803e9ee66f67c1dc0280a0f5f5e98b";
527+ sha512 = "d5489feb1053c4f14481b8cbb3c55c9e6e99b970924caaf7ddda32d3274efdd24d4486ca46909bc469b3791ab7331b25a0eab476ac158d807948ea79aa8c4857";
528528 }
529− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cak/firefox-69.0.tar.bz2";
529+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cak/firefox-69.0.1.tar.bz2";
530530 locale = "cak";
531531 arch = "linux-i686";
532− sha512 = "97b0761c67aca6f6ea89e88154ffea95651f98aa5341f155d8f7a25c40f109e5f5ecc4aa7242b8291cd5b28d5df676503cbb52da25f58de4e1274996b412213b";
532+ sha512 = "ecfedf3b03bb6d52fd43e077d4caa1c09c4a3c43af99e0f5a4089840d507484d753e7a8f0a43bb35b73250d21ffe27f38126ca22b26a06eea494bf89627cc906";
533533 }
534− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cs/firefox-69.0.tar.bz2";
534+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cs/firefox-69.0.1.tar.bz2";
535535 locale = "cs";
536536 arch = "linux-i686";
537− sha512 = "6404cb3cbf6b5850c08fa1e222101f340550a30398413ac49c1a498ffe8a73172a65da20d4c71bc66bad840ce5cbab12d93f9a5e47a2969024981b3e3a6c3594";
537+ sha512 = "5ce4b41bbd50e3ef18364e32632eb39bb25750910d1f5792797cf6e20a11c7bcb65ccdb7b23d780af80552363e7502ea22076bf7b1e7664d7b46b5403e32ab2b";
538538 }
539− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cy/firefox-69.0.tar.bz2";
539+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/cy/firefox-69.0.1.tar.bz2";
540540 locale = "cy";
541541 arch = "linux-i686";
542− sha512 = "2e2f45ab86409368d00af0e8684a2de8f779ae5ed21c4b7bfbbd9b1b6dd2c0cb89ef00ca0d678e2c2f8f0a946ee9576ae3a657e63188b357511da4e512ee0b15";
542+ sha512 = "35ec97df8aec5981ca3edff177a83a8fa52816674d77a7f784cb9939ef65c797d196c7b6512d16307b9a3db8afbecfd958d4b296b72d93d36c01e372ab358175";
543543 }
544− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/da/firefox-69.0.tar.bz2";
544+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/da/firefox-69.0.1.tar.bz2";
545545 locale = "da";
546546 arch = "linux-i686";
547− sha512 = "f39a37f55d49e00074bafd58a1afff2b2fd2284eb14f43b78c1f0a63fede72458c61a34058a453bda0d537109914bf94ab3912d04cff91286bdddf76d0df9534";
547+ sha512 = "ebae89079a202b95601d511d0052989bdf41f5dc7dd76037536982c12ff39f08ba4a9081d41fb0b9571ac5fda7fbe228154c4c437b66075bb1f27aaadc0adac4";
548548 }
549− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/de/firefox-69.0.tar.bz2";
549+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/de/firefox-69.0.1.tar.bz2";
550550 locale = "de";
551551 arch = "linux-i686";
552− sha512 = "4db0be46edbd3443bbaf6d19f115a0dfd751dc08d55f22c905518f7e30fbdc9d765f905505a1908ab96baf16ac4a2f03b50230c565e278e75533c4379e39a0bb";
552+ sha512 = "13bad87f6a65faf5f6ae95e613b199102fbd02204670952cde280dba7ecbc25a201c1a4c424f1ef1bec85a9af51b523bd82cdab612e0933c68b3e257c84a980a";
553553 }
554− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/dsb/firefox-69.0.tar.bz2";
554+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/dsb/firefox-69.0.1.tar.bz2";
555555 locale = "dsb";
556556 arch = "linux-i686";
557− sha512 = "2901e1d382dcc9f67217e15ca2d2575c96be02af1d853e61d4885c3c546171f8da067223a73b53c1176eaa03cf7cdfa80fbe2c74ff20860a8d31642f79ed93de";
557+ sha512 = "32f92a1d47e83f5f3b73b4284adabff6282e65a5df7a2f3e4c76e5e0adb7332ce071ce0b250346870b79df8ea6118b51bfde7604d054dab86f230ae261eea8e0";
558558 }
559− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/el/firefox-69.0.tar.bz2";
559+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/el/firefox-69.0.1.tar.bz2";
560560 locale = "el";
561561 arch = "linux-i686";
562− sha512 = "a31c178ac0003f93ef62091bc1468f30814fd8919ac645b84e6ec5977d13ad983389d04ae7e986ddd0c31325e550c5f8593d64d48450fc50a2d37e32b785165a";
562+ sha512 = "b524c8dd476df29526d030adace43660085b5ffff42f3508caf22a887e4664367606b57d6cf47911e0b61154df10c789b189ac897be80d994271a4464ad3de90";
563563 }
564− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-CA/firefox-69.0.tar.bz2";
564+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-CA/firefox-69.0.1.tar.bz2";
565565 locale = "en-CA";
566566 arch = "linux-i686";
567− sha512 = "4ff8b109121ef8fd4f0a817a3d273e3a28ffb952faa072ed3d8822d48691de54035d45abf7fb84a7dfa6a0543c30281896a3eb840f64a658894b477918ecd902";
567+ sha512 = "005808f2650cb486b718b2fe0e6fd28cfee8b7bc5cab336421cc6cab70a56b0362214853f51410a25680b2cf4d8f528a274ac79f19f6235caf073ade4b1f9882";
568568 }
569− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-GB/firefox-69.0.tar.bz2";
569+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-GB/firefox-69.0.1.tar.bz2";
570570 locale = "en-GB";
571571 arch = "linux-i686";
572− sha512 = "c514432dcbc3529ae58b1896621765da05c8a0511461bf6a09015d5b8e7eb14f8873029947d4d7f17b975ed73982746de8d92b651db70f7c6f97530028c7bc7c";
572+ sha512 = "f9162f83614e6f9ae9a471b92597ce10090577a0e76b10dad397b1222f0012c44dd8f2e3bb8b28f2475b0371ddde37874a24edd75740d0d0a812dd4b5760fc5d";
573573 }
574− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-US/firefox-69.0.tar.bz2";
574+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/en-US/firefox-69.0.1.tar.bz2";
575575 locale = "en-US";
576576 arch = "linux-i686";
577− sha512 = "da231783ed7ef640d02fa7bea95191af2081f694594e08160b682bd2725a49db56b54eed868ce11aac6f664d81d588243987ac80adc71bf11f0d03d85e90e14b";
577+ sha512 = "a7faa84a119abec0905718380bfc8d5853647d75b2d36e8bd7221b10868778eddccea5652f990a8626dc14da6b3402ca7adf5b7fa9789b13d6d460ee552d53d6";
578578 }
579− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eo/firefox-69.0.tar.bz2";
579+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/eo/firefox-69.0.1.tar.bz2";
580580 locale = "eo";
581581 arch = "linux-i686";
582− sha512 = "599d9177a80ab92dcb0ed637f5b344d0e7c180985a04bfa213b5254dbaa932af7f920b8dc95a2a9ff2e276cc4ee8d22ac8ee84d9ae012ae085b59cbb6cc15ea8";
582+ sha512 = "90f02c45bbe91a3fa830967b32776619a21066af4a4df8201ad60cb0bb8d092b814e0d44a40bfd047635740381c223b7f4d17814408983c2cc8f1577fea3c9cc";
583583 }
584− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-AR/firefox-69.0.tar.bz2";
584+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-AR/firefox-69.0.1.tar.bz2";
585585 locale = "es-AR";
586586 arch = "linux-i686";
587− sha512 = "01222211b16a3339bc56ead44cd8f9ef8035230c7f154d078ea444e07520d06add00ee100dc1b37af04ee444745cc9b514c90a8d18ff0af2a84276091c90bf0e";
587+ sha512 = "a1d40686834a78b02d9ddb4b99d26f8d9c44ad5a7d36ac47652a013a430dd392db6270498eaff2eb7248808a8a23cc57572d6f4fa18f963587cc95381f75e7c9";
588588 }
589− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-CL/firefox-69.0.tar.bz2";
589+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-CL/firefox-69.0.1.tar.bz2";
590590 locale = "es-CL";
591591 arch = "linux-i686";
592− sha512 = "16652520468f1a58798cb1ab6580114449cd7116e9f5564f3c886cbce6bfcc21ae93e5f559f45faa6c273ac9e07b584eec7d3c940c50a84f9c02d6ba9d17f192";
592+ sha512 = "761a6b16ce97e28edcc630f4edcee5636a0b112385956ddedfe2e18400207a149ae3d0275faf9f992ae0461108646f258e7ab75e93b9cb6f0c4900f61277c5a6";
593593 }
594− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-ES/firefox-69.0.tar.bz2";
594+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-ES/firefox-69.0.1.tar.bz2";
595595 locale = "es-ES";
596596 arch = "linux-i686";
597− sha512 = "cf96ec9a0f40d4178f0724ca62c9da5208bded775ff0a2ebdf9ff6f0ec7fc919f1450a221050706bb0490347ace75b7bc0e6652f6ff2ca9c5565e06c2b6d4706";
597+ sha512 = "656e00db3eda337d6dc3e0bb69af70eada522cdaefbbb48dd211fb23df12c44bd48ab02e082ee711de746f2dafa52ed918b6fd13602a04b40eb58369b1a6fe11";
598598 }
599− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-MX/firefox-69.0.tar.bz2";
599+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/es-MX/firefox-69.0.1.tar.bz2";
600600 locale = "es-MX";
601601 arch = "linux-i686";
602− sha512 = "771da7d61622787543371266527ba41a24022a278788ff585f76208beb9936a6aa9449adf1cced85952aaf2c04f8c6f2a08883071378c66f297d3cb73a53ee9d";
602+ sha512 = "604e8397f07e1dd8337ea66fbcfa8c208ccc183d482881e4f7c2a9839ce6f9f14a89e6b981cf5ec4ca75332273af63458b0f716ad34a64b6db140db87159b85e";
603603 }
604− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/et/firefox-69.0.tar.bz2";
604+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/et/firefox-69.0.1.tar.bz2";
605605 locale = "et";
606606 arch = "linux-i686";
607− sha512 = "babfb53e1f5a805013eb149bbabc9e9968423c138bed3f8d6146983928210d44c57565a6abaf1f97fd741fd328a3df60d502b1357ccadde79ec1a228147b9334";
607+ sha512 = "d5371374a98c8a9d678c8d4b4f3d3af7152f461bb111e4451594570546acb5d94756eed0c6135b0d72e0c7f455f50c5654ac34275a06c60238749ea28104ed92";
608608 }
609− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eu/firefox-69.0.tar.bz2";
609+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/eu/firefox-69.0.1.tar.bz2";
610610 locale = "eu";
611611 arch = "linux-i686";
612− sha512 = "d88809fb0dae2034f36080bd117bec9d2192c3ddea337ca0012391ed6a17d8f09894d0a3799e712fb3c0fe1f6f88074b265366fff92ade0a5f2db8cb96ab0afe";
612+ sha512 = "a5783b579317a49ee50a74c93b557a3acfe02911bf14e1a1efde185160a4658622ba635662530a4fd9e5c7251061f8eafd3d2421fb4f8eba19da5e0fabbfc8e4";
613613 }
614− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fa/firefox-69.0.tar.bz2";
614+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fa/firefox-69.0.1.tar.bz2";
615615 locale = "fa";
616616 arch = "linux-i686";
617− sha512 = "acef056f215e333a29bbf8c13e17036e50e7763cad2a0e46324326f25de38b0c0060cd1c313cc7c3fdd43ed537e913a0885c6fe1e474ab7746c82531d3e27b39";
617+ sha512 = "70655dcc91e411d3c430e0def9d8b7730922ac4fab9b902fa08f791db6e7d3104fa46aec2b95b91b8e56654778400b3760c4399135ad008aa029daecadad57f3";
618618 }
619− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ff/firefox-69.0.tar.bz2";
619+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ff/firefox-69.0.1.tar.bz2";
620620 locale = "ff";
621621 arch = "linux-i686";
622− sha512 = "dd13224227e1dd82b0b5e153ec4e43e66308fc38e1c8b68402b0a931eccf0e23afd67215832cd01428d975a3dcb72a5e6f876ec3fec2c1641c2058a93e623d83";
622+ sha512 = "d2ff78a9f318a9d0c74aff45d5559c605048bd3655ae4c0cae3018ff9c2f7c030ad5740c4010f1ba59c51633c35b2649f21d84a827900ef3fe277888042acd6d";
623623 }
624− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fi/firefox-69.0.tar.bz2";
624+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fi/firefox-69.0.1.tar.bz2";
625625 locale = "fi";
626626 arch = "linux-i686";
627− sha512 = "3681a99b3ffa8294a81683395ca158a93ec87484d1490ec55c24b34f24437b6e6ab89b3aaf0430c49cf29dbed5a92e605b4a5dc7cf3d2868eb8bb935b61ecad1";
627+ sha512 = "9e8ca84d3e9642ee8950aa676182607d1c19b379389605f4b9311266e15c12d3dc6cac6baadad2f71d09e8acbe1a86ef029002fc46e39ce993370abeefca5eb8";
628628 }
629− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fr/firefox-69.0.tar.bz2";
629+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fr/firefox-69.0.1.tar.bz2";
630630 locale = "fr";
631631 arch = "linux-i686";
632− sha512 = "3bf864381286094a373ed77df37d116424f2297c9efcdaf8fd73190253b77701afdda32ee692292bb4889eeb87bba8c1d6aed3c961a58f717c3ecbddc8fe098c";
632+ sha512 = "0d3810f2c00119277f1d7db396db85e8f82eaeec1db5d0bd7b10e106852140ddf704a02d4a93bd522c7a5b7f6f5e5b0457265cfde0f965e3442f42f55c6dd1c2";
633633 }
634− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fy-NL/firefox-69.0.tar.bz2";
634+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/fy-NL/firefox-69.0.1.tar.bz2";
635635 locale = "fy-NL";
636636 arch = "linux-i686";
637− sha512 = "9468187b6afed9e2fe02cc72e1bb88e06c312af13de59ef97b54f135853ba47916f65dee7543578e01d18352367f4d4ff9c035e4c43666c9510c23f7977fa6f5";
637+ sha512 = "2fa52fb095b4c118404378cd1435058634c5dcd77b8cc76d9f9fdf7596006ace8bdbfcef3fb7355022e241c4e35029b0fc44b1284293bcf473a7fef0df36b0d9";
638638 }
639− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ga-IE/firefox-69.0.tar.bz2";
639+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ga-IE/firefox-69.0.1.tar.bz2";
640640 locale = "ga-IE";
641641 arch = "linux-i686";
642− sha512 = "5135e19b3043ca9891af4035583f228d9a628f6b8717c124bbc9ffb6cb19866182521719e544555257a6921cdfd1619a67d21af8be327fe3f5582e39b9cd389a";
642+ sha512 = "d2204a87685ab5bfb03bb553c18793de4774c563b40bfd13f8c7d50c088a6944e646d01fbacc0c16189da3f214a185bf82aa042de56d1d63ed020483744612d7";
643643 }
644− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gd/firefox-69.0.tar.bz2";
644+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gd/firefox-69.0.1.tar.bz2";
645645 locale = "gd";
646646 arch = "linux-i686";
647− sha512 = "a7d079d791fbde00d83981080694fe813bb2abcd03a014abca9fb9a9df5af9e1daaf4cc6b35b1eaa2359aa9caa317a4352db6ed40a3adbe6021ac76fc48529ee";
647+ sha512 = "a0b6139fae5b0629f5263fae3175fb7a45218c82b1517f97d52d4e65e5381dc0a15e05c1bd1896352681520ba7f213df24ce4878c9b9d4254e17a5a903d6e9c1";
648648 }
649− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gl/firefox-69.0.tar.bz2";
649+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gl/firefox-69.0.1.tar.bz2";
650650 locale = "gl";
651651 arch = "linux-i686";
652− sha512 = "020c63d6ace98c964588040c15d0e8ecc6a74c63cfaf3e0e64b0bd42bcd2a4e7bf762ac93fc510beb1689203d56812e87be743886ca5eb6d1bafbbbc0fe56216";
652+ sha512 = "6e8a7f461b5d5c20ce60c7308a44c19e76bddc8637be3b5b1d2083434c3e213d9f21f6596573503d4cf5fa105cf7a103c038892f052f5fb29b1d6c64d11b4bb0";
653653 }
654− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gn/firefox-69.0.tar.bz2";
654+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gn/firefox-69.0.1.tar.bz2";
655655 locale = "gn";
656656 arch = "linux-i686";
657− sha512 = "0681b4cc593d63f4244bbdd6009287d89acb3709741281c6604c5de57593e53876e9448da46a718d2fdfe369feffba1d5b115f5372b68433d5b05ce2d06c3647";
657+ sha512 = "5288b63758ea97c3349a5e8a427479f2ecdc7f855790fd05ba1de662e1997352dff84103076a923caa67872e849b1af5c2c80168f52d258d1e3f0aea1937a0a3";
658658 }
659− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gu-IN/firefox-69.0.tar.bz2";
659+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/gu-IN/firefox-69.0.1.tar.bz2";
660660 locale = "gu-IN";
661661 arch = "linux-i686";
662− sha512 = "1e4afa88d7f153f2e653d754c71cfd960b51ecd016a533f868a96d3a4c076d5f0063d7aa169740c5f3c6e91c6c10f54edf1a4ad1829cda2fa83a462856d1f981";
662+ sha512 = "4e354642853c537ca7dec9bbe184a64f575870d8017c295db053364635c54ac8cc8e64a9686625b567d99d9055149a9d053a44ae0d145f91b01610570080556f";
663663 }
664− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/he/firefox-69.0.tar.bz2";
664+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/he/firefox-69.0.1.tar.bz2";
665665 locale = "he";
666666 arch = "linux-i686";
667− sha512 = "3ea8ff7b1397ca2e2c15cd1fbfa63542d5d31fbea6fe9fe0c11b8bea0d953c2c2e35afe336714bf76baf2f38ed3894d869e9b467fa98fcc38796f1a31c6a0d00";
667+ sha512 = "e627e7d824cc8174430c8450e1224a61a50cbf7a2fe7ebc1cbd13449c155d2334e40201b5e4190fdf848d7e53edd177bc70caf3addb220dc03fe1c1bf0fdcd6a";
668668 }
669− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hi-IN/firefox-69.0.tar.bz2";
669+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hi-IN/firefox-69.0.1.tar.bz2";
670670 locale = "hi-IN";
671671 arch = "linux-i686";
672− sha512 = "eed63dbb1d8a702cd755383f967d859015040db231b464c3691376b3cd6e8ba5b23bec3460bc0c7dd6b0798735a196525530a533caf68e4056d54d54bc4ae50c";
672+ sha512 = "100c109d4668f1c5bd559bd539ee39a556eb03ac29cab0824a8d9f9121a210632d4fd6aa6e15f523df3bdaba637b5e13940e7afe25d1cccf85ad91eee693c89c";
673673 }
674− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hr/firefox-69.0.tar.bz2";
674+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hr/firefox-69.0.1.tar.bz2";
675675 locale = "hr";
676676 arch = "linux-i686";
677− sha512 = "e79b0398e4a57751c87f11574b9bf6d7b92cd578b41cb80cfceb2f515e01c58bc17426fd7b3668b4d5b48d17abc60009ce1539b2a57355a90a1394f742c8916d";
677+ sha512 = "959573f7900c124dad817dcf526afbfe2a108305e96a94d20a763e19fd6c151b5544ab41191b731ed3881be38f78a29a747c9aba087b82ef29bf8f37eb3d57e7";
678678 }
679− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hsb/firefox-69.0.tar.bz2";
679+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hsb/firefox-69.0.1.tar.bz2";
680680 locale = "hsb";
681681 arch = "linux-i686";
682− sha512 = "704dce04396b78070853cb2ea8a0d6c4bf1da489864f4575a5d98c953b765fd7660e5c75bd3506bb05d94f5eca12d37a50be351fdd189592315e32c3fc361dc1";
682+ sha512 = "4832103eb5ac251f664fc68b044b1bad78260e90be1ae9d3c149cd4d36b98ab1dae3cd56f135e4a7f46bad65af4a368d77717c332476d0faa453655ad0ccc2c4";
683683 }
684− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hu/firefox-69.0.tar.bz2";
684+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hu/firefox-69.0.1.tar.bz2";
685685 locale = "hu";
686686 arch = "linux-i686";
687− sha512 = "613b525e8abc06e54dd985984b690c25e5c9ad8aa072cf5e48b20298b91853a8019696f7d7101d74efe200119a4a9d1196b71fc286bed7916d712dbf6c6b5686";
687+ sha512 = "2f48f16eca53488b2d6a633913214d17f9be56ed84b86e2dd7d2134eb0950d3211e674ec836fee725d08d08042800fa72fd808dd1806b467a2559dd7113aa957";
688688 }
689− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hy-AM/firefox-69.0.tar.bz2";
689+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/hy-AM/firefox-69.0.1.tar.bz2";
690690 locale = "hy-AM";
691691 arch = "linux-i686";
692− sha512 = "5d4088682997b0490ac49606dc8ad56158b3b7585ed4b89507a2596d119eae098d82fdf224eb047b6090572fd5b00cb95dfc5027afd6cea11b0f05e6d93ad439";
692+ sha512 = "315c10ad3c3787e7d564ed563d03b86204e825c9e4a5651a47568a543feb7bbcd0a5243ee8878e7c60df410a578e2fa69552d43ab2aa819e43124b1ebcd66b86";
693693 }
694− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ia/firefox-69.0.tar.bz2";
694+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ia/firefox-69.0.1.tar.bz2";
695695 locale = "ia";
696696 arch = "linux-i686";
697− sha512 = "7ddcddfe7e3baf0bae0bac901b503fca8c344bd02d6b52d90face8b8575318c8805db618e8591372c4c4c60e1092a842f2bb17a920d96e0f15a1491ac847305b";
697+ sha512 = "376a0f09596165fc8c1f5c3624cab6b3ed0f512826504ec94e874b0f856ea3282673b99a6e84c0bf0a08ef76d9d11544c25cf501f3f2ca88cf3f6c00ca19874a";
698698 }
699− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/id/firefox-69.0.tar.bz2";
699+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/id/firefox-69.0.1.tar.bz2";
700700 locale = "id";
701701 arch = "linux-i686";
702− sha512 = "90cf509c70963750a4bbe5029e5e0512e98c8c7286d80120e39e299920d9331cb72dc7f39f2906e9a5b331b54d2f282b46c4b7f69dde51ce2b06c39e2601d335";
702+ sha512 = "7f2acc92f59bb0568b6ea96d5820441790b95377f56da5158bf41a311262ff90bee1259f3917454b11f61fc6e4b329ad938d1116e8940fb28c529c31898a483f";
703703 }
704− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/is/firefox-69.0.tar.bz2";
704+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/is/firefox-69.0.1.tar.bz2";
705705 locale = "is";
706706 arch = "linux-i686";
707− sha512 = "ad4c03603a8a81dbdd968ce4831ea40effe90b4cb044315a3c0566b647854fd4e95cdf6c085da8a4f4d901ef671392237aee70e4604552381959b65ea6d32089";
707+ sha512 = "4d714ca45d2d7bce2e2798c3fcfe7c876b024441a55c53e82c81cca572ebbbe172127ea005516c5729b49d4517fecef497946a45e2768e88f5b648cacbfc14a6";
708708 }
709− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/it/firefox-69.0.tar.bz2";
709+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/it/firefox-69.0.1.tar.bz2";
710710 locale = "it";
711711 arch = "linux-i686";
712− sha512 = "04dcf6f3b9b3f22a44b74a2e9e20d6fa74a75707c3b3145d048fd9bc10eb4859127cff525367d0e7fdb8ba6d997a7ac1506e3611ddcb80256aa0cfb7d472d407";
712+ sha512 = "57fb82bedb27d1928f5bbcbf5f0424966d1b7969df07fd6816d72976fa7a7ead07d2dbc644079672b5831fa1339104d5a9dc58f662b38dcc719e54cc5ce8e1e4";
713713 }
714− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ja/firefox-69.0.tar.bz2";
714+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ja/firefox-69.0.1.tar.bz2";
715715 locale = "ja";
716716 arch = "linux-i686";
717− sha512 = "d9d017a9279bafc6d7b440ea7b11ff945bd647601e85b395e0ac086684f58dfb15bfa18688748e934bd76ddb3729804e10a55ec3428f2e03413f9bce8921936f";
717+ sha512 = "9b4bc5aa16bb05132de7b894cc118dd07166a5f8af603aa206f8e52aa8029532f4fea7236791ed1f0d8d43214240ffee6297969b030750379631bb55ea105609";
718718 }
719− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ka/firefox-69.0.tar.bz2";
719+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ka/firefox-69.0.1.tar.bz2";
720720 locale = "ka";
721721 arch = "linux-i686";
722− sha512 = "513d865cbda546448b77e7adbc236d24dc1d379fd5c74ada7a8fe6667c61237428f0751e1a9c0e067c9ec5684ddb8b0fe8041b8eaa04e98c4690ca1486c20281";
722+ sha512 = "d0b789fbb3fe72bc8e0f4eba595d8015ef6c66fdfd6e8d699ef15071b1e83ed4d5245f7513a6b7122f0852378241fc2ab01047f4d968dbcf40dde79a7524fa30";
723723 }
724− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kab/firefox-69.0.tar.bz2";
724+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kab/firefox-69.0.1.tar.bz2";
725725 locale = "kab";
726726 arch = "linux-i686";
727− sha512 = "7747666dffb5a8836ee88669dfa7e5c848e27821911499c1b4d896172bc8f696dbb998c701b043177fe0370000529d8ef807cbebf9457e013ddd822faf4b7a19";
727+ sha512 = "1aba37ef9fe09a5765ba3b4dae2165373b6fc0b1a10f6705835cf70af0797ef024256d42b7f67ee9b8eb2d93010bac165732d483928253d289d39260799cd450";
728728 }
729− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kk/firefox-69.0.tar.bz2";
729+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kk/firefox-69.0.1.tar.bz2";
730730 locale = "kk";
731731 arch = "linux-i686";
732− sha512 = "badeb493bbcd591359a283e930d9f042c2c81af24b2824cc4559f1a10a5372dba3eff457121744f0e5a8bc78394215535524f440cfe7435853f4b97db03a05a9";
732+ sha512 = "34be7310030481903c867e3d0ef69cf87dea784804190db89109703568515a933704d81d3aaae2e900be6b96a99a48c5d72ce860ece0418fee344b73d774fdea";
733733 }
734− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/km/firefox-69.0.tar.bz2";
734+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/km/firefox-69.0.1.tar.bz2";
735735 locale = "km";
736736 arch = "linux-i686";
737− sha512 = "2e33e07d9a35eaff182ad012dbd2f59cfc70170cba518d066bb05bc4873867dc24dcd0dece4fabfc045cda6313d5aa86a31e4c5d42579eecd6a11596a8d806bd";
737+ sha512 = "62209e5ec47160647d160a8c74ac63ccba4340704e6408cfe780ba6215a1228f994a6b3af5d7d44438effa778377fe31993e255bb6ec4e8eb622eda0f6e6eafe";
738738 }
739− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kn/firefox-69.0.tar.bz2";
739+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/kn/firefox-69.0.1.tar.bz2";
740740 locale = "kn";
741741 arch = "linux-i686";
742− sha512 = "9ba5560db5f127018b3c365da5c18942da60ce609fbd5ea24c2eac75bb683a0853f212d8c46d7ddbd6190b6158d733d9f9dcd146188940e2705e9ca84caf1c33";
742+ sha512 = "ac1fc4c0c3b8b6cead2eef3dffd208eee7cd215aad444f23e00acbf390b933486cfff9b26a34356c57b85963d546d2ebb01dd8e22615ce58df0e1aec83d7cdb7";
743743 }
744− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ko/firefox-69.0.tar.bz2";
744+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ko/firefox-69.0.1.tar.bz2";
745745 locale = "ko";
746746 arch = "linux-i686";
747− sha512 = "7f1ac38d2c303fa4d6ba628b3c57f5fbfde1b29e6830f5a2fc657f85d94f37d7474dd590e6b2933103cbabeefc5a51d6e59b434db7c8b422b8071b09a81e73fe";
747+ sha512 = "a27d76e6acd03b1dafa9b3931a8906d456d35216947b37148eaf48736be18953d83e3fec01914812a8180017ece34662a877c2aeb218404ed3f1f75287b5427b";
748748 }
749− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lij/firefox-69.0.tar.bz2";
749+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lij/firefox-69.0.1.tar.bz2";
750750 locale = "lij";
751751 arch = "linux-i686";
752− sha512 = "9e8023da48c91b1e1eb5cd67ff661413a346fdd9a5062f71df712a4dd237c8b54ead00c49d03342eb32a614b85e55f6cc263a4968c8c6b09e307876483ce39ac";
752+ sha512 = "c0dfb7d36b87250edf7eb2bb566bb46d9ba782d257e87f6e3d080972d2f1cca37b6c41201fea7fdac86db471eadd86c2e2d8a4f568c8d89e848653060e01dda3";
753753 }
754− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lt/firefox-69.0.tar.bz2";
754+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lt/firefox-69.0.1.tar.bz2";
755755 locale = "lt";
756756 arch = "linux-i686";
757− sha512 = "1d422bfdb4fcdaf791541a778bacd27753e154e6093e0f8e76146f0eda6cbaa40346c519590fc78954d6d88c7fb0bd1c23b0ac5e359dd7a052ec124072a63c1c";
757+ sha512 = "9d0990670c808f2e0ea2d4033e4a33347653979d9eb228ba7811069c5e2559e66c50eb8b7c5e8e4ffbd7916f049813b52c3035907d15b8df9dfd266a31a92883";
758758 }
759− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lv/firefox-69.0.tar.bz2";
759+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/lv/firefox-69.0.1.tar.bz2";
760760 locale = "lv";
761761 arch = "linux-i686";
762− sha512 = "5168aef4edacf147f4f26f8f6c9f9b051339bf8b3910d8cda527321c0a6bb410a4cccc016c939de7d99a2db3b096ca2a14bd9eb5889f468d8aea27d2d96db1a8";
762+ sha512 = "0369ff96b5b31795df415f9cb7009208a6e061acd384e0eae689b6cd40e74c737c3137c6de001f4149cdde7f6e6e3ee24eee5d69ffc83426285cd109a29b5441";
763763 }
764− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mk/firefox-69.0.tar.bz2";
764+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/mk/firefox-69.0.1.tar.bz2";
765765 locale = "mk";
766766 arch = "linux-i686";
767− sha512 = "af4d3216ac877e1fed003056ccb9ef502ee8ed9984df609043190946d7017f0e94838a00c1bbdaae9ff0078a8779bb3e0cef668e9f38dc94f546ef9cb4691e1b";
767+ sha512 = "89f9401be25014c9b209fde3f2696462cfcb8b700163190c7c81548dc610c53d930cde00b8d3e25506a2e50d55cca401f856c5a80e2d2a1a1c25f4ab3c167e75";
768768 }
769− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mr/firefox-69.0.tar.bz2";
769+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/mr/firefox-69.0.1.tar.bz2";
770770 locale = "mr";
771771 arch = "linux-i686";
772− sha512 = "744196bffb399181b66ae4c192febdf595906809985807a596d2e482c2e1d519c0e3500ad98d04518b6f71dbdcbacfc481972bf2cf7802ad81f6627fe3b59877";
772+ sha512 = "5fe5f6a7f498d0c287bebb9962843c8d94f1f07245f55c8c904e768ede8fa41ee8b63628d63f03f73c9b46f08c1a10344a5267737cd5d89b7667cce7359cf01f";
773773 }
774− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ms/firefox-69.0.tar.bz2";
774+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ms/firefox-69.0.1.tar.bz2";
775775 locale = "ms";
776776 arch = "linux-i686";
777− sha512 = "5d79b3b383d4163a4ae5ee84c28d8578b27e4fb42d09691fa7cd6fdf77e3a74e5e83c9bac581fa59e74b2aaaf8713f9f3b6b1d5ad778579f274d6f08fb4fc36c";
777+ sha512 = "8e38689f618fb80958b8aa91ce83114f52542c4ad42483f694df1b3825a1dc3de2cc34d61cac5fc55b2b35f9dead7f31e7ddd631f9336c5cf711f02ebbe9a2ee";
778778 }
779− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/my/firefox-69.0.tar.bz2";
779+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/my/firefox-69.0.1.tar.bz2";
780780 locale = "my";
781781 arch = "linux-i686";
782− sha512 = "60b128b6d0cc632667b496f8b61e39fd14ad4c1544b4d0041cf739622c5c1b1cae539e848fd5944d0c3286f0b03dc2de46a156457ec6e2efa155e13cf7ce279d";
782+ sha512 = "5a8c6ac58cfb35b12cacfcbcf933a7aeb5ed8a425e15f9953746e593c6b15b517305d7e721c89d8fd66967f4fb3de0a50f1b6fa7dc4010a120f9d93745aa4e7c";
783783 }
784− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nb-NO/firefox-69.0.tar.bz2";
784+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nb-NO/firefox-69.0.1.tar.bz2";
785785 locale = "nb-NO";
786786 arch = "linux-i686";
787− sha512 = "32e52dc1b1221862c0e3243e29234b330d73cc99c4500faf785aa911c92019e655beaab6f79911a8661a5efbd1dc8784aa328216653c2a206e52f703057f15c8";
787+ sha512 = "80cc7131d33cdbf49a346ced7f8a771e2df9078cfca926e1eca14e15464dc84d574efe9212031f986f8af7b339f0a16a31c0f492ea19b4f728763124b21b30a7";
788788 }
789− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ne-NP/firefox-69.0.tar.bz2";
789+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ne-NP/firefox-69.0.1.tar.bz2";
790790 locale = "ne-NP";
791791 arch = "linux-i686";
792− sha512 = "04802130d9f08cfef7d0f5d29e0ed0b9757c3b7fbac001bd35431ea4851edd8c2e4837518fa893381f6c0c976684ffedeaa96b2bcdec3849cd2cca6bf170bdd3";
792+ sha512 = "42cc3265931455e4be0c4c0a25e108d8af14d786feb232d2b5c66695a9f182fb7d93f604390620c211aae38ab7e9d76d6e498867d886badf19a4034ab08503b4";
793793 }
794− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nl/firefox-69.0.tar.bz2";
794+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nl/firefox-69.0.1.tar.bz2";
795795 locale = "nl";
796796 arch = "linux-i686";
797− sha512 = "fc02ea317fa90caf203608a31f2a188971bf5d6a900c8f03a422ffa76adb1eefd32c55f317c7c89c8443d11a79f0041a6a111a78519b441eaa7ec4832bd8ad38";
797+ sha512 = "1062c28e1a5d8ea5aecbe1af1b4b70e0cafa362c5cae1a5f7000220acb2f658cd3c5ccef8ea5bb35d6b14ddb211b34bd3a0169baa9d02a37ddfc1feb90f61326";
798798 }
799− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nn-NO/firefox-69.0.tar.bz2";
799+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/nn-NO/firefox-69.0.1.tar.bz2";
800800 locale = "nn-NO";
801801 arch = "linux-i686";
802− sha512 = "f7f1274605b79541ec6f93cc7f023fe437c93e969d3644c6867a7c2c448f5504f9a6fc29f47c4267f13187ff6eb1b240e32e17dd2e5d66afc96e0a3bbecd9922";
802+ sha512 = "9c0b4f0ed5cf8ed2d8fcd71c6d72f09a736a339dd83318ea5368652a154e05a695254fd4e78a3e8a185e0c10362e649883e772ff7e64249c6c470d39cb690f50";
803803 }
804− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/oc/firefox-69.0.tar.bz2";
804+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/oc/firefox-69.0.1.tar.bz2";
805805 locale = "oc";
806806 arch = "linux-i686";
807− sha512 = "ce1c1a35de6ac933192cbdd49370d5cbf90dfb993dcc8e3c739f2e3ff2023cc793f7ffeec40b3ba4093449dcd37e221932a6c3771f8f70ec074bf79e50320f69";
807+ sha512 = "407ff179331cf0dc5ae6061f3f5e1f13ae7df5dd5d23b664bcaeebc95e35e6c3b5307a5575264cb0037cbb4561d37dc68dc69a5660729a18593f9e3ed25770e3";
808808 }
809− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pa-IN/firefox-69.0.tar.bz2";
809+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pa-IN/firefox-69.0.1.tar.bz2";
810810 locale = "pa-IN";
811811 arch = "linux-i686";
812− sha512 = "50b4826d83cf08ebccae048c4dd3760f3ec639427d6354de398b77501e73df5062b8090590fcd74be54005a7df61a8cd7c2f4207142bdcd6468b1fbc126801a3";
812+ sha512 = "c1efcb59556591fa2de0568fffd0b6e29835144ca6cda471153c2336b4500cac0d367de84ef345cdd6d995297ec854df97380592477f42cc3f197b1cca443fd6";
813813 }
814− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pl/firefox-69.0.tar.bz2";
814+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pl/firefox-69.0.1.tar.bz2";
815815 locale = "pl";
816816 arch = "linux-i686";
817− sha512 = "ae77877e1eb03174a1899b2b5d0820b367553d56febea14df4f1545a7f10de16c9f4401efad4334ae04a4a5c8abe49b2e24c09263bc002937576ad5ce622ed17";
817+ sha512 = "881e8e438564eb7de648a2bb9c199e184edee3c97382cebb989734e0d6aeb5c213590d6ea04ea6dbbe31c085e62be18172e4dede07d8d8f067de0b2e52d709a5";
818818 }
819− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-BR/firefox-69.0.tar.bz2";
819+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pt-BR/firefox-69.0.1.tar.bz2";
820820 locale = "pt-BR";
821821 arch = "linux-i686";
822− sha512 = "92cd33b35927dddc22e8a3ff3833ce2bb4913ae9ea12d4220d88861f7badcd69d1dd97be22cb6546a8f09b0e7620e17eedddee3d159660c9128c288e49a47dbf";
822+ sha512 = "b45f8802d0a9a1967b17f09bc99bc6761befb676e901fd0b0dc891f0d222c8d860337c70931a082a8508c68cc8b259d460e0534bf9e276c70f69a092f70f49a2";
823823 }
824− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-PT/firefox-69.0.tar.bz2";
824+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/pt-PT/firefox-69.0.1.tar.bz2";
825825 locale = "pt-PT";
826826 arch = "linux-i686";
827− sha512 = "fb8d011fca706e6337e0b0b13b2e1ec619565b954c887c71720240905ec5c085aa7037b54e8b3df316c253483a3d3c7ad2182b27d8591d4e2840c6a4f9e39382";
827+ sha512 = "2b04403601a5c43fd1e5f4f69f3cc5a3761b1d017c97f3b9997317bbc4cb0960aeaac4df1145a8e64b64aa2397d0042fdcf49b0f01d8403b5d63fd26812c85a1";
828828 }
829− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/rm/firefox-69.0.tar.bz2";
829+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/rm/firefox-69.0.1.tar.bz2";
830830 locale = "rm";
831831 arch = "linux-i686";
832− sha512 = "fbf0e34fbae7da291cc132697b6505f3213ad07c78a47171827a9bd6c22b674629cd21a9f47187173cf21f1b168baad0f058365a9ab24e274a2d3aff5acd0e38";
832+ sha512 = "37f0c828559cb9afc157765ea87b3045f827eff59c2a1fea62fc75c3b28886191578bd81d2f44c9acd6d9da0e63e67cc155724759e424f7f2d91ec3256a7f899";
833833 }
834− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ro/firefox-69.0.tar.bz2";
834+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ro/firefox-69.0.1.tar.bz2";
835835 locale = "ro";
836836 arch = "linux-i686";
837− sha512 = "cb712f917e0b70936ba1222f03c8874134e1cac6c901d94792aada224d894a607829b64993535f0cf61d8a2a050f488452c35404400587222418c8312e2b22f6";
837+ sha512 = "23a8b2753dabbaf2e020c0cab2359dbfd99e260d17346de48275941b43134d1b6fe844498e4fda10e5323adfd459757d2a1da3c82b441ac099455b8e33f2cad8";
838838 }
839− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ru/firefox-69.0.tar.bz2";
839+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ru/firefox-69.0.1.tar.bz2";
840840 locale = "ru";
841841 arch = "linux-i686";
842− sha512 = "7ba048f533655e5802347a6d409ed6db4441b421cb81d66269eb610336f3fe2077a5bea405f235c167390f745762ef29863e83e6e704bdec17404d26a97f8ab1";
842+ sha512 = "b8999174e73e0002c06077575ed9a2b8b1dbbcac162a8d53eccde1a3ec50ef5bb26a123e89a5f38029c379560c0b6c67e8da355aeb42d151504fdf3cbac5bfab";
843843 }
844− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/si/firefox-69.0.tar.bz2";
844+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/si/firefox-69.0.1.tar.bz2";
845845 locale = "si";
846846 arch = "linux-i686";
847− sha512 = "ea59ce14e80132d96f0419981dda30184809542978d158b8894c77cb4622c3f0bfb9bbbc4d456b386a023d9856ff6b02e5388ddfb0aced2ca764991ba8bab48e";
847+ sha512 = "8dcc78847797a853f78eaa100f5cba6da54f52e28e3bb92f64ec1187421c871a4f6fbbfa51971b90d7476703862fdaef241110648e031038cd4a3aa62d9eb74d";
848848 }
849− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sk/firefox-69.0.tar.bz2";
849+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sk/firefox-69.0.1.tar.bz2";
850850 locale = "sk";
851851 arch = "linux-i686";
852− sha512 = "4665b3b4b96a07ea0530acf4063dacfa48ff39a65d2e1da0f6d3f65703c3916ed65a8881d8a9d92109e252993f63edfec899d00a3559149a282b615624267431";
852+ sha512 = "416bbffcfd8a32f1c3c22f28beaf3fa45df693e373552ecc78c921dfb010db79c8423251697daf7ea3038dad07ba168786168915a7c4ff844a62167e929da9cd";
853853 }
854− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sl/firefox-69.0.tar.bz2";
854+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sl/firefox-69.0.1.tar.bz2";
855855 locale = "sl";
856856 arch = "linux-i686";
857− sha512 = "f3d6486a3dfc435933871cc8abcd3a428d724dfccca26be63df29d9f5b34fec115bb6e185b2aaf839f428d0ab44d33583610bf9d1c7f02de442506d1fc06192d";
857+ sha512 = "b99af009ca4c1c7a190a31146de0ff2975196e89687fc37ec9b8c506a18bd9f4ccb1820751f52c50acb3c808998dea08151de3a38b69f62b45d7c80f97b0b42e";
858858 }
859− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/son/firefox-69.0.tar.bz2";
859+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/son/firefox-69.0.1.tar.bz2";
860860 locale = "son";
861861 arch = "linux-i686";
862− sha512 = "6486e2f291deb1fb241df996e7898a9d487889815195d01d77d6bfcab6e2cb4bdc24c7694b6b05a95758ef130cb3332842e36446ffc2a926940ded5031cfa13c";
862+ sha512 = "5efab88af1ade7d8c7437c638282c9f1fe8490174cfaa47563b0eaae7fe8c4b35210f240e4154458adf054924780c2a8d91b49158cc693cc3773f18963551434";
863863 }
864− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sq/firefox-69.0.tar.bz2";
864+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sq/firefox-69.0.1.tar.bz2";
865865 locale = "sq";
866866 arch = "linux-i686";
867− sha512 = "b111d30e2cb7fd5edadc68b9d25fd8970db62d721e903d9874afe6b875b313d039dc7c4e98e3de07a09fe84ca7d0ed10da2e74cf3cd4953b2c25252e16e01516";
867+ sha512 = "4a6b10da6d0de76aae0e63a12c81369d8068689e23a3d289629b64350dc5fe191c42d91b58100206befe81a7bdf899c66bad78883605d020eb1e7559b9f9d237";
868868 }
869− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sr/firefox-69.0.tar.bz2";
869+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sr/firefox-69.0.1.tar.bz2";
870870 locale = "sr";
871871 arch = "linux-i686";
872− sha512 = "14c98d156bcae234c12f28166ee5ffc7d034529efb76536ffb29ee8baf850cb3c934ba177956ceba9c4cde2481064c3a906515328d1d8b6f5d9258cc1d30da94";
872+ sha512 = "3833a2db3d8c2a9ef616cb1679c07c71280b74330771d79579c414619e3517bfec56c90712529bffaaf99abb07a63547a8aff9fb376f1089b3964c8dd92e523d";
873873 }
874− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sv-SE/firefox-69.0.tar.bz2";
874+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/sv-SE/firefox-69.0.1.tar.bz2";
875875 locale = "sv-SE";
876876 arch = "linux-i686";
877− sha512 = "a196eb9ec6b667d04dd787aae47a1dd22a99f01fdcbf6b36e9946038dad52ddc3d215e2307641c3f539e476c9b8e3f9470d78b914a243b51595f7d75cad2e114";
877+ sha512 = "8dd898b57cff3dc25a52a7693f8e62f130af23a9c1e7d74a4c36abc5c6249f7b142006601596bd1cdc65b04c5b3ce2d8dcfce6caf230db047d1e7dba127f47d0";
878878 }
879− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ta/firefox-69.0.tar.bz2";
879+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ta/firefox-69.0.1.tar.bz2";
880880 locale = "ta";
881881 arch = "linux-i686";
882− sha512 = "d76c3797cd752a2b8021694421c224c2e2afa2d1350cb86263b01a8efd84b49cbda40a5c6b64f981833865944798148508fd6ae3532e82b773d650b41980893f";
882+ sha512 = "7fa1f1e7dc3099a44841db01ee2746f87eaa4e93a12a5ba909e428b0dd5f3386a35eb66650fbd4b8e160d0a4c48f5b98c19a44a16b48432e576fe32ac953ebd5";
883883 }
884− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/te/firefox-69.0.tar.bz2";
884+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/te/firefox-69.0.1.tar.bz2";
885885 locale = "te";
886886 arch = "linux-i686";
887− sha512 = "8bf86410d1d73cf355ecc4c2ef3308c35a31d55f90bba1c942f915e8cedee919c80729271c2d9e3aecbf499ca711f36bcf74c8b41c50024161e567d395485477";
887+ sha512 = "74a78995878c2c207fc02abf667ef744008fe544c5f594d69c5c4653cb2adc58d56973591b4c0264d77993d76a2802dee1ce9b10b8355848ab6c11d0cfa3cc47";
888888 }
889− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/th/firefox-69.0.tar.bz2";
889+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/th/firefox-69.0.1.tar.bz2";
890890 locale = "th";
891891 arch = "linux-i686";
892− sha512 = "c757659188b17cfad880e70eab772517128bfa7d1dcdb86f313a63fb46c3f3d3504d66bf3ac99d1058848264ee4458bc5b77bf78009e9a7216c1fa359714a3d6";
892+ sha512 = "2fdda53cdea8a2a153b192a52f76e4a5b73dd128310d53ad26c59fadd54734b8d2a2f88b11087e18d6179d0b7fb1a9e87f722c5241544860be25ea14542d7da9";
893893 }
894− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/tr/firefox-69.0.tar.bz2";
894+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/tr/firefox-69.0.1.tar.bz2";
895895 locale = "tr";
896896 arch = "linux-i686";
897− sha512 = "635ad19f913a2d6dc46df50589229658dcea0bc570f45b7c5ff8eb6878b852ebde3a490512d679a6257c39b16fb986f40ea2894c08caed8c485a91e95f4addc3";
897+ sha512 = "8cb6a590382c080a0b6ed81a566b385f07e909a86faab077d2f0027a05d2e985e9ab4eee0103cb30f9e88fde7e63c20250f4b2165824426c7a3956e69a448219";
898898 }
899− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uk/firefox-69.0.tar.bz2";
899+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/uk/firefox-69.0.1.tar.bz2";
900900 locale = "uk";
901901 arch = "linux-i686";
902− sha512 = "99a3410ea2caf11911e7613568f7522230b13dcef48ffe6b95206a6a6d9f43f396b37bda1fad62dc4db097da55f96b30683626031491d88d116797b605d3cd2c";
902+ sha512 = "a9269d73bfdbaa9f9c9484588a0921003c7602732a78c8c5316b00d67ef6ae43836a1fb606988fe3bc2143fb6be55a677a1238da0ad9d3a531bfc19ad0e7d482";
903903 }
904− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ur/firefox-69.0.tar.bz2";
904+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/ur/firefox-69.0.1.tar.bz2";
905905 locale = "ur";
906906 arch = "linux-i686";
907− sha512 = "aeb60017d6ff2deb1675880c2358eb2a8561196e6148e8f796bc6964d26c303355339d7e6e4526be0814190a3bc4a98b48228457d6709a762e0e36bc83f6fb52";
907+ sha512 = "38696e57487b19eccd4669ee7fc0159f13a91abe062e21657111f95d58cf3183fcba370af94156b350a87810f9d73492e8ad2bd8e48a6ed5e82a9a3e54373099";
908908 }
909− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uz/firefox-69.0.tar.bz2";
909+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/uz/firefox-69.0.1.tar.bz2";
910910 locale = "uz";
911911 arch = "linux-i686";
912− sha512 = "99d025db18d86f75818354abfa56bb13041832605f25e0b91c87e18bda06d059ba62aec8be7141c8c6cc5f34edfeb83bfcff9234222ec88121b51fafdeab7ca1";
912+ sha512 = "c912f028950f78c3b4b34c0f40d4381ccd961199f606d4ff8ce75c260dbc04b4eb471985edd61b7c380471835072ff7d58149bd98d029741ddcb39ea082c90e5";
913913 }
914− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/vi/firefox-69.0.tar.bz2";
914+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/vi/firefox-69.0.1.tar.bz2";
915915 locale = "vi";
916916 arch = "linux-i686";
917− sha512 = "5e5a586ed274f112ca20d729c89b949c46eefdf2d993e4bc27ecc4a40530f89ab68838dc458e510cb5d862e63c1b7b6188657650599dea920070092f091d6a2e";
917+ sha512 = "40b0dd2c70c647dfa3f73db24d17296e719f6dedbff24fe7465799b9ae1deeac61a394a11095a93f48b785e5645ca8f801312e965dadf7de4fb964c87b90b17a";
918918 }
919− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xh/firefox-69.0.tar.bz2";
919+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xh/firefox-69.0.1.tar.bz2";
920920 locale = "xh";
921921 arch = "linux-i686";
922− sha512 = "fbcf97c7235c0a765fa083893dbd1e82e6b9befd8266bc86c1b1ca7a5d1674af2cdd8c86d6f2087683823eac2774e0b8983c4da93c72115ea4d53e6b73815140";
922+ sha512 = "35993045afc78623d4ba1fb4e30c3c6e595f2ef02e5720f435d541af510ea552c254209f67afdad8d228bbf4c557885b5a9e2b6579973b323000a796d7e1a4a4";
923923 }
924− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-CN/firefox-69.0.tar.bz2";
924+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/zh-CN/firefox-69.0.1.tar.bz2";
925925 locale = "zh-CN";
926926 arch = "linux-i686";
927− sha512 = "93cce943be38357705ce7d1d4c5d88e5256c34280479216a4f739b60665ba832ef7b18b23730256871ce3bbfcae744ec421ebd56aaa73acb6cee91de03d0abe9";
927+ sha512 = "e1cbdd94cb9c608f4c85354a1c683058eced84e783e6a76c08906983aa8b879094978747898cefe995bca4855ff463599d6288863739305f6a0eac0b0d07cda2";
928928 }
929− { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-TW/firefox-69.0.tar.bz2";
929+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/zh-TW/firefox-69.0.1.tar.bz2";
930930 locale = "zh-TW";
931931 arch = "linux-i686";
932− sha512 = "407014668d7fd6802c1966cb8ac8571c151877ae3a9841e581784987a0337cff5c5ff191d13f305c371c7880a269b8483ac96b08bfd9f04b8ee4747adca5715d";
932+ sha512 = "307e82f9c1b68e916c4369f57c52158be4279a8a5017bcd6e1d5c50e93ce8c25ebf07b115937ae0bf809a8e5448486d0f951b2c426a318037388de6ff58a2b02";
933933 }
934934 ];
935935}
pkgs/applications/networking/browsers/firefox/packages.nix+3−2
@@ -17,10 +17,10 @@ rec {
1717
1818 firefox = common rec {
1919 pname = "firefox";
20− ffversion = "69.0";
20+ ffversion = "69.0.1";
2121 src = fetchurl {
2222 url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
23− sha512 = "2q0gky7a6ayb6mw8bw3s35q3ggibf7vfyrxgggz1l4lpcv6dwjj01x45071h106jkvnh71hycvp1cywf98lkybjbfp8c9kd8sivkd43";
23+ sha512 = "0zvjwn17accmp9m55a9s12mw3cflsplysizfrpa3hy02na20w39g974d42fmxpk4zq4zqy4m17v2rpibibb0g7giy9rywndhaw3xrl9";
2424 };
2525
2626 patches = [
@@ -32,6 +32,7 @@ rec {
3232 homepage = http://www.mozilla.com/en-US/firefox/;
3333 maintainers = with lib.maintainers; [ eelco andir ];
3434 platforms = lib.platforms.unix;
35+ badPlatforms = lib.platforms.darwin;
3536 license = lib.licenses.mpl20;
3637 };
3738 updateScript = callPackage ./update.nix {
pkgs/applications/networking/cluster/terraform/default.nix+2−2
@@ -97,8 +97,8 @@ in rec {
9797 terraform_0_11-full = terraform_0_11.full;
9898
9999 terraform_0_12 = pluggable (generic {
100− version = "0.12.8";
101− sha256 = "1qlhbn6xj2nd8gwr6aiyjsb62qmj4j9jnxab006xgdr1avvl2p67";
100+ version = "0.12.9";
101+ sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka";
102102 patches = [ ./provider-path.patch ];
103103 passthru = { inherit plugins; };
104104 });
pkgs/applications/networking/dropbox/default.nix+1−1
@@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms;
77# Dropbox client to bootstrap installation.
88# The client is self-updating, so the actual version may be newer.
99let
10− version = "73.4.118";
10+ version = "81.4.195";
1111
1212 arch = {
1313 x86_64-linux = "x86_64";
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv, fetchFromGitHub, pidgin, pkgconfig }:
2+
3+stdenv.mkDerivation {
4+ pname = "purple-slack-unstable";
5+ version = "2019-08-18";
6+
7+ src = fetchFromGitHub {
8+ owner = "dylex";
9+ repo = "slack-libpurple";
10+ rev = "be97802c7fd0b611722d2f551756e2a2672f6084";
11+ sha256 = "0l6hwnnv6zzszxkk0a3nli88w5gijvlc9qgkkai0sb4v4c504y5v";
12+ };
13+
14+ nativeBuildInputs = [ pkgconfig ];
15+ buildInputs = [ pidgin ];
16+
17+ PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
18+ PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share";
19+
20+ meta = with stdenv.lib; {
21+ homepage = https://github.com/dylex/slack-libpurple;
22+ description = "Slack plugin for Pidgin";
23+ license = licenses.gpl2;
24+ platforms = platforms.linux;
25+ maintainers = with maintainers; [ eyjhb ];
26+ };
27+}
28+
pkgs/applications/networking/instant-messengers/turses/default.nix+7−6
@@ -1,9 +1,7 @@
1−{ stdenv, fetchpatch, python36Packages }:
1+{ stdenv, fetchpatch, python3Packages }:
22
33with stdenv.lib;
4−
5−# Needs Python <3.7 for now, see https://github.com/louipc/turses/issues/4
6−with python36Packages;
4+with python3Packages;
75
86buildPythonPackage rec {
97 pname = "turses";
@@ -14,8 +12,6 @@ buildPythonPackage rec {
1412 sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6";
1513 };
1614
17− disabled = ! python36Packages.pythonOlder "3.7";
18−
1915 checkInputs = [ mock pytest coverage tox ];
2016 propagatedBuildInputs = [ urwid tweepy future ];
2117
@@ -24,6 +20,11 @@ buildPythonPackage rec {
2420 url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch";
2521 sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3";
2622 })
23+ # python 3.7+ support
24+ (fetchpatch {
25+ url = "https://github.com/booxter/turses/commit/e6e285eae50fc3d2042a476185fe60daef1e758e.patch";
26+ sha256 = "0g2zsrny955viwgs2l6gpiiz8m67b5sgdcxkjmfimfvvih5sg79f";
27+ })
2728 ];
2829
2930 checkPhase = ''
pkgs/applications/networking/remote/teamviewer/default.nix+1
@@ -54,6 +54,7 @@ mkDerivation rec {
5454 '';
5555
5656 dontStrip = true;
57+ preferLocalBuild = true;
5758
5859 meta = with lib; {
5960 homepage = http://www.teamviewer.com;
pkgs/applications/networking/sync/onedrive/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ stdenv
2+, fetchFromGitHub
3+, dmd
4+, pkgconfig
5+, curl
6+, sqlite
7+}:
8+
9+stdenv.mkDerivation rec {
10+ pname = "onedrive";
11+ version = "2.3.9";
12+
13+ src = fetchFromGitHub {
14+ owner = "abraunegg";
15+ repo = "onedrive";
16+ rev = "v${version}";
17+ sha256 = "0fg2zzhhd1wl8z416px432xynx6whnzdamzdckc8rmm1cvghgb0f";
18+ };
19+
20+ nativeBuildInputs = [
21+ dmd
22+ pkgconfig
23+ ];
24+ buildInputs = [
25+ curl
26+ sqlite
27+ ];
28+ meta = with stdenv.lib; {
29+ description = "A complete tool to interact with OneDrive on Linux";
30+ homepage = "https://github.com/abraunegg/onedrive";
31+ license = licenses.gpl3;
32+ maintainers = with maintainers; [ doronbehar ];
33+ platforms = platforms.linux;
34+ };
35+}
pkgs/applications/office/kexi/default.nix+14−3
@@ -1,10 +1,10 @@
11{
2− mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools,
2+ mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools,
33 boost, qttools, qtwebkit,
44 breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
55 kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
66 kwidgetsaddons, kxmlgui,
7− kdb, kproperty, kreport, lcms2, libmysqlclient, marble, postgresql
7+ kdb, kproperty, kreport, lcms2, mysql, marble, postgresql
88}:
99
1010mkDerivation rec {
@@ -23,11 +23,22 @@ mkDerivation rec {
2323 breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
2424 kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets
2525 kwidgetsaddons kxmlgui
26− kdb kproperty kreport lcms2 libmysqlclient marble postgresql
26+ kdb kproperty kreport lcms2 mysql.connector-c marble postgresql
2727 ];
2828
2929 propagatedUserEnvPkgs = [ kproperty ];
3030
31+ patches = [
32+ # Changes in Qt 5.13 mean that QDate isn't exported from certain places,
33+ # which the build was relying on. This patch explicitly imports QDate where
34+ # needed.
35+ # Should be unnecessary with kexi >= 3.3
36+ (fetchpatch {
37+ url = "https://cgit.kde.org/kexi.git/patch/src/plugins/forms/widgets/kexidbdatepicker.cpp?id=511d99b7745a6ce87a208bdbf69e631f1f136d53";
38+ sha256 = "0m5cwq2v46gb1b12p7acck6dadvn7sw4xf8lkqikj9hvzq3r1dnj";
39+ })
40+ ];
41+
3142 meta = with lib; {
3243 description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker";
3344 longDescription = ''
pkgs/applications/office/libreoffice/default.nix+2−2
@@ -4,7 +4,7 @@
44, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
55, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
66, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
7−, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
7+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
88, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
99, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
1010, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -361,7 +361,7 @@ in stdenv.mkDerivation rec {
361361 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
362362 libXaw libXext libXi libXinerama libxml2 libxslt libXtst
363363 libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
364− gst_all_1.gst-plugins-base glib libmysqlclient
364+ gst_all_1.gst-plugins-base glib mysql.connector-c
365365 neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
366366 python3 sablotron sane-backends unzip vigra which zip zlib
367367 mdds bluez5 libcmis libwps libabw libzmf
pkgs/applications/office/libreoffice/still.nix+2−2
@@ -4,7 +4,7 @@
44, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
55, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
66, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
7−, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
7+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
88, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
99, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
1010, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -358,7 +358,7 @@ in stdenv.mkDerivation rec {
358358 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
359359 libXaw libXext libXi libXinerama libxml2 libxslt libXtst
360360 libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
361− gst_all_1.gst-plugins-base glib libmysqlclient
361+ gst_all_1.gst-plugins-base glib mysql.connector-c
362362 neon nspr nss openldap openssl ORBit2 pam perl poppler
363363 python3 sablotron sane-backends unzip vigra which zip zlib
364364 mdds bluez5 libcmis libwps libabw libzmf
pkgs/applications/radio/tlf/default.nix+3−5
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib
2−, perl, ncurses, hamlib, xmlrpc_c }:
2+, perl, ncurses5, hamlib, xmlrpc_c }:
33
44stdenv.mkDerivation rec {
55 pname = "tlf";
@@ -13,15 +13,13 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ];
16− buildInputs = [ glib ncurses hamlib xmlrpc_c ];
16+ buildInputs = [ glib ncurses5 hamlib xmlrpc_c ];
1717
1818 configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ];
1919
2020 postInstall = ''
2121 mkdir -p $out/lib
22−
23− # Hack around lack of libtinfo in NixOS
24− ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
22+ ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
2523 '';
2624
2725 meta = with stdenv.lib; {
pkgs/applications/science/electronics/kicad/default.nix+2−2
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
6565 buildInputs = [
6666 libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
6767 cairo curl openssl boost
68− swig python
68+ swig (python.withPackages (ps: with ps; [ wxPython ]))
6969 ] ++ optional (oceSupport) opencascade
7070 ++ optional (ngspiceSupport) libngspice;
7171
@@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
107107 buildPythonPath "$out $pythonPath"
108108 gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
109109
110− wrapGApp "$out/bin/kicad"
110+ wrapProgram "$out/bin/kicad" "''${gappsWrapperArgs[@]}"
111111 '';
112112
113113 meta = {
pkgs/applications/science/logic/saw-tools/default.nix+1−2
@@ -34,8 +34,7 @@ stdenv.mkDerivation {
3434 mv bin $out/bin
3535 mv doc $out/share
3636
37− # Hack around lack of libtinfo in NixOS
38− ln -s ${ncurses.out}/lib/libncursesw.so.5 $out/lib/libtinfo.so.5
37+ ln -s ${ncurses.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
3938 ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0
4039
4140 # Add a clang symlink for easy building with a suitable compiler.
pkgs/applications/science/math/glsurf/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut
2−, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib
2+, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib
33}:
44
55stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
1111 };
1212
13− buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp
13+ buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp
1414 libtiff libjpeg libpng giflib ]
1515 ++ (with ocamlPackages; [
1616 ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
pkgs/applications/science/math/qalculate-gtk/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "qalculate-gtk";
5− version = "3.3.0";
5+ version = "3.4.0";
66
77 src = fetchFromGitHub {
88 owner = "qalculate";
99 repo = "qalculate-gtk";
1010 rev = "v${version}";
11− sha256 = "1z2d32dcvdd66114j3km58xfk80hc5rd0zrh2fgz1azv8r4cqq1b";
11+ sha256 = "11q9f4p67ckbxd962jchgmwqnbp7v9ghix88c5hn3vaxvgwiw5hl";
1212 };
1313
1414 patchPhase = ''
pkgs/applications/science/programming/fdr/default.nix+3−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}:
1+{stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}:
22stdenv.mkDerivation {
33 name = "fdr-4.2.3";
44 src = fetchurl {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 python27Packages.python
1212 qtbase
1313 qtx11extras
14− ncurses
14+ ncurses5
1515 xorg.libX11
1616 xorg.libXft
1717 zlib
@@ -26,8 +26,7 @@ stdenv.mkDerivation {
2626 rm -r lib/qt_plugins
2727
2828 cp -r * "$out"
29− # Hack around lack of libtinfo in NixOS
30− ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
29+ ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
3130 ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins
3231 ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
3332
pkgs/applications/video/kodi/default.nix+2−2
@@ -13,7 +13,7 @@
1313, libmpeg2, libsamplerate, libmad
1414, libogg, libvorbis, flac, libxslt
1515, lzo, libcdio, libmodplug, libass, libbluray
16−, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm
16+, sqlite, mysql, nasm, gnutls, libva, libdrm
1717, curl, bzip2, zip, unzip, glxinfo, xdpyinfo
1818, libcec, libcec_platform, dcadec, libuuid
1919, libcrossguid, libmicrohttpd
@@ -161,7 +161,7 @@ in stdenv.mkDerivation {
161161 libmpeg2 libsamplerate libmad
162162 libogg libvorbis flac libxslt systemd
163163 lzo libcdio libmodplug libass libbluray
164− sqlite libmysqlclient avahi lame
164+ sqlite mysql.connector-c avahi lame
165165 curl bzip2 zip unzip glxinfo xdpyinfo
166166 libcec libcec_platform dcadec libuuid
167167 libgcrypt libgpgerror libunistring
pkgs/applications/virtualization/firecracker/default.nix+3−3
@@ -1,7 +1,7 @@
11{ fetchurl, stdenv }:
22
33let
4− version = "0.15.2";
4+ version = "0.18.0";
55 baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
66
77 fetchbin = name: sha256: fetchurl {
@@ -9,8 +9,8 @@ let
99 inherit sha256;
1010 };
1111
12− firecracker-bin = fetchbin "firecracker" "11g0iz1krsm6gzhvf0fb4101c6qyk6bl8j3kjidbb52x9i4aqsxk";
13− jailer-bin = fetchbin "jailer" "0j1gc1cdsfsi82fkvvxla25791lcvk6vmp46i82f0ms9xm7xhswz";
12+ firecracker-bin = fetchbin "firecracker" "140g93z0k8yd9lr049ps4dj0psb9ac1v7g5zs7lzpws9rj8shmgh";
13+ jailer-bin = fetchbin "jailer" "0sk1zm1fx0zdy5il8vyygzads72ni2lcil42wv59j8b2bg8p7fwd";
1414in
1515stdenv.mkDerivation {
1616 name = "firecracker-${version}";
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+10−16
@@ -1,19 +1,12 @@
1−# shellcheck shell=bash
21gappsWrapperArgs=()
32
43find_gio_modules() {
5− if [ -d "$1/lib/gio/modules" ] && [ -n "$(ls -A "$1/lib/gio/modules")" ] ; then
4+ if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
65 gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules")
76 fi
87}
98
10−addEnvHooks "${targetOffset:?}" find_gio_modules
11−
12−wrapGApp() {
13− local program="$1"
14− shift 1
15− wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
16−}
9+addEnvHooks "$targetOffset" find_gio_modules
1710
1811# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
1912wrapGAppsHook() {
@@ -33,19 +26,20 @@ wrapGAppsHook() {
3326 gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
3427 fi
3528
36− if [ -d "${prefix:?}/share" ]; then
29+ if [ -d "$prefix/share" ]; then
3730 gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
3831 fi
3932
40− if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then
33+ if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
4134 gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
4235 fi
4336
44− for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
45− gappsWrapperArgs+=(--prefix "$v" : "${!v}")
37+ for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
38+ eval local dummy="\$$v"
39+ gappsWrapperArgs+=(--prefix $v : "$dummy")
4640 done
4741
48− if [[ -z "${dontWrapGApps:-}" ]]; then
42+ if [[ -z "$dontWrapGApps" ]]; then
4943 targetDirsThatExist=()
5044 targetDirsRealPath=()
5145
@@ -58,7 +52,7 @@ wrapGAppsHook() {
5852 find "${targetDir}" -type f -executable -print0 \
5953 | while IFS= read -r -d '' file; do
6054 echo "Wrapping program '${file}'"
61− wrapGApp "${file}"
55+ wrapProgram "${file}" "${gappsWrapperArgs[@]}"
6256 done
6357 fi
6458 done
@@ -77,7 +71,7 @@ wrapGAppsHook() {
7771 fi
7872 done
7973 echo "Wrapping link: '$linkPath'"
80− wrapGApp "${linkPath}"
74+ wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}"
8175 done
8276 fi
8377 fi
pkgs/data/fonts/cascadia-code/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ lib, fetchurl }:
2+
3+let
4+ pname = "cascadia-code";
5+ version = "1909.16";
6+in
7+fetchurl {
8+ name = "${pname}-${version}";
9+ url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/Cascadia.ttf";
10+
11+ downloadToTemp = true;
12+ recursiveHash = true;
13+
14+ postFetch = ''
15+ install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
16+ '';
17+
18+ sha256 = "0nckczvak3pd1h3fiz0j827pm87px9swx60q07lc2jnjlxcghgl2";
19+
20+ meta = with lib; {
21+ description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
22+ homepage = "https://github.com/microsoft/cascadia-code";
23+ license = licenses.ofl;
24+ maintainers = [ maintainers.marsam ];
25+ platforms = platforms.all;
26+ };
27+}
pkgs/data/fonts/vista-fonts/default.nix+2−3
@@ -3,7 +3,7 @@
33fetchzip {
44 name = "vista-fonts-1";
55
6− url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe;
6+ url = https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe;
77
88 postFetch = ''
99 ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile
@@ -21,7 +21,7 @@ fetchzip {
2121 done
2222 '';
2323
24− sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g";
24+ sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11";
2525
2626 meta = {
2727 description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";
@@ -31,6 +31,5 @@ fetchzip {
3131 # Set a non-zero priority to allow easy overriding of the
3232 # fontconfig configuration files.
3333 priority = 5;
34− broken = true; # source url is 404
3534 };
3635}
pkgs/data/icons/papirus-maia-icon-theme/default.nixnew file+36
@@ -0,0 +1,36 @@
1+{ stdenv, fetchFromGitHub, cmake, gtk3 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "papirus-maia-icon-theme";
5+ version = "2019-07-26";
6+
7+ src = fetchFromGitHub {
8+ owner = "Ste74";
9+ repo = pname;
10+ rev = "90d47c817cc0edeed8b5a90335e669948ff4a116";
11+ sha256 = "0d6lvdg5nw5wfaq8lxszcws174vg12ywkrqzn6czimhmhp48jf5p";
12+ };
13+
14+ nativeBuildInputs = [
15+ cmake
16+ gtk3
17+ ];
18+
19+ postPatch = ''
20+ substituteInPlace CMakeLists.txt --replace /usr "$out"
21+ '';
22+
23+ postFixup = ''
24+ for theme in $out/share/icons/*; do
25+ gtk-update-icon-cache $theme
26+ done
27+ '';
28+
29+ meta = with stdenv.lib; {
30+ description = "Manjaro variation of Papirus icon theme";
31+ homepage = https://github.com/Ste74/papirus-maia-icon-theme;
32+ license = licenses.lgpl3;
33+ platforms = platforms.linux;
34+ maintainers = with maintainers; [ romildo ];
35+ };
36+}
pkgs/data/themes/arc/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "arc-theme";
6− version = "20190910";
6+ version = "20190917";
77
88 src = fetchFromGitHub {
99 owner = "arc-design";
1010 repo = pname;
1111 rev = version;
12− sha256 = "161kx9ii5ij1503nvhgn3pyqfj7cj03l1di2yf8kwwfczbi4mq3j";
12+ sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa";
1313 };
1414
1515 nativeBuildInputs = [
pkgs/data/themes/yaru/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja,
2+ python3, gtk3, gnome3, gtk-engine-murrine }:
3+
4+stdenv.mkDerivation rec {
5+ pname = "yaru";
6+ version = "19.10.2";
7+
8+ src = fetchFromGitHub {
9+ owner = "ubuntu";
10+ repo = "yaru";
11+ rev = version;
12+ sha256 = "1azyn8pr0kpbq4wlz91f5amqyxqq0x2mxkglzl488sf39fl0gnbj";
13+ };
14+
15+ nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
16+ buildInputs = [ gtk3 gnome3.gnome-themes-extra ];
17+
18+ propagatedUserEnvPkgs = [ gtk-engine-murrine ];
19+
20+ postPatch = "patchShebangs .";
21+
22+ meta = with stdenv.lib; {
23+ description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10";
24+ homepage = https://github.com/ubuntu/yaru;
25+ license = with licenses; [ cc-by-sa-40 gpl3 ];
26+ platforms = platforms.linux;
27+ maintainers = [ maintainers.jD91mZM2 ];
28+ };
29+}
pkgs/desktops/deepin/dde-daemon/default.nix+1−1
@@ -115,7 +115,7 @@ buildGoPackage rec {
115115 postFixup = ''
116116 # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
117117 for binary in $out/lib/deepin-daemon/*; do
118− wrapGApp "$binary"
118+ wrapProgram $binary "''${gappsWrapperArgs[@]}"
119119 done
120120
121121 searchHardCodedPaths $out # debugging
pkgs/desktops/enlightenment/enlightenment.nix+18−14
@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
2− xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
3− luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa,
4− xkeyboard_config, pcre,
1+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bc,
2+ bzip2, efl, gdbm, libXdmcp, libXrandr, libcap, libffi,
3+ libpthreadstubs, libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms,
4+ xkeyboard_config,
55
66 bluetoothSupport ? true, bluez5,
77 pulseSupport ? !stdenv.isDarwin, libpulseaudio,
@@ -17,27 +17,28 @@ stdenv.mkDerivation rec {
1717 };
1818
1919 nativeBuildInputs = [
20− meson
21− ninja
2220 (pkgconfig.override { vanilla = true; })
2321 gettext
22+ meson
23+ ninja
2424 ];
2525
2626 buildInputs = [
27+ alsaLib
28+ bc # for the Everything module calculator mode
29+ bzip2
2730 efl
31+ gdbm
2832 libXdmcp
29− libxcb
30− xcbutilkeysyms
3133 libXrandr
3234 libffi
33− pam
34− alsaLib
35− luajit
36− bzip2
3735 libpthreadstubs
38− gdbm
39− pcre
36+ libxcb
37+ luajit
4038 mesa
39+ pam
40+ pcre
41+ xcbutilkeysyms
4142 xkeyboard_config
4243 ]
4344 ++ stdenv.lib.optional stdenv.isLinux libcap
@@ -68,6 +69,9 @@ stdenv.mkDerivation rec {
6869
6970 substituteInPlace src/bin/e_import_config_dialog.c \
7071 --replace "e_prefix_bin_get()" "\"${efl}/bin\""
72+
73+ substituteInPlace src/modules/everything/evry_plug_calc.c \
74+ --replace "ecore_exe_pipe_run(\"bc -l\"" "ecore_exe_pipe_run(\"${bc}/bin/bc -l\""
7175 '';
7276
7377 mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ];
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+1−1
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
6464 sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
6565 -i $file
6666
67− wrapGApp "$file"
67+ wrapProgram $file "''${gappsWrapperArgs[@]}"
6868 done
6969 '';
7070
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2−2
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
7676 postFixup = ''
7777 # Let’s wrap the daemons
7878 for file in $out/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/{{daemon,nativeMessagingHost}.js,components/folks.py}; do
79− echo "Wrapping program $file"
80− wrapGApp "$file"
79+ echo "Wrapping program ''${file}"
80+ wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
8181 done
8282 '';
8383
pkgs/desktops/xfce4-14/default.nix+2−5
@@ -93,8 +93,6 @@ makeScope newScope (self: with self; {
9393
9494 ## COMMON PARTS WITH XFCE 4.12
9595
96− gtk-xfce-engine = callPackage ../xfce/core/gtk-xfce-engine.nix { withGtk3 = false; };
97−
9896 xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { };
9997
10098 xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { };
@@ -113,7 +111,6 @@ makeScope newScope (self: with self; {
113111
114112
115113 ## ALIASES
116−
117− # added 2019-08-18
118− xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin";
114+ xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
115+ gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
119116})
pkgs/development/arduino/arduino-core/default.nix+1−1
@@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
200200
201201 # avrdude_bin is linked against libtinfo.so.5
202202 mkdir $out/lib/
203− ln -s ${lib.makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5
203+ ln -s ${lib.makeLibraryPath [ncurses5]}/libtinfo.so.5 $out/lib/libtinfo.so.5
204204
205205 ${stdenv.lib.optionalString withTeensyduino ''
206206 # Patch the Teensy loader binary
pkgs/development/compilers/gcc/8/default.nix+6−1
@@ -186,7 +186,12 @@ stdenv.mkDerivation ({
186186 sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
187187 ''
188188 )
189− else "");
189+ else "")
190+ + stdenv.lib.optionalString targetPlatform.isAvr ''
191+ makeFlagsArray+=(
192+ 'LIMITS_H_TEST=false'
193+ )
194+ '';
190195
191196 inherit noSysDirs staticCompiler crossStageStatic
192197 libcCross crossMingw;
pkgs/development/compilers/gcc/9/default.nix+6−1
@@ -185,7 +185,12 @@ stdenv.mkDerivation ({
185185 sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
186186 ''
187187 )
188− else "");
188+ else "")
189+ + stdenv.lib.optionalString targetPlatform.isAvr ''
190+ makeFlagsArray+=(
191+ 'LIMITS_H_TEST=false'
192+ )
193+ '';
189194
190195 inherit noSysDirs staticCompiler crossStageStatic
191196 libcCross crossMingw;
pkgs/development/compilers/gerbil/build.nix+4−4
@@ -1,6 +1,6 @@
11{ stdenv, makeStaticLibraries,
22 coreutils, rsync, bash,
3− openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql,
3+ openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
44 version, git-version, gambit, src }:
55
66# TODO: distinct packages for gerbil-release and gerbil-devel
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
1212 inherit src;
1313
1414 # Use makeStaticLibraries to enable creation of statically linked binaries
15− buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ];
15+ buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
1616 buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
1717
1818 buildInputs = [ gambit rsync bash ]
1919 ++ buildInputs_libraries ++ buildInputs_staticLibraries;
2020
21− NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
21+ NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
2222
2323 postPatch = ''
2424 echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm
@@ -40,7 +40,7 @@ ZLIB=${makeStaticLibraries zlib}/lib/libz.a
4040# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
4141# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
4242# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
43−MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a
43+MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a
4444# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
4545LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
4646EOF
pkgs/development/compilers/hhvm/default.nix+2−2
@@ -2,7 +2,7 @@
22, pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
33, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
44, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
5−, libxslt, freetype, gdb, git, perl, libmysqlclient, gmp, libyaml, libedit
5+, libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit
66, libvpx, imagemagick, fribidi, gperf, which, ocamlPackages
77}:
88
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 };
2020
2121 buildInputs =
22− [ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl
22+ [ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl
2323 libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
2424 oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
2525 libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
pkgs/development/compilers/neko/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
2−, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
2+, git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
33}:
44
55stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ cmake pkgconfig git ];
1515 buildInputs =
1616 [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
17− libmysqlclient mbedtls openssl libpthreadstubs ]
17+ mysql.connector-c mbedtls openssl libpthreadstubs ]
1818 ++ stdenv.lib.optional stdenv.isLinux gtk2
1919 ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
2020 pkgs.darwin.apple_sdk.frameworks.Carbon];
pkgs/development/compilers/openjdk/8.nix+2
@@ -219,6 +219,8 @@ let
219219 ln -s $jre/lib/openjdk/jre $out/jre
220220 '';
221221
222+ propagatedBuildInputs = [ setJavaClassPath ];
223+
222224 preFixup = ''
223225 # Propagate the setJavaClassPath setup hook from the JRE so that
224226 # any package that depends on the JRE has $CLASSPATH set up
pkgs/development/compilers/urweb/default.nix+4−4
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, file, openssl, mlton
2−, libmysqlclient, postgresql, sqlite, gcc, icu
2+, mysql, postgresql, sqlite, gcc, icu
33}:
44
55stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
1212 };
1313
14− buildInputs = [ openssl mlton libmysqlclient postgresql sqlite icu ];
14+ buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite icu ];
1515
1616 prePatch = ''
1717 sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
@@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
2121
2222 preConfigure = ''
2323 export PGHEADER="${postgresql}/include/libpq-fe.h";
24− export MSHEADER="${libmysqlclient}/include/mysql/mysql.h";
24+ export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h";
2525 export SQHEADER="${sqlite.dev}/include/sqlite3.h";
2626
2727 export CC="${gcc}/bin/gcc";
2828 export CCARGS="-I$out/include \
2929 -L${openssl.out}/lib \
30− -L${libmysqlclient}/lib \
30+ -L${mysql.connector-c}/lib \
3131 -L${postgresql.lib}/lib \
3232 -L${sqlite.out}/lib";
3333 '';
pkgs/development/haskell-modules/configuration-nix.nix+1−1
@@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
5353
5454 # Use the default version of mysql to build this package (which is actually mariadb).
5555 # test phase requires networking
56− mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });
56+ mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
5757
5858 # CUDA needs help finding the SDK headers and libraries.
5959 cuda = overrideCabal super.cuda (drv: {
pkgs/development/interpreters/perl/sw_vers.patch+1−1
@@ -7,7 +7,7 @@ index afadf53..80b7533 100644
77 # "ProductVersion: 10.10.5" "10.10"
88 # "ProductVersion: 10.11" "10.11"
99- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
10−+ prodvers="${MACOSX_DEPLOYMENT_TARGET:-10.12}"
10++ prodvers="10.10"
1111 case "$prodvers" in
1212 10.*)
1313 add_macosx_version_min ccflags $prodvers
pkgs/development/interpreters/php/default.nix+4−4
@@ -1,6 +1,6 @@
11# pcre functionality is tested in nixos/tests/php-pcre.nix
22{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
3−, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext
3+, mysql, libxml2, readline, zlib, curl, postgresql, gettext
44, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
55, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
66, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
@@ -64,7 +64,7 @@ let
6464 }:
6565
6666 let
67− mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient;
67+ mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c;
6868 libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
6969 in stdenv.mkDerivation {
7070
@@ -149,9 +149,9 @@ let
149149 ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
150150 ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
151151 ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
152− ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}"
152+ ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
153153 ++ optionals mysqliSupport [
154− "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}"
154+ "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
155155 ]
156156 ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
157157 ++ optional bcmathSupport "--enable-bcmath"
pkgs/development/java-modules/jogl/default.nix+3−6
@@ -1,9 +1,5 @@
1−{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
1+{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
22
3−let
4− # workaround https://github.com/NixOS/nixpkgs/issues/37364
5− jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk;
6−in
73{
84 jogl_2_3_2 =
95 let
@@ -32,7 +28,8 @@ in
3228 -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
3329 '';
3430
35− buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
31+ nativeBuildInputs = [ jdk ant git ];
32+ buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
3633
3734 buildPhase = ''
3835 cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
pkgs/development/libraries/cpp-utilities/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "cpp-utilities";
5− version = "4.17.1";
5+ version = "5.0.0";
66
77 src = fetchFromGitHub {
88 owner = "Martchus";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "12088cwg3jbqipmbn4843w1cgxi1q6vwx47gy042rkfvbk6azhxl";
11+ sha256 = "031kiawmrp40sqgd9g5qd82ljglcm9xvynicsn4n8n4ngfgbnc0m";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/cppdb/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, sqlite, libmysqlclient, postgresql, unixODBC }:
1+{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
22
33stdenv.mkDerivation rec {
44 pname = "cppdb";
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
1111
1212 enableParallelBuilding = true;
1313
14− buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ];
14+ buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ];
1515
1616 cmakeFlags = [ "--no-warn-unused-cli" ];
17− NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ];
17+ NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
1818
1919 meta = with stdenv.lib; {
2020 homepage = http://cppcms.com/sql/cppdb/;
pkgs/development/libraries/expat/default.nix+3−3
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
4− name = "expat-2.2.8";
4+ name = "expat-2.2.7";
55
66 src = fetchurl {
7− url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz";
8− sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1";
7+ url = "mirror://sourceforge/expat/${name}.tar.bz2";
8+ sha256 = "067cfhqwiswm4zynw7xaxl59mrrimaiyjhnn8byxma1i98pi1jfb";
99 };
1010
1111 outputs = [ "out" "dev" ]; # TODO: fix referrers
pkgs/development/libraries/gdal/2.4.0.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
2−, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
2+, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
33, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
44, libiconv, libxml2
55, netcdfSupport ? true, netcdf, hdf5, curl
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 "--with-poppler=${poppler.dev}" # optional
3131 "--with-libz=${zlib.dev}" # optional
3232 "--with-pg=${postgresql}/bin/pg_config"
33− "--with-mysql=${libmysqlclient}/bin/mysql_config"
33+ "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
3434 "--with-geotiff=${libgeotiff.dev}"
3535 "--with-sqlite3=${sqlite.dev}"
3636 "--with-spatialite=${libspatialite}"
pkgs/development/libraries/gdal/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib
2−, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
2+, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
33, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
44, libiconv, libxml2, autoreconfHook
55, netcdfSupport ? true, netcdf, hdf5, curl
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 "--with-poppler=${poppler.dev}" # optional
3939 "--with-libz=${zlib.dev}" # optional
4040 "--with-pg=${postgresql}/bin/pg_config"
41− "--with-mysql=${libmysqlclient}/bin/mysql_config"
41+ "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config"
4242 "--with-geotiff=${libgeotiff}"
4343 "--with-sqlite3=${sqlite.dev}"
4444 "--with-spatialite=${libspatialite}"
pkgs/development/libraries/giflib/default.nix → pkgs/development/libraries/giflib/5.1.nixrenamed+5−11
@@ -1,24 +1,18 @@
11{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
22
3−stdenv.mkDerivation rec {
4− name = "giflib-5.2.1";
3+stdenv.mkDerivation {
4+ name = "giflib-5.1.4";
55 src = fetchurl {
6− url = "mirror://sourceforge/giflib/${name}.tar.gz";
7− sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
6+ url = mirror://sourceforge/giflib/giflib-5.1.4.tar.bz2;
7+ sha256 = "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz";
88 };
99
10− postPatch = ''
11− substituteInPlace Makefile \
12− --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
13− '';
14−
1510 buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
16−
1711 meta = {
1812 description = "A library for reading and writing gif images";
1913 platforms = stdenv.lib.platforms.unix;
2014 license = stdenv.lib.licenses.mit;
2115 maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
22− branch = "5.2";
16+ branch = "5.1";
2317 };
2418}
pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patchdeleted−49
@@ -1,49 +0,0 @@
1−Description: Work around moc limitations
2− Some parts of Boost, introduced in Boost 1.48 are not
3− understood by the limited C++ parser of moc. This
4− patch defines header guards that prevent the troublesome boost
5− headers from being processed.
6−Bug-Debian: #653796
7−Author: Tobias Frost <tobi@coldtobi.de>
8−Reviewed-By: Steve Robbins <smr@debian.org>
9−
10−--- a/src/QGlib/connect.h
11−+++ b/src/QGlib/connect.h
12−@@ -19,6 +19,11 @@
13− #ifndef QGLIB_CONNECT_H
14− #define QGLIB_CONNECT_H
15−
16−+#ifdef Q_MOC_RUN
17−+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
18−+#endif
19−+
20−+
21− #include "global.h"
22− #include "quark.h"
23− #include <QtCore/QObject>
24−--- a/src/QGst/bin.h
25−+++ b/src/QGst/bin.h
26−@@ -19,6 +19,10 @@
27− #ifndef QGST_BIN_H
28− #define QGST_BIN_H
29−
30−+#ifdef Q_MOC_RUN
31−+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
32−+#endif
33−+
34− #include "element.h"
35− #include "childproxy.h"
36−
37−--- a/src/QGst/Ui/videowidget.h
38−+++ b/src/QGst/Ui/videowidget.h
39−@@ -19,6 +19,10 @@
40− #ifndef QGST_UI_VIDEOWIDGET_H
41− #define QGST_UI_VIDEOWIDGET_H
42−
43−+#ifdef Q_MOC_RUN
44−+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
45−+#endif
46−+
47− #include "global.h"
48− #include "../element.h"
49− #include <QtGui/QWidget>
pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nixdeleted−20
@@ -1,20 +0,0 @@
1−{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake
2−, automoc4, flex, bison, pkgconfig }:
3−
4−stdenv.mkDerivation rec {
5− name = "${pname}-0.10.3";
6− pname = "qt-gstreamer";
7−
8− src = fetchurl {
9− url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
10− sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl";
11− };
12−
13− buildInputs = [ gstreamer gst-plugins-base glib qt4 ];
14− propagatedBuildInputs = [ boost155 ];
15− nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
16−
17− cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
18−
19− patches = [ ./boost1.48.patch ];
20−}
pkgs/development/libraries/gstreamer/qt-gstreamer/default.nixdeleted−32
@@ -1,32 +0,0 @@
1−{ stdenv, fetchurl, fetchpatch, gst_all_1, boost, glib, qt4, cmake
2−, automoc4, flex, bison, pkgconfig }:
3−
4−stdenv.mkDerivation rec {
5− name = "${pname}-1.2.0";
6− pname = "qt-gstreamer";
7−
8− src = fetchurl {
9− url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";
10− sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";
11− };
12−
13− patches = [
14− (fetchpatch {
15− url = "https://cgit.freedesktop.org/gstreamer/qt-gstreamer/patch/?id=e2ca8094aa8d0eac1c3a98df66fe94ce0c754088";
16− sha256 = "1qps0nlc26d74wk8h96xl5s3d9qrdx6c0ph0zpl1dnc691lgyf6s";
17− })
18− ];
19−
20− outputs = [ "out" "dev" ];
21−
22− buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
23− propagatedBuildInputs = [ boost ];
24− nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
25−
26− cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
27−
28− meta = with stdenv.lib; {
29− platforms = platforms.linux;
30− license = licenses.lgpl21;
31− };
32−}
pkgs/development/libraries/kdb/default.nix+2−2
@@ -1,7 +1,7 @@
11{
22 mkDerivation, lib, fetchurl,
33 extra-cmake-modules,
4− qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysqlclient
4+ qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql
55}:
66
77mkDerivation rec {
@@ -15,7 +15,7 @@ mkDerivation rec {
1515
1616 nativeBuildInputs = [ extra-cmake-modules ];
1717
18− buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysqlclient ];
18+ buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ];
1919
2020 propagatedBuildInputs = [ qtbase ];
2121
pkgs/development/libraries/libagar/default.nix+3−3
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc
22, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined
3−, libsndfile, portaudio, libmysqlclient, fontconfig
3+, libsndfile, portaudio, mysql, fontconfig
44}:
55
66let srcs = import ./srcs.nix { inherit fetchurl; }; in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020 "--with-gettext=${gettext}"
2121 "--with-jpeg=${libjpeg.dev}"
2222 "--with-gl=${libGLU_combined}"
23− "--with-mysql=${libmysqlclient}"
23+ "--with-mysql=${mysql.connector-c}"
2424 "--with-manpages=yes"
2525 ];
2626
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
2929 nativeBuildInputs = [ pkgconfig libtool gettext ];
3030
3131 buildInputs = [
32− bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined libmysqlclient mandoc
32+ bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined mysql.connector-c mandoc
3333 freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
3434 ];
3535
pkgs/development/libraries/libdbi-drivers/default.nix+5−5
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, libdbi
2−, libmysqlclient ? null
2+, mysql ? null
33, sqlite ? null
44, postgresql ? null
55}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
1414 };
1515
16− buildInputs = [ libdbi sqlite postgresql ] ++ optional (libmysqlclient != null) libmysqlclient;
16+ buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c;
1717
1818 postPatch = ''
1919 sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
2626 "--enable-libdbi"
2727 "--with-dbi-incdir=${libdbi}/include"
2828 "--with-dbi-libdir=${libdbi}/lib"
29− ] ++ optionals (libmysqlclient != null) [
29+ ] ++ optionals (mysql != null) [
3030 "--with-mysql"
31− "--with-mysql-incdir=${libmysqlclient}/include/mysql"
32− "--with-mysql-libdir=${libmysqlclient}/lib/mysql"
31+ "--with-mysql-incdir=${mysql.connector-c}/include/mysql"
32+ "--with-mysql-libdir=${mysql.connector-c}/lib/mysql"
3333 ] ++ optionals (sqlite != null) [
3434 "--with-sqlite3"
3535 "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
pkgs/development/libraries/libfido2/default.nix+2−2
@@ -2,10 +2,10 @@
22
33stdenv.mkDerivation rec {
44 pname = "libfido2";
5− version = "1.1.0";
5+ version = "1.2.0";
66 src = fetchurl {
77 url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz";
8− sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1";
8+ sha256 = "1pbllhzcrzkgxad00bai7lna8dpkwiv8khx8p20miy661abv956v";
99 };
1010
1111 nativeBuildInputs = [ cmake pkgconfig ];
pkgs/development/libraries/libgda/default.nix+3−3
@@ -1,10 +1,10 @@
11{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
22, overrideCC, gcc6
3−, mysqlSupport ? false, libmysqlclient ? null
3+, mysqlSupport ? false, mysql ? null
44, postgresSupport ? false, postgresql ? null
55}:
66
7−assert mysqlSupport -> libmysqlclient != null;
7+assert mysqlSupport -> mysql != null;
88assert postgresSupport -> postgresql != null;
99
1010(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
@@ -25,7 +25,7 @@ assert postgresSupport -> postgresql != null;
2525
2626 nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
2727 buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
28− ++ optional (mysqlSupport) libmysqlclient
28+ ++ optional (mysqlSupport) mysql.connector-c
2929 ++ optional (postgresSupport) postgresql;
3030
3131 passthru = {
pkgs/development/libraries/libgdiplus/default.nix+19−5
@@ -2,19 +2,33 @@
22, libtiff, giflib, libjpeg, libpng
33, libXrender, libexif, autoreconfHook, fetchpatch }:
44
5−stdenv.mkDerivation rec {
6− pname = "libgdiplus";
7− version = "6.0.2";
5+stdenv.mkDerivation {
6+ name = "libgdiplus-5.6.1";
87
98 src = fetchFromGitHub {
109 owner = "mono";
1110 repo = "libgdiplus";
12− rev = version;
13− sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
11+ rev = "5.6.1";
12+ sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2";
1413 };
1514
1615 NIX_LDFLAGS = "-lgif";
1716
17+ patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
18+ (fetchpatch {
19+ url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
20+ sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
21+ })
22+ (fetchpatch {
23+ url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
24+ sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
25+ })
26+ (fetchpatch {
27+ url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
28+ sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
29+ })
30+ ];
31+
1832 hardeningDisable = [ "format" ];
1933
2034 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/development/libraries/libproxy/default.nix+1−1
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
6666 })
6767 ];
6868
69− postFixup = ''
69+ postFixup = stdenv.lib.optionalString stdenv.isLinux ''
7070 # config_gnome3 uses the helper to find GNOME proxy settings
7171 wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
7272 '';
pkgs/development/libraries/libqalculate/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "libqalculate";
6− version = "3.3.0";
6+ version = "3.4.0";
77
88 src = fetchFromGitHub {
99 owner = "qalculate";
1010 repo = "libqalculate";
1111 rev = "v${version}";
12− sha256 = "1qgsngi9z1sr6pzgcq6kgng62arpc5xn2ai1ks69myzzmgwk8adp";
12+ sha256 = "046fi8cqfqh0ila3kc4sg75yvg24wmghlja2fmhkj96fjjfkzsss";
1313 };
1414
1515 outputs = [ "out" "dev" "doc" ];
pkgs/development/libraries/librdf/redland.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
22, curl, pcre, libxml2, librdf_rasqal, gmp
3−, libmysqlclient, withMysql ? false
3+, mysql, withMysql ? false
44, postgresql, withPostgresql ? false
55, sqlite, withSqlite ? true
66, db, withBdb ? false
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ perl pkgconfig ];
1818
1919 buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
20− ++ stdenv.lib.optional withMysql libmysqlclient
20+ ++ stdenv.lib.optional withMysql mysql.connector-c
2121 ++ stdenv.lib.optional withSqlite sqlite
2222 ++ stdenv.lib.optional withPostgresql postgresql
2323 ++ stdenv.lib.optional withBdb db;
pkgs/development/libraries/mono-zeroconf/default.nixdeleted−25
@@ -1,25 +0,0 @@
1−{ stdenv, fetchurl, which, pkgconfig, mono }:
2−
3−stdenv.mkDerivation rec {
4− pname = "mono-zeroconf";
5− version = "0.9.0";
6−
7− src = fetchurl {
8− url = "http://download.banshee-project.org/mono-zeroconf/mono-zeroconf-${version}.tar.bz2";
9− sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb";
10− };
11−
12− nativeBuildInputs = [ pkgconfig ];
13− buildInputs = [ which mono ];
14−
15− dontStrip = true;
16−
17− configureFlags = [ "--disable-docs" ];
18−
19− meta = with stdenv.lib; {
20− description = "A cross platform Zero Configuration Networking library for Mono and .NET";
21− homepage = https://www.mono-project.com/archived/monozeroconf/;
22− platforms = platforms.linux;
23− license = licenses.mit;
24− };
25−}
pkgs/development/libraries/opendbx/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, readline, libmysqlclient, postgresql, sqlite }:
1+{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
22
33stdenv.mkDerivation rec {
44 name = "opendbx-1.4.6";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
99 };
1010
1111 preConfigure = ''
12− export CPPFLAGS="-I${libmysqlclient}/include/mysql"
13− export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib"
12+ export CPPFLAGS="-I${mysql.connector-c}/include/mysql"
13+ export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib"
1414 configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
1515 '';
1616
17− buildInputs = [ readline libmysqlclient postgresql sqlite ];
17+ buildInputs = [ readline mysql.connector-c postgresql sqlite ];
1818
1919 meta = with stdenv.lib; {
2020 description = "Extremely lightweight but extensible database access library written in C";
pkgs/development/libraries/openssl/default.nix+4−4
@@ -127,8 +127,8 @@ let
127127in {
128128
129129 openssl_1_0_2 = common {
130− version = "1.0.2t";
131− sha256 = "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql";
130+ version = "1.0.2s";
131+ sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
132132 patches = [
133133 ./1.0.2/nix-ssl-cert-file.patch
134134
@@ -139,8 +139,8 @@ in {
139139 };
140140
141141 openssl_1_1 = common {
142− version = "1.1.1d";
143− sha256 = "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy";
142+ version = "1.1.1c";
143+ sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
144144 patches = [
145145 ./1.1/nix-ssl-cert-file.patch
146146
pkgs/development/libraries/poco/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
1+{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
22
33stdenv.mkDerivation rec {
44 pname = "poco";
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ cmake pkgconfig ];
1414
15− buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ];
15+ buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
1616
17− MYSQL_DIR = libmysqlclient;
17+ MYSQL_DIR = mysql.connector-c;
1818 MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
1919
2020 cmakeFlags = [
pkgs/development/libraries/qt-3/default.nix+3−3
@@ -5,7 +5,7 @@
55, xineramaSupport ? true, libXinerama ? null
66, cursorSupport ? true, libXcursor ? null
77, threadSupport ? true
8−, mysqlSupport ? false, libmysqlclient ? null
8+, mysqlSupport ? false, mysql ? null
99, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
1010, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
1111, libGLU_combined ? null, libXmu ? null
@@ -16,7 +16,7 @@ assert xftSupport -> libXft != null;
1616assert xrenderSupport -> xftSupport && libXrender != null;
1717assert xrandrSupport -> libXrandr != null;
1818assert cursorSupport -> libXcursor != null;
19−assert mysqlSupport -> libmysqlclient != null;
19+assert mysqlSupport -> mysql != null;
2020assert openglSupport -> libGLU_combined != null && libXmu != null;
2121
2222stdenv.mkDerivation {
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
6262 ] ++ stdenv.lib.optionals cursorSupport [
6363 "-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
6464 ] ++ stdenv.lib.optionals mysqlSupport [
65− "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
65+ "-qt-sql-mysql" "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql"
6666 ] ++ stdenv.lib.optionals xftSupport [
6767 "-L${libXft.out}/lib" "-I${libXft.dev}/include"
6868 "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
pkgs/development/libraries/qt-4.x/4.8/default.nix+3−3
@@ -2,7 +2,7 @@
22, libXrender, libXinerama, libXcursor, libXv, libXext
33, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
44, libmng, which, libGLU, openssl, dbus, cups, pkgconfig
5−, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
5+, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
66, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
77, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
88, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
166166 (mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig"
167167 "-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked"
168168
169− "-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
169+ "-${if mysql != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
170170
171171 "-exceptions" "-xmlpatterns"
172172
@@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
192192 buildInputs =
193193 [ cups # Qt dlopen's libcups instead of linking to it
194194 postgresql sqlite libjpeg libmng libtiff icu ]
195− ++ lib.optionals (libmysqlclient != null) [ libmysqlclient ]
195+ ++ lib.optionals (mysql != null) [ mysql.connector-c ]
196196 ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
197197 ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
198198
pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh+1−1
@@ -80,7 +80,7 @@ wrapQtAppsHook() {
8080 do
8181 [ -d "$targetDir" ] || continue
8282
83− find "$targetDir" -type f -executable -print0 | while IFS= read -r -d '' file
83+ find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file
8484 do
8585 patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue
8686
pkgs/development/libraries/qt-5/modules/qtbase.nix+6−6
@@ -14,7 +14,7 @@
1414 zlib,
1515
1616 # optional dependencies
17− cups ? null, libmysqlclient ? null, postgresql ? null,
17+ cups ? null, mysql ? null, postgresql ? null,
1818 withGtk3 ? false, dconf ? null, gtk3 ? null,
1919
2020 # options
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
8080 )
8181 ++ lib.optional developerBuild gdb
8282 ++ lib.optional (cups != null) cups
83− ++ lib.optional (libmysqlclient != null) libmysqlclient
83+ ++ lib.optional (mysql != null) mysql.connector-c
8484 ++ lib.optional (postgresql != null) postgresql;
8585
8686 nativeBuildInputs =
@@ -285,7 +285,7 @@ stdenv.mkDerivation {
285285 "-L" "${openssl.out}/lib"
286286 "-I" "${openssl.dev}/include"
287287 "-system-sqlite"
288− ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql''
288+ ''-${if mysql != null then "plugin" else "no"}-sql-mysql''
289289 ''-${if postgresql != null then "plugin" else "no"}-sql-psql''
290290
291291 "-make libs"
@@ -349,9 +349,9 @@ stdenv.mkDerivation {
349349 "-L" "${cups.lib}/lib"
350350 "-I" "${cups.dev}/include"
351351 ]
352− ++ lib.optionals (libmysqlclient != null) [
353− "-L" "${libmysqlclient}/lib"
354− "-I" "${libmysqlclient}/include"
352+ ++ lib.optionals (mysql != null) [
353+ "-L" "${mysql.out}/lib"
354+ "-I" "${mysql.out}/include"
355355 ]
356356 );
357357
pkgs/development/libraries/tntdb/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
1+{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
22
33stdenv.mkDerivation rec {
44 pname = "tntdb";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
1010 };
1111
12− buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ];
12+ buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ];
1313
1414 enableParallelBuilding = true;
1515
pkgs/development/libraries/unixODBCDrivers/default.nix+6−11
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }:
1+{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, mariadb, sqlite, zlib, libxml2, dpkg, lib, kerberos, curl, libuuid, autoPatchelfHook }:
22
33# I haven't done any parameter tweaking.. So the defaults provided here might be bad
44
@@ -29,23 +29,18 @@
2929
3030 mariadb = stdenv.mkDerivation rec {
3131 pname = "mariadb-connector-odbc";
32− version = "3.1.2";
32+ version = "2.0.10";
3333
3434 src = fetchurl {
35− url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/${pname}-${version}-ga-src.tar.gz";
36− sha256 = "0iibly2mbqijqyq4pzpb6dh40clqhvqrhgnj8knm4bw3nlksd0d5";
35+ url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
36+ sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
3737 };
3838
3939 nativeBuildInputs = [ cmake ];
40− buildInputs = [ unixODBC libmysqlclient openssl ];
40+ buildInputs = [ unixODBC mariadb.connector-c ];
4141
4242 cmakeFlags = [
43− "-DWITH_OPENSSL=ON"
44− ];
45−
46− NIX_CFLAGS_COMPILE = [
47− "-I${libmysqlclient}/include/mysql"
48− "-L${libmysqlclient}/lib/mysql"
43+ "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb"
4944 ];
5045
5146 passthru = {
pkgs/development/libraries/wt/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
2−, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
2+, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl
33, pcre, harfbuzz
44}:
55
@@ -22,7 +22,7 @@ let
2222 nativeBuildInputs = [ pkgconfig ];
2323 buildInputs = [
2424 cmake boost doxygen qt48Full libharu
25− pango fcgi firebird libmysqlclient postgresql graphicsmagick glew
25+ pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew
2626 openssl pcre
2727 ];
2828
@@ -30,7 +30,7 @@ let
3030 "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
3131 "-DWT_CPP_11_MODE=-std=c++11"
3232 "-DGM_PREFIX=${graphicsmagick}"
33− "-DMYSQL_PREFIX=${libmysqlclient}"
33+ "-DMYSQL_PREFIX=${mysql.connector-c}"
3434 "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
3535 "--no-warn-unused-cli"
3636 ];
pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix+4−4
@@ -53,11 +53,11 @@ in
5353 cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
5454 cl-async-test = addNativeLibs [pkgs.openssl];
5555 clsql = x: {
56− propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib];
56+ propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib];
5757 overrides = y: (x.overrides y) // {
5858 preConfigure = ((x.overrides y).preConfigure or "") + ''
59− export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql"
60− export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql"
59+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql"
60+ export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql"
6161 '';
6262 };
6363 };
@@ -77,7 +77,7 @@ $out/lib/common-lisp/query-fs"
7777 };
7878 };
7979 cffi = addNativeLibs [pkgs.libffi];
80− cl-mysql = addNativeLibs [pkgs.libmysqlclient];
80+ cl-mysql = addNativeLibs [pkgs.mysql];
8181 cl-ppcre-template = x: {
8282 overrides = y: (x.overrides y) // {
8383 postPatch = ''
pkgs/development/lisp-modules/shell.nix+2−2
@@ -6,11 +6,11 @@ self = rec {
66 env = buildEnv { name = name; paths = buildInputs; };
77 buildInputs = [
88 gcc stdenv
9− openssl fuse libuv libmysqlclient libfixposix libev sqlite
9+ openssl fuse libuv mysql.connector-c libfixposix libev sqlite
1010 freetds
1111 lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
1212 ];
1313 CPATH = "${libfixposix}/include";
14− LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
14+ LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
1515};
1616in stdenv.mkDerivation self
pkgs/development/lua-modules/overrides.nix+3−3
@@ -154,12 +154,12 @@ with super;
154154 luadbi-mysql = super.luadbi-mysql.override({
155155 extraVariables = ''
156156 -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
157− MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql';
158− MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql';
157+ MYSQL_INCDIR='${pkgs.mysql.connector-c}/include/mysql';
158+ MYSQL_LIBDIR='${pkgs.mysql.connector-c}/lib/mysql';
159159 '';
160160 buildInputs = [
161161 pkgs.mysql.client
162− pkgs.libmysqlclient
162+ pkgs.mysql.connector-c
163163 ];
164164 });
165165
pkgs/development/ocaml-modules/mysql/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:
1+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }:
22
33# TODO: la versione stabile da' un errore di compilazione dovuto a
44# qualche cambiamento negli header .h
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 createFindlibDestdir = true;
2828
29− propagatedBuildInputs = [ libmysqlclient ];
29+ propagatedBuildInputs = [ mysql.connector-c ];
3030
3131 patches = [
3232 (fetchpatch {
pkgs/development/ocaml-modules/ocaml-protoc/default.nixnew file+38
@@ -0,0 +1,38 @@
1+{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }:
2+
3+stdenv.mkDerivation rec {
4+ name = "ocaml${ocaml.version}-ocaml-protoc-${version}";
5+ version = "1.2.0";
6+
7+ minimumOCamlVersion = "4.02";
8+
9+ src = fetchFromGitHub {
10+ owner = "mransan";
11+ repo = "ocaml-protoc";
12+ rev = "60d2d4dd55f73830e1bed603cc44d3420430632c";
13+ sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj";
14+ };
15+
16+ installPhase = ''
17+ mkdir -p tmp/bin
18+ export PREFIX=`pwd`/tmp
19+ make all.install.build
20+ make check_install
21+ make lib.install
22+ make bin.install
23+ '';
24+
25+ buildInputs = [ ocaml findlib ocamlbuild ];
26+ propagatedBuildInputs = [ ppx_deriving_protobuf ];
27+
28+ createFindlibDestdir = true;
29+
30+ doCheck = true;
31+
32+ meta = with stdenv.lib; {
33+ homepage = "https://github.com/mransan/ocaml-protoc";
34+ description = "A Protobuf Compiler for OCaml";
35+ license = licenses.mit;
36+ maintainers = [ maintainers.vyorkin ];
37+ };
38+}
pkgs/development/ocaml-modules/optint/default.nix+9−19
@@ -1,28 +1,18 @@
1−{ stdenv, fetchurl, ocaml, findlib, dune }:
1+{ lib, buildDunePackage, fetchurl }:
22
3−if !stdenv.lib.versionAtLeast ocaml.version "4.02"
4−then throw "optint is not available for OCaml ${ocaml.version}"
5−else
6−
7−stdenv.mkDerivation rec {
8− version = "0.0.2";
9− name = "ocaml${ocaml.version}-optint-${version}";
3+buildDunePackage rec {
4+ minimumOCamlVersion = "4.03";
5+ version = "0.0.3";
6+ pname = "optint";
107 src = fetchurl {
11− url = "https://github.com/mirage/optint/releases/download/v0.0.2/optint-v0.0.2.tbz";
12− sha256 = "1lmb7nycmkr05y93slqi98i1lcs1w4kcngjzjwz7i230qqjpw9w1";
8+ url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz";
9+ sha256 = "0c7r3s6lal9xkixngkj25nqncj4s33ka40bjdi7fz7mly08djycj";
1310 };
1411
15− buildInputs = [ ocaml findlib dune ];
16−
17− buildPhase = "dune build";
18−
19− inherit (dune) installPhase;
20−
2112 meta = {
2213 homepage = "https://github.com/mirage/optint";
2314 description = "Abstract type of integer between x64 and x86 architecture";
24− license = stdenv.lib.licenses.mit;
25− maintainers = [ stdenv.lib.maintainers.vbgl ];
26− inherit (ocaml.meta) platforms;
15+ license = lib.licenses.mit;
16+ maintainers = [ lib.maintainers.vbgl ];
2717 };
2818}
pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nixnew file+18
@@ -0,0 +1,18 @@
1+{ lib, buildDunePackage, rpclib, ppxfind, ppx_deriving, cppo }:
2+
3+buildDunePackage rec {
4+ pname = "ppx_deriving_rpc";
5+
6+ inherit (rpclib) version src;
7+
8+ buildInputs = [ ppxfind cppo ];
9+
10+ propagatedBuildInputs = [ rpclib ppx_deriving ];
11+
12+ meta = with lib; {
13+ homepage = "https://github.com/mirage/ocaml-rpc";
14+ description = "Ppx deriver for ocaml-rpc";
15+ license = licenses.isc;
16+ maintainers = [ maintainers.vyorkin ];
17+ };
18+}
pkgs/development/perl-modules/DBD-mysql/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, buildPerlPackage, DBI, DevelChecklib, libmysqlclient }:
1+{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:
22
33buildPerlPackage {
44 pname = "DBD-mysql";
@@ -9,7 +9,7 @@ buildPerlPackage {
99 sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g";
1010 };
1111
12− buildInputs = [ libmysqlclient DevelChecklib ] ;
12+ buildInputs = [ mysql.connector-c DevelChecklib ] ;
1313 propagatedBuildInputs = [ DBI ];
1414
1515 doCheck = false;
pkgs/development/pure-modules/glpk/default.nix+3−3
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl,
2− pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
2+ pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }:
33
44stdenv.mkDerivation rec {
55 baseName = "glpk";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 glpkWithExtras = lib.overrideDerivation glpk (attrs: {
15− propagatedBuildInputs = [ gmp libtool libmysqlclient libiodbc ];
15+ propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ];
1616
1717 CPPFLAGS = "-I${gmp.dev}/include";
1818
1919 preConfigure = ''
2020 substituteInPlace configure \
21− --replace /usr/include/mysql ${libmysqlclient}/include/mysql
21+ --replace /usr/include/mysql ${mysql.connector-c}/include/mysql
2222 '';
2323 configureFlags = [ "--enable-dl"
2424 "--enable-odbc"
pkgs/development/python-modules/Logbook/default.nix+3
@@ -18,6 +18,9 @@ buildPythonPackage rec {
1818 py.test tests
1919 '';
2020
21+ # Some of the tests use localhost networking.
22+ __darwinAllowLocalNetworking = true;
23+
2124 meta = {
2225 homepage = https://pythonhosted.org/Logbook/;
2326 description = "A logging replacement for Python";
pkgs/development/python-modules/algebraic-data-types/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, hypothesis, mypy }:
2+
3+buildPythonPackage rec {
4+ pname = "algebraic-data-types";
5+ version = "0.1.1";
6+
7+ src = fetchFromGitHub {
8+ owner = "jspahrsummers";
9+ repo = "adt";
10+ rev = "v" + version;
11+ sha256 = "1py94jsgh6wch59n9dxnwvk74psbpa1679zfmripa1qfc2218kqi";
12+ };
13+
14+ disabled = pythonOlder "3.6";
15+
16+ checkInputs = [
17+ hypothesis
18+ mypy
19+ ];
20+
21+ meta = with lib; {
22+ description = "Algebraic data types for Python";
23+ homepage = https://github.com/jspahrsummers/adt;
24+ license = licenses.mit;
25+ maintainers = with maintainers; [ uri-canva ];
26+ platforms = platforms.unix;
27+ };
28+}
pkgs/development/python-modules/aws-adfs/default.nix+5−5
@@ -2,12 +2,12 @@
22, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
33
44buildPythonPackage rec {
5− version = "1.12.3";
65 pname = "aws-adfs";
6+ version = "1.17.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831";
10+ sha256 = "0wnsmwjpfhxilmvrqvwilcf3h9p5m5ixi5gn9bgkr3gwd2laxf54";
1111 };
1212
1313 # Relax version constraint
@@ -24,10 +24,10 @@ buildPythonPackage rec {
2424 checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ];
2525 propagatedBuildInputs = [ lxml boto3 requests click configparser ];
2626
27− meta = {
27+ meta = with lib; {
2828 description = "Command line tool to ease aws cli authentication against ADFS";
2929 homepage = https://github.com/venth/aws-adfs;
30− license = lib.licenses.psfl;
31− maintainers = [ lib.maintainers.bhipple ];
30+ license = licenses.psfl;
31+ maintainers = [ maintainers.bhipple ];
3232 };
3333}
pkgs/development/python-modules/cheroot/default.nix+3
@@ -34,6 +34,9 @@ buildPythonPackage rec {
3434 pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
3535 '';
3636
37+ # Some of the tests use localhost networking.
38+ __darwinAllowLocalNetworking = true;
39+
3740 meta = with lib; {
3841 description = "High-performance, pure-Python HTTP";
3942 homepage = https://github.com/cherrypy/cheroot;
pkgs/development/python-modules/cryptography/default.nix+1−10
@@ -1,7 +1,6 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4−, fetchpatch
54, openssl
65, cryptography_vectors
76, darwin
@@ -50,18 +49,10 @@ buildPythonPackage rec {
5049 pytz
5150 ];
5251
53− # remove when https://github.com/pyca/cryptography/issues/4998 is fixed
5452 checkPhase = ''
55− py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve'
53+ py.test --disable-pytest-warnings tests
5654 '';
5755
58− patches = [
59− (fetchpatch {
60− url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch";
61− sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp";
62− })
63− ];
64−
6556 # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
6657 # can do until nix 1.11's release
6758 __impureHostDeps = [ "/usr/lib" ];
pkgs/development/python-modules/csvs-to-sqlite/default.nix+4−4
@@ -1,6 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchFromGitHub
4+, isPy3k
45, pytestrunner
56, click
67, dateparser
@@ -12,17 +13,16 @@
1213
1314buildPythonPackage rec {
1415 pname = "csvs-to-sqlite";
15− version = "0.9";
16+ version = "1.0";
17+ disabled = !isPy3k;
1618
1719 src = fetchFromGitHub {
1820 owner = "simonw";
1921 repo = pname;
2022 rev = version;
21− sha256 = "0js86m4kj70g9n9gagr8l6kgswqllg6hn1xa3yvxwv95i59ihpz5";
23+ sha256 = "0n80y9a6qhbhhbz64jdpscx0nha9jn9nygp9nkgszmw04ri5j5hm";
2224 };
2325
24− buildInputs = [ pytestrunner ];
25−
2626 propagatedBuildInputs = [
2727 click
2828 dateparser
pkgs/development/python-modules/h11/default.nix+3
@@ -23,6 +23,9 @@ buildPythonPackage rec {
2323 py.test
2424 '';
2525
26+ # Some of the tests use localhost networking.
27+ __darwinAllowLocalNetworking = true;
28+
2629 meta = with lib; {
2730 description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1";
2831 license = licenses.mit;
pkgs/development/python-modules/ipykernel/default.nix+3
@@ -37,6 +37,9 @@ buildPythonPackage rec {
3737 HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)"
3838 '';
3939
40+ # Some of the tests use localhost networking.
41+ __darwinAllowLocalNetworking = true;
42+
4043 meta = {
4144 description = "IPython Kernel for Jupyter";
4245 homepage = http://ipython.org/;
pkgs/development/python-modules/ledgerblue/default.nix+4−3
@@ -1,18 +1,19 @@
11{ stdenv, fetchPypi, buildPythonPackage, hidapi
22, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
3+, websocket_client
34}:
45
56buildPythonPackage rec {
67 pname = "ledgerblue";
7− version = "0.1.24";
8+ version = "0.1.28";
89
910 src = fetchPypi {
1011 inherit pname version;
11− sha256 = "fc111ed5db8da93f280928d966f9d87416b464f5f09cec80b60e88c4c1265026";
12+ sha256 = "1jfh4gb3f16ga1ircwiyg7dldldmhn0a5slbpqsqr2g6mlqihpmd";
1213 };
1314
1415 propagatedBuildInputs = [
15− hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex
16+ hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client
1617 ];
1718
1819 # No tests
pkgs/development/python-modules/lxml/default.nix+1−1
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515 };
1616
1717 nativeBuildInputs = [ libxml2.dev libxslt.dev ];
18− buildInputs = [ libxml2 libxslt ];
18+ propagatedBuildInputs = [ libxml2 libxslt ];
1919
2020 hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
2121
pkgs/development/python-modules/mypy/default.nix+2−2
@@ -3,14 +3,14 @@
33
44buildPythonPackage rec {
55 pname = "mypy";
6− version = "0.701";
6+ version = "0.711";
77
88 # Tests not included in pip package.
99 doCheck = false;
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "05479r3gbq17r22hyhxjg49smx5q864pgx8ayy23rsdj4w6z2r2p";
13+ sha256 = "0s1kwi1dhrv55v0c9w7c1g6mq5d2dpw7x1jj5mcnniw77mclmvdv";
1414 };
1515
1616 disabled = !isPy3k;
pkgs/development/python-modules/mysqlclient/default.nix+3−3
@@ -1,15 +1,15 @@
1−{ stdenv, buildPythonPackage, fetchPypi, libmysqlclient }:
1+{ stdenv, buildPythonPackage, fetchPypi, mysql }:
22
33buildPythonPackage rec {
44 pname = "mysqlclient";
55 version = "1.4.4";
66
77 nativeBuildInputs = [
8− libmysqlclient
8+ mysql.connector-c
99 ];
1010
1111 buildInputs = [
12− libmysqlclient
12+ mysql.connector-c
1313 ];
1414
1515 # Tests need a MySQL database
pkgs/development/python-modules/nbconvert/default.nix+3
@@ -44,6 +44,9 @@ buildPythonPackage rec {
4444 HOME=$(mktemp -d) py.test -v --ignore="nbconvert/preprocessors/tests/test_execute.py"
4545 '';
4646
47+ # Some of the tests use localhost networking.
48+ __darwinAllowLocalNetworking = true;
49+
4750 meta = {
4851 description = "Converting Jupyter Notebooks";
4952 homepage = https://jupyter.org/;
pkgs/development/python-modules/nbformat/default.nix+3
@@ -29,6 +29,9 @@ buildPythonPackage rec {
2929 export HOME=tmp
3030 '';
3131
32+ # Some of the tests use localhost networking.
33+ __darwinAllowLocalNetworking = true;
34+
3235 meta = {
3336 description = "The Jupyter Notebook format";
3437 homepage = https://jupyter.org/;
pkgs/development/python-modules/nbval/default.nix+3
@@ -45,6 +45,9 @@ buildPythonPackage rec {
4545 pytest tests --ignore tests/test_timeouts.py
4646 '';
4747
48+ # Some of the tests use localhost networking.
49+ __darwinAllowLocalNetworking = true;
50+
4851 meta = with lib; {
4952 description = "A py.test plugin to validate Jupyter notebooks";
5053 homepage = https://github.com/computationalmodelling/nbval;
pkgs/development/python-modules/ncclient/default.nix+1−3
@@ -4,8 +4,6 @@
44, paramiko
55, selectors2
66, lxml
7−, libxml2
8−, libxslt
97, nose
108, rednose
119}:
@@ -22,7 +20,7 @@ buildPythonPackage rec {
2220 checkInputs = [ nose rednose ];
2321
2422 propagatedBuildInputs = [
25− paramiko lxml libxml2 libxslt selectors2
23+ paramiko lxml selectors2
2624 ];
2725
2826 checkPhase = ''
pkgs/development/python-modules/notebook/default.nix+3
@@ -64,6 +64,9 @@ buildPythonPackage rec {
6464 else ""}
6565 '';
6666
67+ # Some of the tests use localhost networking.
68+ __darwinAllowLocalNetworking = true;
69+
6770 meta = {
6871 description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
6972 homepage = https://jupyter.org/;
pkgs/development/python-modules/picos/default.nixnew file+36
@@ -0,0 +1,36 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitLab
4+, numpy
5+, cvxopt
6+, python
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "picos";
11+ version = "1.2.0";
12+
13+ src = fetchFromGitLab {
14+ owner = "picos-api";
15+ repo = "picos";
16+ rev = "v${version}";
17+ sha256 = "018xhc7cb2crkk27lhl63c7h77w5wa37fg41i7nqr4xclr43cs9z";
18+ };
19+
20+ propagatedBuildInputs = [
21+ numpy
22+ cvxopt
23+ ];
24+
25+ checkPhase = ''
26+ ${python.interpreter} test.py
27+ '';
28+
29+ meta = with lib; {
30+ description = "A Python interface to conic optimization solvers";
31+ homepage = https://gitlab.com/picos-api/picos;
32+ license = licenses.gpl3;
33+ maintainers = with maintainers; [ tobiasBora ];
34+ };
35+}
36+
pkgs/development/python-modules/portend/default.nix+3
@@ -24,6 +24,9 @@ buildPythonPackage rec {
2424 py.test --deselect=test_portend.py::TestChecker::test_check_port_listening
2525 '';
2626
27+ # Some of the tests use localhost networking.
28+ __darwinAllowLocalNetworking = true;
29+
2730 meta = with stdenv.lib; {
2831 description = "Monitor TCP ports for bound or unbound states";
2932 homepage = https://github.com/jaraco/portend;
pkgs/development/python-modules/pyopenssl/default.nix+1−2
@@ -9,7 +9,6 @@
99, pretend
1010, flaky
1111, glibcLocales
12−, six
1312}:
1413
1514with stdenv.lib;
@@ -85,7 +84,7 @@ buildPythonPackage rec {
8584 doCheck = !stdenv.isDarwin;
8685
8786 nativeBuildInputs = [ openssl ];
88− propagatedBuildInputs = [ cryptography pyasn1 idna six ];
87+ propagatedBuildInputs = [ cryptography pyasn1 idna ];
8988
9089 checkInputs = [ pytest pretend flaky glibcLocales ];
9190}
pkgs/development/python-modules/python-engineio/default.nix+12−14
@@ -1,27 +1,25 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchFromGitHub
4−, six
1+{ stdenv, buildPythonPackage, fetchFromGitHub
2+, aiohttp
53, eventlet
6−, mock
74, iana-etc
85, libredirect
9−, aiohttp
10−, websockets
11−, websocket_client
6+, mock
127, requests
8+, six
139, tornado
10+, websocket_client
11+, websockets
1412}:
1513
1614buildPythonPackage rec {
1715 pname = "python-engineio";
18− version = "3.4.3";
16+ version = "3.9.3";
1917
2018 src = fetchFromGitHub {
2119 owner = "miguelgrinberg";
2220 repo = "python-engineio";
2321 rev = "v${version}";
24− sha256 = "0wk81rqigw47z087f5kc7b9iwqggypxc62q8q818qyzqwb93ysxf";
22+ sha256 = "0rwlj12d37dpw6y3bdn6rxv68xnd9ykj4fr3ly0fa143xci35d9y";
2523 };
2624
2725 propagatedBuildInputs = [
@@ -29,13 +27,13 @@ buildPythonPackage rec {
2927 ];
3028
3129 checkInputs = [
30+ aiohttp
3231 eventlet
3332 mock
34− aiohttp
35− websockets
36− websocket_client
37− tornado
3833 requests
34+ tornado
35+ websocket_client
36+ websockets
3937 ];
4038
4139 # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
pkgs/development/python-modules/python-language-server/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
22, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server
3−, pytest, mock, pytestcov, coverage
3+, pytest, mock, pytestcov, coverage, setuptools
44, # Allow building a limited set of providers, e.g. ["pycodestyle"].
55 providers ? ["*"]
66 # The following packages are optional and
@@ -44,7 +44,7 @@ buildPythonPackage rec {
4444 HOME=$TEMPDIR pytest
4545 '';
4646
47− propagatedBuildInputs = [ jedi pluggy future python-jsonrpc-server ]
47+ propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ]
4848 ++ stdenv.lib.optional (withProvider "autopep8") autopep8
4949 ++ stdenv.lib.optional (withProvider "mccabe") mccabe
5050 ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
pkgs/development/python-modules/pyzmq/default.nix+3
@@ -32,4 +32,7 @@ buildPythonPackage rec {
3232 and not test_on_recv_wake \
3333 and not test_monitor"
3434 '';
35+
36+ # Some of the tests use localhost networking.
37+ __darwinAllowLocalNetworking = true;
3538}
pkgs/development/python-modules/sentry-sdk/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi }:
1+{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi, django, flask, tornado, sanic, aiohttp, bottle, rq, falcon, pyramid, celery }:
22
33buildPythonPackage rec {
44 pname = "sentry-sdk";
@@ -9,6 +9,8 @@ buildPythonPackage rec {
99 sha256 = "f5819df450d7b0696be69a0c6d70a09e4890a3844ee8ccb7a461794135bd5965";
1010 };
1111
12+ checkInputs = [ django flask tornado sanic aiohttp bottle rq falcon pyramid celery ];
13+
1214 propagatedBuildInputs = [ urllib3 certifi ];
1315
1416 meta = with stdenv.lib; {
pkgs/development/python-modules/trustme/default.nix+3
@@ -36,6 +36,9 @@ buildPythonPackage rec {
3636 pytest
3737 '';
3838
39+ # Some of the tests use localhost networking.
40+ __darwinAllowLocalNetworking = true;
41+
3942 meta = {
4043 description = "High quality TLS certs while you wait, for the discerning tester";
4144 homepage = https://github.com/python-trio/trustme;
pkgs/development/python-modules/typed-ast/default.nix+7−5
@@ -1,10 +1,12 @@
1−{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
1+{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder }:
22buildPythonPackage rec {
33 pname = "typed-ast";
4− version = "1.3.5";
5− src = fetchPypi{
6− inherit pname version;
7− sha256 = "1m7pr6qpana3cvqwiw7mlvrgvmw27ch5mx1592572xhlki8g85ak";
4+ version = "1.4.0";
5+ src = fetchFromGitHub{
6+ owner = "python";
7+ repo = "typed_ast";
8+ rev = version;
9+ sha256 = "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb";
810 };
911 # Only works with Python 3.3 and newer;
1012 disabled = pythonOlder "3.3";
pkgs/development/python-modules/uvicorn/default.nix+16−8
@@ -1,23 +1,27 @@
11{ lib
22, buildPythonPackage
3−, fetchPypi
3+, fetchFromGitHub
44, click
55, h11
66, httptools
77, uvloop
88, websockets
99, wsproto
10+, pytest
11+, requests
1012, isPy27
1113}:
1214
1315buildPythonPackage rec {
1416 pname = "uvicorn";
15− version = "0.8.4";
17+ version = "0.9.0";
1618 disabled = isPy27;
1719
18− src = fetchPypi {
19− inherit pname version;
20− sha256 = "1l8rfm30inx9pma893i7sby9h7y910k58841zqaajksn563b882k";
20+ src = fetchFromGitHub {
21+ owner = "encode";
22+ repo = pname;
23+ rev = version;
24+ sha256 = "0z4h04mbkzqgpk698bac6f50jxkf02ils6khzl7zbw7yvi6gkkc8";
2125 };
2226
2327 propagatedBuildInputs = [
@@ -29,11 +33,15 @@ buildPythonPackage rec {
2933 wsproto
3034 ];
3135
32− checkPhase = ''
33− $out/bin/uvicorn --help
36+ postPatch = ''
37+ substituteInPlace setup.py \
38+ --replace "h11==0.8.*" "h11"
3439 '';
3540
36− patches = [ ./setup.patch ];
41+ checkInputs = [ pytest requests ];
42+ checkPhase = ''
43+ pytest
44+ '';
3745
3846 meta = with lib; {
3947 homepage = https://www.uvicorn.org/;
pkgs/development/python-modules/uvicorn/setup.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/setup.py b/setup.py
2−index 802cda4..561abf4 100755
3−--- a/setup.py
4−+++ b/setup.py
5−@@ -42,7 +42,7 @@ env_marker = (
6−
7− requirements = [
8− "click==7.*",
9−- "h11==0.8.*",
10−+ "h11",
11− "websockets==7.*",
12− "httptools==0.0.13 ;" + env_marker,
13− "uvloop==0.12.* ;" + env_marker,
pkgs/development/python-modules/uvloop/darwin_sandbox.patchnew file+28
@@ -0,0 +1,28 @@
1+diff --git a/tests/test_pipes.py b/tests/test_pipes.py
2+index d883abf..2e74d7a 100644
3+--- a/tests/test_pipes.py
4++++ b/tests/test_pipes.py
5+@@ -2,6 +2,7 @@ import asyncio
6+ import io
7+ import os
8+ import socket
9++import unittest
10+
11+ from uvloop import _testbase as tb
12+
13+@@ -96,6 +97,7 @@ class _BasePipeTest:
14+ # extra info is available
15+ self.assertIsNotNone(proto.transport.get_extra_info('pipe'))
16+
17++ @unittest.skip("darwin sandbox")
18+ def test_read_pty_output(self):
19+ proto = MyReadPipeProto(loop=self.loop)
20+
21+@@ -198,6 +200,7 @@ class _BasePipeTest:
22+ self.loop.run_until_complete(proto.done)
23+ self.assertEqual('CLOSED', proto.state)
24+
25++ @unittest.skip("darwin sandbox")
26+ def test_write_pty(self):
27+ master, slave = os.openpty()
28+ os.set_blocking(master, False)
pkgs/development/python-modules/uvloop/default.nix+5
@@ -20,6 +20,8 @@ buildPythonPackage rec {
2020 sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l";
2121 };
2222
23+ patches = lib.optional stdenv.isDarwin ./darwin_sandbox.patch;
24+
2325 buildInputs = [
2426 libuv
2527 ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
@@ -31,6 +33,9 @@ buildPythonPackage rec {
3133
3234 checkInputs = [ pyopenssl psutil ];
3335
36+ # Some of the tests use localhost networking.
37+ __darwinAllowLocalNetworking = true;
38+
3439 meta = with lib; {
3540 description = "Fast implementation of asyncio event loop on top of libuv";
3641 homepage = http://github.com/MagicStack/uvloop;
pkgs/development/python-modules/websockets/default.nix+11−9
@@ -1,24 +1,26 @@
11{ lib
2−, fetchPypi
2+, fetchFromGitHub
33, buildPythonPackage
44, pythonOlder
5+, pytest
56}:
67
78buildPythonPackage rec {
89 pname = "websockets";
9− version = "7.0";
10+ version = "8.0.2";
1011
11− src = fetchPypi {
12− inherit pname version;
13− sha256 = "17vwr6sa1y3lb24wzfyyc98c5v03di4j8f24qkqa9vsvaghc7qq8";
12+ src = fetchFromGitHub {
13+ owner = "aaugustin";
14+ repo = pname;
15+ rev = version;
16+ sha256 = "02fgb8gib4z5fqv30brz3mhxmblw9bw0978fhpjdrkj7wvqrz5h8";
1417 };
1518
1619 disabled = pythonOlder "3.3";
17− doCheck = false; # protocol tests fail
1820
19− meta = {
21+ meta = with lib; {
2022 description = "WebSocket implementation in Python 3";
21− homepage = https://github.com/aaugustin/websockets;
22− license = lib.licenses.bsd3;
23+ homepage = "https://github.com/aaugustin/websockets";
24+ license = licenses.bsd3;
2325 };
2426}
pkgs/development/r-modules/default.nix+2−2
@@ -325,7 +325,7 @@ let
325325 rmatio = [ pkgs.zlib.dev ];
326326 Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
327327 Rmpi = [ pkgs.openmpi ];
328− RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ];
328+ RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ];
329329 RNetCDF = [ pkgs.netcdf pkgs.udunits ];
330330 RODBCext = [ pkgs.libiodbc ];
331331 RODBC = [ pkgs.libiodbc ];
@@ -810,7 +810,7 @@ let
810810 });
811811
812812 RMySQL = old.RMySQL.overrideDerivation (attrs: {
813− MYSQL_DIR="${pkgs.libmysqlclient}";
813+ MYSQL_DIR=pkgs.mysql.connector-c;
814814 preConfigure = ''
815815 patchShebangs configure
816816 '';
pkgs/development/ruby-modules/gem-config/default.nix+3−3
@@ -20,7 +20,7 @@
2020{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
2121, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
2222, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
23−, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
23+, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
2424, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
2525, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
2626, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
@@ -349,11 +349,11 @@ in
349349 };
350350
351351 mysql = attrs: {
352− buildInputs = [ libmysqlclient zlib openssl ];
352+ buildInputs = [ mysql.connector-c zlib openssl ];
353353 };
354354
355355 mysql2 = attrs: {
356− buildInputs = [ libmysqlclient zlib openssl ];
356+ buildInputs = [ mysql.connector-c zlib openssl ];
357357 };
358358
359359 ncursesw = attrs: {
pkgs/development/tools/ammonite/default.nix+15−14
@@ -1,30 +1,27 @@
1−{ stdenv, lib, fetchurl, makeWrapper, jre, gnused
1+{ stdenv, fetchurl, jre
22, disableRemoteLogging ? true
33}:
44
55with stdenv.lib;
6+
7+let
8+common = { scalaVersion, sha256 }:
69stdenv.mkDerivation rec {
710 pname = "ammonite";
811 version = "1.7.1";
9− scalaVersion = "2.12";
1012
1113 src = fetchurl {
1214 url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
13− sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0";
15+ inherit sha256;
1416 };
1517
16− propagatedBuildInputs = [ jre ] ;
17− buildInputs = [ makeWrapper gnused ] ;
18−
1918 phases = "installPhase";
2019
2120 installPhase = ''
22− mkdir -p $out/bin
23− cp ${src} $out/bin/amm
24− chmod +x $out/bin/amm
25− ${gnused}/bin/sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
21+ install -Dm755 ${src} $out/bin/amm
22+ sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
2623 '' + optionalString (disableRemoteLogging) ''
27− ${gnused}/bin/sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
24+ sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
2825 '';
2926
3027 meta = {
@@ -36,8 +33,12 @@ stdenv.mkDerivation rec {
3633 that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh.
3734 '';
3835 homepage = http://www.lihaoyi.com/Ammonite/;
39− license = lib.licenses.mit;
40− platforms = lib.platforms.all;
41− maintainers = [ lib.maintainers.nequissimus ];
36+ license = licenses.mit;
37+ platforms = platforms.all;
38+ maintainers = [ maintainers.nequissimus ];
4239 };
40+};
41+in {
42+ ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; };
43+ ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "01dyc6bilhcr1mwrpmhjc8nhzfqgjh44bx36gd3gk9mkvlbys5mp"; };
4344}
pkgs/development/tools/analysis/flow/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "flow";
5− version = "0.107.0";
5+ version = "0.108.0";
66
77 src = fetchFromGitHub {
88 owner = "facebook";
99 repo = "flow";
1010 rev = "refs/tags/v${version}";
11− sha256 = "1in7a006lgw4v2p0gn5sx41cn3p259vncpq0l3rz52lyfpn7ai3b";
11+ sha256 = "13irr1hkv7mxvq57pywmjmqdf5fv359vl5d19w3sra3rqg7vi3ws";
1212 };
1313
1414 installPhase = ''
pkgs/development/tools/analysis/tflint/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "tflint";
5− version = "0.11.1";
5+ version = "0.11.2";
66
77 src = fetchFromGitHub {
88 owner = "wata727";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0aw39xv6jpnhy201gp9jhz6cbz47k7qgxgcwsffak8janbk6bj2a";
11+ sha256 = "1lhg81bsmzxs46329rlayf8k2y7fbjlmxj09rqbygr9f0693rzgy";
1212 };
1313
14− modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh";
14+ modSha256 = "10za02363yglhj0pbsd2591rflrrcq12gxx9d53pg9hb7lrxj9ij";
1515
1616 subPackages = [ "." ];
1717
pkgs/development/tools/build-managers/redo-apenwarr/default.nix+3−3
@@ -17,10 +17,10 @@ in stdenv.mkDerivation rec {
1717 pname = "redo-apenwarr";
1818 version = "0.42";
1919
20− src = fetchFromGitHub {
20+ src = fetchFromGitHub rec {
2121 owner = "apenwarr";
22− repo = pname;
23− rev = "${pname}-${version}";
22+ repo = "redo";
23+ rev = "${repo}-${version}";
2424 sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm";
2525 };
2626
pkgs/development/tools/misc/hydra-cli/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }:
2+
3+rustPlatform.buildRustPackage rec {
4+ pname = "hydra-cli";
5+ version = "0.2.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "nlewo";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc";
12+ };
13+
14+ cargoSha256 = "0dqj2pdqfbgg8r3h2s07p3m9zgl9xl4vislbqs6a0f1ahrczlda5";
15+
16+ buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
17+
18+ nativeBuildInputs = [
19+ pkgconfig
20+ openssl
21+ ];
22+
23+ meta = with stdenv.lib; {
24+ description = "A client for the Hydra CI";
25+ homepage = "https://github.com/nlewo/hydra-cli";
26+ license = with licenses; [ mit ];
27+ maintainers = with maintainers; [ gilligan lewo ];
28+ platforms = platforms.all;
29+ };
30+
31+}
pkgs/development/tools/misc/patchelf/default.nix+4−15
@@ -1,27 +1,16 @@
1−{ stdenv, fetchurl, autoreconfHook }:
1+{ stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
4− name = "patchelf-${version}";
5− version = "0.10";
4+ name = "patchelf-0.9";
65
76 src = fetchurl {
87 url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
9− sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
8+ sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
109 };
1110
12− # Drop test that fails on musl (?)
13− postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
14− substituteInPlace tests/Makefile.am \
15− --replace "set-rpath-library.sh" ""
16− '';
17−
1811 setupHook = [ ./setup-hook.sh ];
1912
20− nativeBuildInputs = [ autoreconfHook ];
21− buildInputs = [ ];
22−
23− # if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
24− doCheck = stdenv.hostPlatform.isMusl;
13+ doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
2514
2615 meta = with stdenv.lib; {
2716 homepage = https://nixos.org/patchelf.html;
pkgs/development/tools/misc/patchelf/unstable.nix+16−10
@@ -1,18 +1,24 @@
1−{ stdenv, fetchurl, autoreconfHook }:
1+{ stdenv, fetchFromGitHub, autoreconfHook }:
22
33stdenv.mkDerivation rec {
4− name = "patchelf-${version}";
5− version = "0.10";
4+ pname = "patchelf";
5+ version = "0.10-pre-20190328";
66
7− src = fetchurl {
8− url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
9− sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
7+ src = fetchFromGitHub {
8+ owner = "NixOS";
9+ repo = "patchelf";
10+ rev = "e1e39f3639e39360ceebb2f7ed533cede4623070";
11+ sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k";
1012 };
1113
1214 # Drop test that fails on musl (?)
1315 postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
1416 substituteInPlace tests/Makefile.am \
1517 --replace "set-rpath-library.sh" ""
18+ '' +
19+ # extend version identifier to more informative than "0.10".
20+ ''
21+ echo -n ${version} > version
1622 '';
1723
1824 setupHook = [ ./setup-hook.sh ];
@@ -22,11 +28,11 @@ stdenv.mkDerivation rec {
2228
2329 doCheck = !stdenv.isDarwin;
2430
25− meta = with stdenv.lib; {
31+ meta = {
2632 homepage = https://nixos.org/patchelf.html;
27− license = licenses.gpl3;
33+ license = "GPL";
2834 description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
29− maintainers = [ maintainers.eelco ];
30− platforms = platforms.all;
35+ maintainers = [ stdenv.lib.maintainers.eelco ];
36+ platforms = stdenv.lib.platforms.all;
3137 };
3238}
pkgs/development/tools/misc/sysbench/default.nix+2−2
@@ -1,11 +1,11 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysqlclient
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql
22, libaio }:
33
44stdenv.mkDerivation {
55 name = "sysbench-1.0.17";
66
77 nativeBuildInputs = [ autoreconfHook pkgconfig ];
8− buildInputs = [ vim libmysqlclient libaio ];
8+ buildInputs = [ vim mysql.connector-c libaio ];
99
1010 src = fetchFromGitHub {
1111 owner = "akopytov";
pkgs/development/tools/misc/terraform-lsp/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "terraform-lsp";
5− version = "0.0.6";
5+ version = "0.0.9";
66
77 src = fetchFromGitHub {
88 owner = "juliosueiras";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "1nalypaw64kdv5zmmb0xgkajhs2gf71ivbxvgwpgvlv2lyidawx5";
11+ sha256 = "1m133fznf58fkjl5yx0gxa3cjfb0h8f9fv760c9h1d5cg279bghk";
1212 };
1313
1414 modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2";
pkgs/development/tools/misc/ycmd/default.nix+22−11
@@ -1,18 +1,19 @@
11{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python
22, gocode ? null
33, godef ? null
4+, gotools ? null
45, rustracerd ? null
56, fixDarwinDylibNames, Cocoa ? null
67}:
78
89stdenv.mkDerivation {
910 pname = "ycmd";
10− version = "2018-09-20";
11+ version = "2019-09-19";
1112
1213 src = fetchgit {
1314 url = "https://github.com/Valloric/ycmd.git";
14− rev = "bf658fd78722c517674c0aaf2381e199bca8f163";
15− sha256 = "1lwa8xr76vapfpncvp81cn3m9219yw14fl7fzk5gnly60zkphbbl";
15+ rev = "c6d360775b0c5c82e2513dce7b625f8bf3812702";
16+ sha256 = "19rxlval20gg65xc5p7q9cnzfm9zw2j0m6vxxk0vqlalcyh0rnzd";
1617 };
1718
1819 nativeBuildInputs = [ cmake ];
@@ -49,18 +50,28 @@ stdenv.mkDerivation {
4950 mkdir -p $out/bin
5051 ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
5152
52− mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
53−
54− for p in jedi waitress frozendict bottle parso python-future requests; do
55− cp -r third_party/$p $out/lib/ycmd/third_party
56− done
53+ # Copy everything: the structure of third_party has been known to change.
54+ # When linking our own libraries below, do so with '-f'
55+ # to clobber anything we may have copied here.
56+ mkdir -p $out/lib/ycmd/third_party
57+ cp -r third_party/* $out/lib/ycmd/third_party/
5758
5859 '' + lib.optionalString (gocode != null) ''
59− ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode
60+ TARGET=$out/lib/ycmd/third_party/gocode
61+ mkdir -p $TARGET
62+ ln -sf ${gocode}/bin/gocode $TARGET
6063 '' + lib.optionalString (godef != null) ''
61− ln -s ${godef}/bin/godef $out/lib/ycmd/third_party/godef
64+ TARGET=$out/lib/ycmd/third_party/godef
65+ mkdir -p $TARGET
66+ ln -sf ${godef}/bin/godef $TARGET
67+ '' + lib.optionalString (gotools != null) ''
68+ TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls
69+ mkdir -p $TARGET
70+ ln -sf ${gotools}/bin/gopls $TARGET
6271 '' + lib.optionalString (rustracerd != null) ''
63− ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release
72+ TARGET=$out/lib/ycmd/third_party/racerd/target/release
73+ mkdir -p $TARGET
74+ ln -sf ${rustracerd}/bin/racerd $TARGET
6475 '';
6576
6677 # fixup the argv[0] and replace __file__ with the corresponding path so
pkgs/development/tools/pgformatter/default.nix+2−2
@@ -2,13 +2,13 @@
22
33perlPackages.buildPerlPackage rec {
44 pname = "pgformatter";
5− version = "4.0";
5+ version = "4.1";
66
77 src = fetchFromGitHub {
88 owner = "darold";
99 repo = "pgFormatter";
1010 rev = "v${version}";
11− sha256 = "09p242s406mf469p66zp1jmp9pxcim2vk1v6qsxnrbzicchsn5i2";
11+ sha256 = "1xp26p70zn7mh4qg4w74a690ww43b1csgl92ak9fg8kidgwcbprd";
1212 };
1313
1414 outputs = [ "out" ];
pkgs/development/tools/tora/default.nix+3−3
@@ -1,5 +1,5 @@
11{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
2−, boost, doxygen, openssl, libmysqlclient, postgresql, graphviz, loki
2+, boost, doxygen, openssl, mysql, postgresql, graphviz, loki
33, qscintilla, qtbase, qttools }:
44
55mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
1616 nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
1717
1818 buildInputs = [
19− boost doxygen graphviz loki libmysqlclient openssl postgresql qscintilla qtbase
19+ boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase
2020 ];
2121
2222 preConfigure = ''
@@ -47,7 +47,7 @@ mkDerivation {
4747 "-lssl"
4848 ];
4949
50− NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ];
50+ NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ];
5151
5252 qtWrapperArgs = [
5353 ''--prefix PATH : ${lib.getBin graphviz}/bin''
pkgs/games/minecraft/default.nix+114−28
@@ -1,51 +1,137 @@
1−{ stdenv, fetchurl, makeDesktopItem, makeWrapper
2−, jdk, jre, libpulseaudio, libXxf86vm
1+{ stdenv
2+, fetchurl
3+, makeDesktopItem
4+, makeWrapper
5+, jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960)
6+, xorg
7+, zlib
8+, nss
9+, nspr
10+, fontconfig
11+, gnome2
12+, cairo
13+, expat
14+, alsaLib
15+, cups
16+, dbus
17+, atk
18+, gtk2-x11
19+, gdk-pixbuf
20+, glib
21+, curl
22+, freetype
23+, libpulseaudio
24+, systemd
25+, flite ? null
26+, libXxf86vm ? null
327}:
428
529let
630 desktopItem = makeDesktopItem {
7− name = "minecraft";
8− exec = "minecraft";
9− icon = "minecraft";
10− comment = "A sandbox-building game";
11− desktopName = "Minecraft";
12− genericName = "minecraft";
13− categories = "Game;";
31+ name = "minecraft-launcher";
32+ exec = "minecraft-launcher";
33+ icon = "minecraft-launcher";
34+ comment = "Official launcher for Minecraft, a sandbox-building game";
35+ desktopName = "Minecraft Launcher";
36+ categories = "Game;Application;";
1437 };
1538
16− libPath = stdenv.lib.makeLibraryPath [
17− libpulseaudio
18− libXxf86vm # Needed only for versions <1.13
19− ];
39+ envLibPath = stdenv.lib.makeLibraryPath [
40+ curl
41+ libpulseaudio
42+ systemd
43+ alsaLib # needed for narrator
44+ flite # needed for narrator
45+ libXxf86vm # needed only for versions <1.13
46+ ];
2047
21−in stdenv.mkDerivation {
22− name = "minecraft-2015-07-24";
48+ libPath = stdenv.lib.makeLibraryPath ([
49+ alsaLib
50+ atk
51+ cairo
52+ cups
53+ dbus
54+ expat
55+ fontconfig
56+ freetype
57+ gdk-pixbuf
58+ glib
59+ gnome2.GConf
60+ gnome2.pango
61+ gtk2-x11
62+ nspr
63+ nss
64+ stdenv.cc.cc
65+ zlib
66+ ] ++
67+ (with xorg; [
68+ libX11
69+ libxcb
70+ libXcomposite
71+ libXcursor
72+ libXdamage
73+ libXext
74+ libXfixes
75+ libXi
76+ libXrandr
77+ libXrender
78+ libXtst
79+ libXScrnSaver
80+ ]));
81+in
82+ stdenv.mkDerivation rec {
83+ pname = "minecraft-launcher";
84+
85+ version = "2.1.5965";
2386
2487 src = fetchurl {
25− url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar";
26− sha256 = "04pj4l5q0a64jncm2kk45r7nxnxa2z9n110dcxbbahdi6wk0png8";
88+ url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
89+ sha256 = "0wlc49s541li4cbxdmlw8fp34hp1q9m6ngr7l5hfdhv1i13s5845";
90+ };
91+
92+ icon = fetchurl {
93+ url = "https://launcher.mojang.com/download/minecraft-launcher.svg";
94+ sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim";
2795 };
2896
2997 nativeBuildInputs = [ makeWrapper ];
3098
31− unpackPhase = "${jdk}/bin/jar xf $src favicon.png";
99+ sourceRoot = ".";
100+
101+ dontConfigure = true;
102+ dontBuild = true;
32103
33104 installPhase = ''
34− mkdir -p $out/bin $out/share/minecraft
105+ mkdir -p $out/opt
106+ mv minecraft-launcher $out/opt
35107
36− makeWrapper ${jre}/bin/java $out/bin/minecraft \
37− --add-flags "-jar $out/share/minecraft/minecraft.jar" \
38− --suffix LD_LIBRARY_PATH : ${libPath}
108+ ${desktopItem.buildCommand}
109+ install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg
39110
40− cp $src $out/share/minecraft/minecraft.jar
41− cp -r ${desktopItem}/share/applications $out/share
42− install -D favicon.png $out/share/icons/hicolor/32x32/apps/minecraft.png
111+ makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
112+ --prefix LD_LIBRARY_PATH : ${envLibPath} \
113+ --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]}
114+ '';
115+
116+ preFixup = ''
117+ patchelf \
118+ --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
119+ --set-rpath '$ORIGIN/'":${libPath}" \
120+ $out/opt/minecraft-launcher/minecraft-launcher
121+ patchelf \
122+ --set-rpath '$ORIGIN/'":${libPath}" \
123+ $out/opt/minecraft-launcher/libcef.so
124+ patchelf \
125+ --set-rpath '$ORIGIN/'":${libPath}" \
126+ $out/opt/minecraft-launcher/liblauncher.so
43127 '';
44128
45129 meta = with stdenv.lib; {
46− description = "A sandbox-building game";
47− homepage = https://minecraft.net;
130+ description = "Official launcher for Minecraft, a sandbox-building game";
131+ homepage = "https://minecraft.net";
48132 maintainers = with maintainers; [ cpages ryantm infinisil ];
49− license = licenses.unfreeRedistributable;
133+ license = licenses.unfree;
50134 };
135+
136+ passthru.updateScript = ./update.sh;
51137}
pkgs/games/minecraft/update.shnew file+7
@@ -0,0 +1,7 @@
1+#!/usr/bin/env nix-shell
2+#!nix-shell -i bash -p curl jq gnugrep common-updater-scripts
3+
4+set -eu -o pipefail
5+
6+version=$(curl -s 'https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=minecraft-launcher' | jq '.results[0].Version' | grep -Po '[.\d]*(?=-)')
7+update-source-version minecraft "$version"
pkgs/games/zod/default.nix+3−3
@@ -1,5 +1,5 @@
11{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
2−, libmysqlclient, makeWrapper }:
2+, mysql, makeWrapper }:
33
44stdenv.mkDerivation {
55 name = "zod-engine-2011-03-18";
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
2424 sourceRoot=`pwd`/src
2525 '';
2626
27− buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ];
27+ buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ];
2828
29− NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
29+ NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql";
3030
3131 installPhase = ''
3232 mkdir -p $out/bin $out/share/zod
pkgs/misc/emulators/wine/sources.nix+5−5
@@ -39,16 +39,16 @@ in rec {
3939
4040 unstable = fetchurl rec {
4141 # NOTE: Don't forget to change the SHA256 for staging as well.
42− version = "4.14";
42+ version = "4.16";
4343 url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz";
44− sha256 = "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs";
44+ sha256 = "17qxbddv23ibbayw1ai984m0dlq63cgplms2jhsc09incjhafywd";
4545 inherit (stable) mono gecko32 gecko64;
4646 };
4747
4848 staging = fetchFromGitHub rec {
4949 # https://github.com/wine-staging/wine-staging/releases
5050 inherit (unstable) version;
51− sha256 = "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j";
51+ sha256 = "0zkvwl6rxr6xcqk4a3h43cak67w6bcyqqnajz6azif07ir3z1c61";
5252 owner = "wine-staging";
5353 repo = "wine-staging";
5454 rev = "v${version}";
@@ -56,8 +56,8 @@ in rec {
5656
5757 winetricks = fetchFromGitHub rec {
5858 # https://github.com/Winetricks/winetricks/releases
59− version = "20190615";
60− sha256 = "1bdvj363yjn7agqq1fxdfz31j1rrs2wc02v874jjx5sw1bfq5qsa";
59+ version = "20190912";
60+ sha256 = "08my9crgpj5ai77bm64v99x4kmdb9dl8fw14581n69id449v7gzv";
6161 owner = "Winetricks";
6262 repo = "winetricks";
6363 rev = version;
pkgs/misc/vim-plugins/generated.nix+11
@@ -3466,6 +3466,17 @@ let
34663466 };
34673467 };
34683468
3469+ vim-gui-position = buildVimPluginFrom2Nix {
3470+ pname = "vim-gui-position";
3471+ version = "2019-06-06";
3472+ src = fetchFromGitHub {
3473+ owner = "brennanfee";
3474+ repo = "vim-gui-position";
3475+ rev = "065d0dcf96c28cfc0003d72c1b3c49203632f62a";
3476+ sha256 = "11kv9kkya9sybslg7lfhhcn2fi3n735zvprg8ch6kd58m82xr4n3";
3477+ };
3478+ };
3479+
34693480 vim-gutentags = buildVimPluginFrom2Nix {
34703481 pname = "vim-gutentags";
34713482 version = "2019-05-06";
pkgs/misc/vim-plugins/overrides.nix+3−3
@@ -49,16 +49,16 @@ self: super: {
4949 };
5050
5151 LanguageClient-neovim = let
52− version = "0.1.146";
52+ version = "0.1.154";
5353 LanguageClient-neovim-src = fetchurl {
5454 url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz";
55− sha256 = "1xm98pyzf2dlh04ijjf3nkh37lyqspbbjddkjny1g06xxb4kfxnk";
55+ sha256 = "03sp643nihj9p2s9cx2dcazhz68s30qx7igqprgsmr1040rhg2py";
5656 };
5757 LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
5858 name = "LanguageClient-neovim-bin";
5959 src = LanguageClient-neovim-src;
6060
61− cargoSha256 = "0dixvmwq611wg2g3rp1n1gqali46904fnhb90gcpl9a1diqb34sh";
61+ cargoSha256 = "1bvbls2l1xa0s3k11crvd98il4i20z5sn0hqmsc1b915k03qq4zj";
6262 buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
6363
6464 # FIXME: Use impure version of CoreFoundation because of missing symbols.
pkgs/misc/vim-plugins/vim-plugin-names+1
@@ -23,6 +23,7 @@ bitc/vim-hdevtools
2323bkad/camelcasemotion
2424bling/vim-bufferline
2525bogado/file-line
26+brennanfee/vim-gui-position
2627bronson/vim-trailing-whitespace
2728brooth/far.vim
2829carlitux/deoplete-ternjs
pkgs/os-specific/linux/firmware/fwupd/default.nix+3−3
@@ -237,9 +237,9 @@ stdenv.mkDerivation rec {
237237 postFixup = ''
238238 find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
239239 | while IFS= read -r -d ''' file; do
240− if [[ "$file" != *.efi ]]; then
241− echo "Wrapping program $file"
242− wrapGApp "$file"
240+ if [[ "''${file}" != *.efi ]]; then
241+ echo "Wrapping program ''${file}"
242+ wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
243243 fi
244244 done
245245 '';
pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.14.145";
6+ version = "4.14.146";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "0aa9b7ni6wadm43260vidqy4ngvws25027psbdnkl9hkcy0ba1gb";
16+ sha256 = "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.19.74";
6+ version = "4.19.75";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "10pfg5sijw9sx66ybrb06nlmlvj0sxxa1yjhg6qwdhi9sgm2yp29";
16+ sha256 = "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.4.193";
4+ version = "4.4.194";
55 extraMeta.branch = "4.4";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9− sha256 = "13iy0xyrqqagnrk7msp1qfw6xsc0dlc74dpdzki9rfsxcildxz3a";
9+ sha256 = "0kvlp2v4nvkilaanhpgwf8dkyfj24msaw0m38rbc4y51y69yhqvz";
1010 };
1111} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.9.193";
4+ version = "4.9.194";
55 extraMeta.branch = "4.9";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9− sha256 = "00gx2sg0zc1xz6gs1kdkkd35gn7kjq1bjp1ydc774szsq0f0ircv";
9+ sha256 = "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m";
1010 };
1111} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.2.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "5.2.16";
6+ version = "5.2.17";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "0xg5jnkmc7b552jrhi200ck7q4hql3az2fpjfwxj3ay8xp4n280c";
16+ sha256 = "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.3.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "5.3";
6+ version = "5.3.1";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "1ck70ns130nqf6xy02bwm67y00yh46lhjzdajq7zzx1wa6bw7wvq";
16+ sha256 = "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kexectools/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 depsBuildBuild = [ buildPackages.stdenv.cc ];
1919 buildInputs = [ zlib ];
2020
21− patches = [
21+ patches = stdenv.lib.optionals stdenv.hostPlatform.isi686 [
2222 # fix build on i686
2323 # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
2424 (fetchpatch {
pkgs/servers/clickhouse/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, cmake, libtool
22, boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
3−, libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka
3+, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka
44, readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash
55}:
66
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [ cmake libtool ninja ];
1919 buildInputs = [
2020 boost capnproto cctz clang-unwrapped double-conversion gperftools icu
21− libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka
21+ libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka
2222 readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash
2323 ];
2424
pkgs/servers/computing/slurm/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl
22, python, munge, perl, pam, openssl, zlib
3−, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
3+, ncurses, mysql, gtk2, lua, hwloc, numactl
44, readline, freeipmi, libssh2, xorg, lz4
55# enable internal X11 support via libssh2
66, enableX11 ? true
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 nativeBuildInputs = [ pkgconfig libtool ];
3636 buildInputs = [
3737 curl python munge perl pam openssl zlib
38− libmysqlclient ncurses gtk2 lz4
38+ mysql.connector-c ncurses gtk2 lz4
3939 lua hwloc numactl readline freeipmi
4040 ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
4141
pkgs/servers/freeradius/default.nix+3−3
@@ -13,7 +13,7 @@
1313, withMemcached ? false
1414, hiredis
1515, withRedis ? false
16−, libmysqlclient
16+, mysql
1717, withMysql ? false
1818, json_c
1919, withJson ? false
@@ -31,7 +31,7 @@ assert withPcap -> libpcap != null;
3131assert withCap -> libcap != null;
3232assert withMemcached -> libmemcached != null;
3333assert withRedis -> hiredis != null;
34−assert withMysql -> libmysqlclient != null;
34+assert withMysql -> mysql != null;
3535assert withYubikey -> libyubikey != null;
3636assert withCollectd -> collectd != null;
3737assert withRest -> curl != null && withJson;
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
5959 ++ optional withCap libcap
6060 ++ optional withMemcached libmemcached
6161 ++ optional withRedis hiredis
62− ++ optional withMysql libmysqlclient
62+ ++ optional withMysql mysql.connector-c
6363 ++ optional withJson json_c
6464 ++ optional withYubikey libyubikey
6565 ++ optional withCollectd collectd
pkgs/servers/http/h2o/default.nix+11−20
@@ -1,39 +1,30 @@
11{ stdenv, fetchFromGitHub
2−, pkgconfig, cmake
2+, pkgconfig, cmake, ninja
33, libressl, libuv, zlib
44}:
55
6−with builtins;
7−
86stdenv.mkDerivation rec {
9− pname = "h2o";
10− version = "2.2.6";
7+ pname = "h2o";
8+ version = "2.3.0-beta2";
119
1210 src = fetchFromGitHub {
1311 owner = "h2o";
1412 repo = "h2o";
1513 rev = "refs/tags/v${version}";
16− sha256 = "0qni676wqvxx0sl0pw9j0ph7zf2krrzqc1zwj73mgpdnsr8rsib7";
14+ sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n";
1715 };
1816
19− # We have to fix up some function prototypes, because despite upstream h2o
20− # issue #1705 (https://github.com/h2o/h2o/issues/1706), libressl 2.7+ doesn't
21− # seem to work
22− patchPhase = ''
23− substituteInPlace ./deps/neverbleed/neverbleed.c \
24− --replace 'static void RSA_' 'void RSA_' \
25− --replace 'static int RSA_' 'int RSA_'
26− '';
17+ outputs = [ "out" "man" "dev" "lib" ];
2718
28− nativeBuildInputs = [ pkgconfig cmake ];
29− buildInputs = [ libressl libuv zlib ];
3019 enableParallelBuilding = true;
20+ nativeBuildInputs = [ pkgconfig cmake ninja ];
21+ buildInputs = [ libressl libuv zlib ];
3122
32− meta = {
23+ meta = with stdenv.lib; {
3324 description = "Optimized HTTP/1 and HTTP/2 server";
3425 homepage = https://h2o.examp1e.net;
35− license = stdenv.lib.licenses.mit;
36− maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
37− platforms = stdenv.lib.platforms.linux;
26+ license = licenses.mit;
27+ maintainers = with maintainers; [ thoughtpolice ];
28+ platforms = platforms.linux;
3829 };
3930}
pkgs/servers/http/lighttpd/default.nix+3−3
@@ -1,6 +1,6 @@
11{ stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
22, openssl, enableMagnet ? false, lua5_1 ? null
3−, enableMysql ? false, libmysqlclient ? null
3+, enableMysql ? false, mysql ? null
44, enableLdap ? false, openldap ? null
55, enableWebDAV ? false, sqlite ? null, libuuid ? null
66, enableExtendedAttrs ? false, attr ? null
@@ -8,7 +8,7 @@
88}:
99
1010assert enableMagnet -> lua5_1 != null;
11−assert enableMysql -> libmysqlclient != null;
11+assert enableMysql -> mysql != null;
1212assert enableLdap -> openldap != null;
1313assert enableWebDAV -> sqlite != null;
1414assert enableWebDAV -> libuuid != null;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 nativeBuildInputs = [ pkgconfig ];
3434 buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
3535 ++ stdenv.lib.optional enableMagnet lua5_1
36− ++ stdenv.lib.optional enableMysql libmysqlclient
36+ ++ stdenv.lib.optional enableMysql mysql.connector-c
3737 ++ stdenv.lib.optional enableLdap openldap
3838 ++ stdenv.lib.optional enableWebDAV sqlite
3939 ++ stdenv.lib.optional enableWebDAV libuuid;
pkgs/servers/mail/dovecot/default.nix+2−2
@@ -3,7 +3,7 @@
33, clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl
44, nixosTests
55# Auth modules
6−, withMySQL ? false, libmysqlclient
6+, withMySQL ? false, mysql
77, withPgSQL ? false, postgresql
88, withSQLite ? true, sqlite
99}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 buildInputs =
1616 [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ]
1717 ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
18− ++ lib.optional withMySQL libmysqlclient
18+ ++ lib.optional withMySQL mysql.connector-c
1919 ++ lib.optional withPgSQL postgresql
2020 ++ lib.optional withSQLite sqlite;
2121
pkgs/servers/mail/exim/default.nix+6−6
@@ -1,6 +1,6 @@
11{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv
22, enableLDAP ? false, openldap
3−, enableMySQL ? false, libmysqlclient, zlib
3+, enableMySQL ? false, mysql, zlib
44, enableAuthDovecot ? false, dovecot
55, enablePAM ? false, pam
66, enableSPF ? true, libspf2
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ pkgconfig ];
1818 buildInputs = [ coreutils db openssl perl pcre ]
1919 ++ stdenv.lib.optional enableLDAP openldap
20− ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ]
20+ ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ]
2121 ++ stdenv.lib.optional enableAuthDovecot dovecot
2222 ++ stdenv.lib.optional enablePAM pam
2323 ++ stdenv.lib.optional enableSPF libspf2;
@@ -53,10 +53,10 @@ stdenv.mkDerivation rec {
5353 ''}
5454 ${stdenv.lib.optionalString enableMySQL ''
5555 s:^# \(LOOKUP_MYSQL=yes\)$:\1:
56− s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
57− s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
58− s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
59− s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/:
56+ s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1:
57+ s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
58+ s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
59+ s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/:
6060 ''}
6161 ${stdenv.lib.optionalString enableAuthDovecot ''
6262 s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
pkgs/servers/mail/opensmtpd/extras.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, openssl, libevent, libasr,
2− python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis,
2+ python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis,
33 enablePython ? true,
44 enableLua ? true,
55 enablePerl ? true,
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 nativeBuildInputs = [ pkgconfig ];
2222 buildInputs = [ openssl libevent
23− libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ];
23+ libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];
2424
2525 configureFlags = [
2626 "--sysconfdir=/etc"
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
8080 stdenv.lib.optional enableRedis
8181 "-I${hiredis}/include/hiredis -lhiredis"
8282 ++ stdenv.lib.optional enableMysql
83− "-L${libmysqlclient}/lib/mysql";
83+ "-L${mysql.connector-c}/lib/mysql";
8484
8585 meta = with stdenv.lib; {
8686 homepage = https://www.opensmtpd.org/;
pkgs/servers/mail/postfix/default.nix+3−3
@@ -3,7 +3,7 @@
33, buildPackages
44, withLDAP ? true, openldap
55, withPgSQL ? false, postgresql
6−, withMySQL ? false, libmysqlclient
6+, withMySQL ? false, mysql
77, withSQLite ? false, sqlite
88}:
99
@@ -12,7 +12,7 @@ let
1212 "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
1313 "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
1414 ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
15− ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]
15+ ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]
1616 ++ lib.optional withSQLite "-DHAS_SQLITE"
1717 ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
1818 auxlibs = lib.concatStringsSep " " ([
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
3636 nativeBuildInputs = [ makeWrapper m4 ];
3737 buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
3838 ++ lib.optional withPgSQL postgresql
39− ++ lib.optional withMySQL libmysqlclient
39+ ++ lib.optional withMySQL mysql.connector-c
4040 ++ lib.optional withSQLite sqlite
4141 ++ lib.optional withLDAP openldap;
4242
pkgs/servers/mautrix-telegram/default.nix+2−2
@@ -4,11 +4,11 @@ with python3.pkgs;
44
55buildPythonPackage rec {
66 pname = "mautrix-telegram";
7− version = "0.6.0";
7+ version = "0.6.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "fbed41838e1ef7e43f6e47ff38f9906cb311cfc5b3b6bc6f704babd7c83b193d";
11+ sha256 = "1lsi6x5yr8f9yjxsh1rmcd6wnxr6s6rpr720lg7sq629m42d9p1d";
1212 };
1313
1414 postPatch = ''
pkgs/servers/monitoring/plugins/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook
22, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl
3−, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps
3+, dnsutils, libdbi, mysql, zlib, openldap, procps
44, runtimeShell }:
55
66with stdenv.lib;
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
4848 '';
4949
5050 # !!! make openssh a runtime dependency only
51− buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ];
51+ buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ];
5252
5353 nativeBuildInputs = [ autoreconfHook ];
5454
pkgs/servers/monitoring/prometheus/apcupsd-exporter.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, buildGoPackage, fetchFromGitHub }:
2+
3+buildGoPackage rec {
4+ pname = "apcupsd-exporter";
5+ version = "unstable-2019-03-14";
6+
7+ goPackagePath = "github.com/mdlayher/apcupsd_exporter";
8+
9+ goDeps = ./apcupsd-exporter_deps.nix;
10+
11+ src = fetchFromGitHub {
12+ owner = "mdlayher";
13+ repo = "apcupsd_exporter";
14+ rev = "cbd49be";
15+ sha256 = "1h5z295m9bddch5bc8fppn02b31h370yns6026a1d4ygfy3w46y0";
16+ };
17+
18+ doCheck = true;
19+
20+ meta = with stdenv.lib; {
21+ description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)";
22+ homepage = "https://github.com/mdlayher/apcupsd_exporter";
23+ license = licenses.mit;
24+ maintainers = with maintainers; [ maintainers."1000101" ];
25+ platforms = platforms.all;
26+ };
27+}
pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nixnew file+93
@@ -0,0 +1,93 @@
1+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
2+[
3+ {
4+ goPackagePath = "github.com/beorn7/perks";
5+ fetch = {
6+ type = "git";
7+ url = "https://github.com/beorn7/perks";
8+ rev = "3a771d992973";
9+ sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
10+ };
11+ }
12+ {
13+ goPackagePath = "github.com/golang/protobuf";
14+ fetch = {
15+ type = "git";
16+ url = "https://github.com/golang/protobuf";
17+ rev = "v1.2.0";
18+ sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
19+ };
20+ }
21+ {
22+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
23+ fetch = {
24+ type = "git";
25+ url = "https://github.com/matttproud/golang_protobuf_extensions";
26+ rev = "v1.0.1";
27+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
28+ };
29+ }
30+ {
31+ goPackagePath = "github.com/mdlayher/apcupsd";
32+ fetch = {
33+ type = "git";
34+ url = "https://github.com/mdlayher/apcupsd";
35+ rev = "eb3dd99a75fe";
36+ sha256 = "0s1m6l4pnazqiymb8y89ajbxfl2cn0ahvhws10nvxvc4jjivlbbq";
37+ };
38+ }
39+ {
40+ goPackagePath = "github.com/prometheus/client_golang";
41+ fetch = {
42+ type = "git";
43+ url = "https://github.com/prometheus/client_golang";
44+ rev = "v0.9.2";
45+ sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs";
46+ };
47+ }
48+ {
49+ goPackagePath = "github.com/prometheus/client_model";
50+ fetch = {
51+ type = "git";
52+ url = "https://github.com/prometheus/client_model";
53+ rev = "5c3871d89910";
54+ sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
55+ };
56+ }
57+ {
58+ goPackagePath = "github.com/prometheus/common";
59+ fetch = {
60+ type = "git";
61+ url = "https://github.com/prometheus/common";
62+ rev = "4724e9255275";
63+ sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6";
64+ };
65+ }
66+ {
67+ goPackagePath = "github.com/prometheus/procfs";
68+ fetch = {
69+ type = "git";
70+ url = "https://github.com/prometheus/procfs";
71+ rev = "1dc9a6cbc91a";
72+ sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab";
73+ };
74+ }
75+ {
76+ goPackagePath = "golang.org/x/net";
77+ fetch = {
78+ type = "git";
79+ url = "https://go.googlesource.com/net";
80+ rev = "351d144fa1fc";
81+ sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k";
82+ };
83+ }
84+ {
85+ goPackagePath = "golang.org/x/sync";
86+ fetch = {
87+ type = "git";
88+ url = "https://go.googlesource.com/sync";
89+ rev = "42b317875d0f";
90+ sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3";
91+ };
92+ }
93+]
pkgs/servers/monitoring/zabbix/proxy.nix+2−2
@@ -3,7 +3,7 @@
33, snmpSupport ? true, net_snmp
44, sshSupport ? true, libssh2
55, sqliteSupport ? false, sqlite
6−, mysqlSupport ? false, libmysqlclient
6+, mysqlSupport ? false, mysql
77, postgresqlSupport ? false, postgresql
88}:
99
@@ -37,7 +37,7 @@ in
3737 ++ optional snmpSupport net_snmp
3838 ++ optional sqliteSupport sqlite
3939 ++ optional sshSupport libssh2
40− ++ optional mysqlSupport libmysqlclient
40+ ++ optional mysqlSupport mysql.connector-c
4141 ++ optional postgresqlSupport postgresql;
4242
4343 configureFlags = [
pkgs/servers/monitoring/zabbix/server.nix+2−2
@@ -4,7 +4,7 @@
44, odbcSupport ? true, unixODBC
55, snmpSupport ? true, net_snmp
66, sshSupport ? true, libssh2
7−, mysqlSupport ? false, libmysqlclient
7+, mysqlSupport ? false, mysql
88, postgresqlSupport ? false, postgresql
99}:
1010
@@ -40,7 +40,7 @@ in
4040 ++ optional ldapSupport openldap
4141 ++ optional snmpSupport net_snmp
4242 ++ optional sshSupport libssh2
43− ++ optional mysqlSupport libmysqlclient
43+ ++ optional mysqlSupport mysql.connector-c
4444 ++ optional postgresqlSupport postgresql;
4545
4646 configureFlags = [
pkgs/servers/openafs/1.8/module.nix+15−1
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
2−, kernel, glibc, perl, libtool_2, kerberos }:
2+, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }:
33
44with (import ./srcs.nix { inherit fetchurl; });
55
@@ -11,6 +11,20 @@ in stdenv.mkDerivation {
1111 name = "openafs-${version}-${kernel.modDirVersion}";
1212 inherit version src;
1313
14+ patches = [
15+ # Linux 5.3
16+ (fetchpatch {
17+ name = "openafs_1_8-recurse-keyring_search.patch";
18+ url = "http://git.openafs.org/?p=openafs.git;a=patch;h=02d82275c17284d04629282aa374bb39f511c989";
19+ sha256 = "03pkldwf6i67yf6i1705qp18rx5b0b342ryda8vfjw9lnvpinygs";
20+ })
21+ (fetchpatch {
22+ name = "openafs_1_8-send-sig.patch";
23+ url = "http://git.openafs.org/?p=openafs.git;a=patch;h=2b7af1243f46496c0b5973b3fa2a6396243f7613";
24+ sha256 = "13gyh5ncpp15dl7056gdzl5xhp2bmafc557bd2a4bwx9nyj53bag";
25+ })
26+ ];
27+
1428 nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
1529 ++ kernel.moduleBuildDependencies;
1630
pkgs/servers/plex/raw.nix+2−2
@@ -8,13 +8,13 @@
88# server, and the FHS userenv and corresponding NixOS module should
99# automatically pick up the changes.
1010stdenv.mkDerivation rec {
11− version = "1.16.5.1554-1e5ff713d";
11+ version = "1.16.6.1592-b9d49bdb7";
1212 pname = "plexmediaserver";
1313
1414 # Fetch the source
1515 src = fetchurl {
1616 url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
17− sha256 = "1h2f8dgwz9bnvj7h4nk61a5rpl62918nwq6v85d97miwjfc1mv6n";
17+ sha256 = "12wff06nlvcssa6sf6vhxajfd1dnr9870xn9fac4q7gf0yayj27j";
1818 };
1919
2020 outputs = [ "out" "basedb" ];
pkgs/servers/sql/mariadb/connector-c/3_1.nixdeleted−6
@@ -1,6 +0,0 @@
1−{ callPackage, ... } @ args:
2−
3−callPackage ./. (args // {
4− version = "3.1.2";
5− sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm";
6−})
pkgs/servers/sql/mariadb/connector-c/default.nixdeleted−54
@@ -1,54 +0,0 @@
1−{ stdenv, fetchurl, cmake
2−, curl, openssl, zlib
3−, libiconv
4−, version, sha256, ...
5−}:
6−
7−with stdenv.lib;
8−
9−stdenv.mkDerivation {
10− pname = "mariadb-connector-c";
11− inherit version;
12−
13− src = fetchurl {
14− urls = [
15− "https://downloads.mariadb.org/f/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
16− "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
17− ];
18− inherit sha256;
19− };
20−
21− cmakeFlags = [
22− "-DWITH_EXTERNAL_ZLIB=ON"
23− "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
24− "-DWITH_CURL=ON"
25− ];
26−
27− # The cmake setup-hook uses $out/lib by default, this is not the case here.
28− preConfigure = optionalString stdenv.isDarwin ''
29− cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
30− '';
31−
32− nativeBuildInputs = [ cmake ];
33− propagatedBuildInputs = [ curl openssl zlib ];
34− buildInputs = [ libiconv ];
35−
36− enableParallelBuilding = true;
37−
38− postFixup = ''
39− ln -sv mariadb_config $out/bin/mysql_config
40− ln -sv mariadb $out/lib/mysql
41− ln -sv mariadb $out/include/mysql
42− ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a
43− ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a
44− ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so
45− ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so
46− '';
47−
48− meta = {
49− description = "Client library that can be used to connect to MySQL or MariaDB";
50− license = licenses.lgpl21;
51− maintainers = with maintainers; [ globin ];
52− platforms = platforms.all;
53− };
54−}
pkgs/servers/sql/mariadb/default.nix+101
@@ -18,6 +18,13 @@ mytopEnv = perl.withPackages (p: with p; [ DataDumper DBDmysql DBI TermReadKey ]
1818mariadb = server // {
1919 inherit client; # MariaDB Client
2020 server = server; # MariaDB Server
21+ inherit connector-c; # libmysqlclient.so
22+ inherit galera;
23+};
24+
25+galeraLibs = buildEnv {
26+ name = "galera-lib-inputs-united";
27+ paths = [ openssl.out boost check ];
2128};
2229
2330common = rec { # attributes common to both builds
@@ -41,6 +48,9 @@ common = rec { # attributes common to both builds
4148
4249 prePatch = ''
4350 sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
51+ '' + optionalString stdenv.hostPlatform.isDarwin ''
52+ substituteInPlace cmake/build_configurations/mysql_release.cmake \
53+ --replace "SET(PLUGIN_AUTH_PAM YES)" ""
4454 '';
4555
4656 patches = [
@@ -208,4 +218,95 @@ server = stdenv.mkDerivation (common // {
208218
209219 CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";
210220});
221+
222+connector-c = stdenv.mkDerivation rec {
223+ pname = "mariadb-connector-c";
224+ version = "2.3.7";
225+
226+ src = fetchurl {
227+ url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/";
228+ sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl";
229+ name = "mariadb-connector-c-${version}-src.tar.gz";
230+ };
231+
232+ # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0
233+ cmakeFlags = [
234+ "-DWITH_EXTERNAL_ZLIB=ON"
235+ "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
236+ ];
237+
238+ # The cmake setup-hook uses $out/lib by default, this is not the case here.
239+ preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
240+ cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
241+ '';
242+
243+ nativeBuildInputs = [ cmake ];
244+ propagatedBuildInputs = [ openssl zlib ];
245+ buildInputs = [ libiconv ];
246+
247+ enableParallelBuilding = true;
248+
249+ postFixup = ''
250+ ln -sv mariadb_config $out/bin/mysql_config
251+ ln -sv mariadb $out/lib/mysql
252+ ln -sv mariadb $out/include/mysql
253+ '';
254+
255+ meta = with stdenv.lib; {
256+ description = "Client library that can be used to connect to MySQL or MariaDB";
257+ license = licenses.lgpl21;
258+ maintainers = with maintainers; [ globin ];
259+ platforms = platforms.all;
260+ };
261+};
262+
263+galera = stdenv.mkDerivation rec {
264+ pname = "mariadb-galera";
265+ version = "25.3.26";
266+
267+ src = fetchFromGitHub {
268+ owner = "codership";
269+ repo = "galera";
270+ rev = "release_${version}";
271+ sha256 = "0fs0c1px9lknf1a5wwb12z1hj7j7b6hsfjddggikvkdkrnr2xs1f";
272+ fetchSubmodules = true;
273+ };
274+
275+ buildInputs = [ asio boost check openssl scons ];
276+
277+ postPatch = ''
278+ substituteInPlace SConstruct \
279+ --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
280+ '';
281+
282+ preConfigure = ''
283+ export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
284+ export LIBPATH="${galeraLibs}/lib"
285+ '';
286+
287+ sconsFlags = "ssl=1 system_asio=0 strict_build_flags=0";
288+
289+ installPhase = ''
290+ # copied with modifications from scripts/packages/freebsd.sh
291+ GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
292+ install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
293+ install -m 555 "garb/garbd" "$out/bin/garbd"
294+ install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so"
295+ install -m 444 "scripts/packages/README" "$out/share/doc/galera/"
296+ install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/"
297+ install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
298+ install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2"
299+ install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
300+ install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
301+ install -m 444 "chromium/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
302+ '';
303+
304+ meta = {
305+ description = "Galera 3 wsrep provider library";
306+ homepage = http://galeracluster.com/;
307+ license = licenses.lgpl2;
308+ maintainers = with maintainers; [ izorkin ];
309+ platforms = platforms.all;
310+ };
311+};
211312in mariadb
pkgs/servers/sql/mariadb/galera/25.nixdeleted−6
@@ -1,6 +0,0 @@
1−{ callPackage, ... } @ args:
2−
3−callPackage ./. (args // {
4− version = "25.3.27";
5− sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q";
6−})
pkgs/servers/sql/mariadb/galera/default.nixdeleted−63
@@ -1,63 +0,0 @@
1−{ stdenv, fetchFromGitHub, buildEnv
2−, asio, boost, check, openssl, scons
3−, version, sha256, ...
4−}:
5−
6−let
7− pname = "mariadb-galera";
8− galeraLibs = buildEnv {
9− name = "galera-lib-inputs-united";
10− paths = [ openssl.out boost check ];
11− };
12−
13−in stdenv.mkDerivation {
14− inherit pname;
15− inherit version;
16−
17− src = fetchFromGitHub {
18− owner = "codership";
19− repo = "galera";
20− rev = "release_${version}";
21− inherit sha256;
22− fetchSubmodules = true;
23− };
24−
25− buildInputs = [ asio boost check openssl scons ];
26−
27− postPatch = ''
28− substituteInPlace SConstruct \
29− --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
30− '';
31−
32− preConfigure = ''
33− export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
34− export LIBPATH="${galeraLibs}/lib"
35− '';
36−
37− sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";
38−
39− enableParallelBuilding = true;
40−
41− installPhase = ''
42− # copied with modifications from scripts/packages/freebsd.sh
43− GALERA_LICENSE_DIR="$share/licenses/${pname}"
44− install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
45− install -m 555 "garb/garbd" "$out/bin/garbd"
46− install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so"
47− install -m 444 "scripts/packages/README" "$out/share/doc/galera/"
48− install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/"
49− install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
50− install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2"
51− install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
52− install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
53− install -m 444 "chromium/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.chromium"
54− '';
55−
56− meta = with stdenv.lib; {
57− description = "Galera 3 wsrep provider library";
58− homepage = http://galeracluster.com/;
59− license = licenses.lgpl2;
60− maintainers = with maintainers; [ izorkin ];
61− platforms = platforms.all;
62− };
63−}
pkgs/servers/uwsgi/default.nix+2−2
@@ -4,7 +4,7 @@
44, pam, withPAM ? stdenv.isLinux
55, systemd, withSystemd ? stdenv.isLinux
66, python2, python3, ncurses
7−, ruby, php-embed, libmysqlclient
7+, ruby, php-embed, mysql
88}:
99
1010let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
@@ -34,7 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "
3434 # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
3535 path = "plugins/php";
3636 inputs = [ php-embed ] ++ php-embed.buildInputs;
37− NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ];
37+ NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ];
3838 })
3939 ];
4040
pkgs/shells/liquidprompt/default.nixnew file+32
@@ -0,0 +1,32 @@
1+{ stdenv, fetchFromGitHub }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "liquidprompt";
5+ version = "unstable-2018-05-21";
6+
7+ src = fetchFromGitHub {
8+ owner = "nojhan";
9+ repo = pname;
10+ rev = "eda83efe4e0044f880370ed5e92aa7e3fdbef971";
11+ sha256 = "1p7ah3x850ajpq07xvxxd7fx2i67cf0n71ww085g32k9fwij4rd4";
12+ };
13+
14+ installPhase = ''
15+ install -D -m 0444 liquidprompt $out/bin/liquidprompt
16+ install -D -m 0444 liquidpromptrc-dist $out/share/doc/liquidprompt/liquidpromptrc-dist
17+ install -D -m 0444 liquid.theme $out/share/doc/liquidprompt/liquid.theme
18+
19+ install -D -m 0444 liquidprompt.plugin.zsh \
20+ $out/share/zsh/plugins/liquidprompt/liquidprompt.plugin.zsh
21+ install -D -m 0444 liquidprompt \
22+ $out/share/zsh/plugins/liquidprompt/liquidprompt
23+ '';
24+
25+ meta = with stdenv.lib; {
26+ description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh";
27+ homepage = https://github.com/nojhan/liquidprompt;
28+ license = licenses.agpl3;
29+ platforms = platforms.all;
30+ maintainers = with maintainers; [ gerschtli ];
31+ };
32+}
pkgs/shells/zsh/oh-my-zsh/default.nix+3−3
@@ -4,13 +4,13 @@
44{ stdenv, fetchgit }:
55
66stdenv.mkDerivation rec {
7− version = "2019-09-13";
7+ version = "2019-09-20";
88 pname = "oh-my-zsh";
9− rev = "32338fd40cae45c775dadc34ae05476811a3834b";
9+ rev = "6cfaa076272e08b6a81b6358b78d020e48f8a4a6";
1010
1111 src = fetchgit { inherit rev;
1212 url = "https://github.com/robbyrussell/oh-my-zsh";
13− sha256 = "0fp1hzxmml14ds12751icbsm2v3rhwm2vf5qzc65722fvvb98p0p";
13+ sha256 = "0i1mlw42g2w5pbg6zsl48pdwv1hy5zrwx9kq4w04mynwg7mc9hs5";
1414 };
1515
1616 pathsToLink = [ "/share/oh-my-zsh" ];
pkgs/shells/zsh/zsh-completions/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "zsh-completions";
5− version = "0.30.0";
5+ version = "0.31.0";
66
77 src = fetchFromGitHub {
88 owner = "zsh-users";
9− repo = "zsh-completions";
9+ repo = pname;
1010 rev = version;
11− sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l";
11+ sha256 = "0rw23m8cqxhcb4yjhbzb9lir60zn1xjy7hn3zv1fzz700f0i6fyk";
1212 };
1313
1414 installPhase= ''
pkgs/stdenv/adapters.nix−1
@@ -62,7 +62,6 @@ rec {
6262 ];
6363 mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ];
6464 });
65− static = true;
6665 };
6766
6867
pkgs/tools/admin/nomachine-client/default.nix+6−6

This diff is too big to show here.

pkgs/tools/backup/bareos/default.nix+4−4

This diff is too big to show here.

pkgs/tools/backup/bup/default.nix+2−2

This diff is too big to show here.

pkgs/tools/backup/mydumper/default.nix+2−2

This diff is too big to show here.

pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patchdeleted−90

This diff is too big to show here.

pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patchdeleted−83

This diff is too big to show here.

pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patchdeleted−220

This diff is too big to show here.

pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch → pkgs/tools/filesystems/squashfs/4k-align.patchrenamed+31−20

This diff is too big to show here.

pkgs/tools/filesystems/squashfs/darwin.patch+84−158

This diff is too big to show here.

pkgs/tools/filesystems/squashfs/default.nix+5−11

This diff is too big to show here.

pkgs/tools/graphics/zbar/default.nix+4−3

This diff is too big to show here.

pkgs/tools/misc/shunit2/default.nixnew file+32

This diff is too big to show here.

pkgs/tools/misc/starship/default.nix+5−6

This diff is too big to show here.

pkgs/tools/networking/croc/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/httpie/default.nix+4−4

This diff is too big to show here.

pkgs/tools/networking/ip2unix/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/kea/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/mailutils/default.nix+4−4

This diff is too big to show here.

pkgs/tools/networking/maxscale/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/modem-manager/default.nix+7

This diff is too big to show here.

pkgs/tools/networking/network-manager/default.nix+5

This diff is too big to show here.

pkgs/tools/security/thc-hydra/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/tor/default.nix+2−2

This diff is too big to show here.

pkgs/tools/system/collectd/default.nix+2−2

This diff is too big to show here.

pkgs/tools/system/plan9port/builder.sh+1−1

This diff is too big to show here.

pkgs/tools/system/rsyslog/default.nix+3−3

This diff is too big to show here.

pkgs/top-level/aliases.nix+4−3

This diff is too big to show here.

pkgs/top-level/all-packages.nix+36−24

This diff is too big to show here.

pkgs/top-level/ocaml-packages.nix+4

This diff is too big to show here.

pkgs/top-level/python-packages.nix+4

This diff is too big to show here.

pkgs/top-level/release.nix+1−1

This diff is too big to show here.