summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2020-10-28 03:00:32 +0100
committerAndreas Rammhold <andreas@rammhold.de>2020-10-28 03:03:27 +0100
commitdb0fe5c3eb1d680fb8c635f8e327c412528eba90 (patch)
treeeb73686ee894bbc2d528824803dacf5bc914f28f
parent5d03fe6ac4b2e5e4132bb6f893380544ae2cf008 (diff)
parentc127653b72574199463a73a56e1809223eaec0df (diff)
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that was fixed in 1088f05 & eba8f542.
-rw-r--r--.github/CONTRIBUTING.md4
-rw-r--r--.github/STALE-BOT.md34
-rw-r--r--.github/stale.yml37
-rw-r--r--README.md4
-rw-r--r--lib/debug.nix32
-rw-r--r--lib/default.nix40
-rw-r--r--lib/lists.nix2
-rw-r--r--lib/modules.nix57
-rw-r--r--lib/options.nix41
-rw-r--r--lib/sources.nix40
-rw-r--r--lib/strings-with-deps.nix13
-rw-r--r--lib/strings.nix64
-rw-r--r--lib/types.nix65
-rw-r--r--maintainers/maintainer-list.nix12
-rwxr-xr-xmaintainers/scripts/hydra-eval-failures.py2
-rw-r--r--nixos/doc/manual/configuration/user-mgmt.xml2
-rw-r--r--nixos/doc/manual/installation/upgrading.xml16
-rw-r--r--nixos/doc/manual/release-notes/rl-2009.xml801
-rw-r--r--nixos/lib/test-driver/test-driver.py2
-rw-r--r--nixos/lib/testing-python.nix266
-rw-r--r--nixos/modules/config/system-path.nix1
-rw-r--r--nixos/modules/config/users-groups.nix3
-rw-r--r--nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix9
-rw-r--r--nixos/modules/installer/tools/nixos-build-vms/build-vms.nix9
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/programs/wshowkeys.nix22
-rw-r--r--nixos/modules/security/pam.nix45
-rw-r--r--nixos/modules/services/backup/syncoid.nix52
-rw-r--r--nixos/modules/services/desktops/flatpak.nix14
-rw-r--r--nixos/modules/services/networking/avahi-daemon.nix3
-rw-r--r--nixos/modules/services/networking/dnscrypt-wrapper.nix5
-rw-r--r--nixos/modules/services/networking/mosquitto.nix36
-rw-r--r--nixos/modules/services/web-apps/engelsystem.nix2
-rw-r--r--nixos/modules/services/web-servers/nginx/default.nix4
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix25
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix1
-rw-r--r--nixos/modules/testing/test-instrumentation.nix24
-rw-r--r--nixos/modules/virtualisation/ec2-amis.nix21
-rw-r--r--nixos/tests/bitcoind.nix8
-rw-r--r--nixos/tests/caddy.nix6
-rw-r--r--nixos/tests/cadvisor.nix6
-rw-r--r--nixos/tests/cfssl.nix2
-rw-r--r--nixos/tests/convos.nix2
-rw-r--r--nixos/tests/corerad.nix2
-rw-r--r--nixos/tests/docker-edge.nix4
-rw-r--r--nixos/tests/docker-tools.nix2
-rw-r--r--nixos/tests/go-neb.nix2
-rw-r--r--nixos/tests/hadoop/hdfs.nix4
-rw-r--r--nixos/tests/hadoop/yarn.nix4
-rw-r--r--nixos/tests/haproxy.nix6
-rw-r--r--nixos/tests/hitch/default.nix2
-rw-r--r--nixos/tests/hound.nix2
-rw-r--r--nixos/tests/leaps.nix2
-rw-r--r--nixos/tests/limesurvey.nix2
-rw-r--r--nixos/tests/mailcatcher.nix2
-rw-r--r--nixos/tests/matrix-synapse.nix4
-rw-r--r--nixos/tests/mediawiki.nix2
-rw-r--r--nixos/tests/metabase.nix2
-rw-r--r--nixos/tests/morty.nix2
-rw-r--r--nixos/tests/neo4j.nix2
-rw-r--r--nixos/tests/nzbget.nix2
-rw-r--r--nixos/tests/oci-containers.nix2
-rw-r--r--nixos/tests/osrm-backend.nix4
-rw-r--r--nixos/tests/paperless.nix6
-rw-r--r--nixos/tests/peerflix.nix2
-rw-r--r--nixos/tests/php/fpm.nix2
-rw-r--r--nixos/tests/php/httpd.nix2
-rw-r--r--nixos/tests/php/pcre.nix2
-rw-r--r--nixos/tests/prometheus.nix4
-rw-r--r--nixos/tests/sanoid.nix9
-rw-r--r--nixos/tests/service-runner.nix2
-rw-r--r--nixos/tests/spacecookie.nix4
-rw-r--r--nixos/tests/sslh.nix2
-rw-r--r--nixos/tests/sympa.nix2
-rw-r--r--nixos/tests/syncthing-relay.nix2
-rw-r--r--nixos/tests/syncthing.nix4
-rw-r--r--nixos/tests/trac.nix2
-rw-r--r--nixos/tests/trezord.nix2
-rw-r--r--nixos/tests/trickster.nix8
-rw-r--r--nixos/tests/upnp.nix2
-rw-r--r--nixos/tests/uwsgi.nix2
-rw-r--r--nixos/tests/victoriametrics.nix6
-rw-r--r--nixos/tests/web-servers/unit-php.nix2
-rw-r--r--nixos/tests/wordpress.nix2
-rw-r--r--pkgs/applications/audio/asunder/default.nix4
-rw-r--r--pkgs/applications/audio/ecasound/default.nix2
-rw-r--r--pkgs/applications/audio/eflite/default.nix2
-rw-r--r--pkgs/applications/audio/geonkick/default.nix20
-rw-r--r--pkgs/applications/audio/ncspot/default.nix6
-rw-r--r--pkgs/applications/audio/picard/default.nix4
-rw-r--r--pkgs/applications/audio/picoloop/default.nix2
-rw-r--r--pkgs/applications/blockchains/exodus/default.nix4
-rw-r--r--pkgs/applications/blockchains/sumokoin.nix2
-rw-r--r--pkgs/applications/editors/geany/default.nix4
-rw-r--r--pkgs/applications/editors/glow/default.nix6
-rw-r--r--pkgs/applications/editors/jetbrains/default.nix40
-rw-r--r--pkgs/applications/editors/kile/default.nix2
-rw-r--r--pkgs/applications/graphics/gnuclad/default.nix2
-rw-r--r--pkgs/applications/graphics/krita/default.nix4
-rw-r--r--pkgs/applications/graphics/lightburn/default.nix2
-rw-r--r--pkgs/applications/graphics/xournalpp/default.nix8
-rw-r--r--pkgs/applications/kde/bomber.nix2
-rw-r--r--pkgs/applications/kde/granatier.nix2
-rw-r--r--pkgs/applications/kde/kalzium.nix2
-rw-r--r--pkgs/applications/kde/kapman.nix2
-rw-r--r--pkgs/applications/kde/katomic.nix2
-rw-r--r--pkgs/applications/kde/kblackbox.nix2
-rw-r--r--pkgs/applications/kde/kblocks.nix2
-rw-r--r--pkgs/applications/kde/kbounce.nix2
-rw-r--r--pkgs/applications/kde/kdiamond.nix2
-rw-r--r--pkgs/applications/kde/kfloppy.nix2
-rw-r--r--pkgs/applications/kde/klettres.nix2
-rw-r--r--pkgs/applications/kde/klines.nix2
-rw-r--r--pkgs/applications/kde/kmag.nix2
-rw-r--r--pkgs/applications/kde/kmines.nix2
-rw-r--r--pkgs/applications/kde/knetwalk.nix2
-rw-r--r--pkgs/applications/kde/knights.nix2
-rw-r--r--pkgs/applications/kde/kollision.nix2
-rw-r--r--pkgs/applications/kde/kreversi.nix2
-rw-r--r--pkgs/applications/kde/kshisen.nix2
-rw-r--r--pkgs/applications/kde/ksquares.nix2
-rw-r--r--pkgs/applications/kde/kteatime.nix2
-rw-r--r--pkgs/applications/kde/ktimer.nix2
-rw-r--r--pkgs/applications/kde/kturtle.nix2
-rw-r--r--pkgs/applications/kde/kwave.nix2
-rw-r--r--pkgs/applications/misc/corectrl/default.nix74
-rw-r--r--pkgs/applications/misc/dockbarx/default.nix2
-rw-r--r--pkgs/applications/misc/electron-cash/default.nix6
-rw-r--r--pkgs/applications/misc/fsv/default.nix4
-rw-r--r--pkgs/applications/misc/grsync/default.nix2
-rw-r--r--pkgs/applications/misc/heimer/default.nix4
-rw-r--r--pkgs/applications/misc/icesl/default.nix2
-rw-r--r--pkgs/applications/misc/j4-dmenu-desktop/default.nix4
-rw-r--r--pkgs/applications/misc/kanboard/default.nix4
-rw-r--r--pkgs/applications/misc/keepassx/community.nix4