summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Schaefer <git@danielschaefer.me>2020-04-06 19:26:10 +0200
committerGitHub <noreply@github.com>2020-04-06 19:26:10 +0200
commit6689065a3b611b7f1830da556a5b0236343971a2 (patch)
treee2f771cb14adfd17bacc364ead088d0f5b177364
parentcc41ff02882ddf18063a30c8f4a896480ae06b3d (diff)
parenta3358eeeb4c6889a104fe8dc1a78c06969bcb744 (diff)
Merge branch 'master' into auto-update/chipsec
-rw-r--r--.github/CODEOWNERS7
-rw-r--r--doc/languages-frameworks/android.section.md2
-rw-r--r--doc/languages-frameworks/php.section.md112
-rw-r--r--maintainers/maintainer-list.nix29
-rw-r--r--nixos/doc/manual/release-notes/rl-2003.xml4
-rw-r--r--nixos/doc/manual/release-notes/rl-2009.xml70
-rw-r--r--nixos/modules/config/gtk/gtk-icon-cache.nix2
-rw-r--r--nixos/modules/i18n/input-method/ibus.nix2
-rw-r--r--nixos/modules/profiles/hardened.nix2
-rw-r--r--nixos/modules/services/desktops/gnome3/gnome-keyring.nix2
-rw-r--r--nixos/modules/services/misc/matrix-synapse.nix9
-rw-r--r--nixos/modules/services/networking/rxe.nix29
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix4
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix24
-rw-r--r--nixos/modules/services/x11/desktop-managers/enlightenment.nix2
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix15
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix4
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.xml16
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix4
-rw-r--r--nixos/release-combined.nix3
-rw-r--r--nixos/release-small.nix5
-rw-r--r--nixos/tests/all-tests.nix2
-rw-r--r--nixos/tests/ceph-multi-node.nix6
-rw-r--r--nixos/tests/ceph-single-node.nix6
-rw-r--r--nixos/tests/php/default.nix7
-rw-r--r--nixos/tests/php/fpm.nix55
-rw-r--r--nixos/tests/php/pcre.nix (renamed from nixos/tests/php-pcre.nix)31
-rw-r--r--nixos/tests/rxe.nix2
-rw-r--r--pkgs/applications/accessibility/contrast/default.nix1
-rw-r--r--pkgs/applications/audio/bshapr/default.nix4
-rw-r--r--pkgs/applications/audio/jackmix/default.nix3
-rw-r--r--pkgs/applications/audio/mixxx/default.nix3
-rw-r--r--pkgs/applications/audio/mopidy/default.nix6
-rw-r--r--pkgs/applications/audio/rhvoice/default.nix2
-rw-r--r--pkgs/applications/audio/sound-juicer/default.nix1
-rw-r--r--pkgs/applications/blockchains/tessera.nix4
-rw-r--r--pkgs/applications/editors/aseprite/default.nix2
-rw-r--r--pkgs/applications/editors/aseprite/skia.nix12
-rw-r--r--pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json2
-rw-r--r--pkgs/applications/editors/gnome-builder/default.nix23
-rw-r--r--pkgs/applications/editors/kakoune/default.nix2
-rw-r--r--pkgs/applications/graphics/fluxus/default.nix2
-rw-r--r--pkgs/applications/kde/kitinerary.nix6
-rw-r--r--pkgs/applications/misc/gpsprune/default.nix12
-rw-r--r--pkgs/applications/misc/khard/default.nix6
-rw-r--r--pkgs/applications/misc/mwic/default.nix4
-rw-r--r--pkgs/applications/misc/orca/default.nix4
-rw-r--r--pkgs/applications/misc/pueue/default.nix6
-rw-r--r--pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch25
-rw-r--r--pkgs/applications/misc/rofi-emoji/default.nix69
-rw-r--r--pkgs/applications/misc/rofi/wrapper.nix1
-rw-r--r--pkgs/applications/misc/tut/default.nix24
-rw-r--r--pkgs/applications/misc/tut/deps.nix273
-rw-r--r--pkgs/applications/networking/browsers/brave/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix17
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix770
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix770
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/release_sources.nix770
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix12
-rw-r--r--pkgs/applications/networking/browsers/vivaldi/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/fluxctl/default.nix8
-rw-r--r--pkgs/applications/networking/cluster/k3s/default.nix235
-rw-r--r--pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch74
-rw-r--r--pkgs/applications/networking/cluster/kubeseal/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/gomuks/default.nix25
-rw-r--r--pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix21
-rw-r--r--pkgs/applications/networking/instant-messengers/swift-im/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix11
-rw-r--r--pkgs/applications/networking/instant-messengers/zulip/default.nix4
-rw-r--r--pkgs/applications/networking/ipfs-migrator/default.nix2
-rw-r--r--pkgs/applications/networking/ipfs-migrator/deps.nix8
-rw-r--r--pkgs/applications/networking/irc/qweechat/default.nix2
-rw-r--r--pkgs/applications/networking/modem-manager-gui/default.nix9
-rw-r--r--pkgs/applications/networking/p2p/stig/default.nix6
-rw-r--r--pkgs/applications/office/mendeley/default.nix2
-rw-r--r--pkgs/applications/office/notes-up/default.nix7
-rw-r--r--pkgs/applications/radio/airspy/default.nix51
-rw-r--r--pkgs/applications/radio/dump1090/default.nix4
-rw-r--r--pkgs/applications/radio/hackrf/default.nix11
-rw-r--r--pkgs/applications/radio/uhd/default.nix150
-rw-r--r--pkgs/applications/science/electronics/dsview/default.nix4
-rw-r--r--pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix4
-rw-r--r--pkgs/applications/science/logic/cadical/default.nix29
-rw-r--r--pkgs/applications/science/logic/coq/default.nix1
-rw-r--r--pkgs/applications/science/math/gmsh/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix11
-rw-r--r--pkgs/applications/video/bombono/default.nix10
-rw-r--r--pkgs/applications/video/kodi/plugins.nix7
-rw-r--r--pkgs/applications/window-managers/cage/default.nix2
-rw-r--r--pkgs/build-support/build-pecl.nix12
-rw-r--r--pkgs/build-support/release/binary-tarball.nix31
-rw-r--r--pkgs/build-support/release/debian-build.nix2
-rw-r--r--pkgs/build-support/release/default.nix6
-rw-r--r--pkgs/build-support/release/maven-build.nix24
-rw-r--r--pkgs/build-support/release/rpm-build.nix2
-rw-r--r--pkgs/build-support/rust/default.nix2
-rw-r--r--pkgs/build-support/setup-hooks/patch-shebangs.sh4
-rw-r--r--pkgs/data/fonts/iosevka/bin.nix2
-rw-r--r--pkgs/data/fonts/junicode/default.nix14
-rw-r--r--pkgs/data/fonts/recursive/default.nix4
-rw-r--r--pkgs/data/icons/gnome-icon-theme/default.nix33
-rw-r--r--pkgs/data/misc/hackage/default.nix4
-rw-r--r--pkgs/data/misc/nixos-artwork/icons.nix2
-rw-r--r--pkgs/data/misc/osinfo-db/default.nix2
-rw-r--r--pkgs/data/themes/arc/default.nix2
-rw-r--r--pkgs/data/themes/matcha/default.nix4
-rw-r--r--pkgs/data/themes/obsidian2/default.nix6
-rw-r--r--pkgs/desktops/deepin/deepin-terminal/default.nix10
-rw-r--r--pkgs/desktops/deepin/go-gir-generator/default.nix11
-rw-r--r--pkgs/desktops/gnome-2/default.nix6
-rw-r--r--pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix20
-rw-r--r--pkgs/desktops/gnome-2/desktop/mail-notification/default.nix4
-rw-r--r--pkgs/desktops/gnome-2/platform