summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDing Xiang Fei <dingxiangfei2009@gmail.com>2018-11-14 12:32:28 +0800
committerDing Xiang Fei <dingxiangfei2009@gmail.com>2018-11-14 12:32:28 +0800
commitceececbd0404d180b34d1eecfcd4cea728fb1f4a (patch)
tree79354fafb55623575c0c15a4093c3ab55911d3d5
parent4259f7575e5a715bf4001e22894ce95cdc06385a (diff)
parent4b5ffcb964b48c2754aa8964699b339840f507d3 (diff)
Merge branch 'master' of https://github.com/nixos/nixpkgs into tarball-closureinfo
-rw-r--r--.github/CODEOWNERS31
-rw-r--r--doc/coding-conventions.xml5
-rw-r--r--doc/languages-frameworks/index.xml1
-rw-r--r--doc/languages-frameworks/ocaml.xml99
-rw-r--r--doc/languages-frameworks/python.section.md19
-rw-r--r--doc/meta.xml54
-rw-r--r--doc/quick-start.xml4
-rw-r--r--doc/stdenv.xml17
-rw-r--r--lib/licenses.nix9
-rw-r--r--lib/sources.nix6
-rw-r--r--lib/systems/default.nix1
-rw-r--r--lib/systems/examples.nix43
-rw-r--r--lib/systems/inspect.nix1
-rw-r--r--lib/systems/parse.nix19
-rw-r--r--lib/systems/platforms.nix1
-rw-r--r--lib/types.nix3
-rw-r--r--maintainers/maintainer-list.nix80
-rw-r--r--nixos/doc/manual/administration/declarative-containers.xml2
-rw-r--r--nixos/doc/manual/configuration/config-file.xml4
-rw-r--r--nixos/doc/manual/configuration/firewall.xml9
-rw-r--r--nixos/doc/manual/development/option-types.xml13
-rw-r--r--nixos/doc/manual/release-notes/rl-1809.xml5
-rw-r--r--nixos/doc/manual/release-notes/rl-1903.xml88
-rw-r--r--nixos/lib/build-vms.nix4
-rw-r--r--nixos/lib/make-channel.nix4
-rw-r--r--nixos/lib/testing.nix6
-rw-r--r--nixos/modules/config/gtk/gtk-icon-cache.nix86
-rw-r--r--nixos/modules/config/networking.nix10
-rw-r--r--nixos/modules/config/pulseaudio.nix8
-rw-r--r--nixos/modules/config/system-path.nix8
-rw-r--r--nixos/modules/hardware/ckb-next.nix (renamed from nixos/modules/hardware/ckb.nix)16
-rw-r--r--nixos/modules/hardware/opengl.nix4
-rw-r--r--nixos/modules/hardware/video/amdgpu-pro.nix4
-rw-r--r--nixos/modules/hardware/video/ati.nix4
-rw-r--r--nixos/modules/hardware/video/nvidia.nix4
-rw-r--r--nixos/modules/installer/tools/nixos-build-vms/build-vms.nix6
-rw-r--r--nixos/modules/misc/ids.nix10
-rw-r--r--nixos/modules/misc/nixpkgs.nix59
-rw-r--r--nixos/modules/module-list.nix7
-rw-r--r--nixos/modules/profiles/installation-device.nix2
-rw-r--r--nixos/modules/programs/bash/bash.nix2
-rw-r--r--nixos/modules/programs/dmrconfig.nix38
-rw-r--r--nixos/modules/programs/shell.nix4
-rw-r--r--nixos/modules/programs/sway-beta.nix33
-rw-r--r--nixos/modules/rename.nix9
-rw-r--r--nixos/modules/security/apparmor-suid.nix2
-rw-r--r--nixos/modules/security/dhparams.nix2
-rw-r--r--nixos/modules/security/rngd.nix2
-rw-r--r--nixos/modules/services/admin/salt/master.nix3
-rw-r--r--nixos/modules/services/admin/salt/minion.nix21
-rw-r--r--nixos/modules/services/amqp/rabbitmq.nix29
-rw-r--r--nixos/modules/services/backup/bacula.nix24
-rw-r--r--nixos/modules/services/backup/postgresql-backup.nix2
-rw-r--r--nixos/modules/services/cluster/kubernetes/dns.nix386
-rw-r--r--nixos/modules/services/computing/slurm/slurm.nix113
-rw-r--r--nixos/modules/services/databases/postgresql.nix12
-rw-r--r--nixos/modules/services/databases/postgresql.xml8
-rw-r--r--nixos/modules/services/development/jupyter/default.nix1
-rw-r--r--nixos/modules/services/games/minetest-server.nix3
-rw-r--r--nixos/modules/services/hardware/upower.nix26
-rw-r--r--nixos/modules/services/mail/clamsmtp.nix2
-rw-r--r--nixos/modules/services/mail/dkimproxy-out.nix2
-rw-r--r--nixos/modules/services/mail/rspamd.nix178
-rw-r--r--nixos/modules/services/misc/gitea.nix12
-rw-r--r--nixos/modules/services/misc/gitlab.nix221
-rw-r--r--nixos/modules/services/misc/home-assistant.nix1
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix14
-rw-r--r--nixos/modules/services/misc/packagekit.nix3
-rw-r--r--nixos/modules/services/monitoring/alerta.nix116
-rw-r--r--nixos/modules/services/monitoring/grafana-reporter.nix66
-rw-r--r--nixos/modules/services/monitoring/kapacitor.nix192
-rw-r--r--nixos/modules/services/monitoring/monit.nix33
-rw-r--r--nixos/modules/services/monitoring/prometheus/default.nix29
-rw-r--r--nixos/modules/services/network-filesystems/glusterfs.nix3
-rw-r--r--nixos/modules/services/networking/bitlbee.nix2
-rw-r--r--nixos/modules/services/networking/chrony.nix2
-rw-r--r--nixos/modules/services/networking/consul.nix7
-rw-r--r--nixos/modules/services/networking/ntpd.nix2
-rw-r--r--nixos/modules/services/networking/redsocks.nix2
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix2
-rw-r--r--nixos/modules/services/networking/syncthing.nix14
-rw-r--r--nixos/modules/services/networking/zerotierone.nix3
-rw-r--r--nixos/modules/services/search/solr.nix181
-rw-r--r--nixos/modules/services/system/cloud-init.nix29
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix7
-rw-r--r--nixos/modules/services/web-servers/tomcat.nix27
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix2
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm.nix14
-rw-r--r--nixos/modules/services/x11/display-managers/sddm.nix2
-rw-r--r--nixos/modules/services/x11/display-managers/xpra.nix44
-rw-r--r--nixos/modules/system/activation/activation-script.nix3
-rw-r--r--nixos/modules/system/boot/stage-1-init.sh5
-rw-r--r--nixos/modules/system/boot/stage-1.nix2
-rw-r--r--nixos/modules/system/boot/systemd-nspawn.nix1
-rw-r--r--nixos/modules/tasks/filesystems.nix8
-rw-r--r--nixos/modules/tasks/filesystems/bcachefs.nix61
-rw-r--r--nixos/modules/virtualisation/amazon-image.nix2
-rw-r--r--nixos/modules/virtualisation/containers.nix9
-rw-r--r--nixos/modules/virtualisation/docker-preloader.nix135
-rw-r--r--nixos/modules/virtualisation/google-compute-image.nix1
-rw-r--r--nixos/modules/virtualisation/libvirtd.nix2
-rw-r--r--nixos/modules/virtualisation/parallels-guest.nix4
-rw-r--r--nixos/modules/virtualisation/qemu-vm.nix5
-rw-r--r--nixos/release.nix241
-rw-r--r--nixos/tests/all-tests.nix215
-rw-r--r--nixos/tests/boot.nix7
-rw-r--r--nixos/tests/buildbot.nix7
-rw-r--r--nixos/tests/ceph.nix7
-rw-r--r--nixos/tests/certmgr.nix7
-rw-r--r--nixos/tests/chromium.nix15
-rw-r--r--nixos/tests/cjdns.nix3
-rw-r--r--nixos/tests/cloud-init.nix7
-rw-r--r--nixos/tests/containers-bridge.nix1
-rw-r--r--nixos/tests/containers-extra_veth.nix1
-rw-r--r--nixos/tests/containers-ipv4.nix1
-rw-r--r--nixos/tests/containers-ipv6.nix1
-rw-r--r--nixos/tests/containers-portforward.nix1
-rw-r--r--nixos/tests/containers-restart_networking.nix1
-rw-r--r--nixos/tests/docker-preloader.nix27
-rw-r--r--nixos/tests/ec2.nix7
-rw-r--r--nixos/tests/elk.nix10
-rw-r--r--nixos/tests/gitea.nix77
-rw-r--r--nixos/tests/gitlab.nix18
-rw-r--r--nixos/tests/handbrake.nix25
-rwxr-xr-xnixos/tests/hydra/create-trivial-project.sh3
-rw-r--r--nixos/tests/incron.nix52
-rw-r--r--nixos/tests/installer.nix7
-rw-r--r--nixos/tests/kafka.nix8
-rw-r--r--nixos/tests/keymap.nix7
-rw-r--r--nixos/tests/kubernetes/base.nix7
-rw-r--r--nixos/tests/kubernetes/dns.nix4
-rw-r--r--nixos/tests/make-test.nix8
-rw-r--r--<