summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-08-18 12:53:44 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-08-18 12:53:44 +0200
commitf65aa21bb2b0a45ac671e8c9d656b1dfc88cda33 (patch)
tree98bb48130a5c464418af19f314236e112ad20c55
parentb8a79ac677bbc0f7b662bcc0c4fcb9df34c9f5f3 (diff)
parentffbb4d26f9f93681576815be82142d14f2aa8234 (diff)
Merge master into staging-next
-rw-r--r--doc/quick-start.xml8
-rw-r--r--maintainers/maintainer-list.nix1038
-rw-r--r--nixos/doc/manual/installation/installing.xml6
-rw-r--r--nixos/modules/services/desktops/flatpak.nix11
-rw-r--r--nixos/modules/services/editors/emacs.xml2
-rw-r--r--nixos/modules/services/monitoring/loki.nix2
-rw-r--r--nixos/modules/services/monitoring/zabbix-proxy.nix11
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix8
-rw-r--r--pkgs/applications/audio/mixxx/default.nix4
-rw-r--r--pkgs/applications/editors/android-studio/default.nix6
-rw-r--r--pkgs/applications/editors/nano/default.nix2
-rw-r--r--pkgs/applications/misc/barrier/default.nix4
-rw-r--r--pkgs/applications/misc/calibre/default.nix4
-rw-r--r--pkgs/applications/misc/firestarter/default.nix39
-rw-r--r--pkgs/applications/misc/gollum/Gemfile.lock2
-rw-r--r--pkgs/applications/misc/gollum/gemset.nix4
-rw-r--r--pkgs/applications/misc/gsctl/default.nix22
-rw-r--r--pkgs/applications/misc/jekyll/basic/Gemfile.lock12
-rw-r--r--pkgs/applications/misc/jekyll/basic/gemset.nix20
-rw-r--r--pkgs/applications/misc/jekyll/full/Gemfile.lock14
-rw-r--r--pkgs/applications/misc/jekyll/full/gemset.nix24
-rw-r--r--pkgs/applications/misc/kdeconnect/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/cni/plugins.nix4
-rw-r--r--pkgs/applications/networking/gns3/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/discord/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/signal-desktop/default.nix4
-rw-r--r--pkgs/applications/office/libreoffice/default-primary-src.nix8
-rw-r--r--pkgs/applications/office/libreoffice/default.nix9
-rw-r--r--pkgs/applications/office/libreoffice/libreoffice-srcs.nix80
-rw-r--r--pkgs/applications/science/logic/symbiyosys/default.nix9
-rw-r--r--pkgs/applications/science/logic/tlaplus/toolbox.nix15
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix2
-rw-r--r--pkgs/applications/version-management/nbstripout/default.nix3
-rw-r--r--pkgs/applications/video/avidemux/default.nix4
-rw-r--r--pkgs/applications/window-managers/bspwm/default.nix4
-rw-r--r--pkgs/development/compilers/binaryen/default.nix4
-rw-r--r--pkgs/development/compilers/nextpnr/default.nix10
-rw-r--r--pkgs/development/compilers/yosys/default.nix14
-rw-r--r--pkgs/development/interpreters/python/default.nix42
-rw-r--r--pkgs/development/interpreters/python/pypy/default.nix9
-rw-r--r--pkgs/development/interpreters/python/pypy/prebuilt.nix4
-rw-r--r--pkgs/development/libraries/ace/default.nix6
-rw-r--r--pkgs/development/libraries/armadillo/default.nix4
-rw-r--r--pkgs/development/libraries/audio/libbass/default.nix18
-rw-r--r--pkgs/development/libraries/cimg/default.nix5
-rw-r--r--pkgs/development/libraries/flatpak/bubblewrap-paths.patch4
-rw-r--r--pkgs/development/libraries/flatpak/default.nix8
-rw-r--r--pkgs/development/libraries/flatpak/fix-paths.patch6
-rw-r--r--pkgs/development/libraries/flatpak/fix-test-paths.patch29
-rw-r--r--pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch4
-rw-r--r--pkgs/development/libraries/flatpak/unset-env-vars.patch4
-rw-r--r--pkgs/development/libraries/flatpak/use-flatpak-from-path.patch22
-rw-r--r--pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch4
-rw-r--r--pkgs/development/libraries/g2o/default.nix32
-rw-r--r--pkgs/development/libraries/g2o/remove-compiler-reference.patch25
-rw-r--r--pkgs/development/libraries/libmodulemd/1.nix21
-rw-r--r--pkgs/development/libraries/libmodulemd/default.nix59
-rw-r--r--pkgs/development/libraries/libmodulemd/dont-check-docs.patch29
-rw-r--r--pkgs/development/libraries/libmodulemd/pygobject-dir.patch45
-rw-r--r--pkgs/development/libraries/libqglviewer/default.nix20
-rw-r--r--pkgs/development/libraries/readline/readline-8.0-patches.nix1
-rw-r--r--pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix31
-rw-r--r--pkgs/development/libraries/xdg-desktop-portal/default.nix8
-rw-r--r--pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch20
-rw-r--r--pkgs/development/libraries/zlib/default.nix58
-rw-r--r--pkgs/development/ocaml-modules/ocsigen-start/default.nix18
-rw-r--r--pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix4
-rw-r--r--pkgs/development/python-modules/capstone/default.nix8
-rw-r--r--pkgs/development/python-modules/deprecated/default.nix27
-rw-r--r--pkgs/development/python-modules/gspread/default.nix6
-rw-r--r--pkgs/development/python-modules/hocr-tools/default.nix31
-rw-r--r--pkgs/development/python-modules/kconfiglib/default.nix21
-rw-r--r--pkgs/development/python-modules/pikepdf/default.nix73
-rw-r--r--pkgs/development/python-modules/pre-commit/default.nix (renamed from pkgs/applications/version-management/git-and-tools/pre-commit/default.nix)25
-rw-r--r--pkgs/development/python-modules/pyGithub/default.nix14
-rw-r--r--pkgs/development/python-modules/pylibgen/default.nix28
-rw-r--r--pkgs/development/python-modules/pyprof2calltree/default.nix (renamed from pkgs/development/tools/profiling/pyprof2calltree/default.nix)4
-rw-r--r--pkgs/development/python-modules/pytest-helpers-namespace/default.nix35
-rw-r--r--pkgs/development/python-modules/python-xmp-toolkit/default.nix44
-rw-r--r--pkgs/development/python-modules/ruffus/default.nix53
-rw-r--r--pkgs/development/python-modules/unittest-data-provider/default.nix21
-rw-r--r--pkgs/development/tools/icestorm/default.nix21
-rw-r--r--pkgs/development/tools/misc/cgdb/default.nix4
-rw-r--r--pkgs/development/tools/trellis/default.nix10
-rw-r--r--pkgs/games/angband/default.nix4
-rw-r--r--pkgs/misc/vim-plugins/generated.nix174
-rw-r--r--pkgs/os-specific/linux/batman-adv/alfred.nix4
-rw-r--r--pkgs/os-specific/linux/checksec/default.nix4
-rw-r--r--pkgs/os-specific/linux/conky/default.nix4
-rw-r--r--pkgs/os-specific/linux/nvme-cli/default.nix8
-rw-r--r--pkgs/servers/dns/doh-proxy/default.nix30
-rw-r--r--pkgs/servers/misc/airsonic/default.nix4
-rw-r--r--pkgs/servers/monitoring/zabbix/proxy.nix5
-rw-r--r--pkgs/servers/plex/raw.nix4
-rw-r--r--pkgs/servers/varnish/default.nix18
-rw-r--r--pkgs/servers/varnish/dynamic.nix6
-rw-r--r--pkgs/servers/varnish/modules.nix13
-rw-r--r--pkgs/servers/varnish/rtstatus.nix6
-rw-r--r--pkgs/tools/X11/ckbcomp/default.nix4
-rw-r--r--pkgs/tools/admin/analog/default.nix4
-rw-r--r--pkgs/tools/audio/abcmidi/default.nix4
-rw-r--r--pkgs/tools/backup/btrbk/default.nix8
-rw-r--r--pkgs/tools/filesystems/avfs/default.nix4
-rw-r--r--pkgs/tools/filesystems/btrfs-progs/default.nix4
-rw-r--r--pkgs/tools/misc/chafa/default.nix4
-rw-r--r--pkgs/tools/misc/chezmoi/default.nix6
-rw-r--r--pkgs/tools/misc/chezmoi/deps.nix180
-rw-r--r--pkgs/tools/misc/graylog/default.nix4
-rw-r--r--pkgs/tools/misc/html-proofer/Gemfile.lock4
-rw-r--r--pkgs/tools/misc/html-proofer/gemset.nix40
-rw-r--r--pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch271
-rw-r--r--pkgs/tools/misc/ostree/default.nix9
-rw-r--r--pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch12
-rw-r--r--pkgs/tools/misc/ostree/fix-1592.patch87
-rw-r--r--pkgs/tools/misc/rpm-ostree/default.nix8
-rw-r--r--pkgs/tools/networking/babeld/default.nix4
-rw-r--r--pkgs/tools/networking/curlie/default.nix22
-rw-r--r--pkgs/tools/networking/http-prompt/default.nix2
-rw-r--r--pkgs/tools/networking/httplz/cargo-lock.patch573
-rw-r--r--pkgs/tools/networking/httplz/default.nix10
-rw-r--r--pkgs/tools/security/ccid/default.nix4
-rw-r--r--pkgs/tools/text/ocrmypdf/default.nix103
-rw-r--r--pkgs/tools/typesetting/tex/texlive/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix29
-rw-r--r--pkgs/top-level/python-packages.nix20
125 files changed, 3216 insertions, 884 deletions
diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index 4f0952896e45..292d66864a4c 100644
--- a/doc/quick-start.xml
+++ b/