summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2021-08-02 17:08:40 +0200
committerGitHub <noreply@github.com>2021-08-02 17:08:40 +0200
commit15ffca434eb8c47d472c3508abe10616022b31a4 (patch)
treeb0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4
parenta476da069049bbdd1630ba1bc66e0ba0512cff15 (diff)
parent5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff)
Merge branch 'master' into meshcentral
-rw-r--r--.github/labeler.yml1
-rw-r--r--doc/contributing/coding-conventions.chapter.md32
-rw-r--r--doc/languages-frameworks/rust.section.md2
-rw-r--r--lib/systems/doubles.nix16
-rw-r--r--lib/systems/parse.nix7
-rw-r--r--lib/systems/platforms.nix6
-rw-r--r--lib/tests/systems.nix2
-rw-r--r--maintainers/maintainer-list.nix18
-rwxr-xr-xmaintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh4
-rw-r--r--maintainers/scripts/luarocks-packages.csv3
-rwxr-xr-xmaintainers/scripts/update-luarocks-packages6
-rw-r--r--maintainers/team-list.nix1
-rw-r--r--nixos/doc/manual/development/linking-nixos-tests-to-packages.section.md6
-rw-r--r--nixos/doc/manual/development/nixos-tests.xml1
-rw-r--r--nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml10
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml60
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md13
-rw-r--r--nixos/lib/testing-python.nix9
-rw-r--r--nixos/modules/hardware/all-firmware.nix12
-rw-r--r--nixos/modules/installer/cd-dvd/iso-image.nix6
-rw-r--r--nixos/modules/installer/netboot/netboot.nix6
-rw-r--r--nixos/modules/installer/tools/nix-fallback-paths.nix10
-rw-r--r--nixos/modules/misc/ids.nix1
-rw-r--r--nixos/modules/misc/version.nix5
-rw-r--r--nixos/modules/module-list.nix4
-rw-r--r--nixos/modules/services/cluster/kubernetes/addons/dns.nix54
-rw-r--r--nixos/modules/services/cluster/kubernetes/pki.nix2
-rw-r--r--nixos/modules/services/hardware/sane.nix27
-rw-r--r--nixos/modules/services/misc/gitea.nix11
-rw-r--r--nixos/modules/services/misc/libreddit.nix66
-rw-r--r--nixos/modules/services/misc/mx-puppet-discord.nix120
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix2
-rw-r--r--nixos/modules/services/monitoring/prometheus/exporters.nix1
-rw-r--r--nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix34
-rw-r--r--nixos/modules/services/network-filesystems/litestream/default.nix100
-rw-r--r--nixos/modules/services/network-filesystems/litestream/litestream.xml65
-rw-r--r--nixos/modules/services/networking/bird.nix4
-rw-r--r--nixos/modules/services/networking/firewall.nix4
-rw-r--r--nixos/modules/services/networking/kea.nix16
-rw-r--r--nixos/modules/services/networking/networkmanager.nix13
-rw-r--r--nixos/modules/services/networking/nftables.nix1
-rw-r--r--nixos/modules/services/networking/syncthing.nix634
-rw-r--r--nixos/modules/services/networking/wpa_supplicant.nix3
-rw-r--r--nixos/modules/services/system/uptimed.nix10
-rw-r--r--nixos/modules/services/web-apps/node-red.nix148
-rw-r--r--nixos/modules/services/web-apps/tt-rss.nix127
-rwxr-xr-xnixos/modules/services/x11/display-managers/set-session.py3
-rw-r--r--nixos/modules/system/boot/systemd.nix3
-rw-r--r--nixos/modules/system/etc/etc.nix64
-rw-r--r--nixos/modules/system/etc/make-etc.sh45
-rw-r--r--nixos/modules/virtualisation/virtualbox-image.nix8
-rw-r--r--nixos/tests/all-tests.nix5
-rw-r--r--nixos/tests/kbd-update-search-paths-patch.nix18
-rw-r--r--nixos/tests/libreddit.nix19
-rw-r--r--nixos/tests/litestream.nix93
-rw-r--r--nixos/tests/mpv.nix28
-rw-r--r--nixos/tests/node-red.nix31
-rw-r--r--nixos/tests/prometheus-exporters.nix20
-rw-r--r--nixos/tests/soapui.nix24
-rw-r--r--nixos/tests/syncthing-init.nix16
-rw-r--r--nixos/tests/syncthing.nix4
-rw-r--r--pkgs/applications/audio/axoloti/libusb1.nix13
-rw-r--r--pkgs/applications/audio/dfasma/default.nix2
-rw-r--r--pkgs/applications/audio/easyeffects/default.nix4
-rw-r--r--pkgs/applications/audio/fmit/default.nix2
-rw-r--r--pkgs/applications/audio/friture/default.nix2
-rw-r--r--pkgs/applications/audio/gpodder/default.nix7
-rw-r--r--pkgs/applications/audio/iannix/default.nix2
-rw-r--r--pkgs/applications/audio/mimms/default.nix4
-rw-r--r--pkgs/applications/audio/mixxx/default.nix2
-rw-r--r--pkgs/applications/audio/ncspot/default.nix6
-rw-r--r--pkgs/applications/audio/rosegarden/default.nix36
-rw-r--r--pkgs/applications/audio/spectmorph/default.nix2
-rw-r--r--pkgs/applications/audio/tageditor/default.nix2
-rw-r--r--pkgs/applications/blockchains/bitcoin-abc/default.nix (renamed from pkgs/applications/blockchains/bitcoin-abc.nix)52
-rw-r--r--pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch (renamed from pkgs/applications/blockchains/fix-bitcoin-qt-build.patch)0
-rw-r--r--pkgs/applications/blockchains/bitcoin-classic/default.nix (renamed from pkgs/applications/blockchains/bitcoin-classic.nix)50
-rw-r--r--pkgs/applications/blockchains/bitcoin-gold/default.nix (renamed from pkgs/applications/blockchains/bitcoin-gold.nix)0
-rw-r--r--pkgs/applications/blockchains/bitcoin-knots/default.nix (renamed from pkgs/applications/blockchains/bitcoin-knots.nix)0
-rw-r--r--pkgs/applications/blockchains/bitcoin-unlimited/default.nix (renamed from pkgs/applications/blockchains/bitcoin-unlimited.nix)0
-rw-r--r--pkgs/applications/blockchains/bitcoin/default.nix (renamed from pkgs/applications/blockchains/bitcoin.nix)0
-rw-r--r--pkgs/applications/blockchains/chia-plotter/default.nix65
-rw-r--r--pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch50
-rw-r--r--pkgs/applications/blockchains/chia/default.nix1
-rw-r--r--pkgs/applications/blockchains/clightning/default.nix (renamed from pkgs/applications/blockchains/clightning.nix)0
-rw-r--r--pkgs/applications/blockchains/crypto-org-wallet/default.nix (renamed from pkgs/applications/blockchains/crypto-org-wallet.nix)0
-rw-r--r--pkgs/applications/blockchains/dashpay/default.nix (renamed from pkgs/applications/blockchains/dashpay.nix)0
-rw-r--r--pkgs/applications/blockchains/dcrd/default.nix (renamed from pkgs/applications/blockchains/dcrd.nix)0
-rw-r--r--pkgs/applications/blockchains/dcrwallet/default.nix (renamed from pkgs/applications/blockchains/dcrwallet.nix)0
-rw-r--r--pkgs/applications/blockchains/dero/default.nix (renamed from pkgs/applications/blockchains/dero.nix)0
-rw-r--r--pkgs/applications/blockchains/digibyte/default.nix (renamed from pkgs/applications/blockchains/digibyte.nix)0
-rw-r--r--pkgs/applications/blockchains/dogecoin/default.nix (renamed from pkgs/applications/blockchains/dogecoin.nix)0
-rw-r--r--pkgs/applications/blockchains/eclair/default.nix (renamed from pkgs/applications/blockchains/eclair.nix)0
-rw-r--r--pkgs/applications/blockchains/electrs/default.nix (renamed from pkgs/applications/blockchains/electrs.nix)0
-rw-r--r--pkgs/applications/blockchains/elements/default.nix (renamed from pkgs/applications/blockchains/elements.nix)0
-rw-r--r--pkgs/applications/blockchains/go-ethereum/default.nix (renamed from pkgs/applications/blockchains/go-ethereum.nix)0
-rw-r--r--pkgs/applications/blockchains/ledger-live-desktop/default.nix6
-rw-r--r--pkgs/applications/blockchains/litecoin/default.nix (renamed from pkgs/applications/blockchains/litecoin.nix)0
-rw-r--r--pkgs/applications/blockchains/lnd/default.nix (renamed from pkgs/applications/blockchains/lnd.nix)0
-rw-r--r--pkgs/applications/blockchains/lndmanage/default.nix (renamed from pkgs/applications/blockchains/lndmanage.nix)4
-rw-r--r--pkgs/applications/blockchains/masari/default.nix (renamed from pkgs/applications/blockchains/masari.nix)0
-rw-r--r--pkgs/applications/blockchains/namecoin/default.nix (renamed from pkgs/applications/blockchains/namecoin.nix)0
-rw-r--r--pkgs/applications/blockchains/nano-wallet/default.nix6
-rw-r--r--pkgs/applications/blockchains/particl-core/default.nix (renamed from pkgs/applications/blockchains/particl/particl-core.nix)0
-rw-r--r--pkgs/applications/blockchains/pivx/default.nix (renamed from pkgs/applications/blockchains/pivx.nix)53
-rw-r--r--pkgs/applications/blockchains/quorum/default.nix (renamed from pkgs/applications/blockchains/quorum.nix)0
-rw-r--r--pkgs/applications/blockchains/stellar-core/default.nix (renamed from pkgs/applications/blockchains/stellar-core.nix)0
-rw-r--r--pkgs/applications/blockchains/sumokoin/default.nix (renamed from pkgs/applications/blockchains/sumokoin.nix)0
-rw-r--r--pkgs/applications/blockchains/tessera/default.nix (renamed from pkgs/applications/blockchains/tessera.nix)0
-rw-r--r--pkgs/applications/blockchains/turbo-geth/default.nix (renamed from pkgs/applications/blockchains/turbo-geth.nix)0
-rw-r--r--pkgs/applications/blockchains/vertcoin/default.nix (renamed from pkgs/applications/blockchains/vertcoin.nix)0
-rw-r--r--pkgs/applications/blockchains/wownero/default.nix (renamed from pkgs/applications/blockchains/wownero.nix)0
-rw-r--r--pkgs/applications/editors/cudatext/default.nix4
-rw-r--r--pkgs/applications/editors/cudatext/deps.json20
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix42
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/org-generated.nix12
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json1539
-rw-r--r--pkgs/applications/editors/focuswriter/default.nix2
-rw-r--r--pkgs/applications/editors/ne/default.nix2
-rw-r--r--pkgs/applications/editors/texmaker/default.nix2
-rw-r--r--pkgs/applications/editors/tiled/default.nix2
-rw-r--r--pkgs/applications/graphics/ImageMagick/7.0.nix4
-rw-r--r--pkgs/applications/graphics/geeqie/default.nix13