summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-09-12 10:00:45 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-09-12 10:00:45 +0200
commit37d29394ecba3ccff2083119ec49fc3eaf36db8c (patch)
treef5392870bb7a3c48a55cd326dc4f51d9000cb59e
parent6d269ce4095d110e9e1bc0e358338f8dc8f58076 (diff)
parentfd6899d9b5171da75d53b2435cefee8de4212521 (diff)
Merge staging-next into staging
-rw-r--r--.github/CODEOWNERS6
-rw-r--r--.version2
-rw-r--r--doc/languages-frameworks/go.xml9
-rw-r--r--doc/languages-frameworks/rust.section.md2
-rw-r--r--doc/using/overlays.xml24
-rw-r--r--lib/licenses.nix5
-rw-r--r--lib/modules.nix6
-rw-r--r--lib/systems/architectures.nix2
-rw-r--r--lib/systems/examples.nix4
-rw-r--r--lib/tests/misc.nix26
-rw-r--r--lib/trivial.nix2
-rw-r--r--lib/types.nix38
-rw-r--r--maintainers/maintainer-list.nix48
-rw-r--r--maintainers/scripts/build.nix2
-rw-r--r--maintainers/team-list.nix7
-rw-r--r--nixos/doc/manual/installation/installing.xml10
-rw-r--r--nixos/doc/manual/release-notes/release-notes.xml1
-rw-r--r--nixos/doc/manual/release-notes/rl-2009.xml53
-rw-r--r--nixos/doc/manual/release-notes/rl-2103.xml80
-rw-r--r--nixos/lib/test-driver/test-driver.py21
-rw-r--r--nixos/modules/config/system-path.nix23
-rw-r--r--nixos/modules/hardware/device-tree.nix164
-rw-r--r--nixos/modules/installer/tools/tools.nix6
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/profiles/installation-device.nix15
-rw-r--r--nixos/modules/programs/qt5ct.nix2
-rw-r--r--nixos/modules/programs/xss-lock.nix2
-rw-r--r--nixos/modules/security/pam.nix4
-rw-r--r--nixos/modules/security/rngd.nix13
-rw-r--r--nixos/modules/security/systemd-confinement.nix2
-rw-r--r--nixos/modules/services/audio/mpd.nix31
-rw-r--r--nixos/modules/services/databases/couchdb.nix25
-rw-r--r--nixos/modules/services/databases/victoriametrics.nix4
-rw-r--r--nixos/modules/services/mail/mailhog.nix68
-rw-r--r--nixos/modules/services/monitoring/prometheus/exporters.nix1
-rw-r--r--nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix34
-rw-r--r--nixos/modules/services/monitoring/unifi-poller.nix242
-rw-r--r--nixos/modules/services/network-filesystems/samba.nix2
-rw-r--r--nixos/modules/services/networking/ntp/chrony.nix1
-rw-r--r--nixos/modules/services/networking/openvpn.nix2
-rw-r--r--nixos/modules/services/security/bitwarden_rs/default.nix19
-rw-r--r--nixos/modules/services/web-servers/caddy.nix66
-rw-r--r--nixos/modules/services/web-servers/nginx/default.nix9
-rw-r--r--nixos/modules/services/x11/desktop-managers/cinnamon.nix205
-rw-r--r--nixos/modules/services/x11/desktop-managers/default.nix1
-rw-r--r--nixos/modules/services/x11/desktop-managers/plasma5.nix14
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix31
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix8
-rw-r--r--nixos/modules/services/x11/window-managers/xmonad.nix21
-rw-r--r--nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix4
-rw-r--r--nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py4
-rw-r--r--nixos/tests/3proxy.nix4
-rw-r--r--nixos/tests/all-tests.nix1
-rw-r--r--nixos/tests/caddy.nix18
-rw-r--r--nixos/tests/couchdb.nix80
-rw-r--r--nixos/tests/lxd-nftables.nix1
-rw-r--r--nixos/tests/lxd.nix14
-rw-r--r--nixos/tests/nginx-sandbox.nix1
-rw-r--r--nixos/tests/prometheus-exporters.nix33
-rw-r--r--nixos/tests/v2ray.nix83
-rw-r--r--nixos/tests/xmpp/ejabberd.nix16
-rw-r--r--nixos/tests/xmpp/xmpp-sendmessage.nix6
-rw-r--r--pkgs/applications/audio/cantata/default.nix17
-rw-r--r--pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff17
-rw-r--r--pkgs/applications/audio/friture/default.nix16
-rw-r--r--pkgs/applications/audio/friture/unlock_constraints.patch34
-rw-r--r--pkgs/applications/audio/ft2-clone/default.nix4
-rw-r--r--pkgs/applications/audio/jackmix/default.nix3
-rw-r--r--pkgs/applications/audio/mamba/default.nix13
-rw-r--r--pkgs/applications/audio/mamba/fix-build.patch10
-rw-r--r--pkgs/applications/audio/midi-visualizer/default.nix42
-rw-r--r--pkgs/applications/audio/picoloop/default.nix50
-rw-r--r--pkgs/applications/audio/seq66/default.nix35
-rw-r--r--pkgs/applications/audio/sublime-music/default.nix4
-rw-r--r--pkgs/applications/backup/vorta/default.nix4
-rw-r--r--pkgs/applications/blockchains/go-ethereum.nix7
-rw-r--r--pkgs/applications/editors/android-studio/default.nix6
-rw-r--r--pkgs/applications/editors/cudatext/default.nix113
-rw-r--r--pkgs/applications/editors/cudatext/deps.json42
-rw-r--r--pkgs/applications/editors/cudatext/dont-check-update.patch12
-rw-r--r--pkgs/applications/editors/emacs/macport.nix4
-rw-r--r--pkgs/applications/editors/jetbrains/default.nix48
-rw-r--r--pkgs/applications/graphics/digikam/default.nix4
-rw-r--r--pkgs/applications/graphics/drawpile/default.nix2
-rw-r--r--pkgs/applications/graphics/inkscape/extensions.nix37
-rw-r--r--pkgs/applications/graphics/inkscape/with-extensions.nix21
-rw-r--r--pkgs/applications/graphics/ktikz/default.nix9
-rw-r--r--pkgs/applications/graphics/mypaint/default.nix6
-rw-r--r--pkgs/applications/misc/autospotting/default.nix2
-rw-r--r--pkgs/applications/misc/autospotting/deps.nix75
-rw-r--r--pkgs/applications/misc/cointop/default.nix8
-rw-r--r--pkgs/applications/misc/electron-cash/default.nix20
-rw-r--r--pkgs/applications/misc/joplin-desktop/default.nix4
-rw-r--r--pkgs/applications/misc/k2pdfopt/default.nix2
-rw-r--r--pkgs/applications/misc/obsidian/default.nix74
-rw-r--r--pkgs/applications/misc/rofi/default.nix4
-rw-r--r--pkgs/applications/misc/tipp10/default.nix8
-rw-r--r--pkgs/applications/misc/weather/default.nix12
-rw-r--r--pkgs/applications/misc/xbattbar/default.nix46
-rw-r--r--pkgs/applications/misc/xbattbar/sys-by-default.patch26
-rw-r--r--pkgs/applications/misc/xdragon/default.nix28
-rw-r--r--pkgs/applications/networking/browsers/arora/default.nix26
-rw-r--r--pkgs/applications/networking/browsers/castor/default.nix3
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix11
-rw-r--r--pkgs/applications/networking/browsers/chromium/plugins.nix4
-rwxr-xr-xpkgs/applications/networking/browsers/chromium/update.py20
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.json22
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/release_sources.nix770
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix1
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix10
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix6
-rw-r--r--pkgs/applications/networking/browsers/next/next-gtk-webkit.nix6
-rw-r--r--pkgs/applications/networking/browsers/palemoon/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix4
-rw-r--r--pkgs/applications/networking/browsers/vivaldi/default.nix2
-rw-r--r--pkgs/applications/networking/c14/default.nix2
-rw-r--r--pkgs/applications/networking/c14/deps.nix1
-rw-r--r--pkgs/applications/networking/cluster/flink/default.nix6
-rw-r--r--pkgs/applications/networking/cluster/k3s/default.nix13
-rw-r--r--pkgs/applications/networking/cluster/kops/default.nix20
-rw-r--r--pkgs/applications/networking/cluster/nomad/0.11.nix3
-rw-r--r--pkgs/applications/networking/cluster/nomad/0.12.nix7
-rw-r--r--pkgs/applications/networking/cluster/stern/default.nix1
-rw-r--r--pkgs/applications/networking/ftp/filezilla/default.nix7
-rw-r--r--pkgs/applications/networking/instant-messengers/discord/default.nix12
-rw-r--r--pkgs/applications/networking/instant-messengers/jackline/default.nix52
-rw-r--r--pkgs/applications/networking/instant-messengers/psi-plus/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/psi/default.nix4