summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md5
-rw-r--r--doc/beam-users-guide.xml376
-rw-r--r--doc/erlang-users-guide.xml305
-rw-r--r--doc/languages-frameworks/go.xml2
-rw-r--r--doc/languages-frameworks/python.md14
-rw-r--r--doc/manual.xml2
-rw-r--r--lib/maintainers.nix12
-rwxr-xr-xmaintainers/scripts/copy-tarballs.pl39
-rw-r--r--maintainers/scripts/find-tarballs.nix2
-rw-r--r--maintainers/scripts/map-files.pl22
-rw-r--r--nixos/default.nix2
-rw-r--r--nixos/doc/manual/configuration/config-file.xml10
-rw-r--r--nixos/doc/manual/default.nix75
-rw-r--r--nixos/doc/manual/development/sources.xml32
-rw-r--r--nixos/doc/manual/installation/installing-pxe.xml48
-rw-r--r--nixos/doc/manual/installation/installing.xml1
-rw-r--r--nixos/doc/manual/release-notes/release-notes.xml1
-rw-r--r--nixos/doc/manual/release-notes/rl-1609.xml48
-rw-r--r--nixos/lib/make-disk-image.nix6
-rw-r--r--nixos/modules/config/pulseaudio.nix10
-rw-r--r--nixos/modules/hardware/all-firmware.nix6
-rw-r--r--nixos/modules/hardware/video/webcam/facetimehd.nix4
-rw-r--r--nixos/modules/installer/cd-dvd/channel.nix2
-rw-r--r--nixos/modules/installer/cd-dvd/iso-image.nix4
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image.nix4
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix3
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix3
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball.nix4
-rw-r--r--nixos/modules/installer/netboot/netboot-base.nix20
-rw-r--r--nixos/modules/installer/netboot/netboot-minimal.nix10
-rw-r--r--nixos/modules/installer/netboot/netboot.nix91
-rw-r--r--nixos/modules/installer/tools/auto-upgrade.nix2
-rw-r--r--nixos/modules/installer/tools/nixos-checkout.nix60
-rw-r--r--nixos/modules/installer/tools/nixos-rebuild.sh2
-rw-r--r--nixos/modules/installer/tools/tools.nix6
-rw-r--r--nixos/modules/misc/ids.nix3
-rw-r--r--nixos/modules/module-list.nix7
-rw-r--r--nixos/modules/profiles/docker-container.nix4
-rw-r--r--nixos/modules/programs/mosh.nix26
-rw-r--r--nixos/modules/rename.nix4
-rw-r--r--nixos/modules/security/grsecurity.nix3
-rw-r--r--nixos/modules/services/backup/crashplan.nix7
-rw-r--r--nixos/modules/services/databases/postgresql.nix2
-rw-r--r--nixos/modules/services/development/hoogle.nix70
-rw-r--r--nixos/modules/services/hardware/sane_extra_backends/brscan4.nix116
-rw-r--r--nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix71
-rw-r--r--nixos/modules/services/logging/graylog.nix161
-rw-r--r--nixos/modules/services/logging/logcheck.nix5
-rw-r--r--nixos/modules/services/mail/dovecot.nix6
-rw-r--r--nixos/modules/services/mail/rmilter.nix67
-rw-r--r--nixos/modules/services/mail/rspamd.nix59
-rw-r--r--nixos/modules/services/misc/emby.nix64
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix18
-rw-r--r--nixos/modules/services/misc/nix-gc.nix2
-rw-r--r--nixos/modules/services/misc/nix-ssh-serve.nix2
-rw-r--r--nixos/modules/services/misc/taskserver/default.nix4
-rw-r--r--nixos/modules/services/network-filesystems/openafs-client/default.nix4
-rw-r--r--nixos/modules/services/networking/copy-com.nix54
-rw-r--r--nixos/modules/services/networking/logmein-hamachi.nix50
-rw-r--r--nixos/modules/services/networking/mfi.nix10
-rw-r--r--nixos/modules/services/networking/nix-serve.nix2
-rw-r--r--nixos/modules/services/networking/quassel.nix2
-rw-r--r--nixos/modules/services/networking/unifi.nix16
-rw-r--r--nixos/modules/services/networking/zerobin.nix102
-rw-r--r--nixos/modules/services/search/elasticsearch.nix1
-rw-r--r--nixos/modules/services/security/fail2ban.nix28
-rw-r--r--nixos/modules/services/system/dbus.nix2
-rw-r--r--nixos/modules/services/system/kerberos.nix10
-rw-r--r--nixos/modules/services/torrent/transmission.nix2
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix2
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix24
-rw-r--r--nixos/modules/services/x11/desktop-managers/xfce.nix5
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix8
-rw-r--r--nixos/modules/services/x11/redshift.nix10
-rw-r--r--nixos/modules/services/x11/xserver.nix9
-rw-r--r--nixos/modules/system/boot/loader/grub/grub.nix2
-rw-r--r--nixos/modules/system/boot/loader/gummiboot/gummiboot.nix2
-rw-r--r--nixos/modules/system/etc/etc.nix2
-rw-r--r--nixos/modules/tasks/network-interfaces.nix10
-rw-r--r--nixos/modules/virtualisation/amazon-init.nix2
-rw-r--r--nixos/modules/virtualisation/azure-image.nix4
-rw-r--r--nixos/modules/virtualisation/brightbox-image.nix4
-rw-r--r--nixos/modules/virtualisation/containers.nix345
-rw-r--r--nixos/modules/virtualisation/ec2-amis.nix72
-rw-r--r--nixos/modules/virtualisation/google-compute-image.nix4
-rw-r--r--nixos/modules/virtualisation/qemu-vm.nix12
-rw-r--r--nixos/release-combined.nix5
-rw-r--r--nixos/release-small.nix3
-rw-r--r--nixos/release.nix18
-rw-r--r--nixos/tests/boot.nix40
-rw-r--r--nixos/tests/containers-bridge.nix81
-rw-r--r--nixos/tests/containers-imperative.nix (renamed from nixos/tests/containers.nix)34
-rw-r--r--nixos/tests/containers-ipv4.nix55
-rw-r--r--nixos/tests/containers-ipv6.nix61
-rw-r--r--nixos/tests/printing.nix2
-rw-r--r--pkgs/applications/altcoins/memorycoin.nix6
-rw-r--r--pkgs/applications/altcoins/namecoin.nix12
-rw-r--r--pkgs/applications/altcoins/primecoin.nix6
-rw-r--r--pkgs/applications/audio/MMA/default.nix68
-rw-r--r--pkgs/applications/audio/abcde/default.nix6
-rw-r--r--pkgs/applications/audio/audacity/default.nix18
-rw-r--r--pkgs/applications/audio/deadbeef/default.nix8
-rw-r--r--pkgs/applications/audio/deadbeef/wrapper.nix20
-rw-r--r--pkgs/applications/audio/dfasma/default.nix10
-rw-r--r--pkgs/applications/audio/fmit/default.nix19
-rw-r--r--pkgs/applications/audio/iannix/default.nix10
-rw-r--r--pkgs/applications/audio/keyfinder/default.nix11
-rw-r--r--pkgs/applications/audio/non/default.nix6
-rw-r--r--pkgs/applications/audio/paprefs/default.nix2
-rw-r--r--pkgs/applications/audio/pavucontrol/default.nix2
-rw-r--r--pkgs/applications/audio/puredata/wrapper.nix19
-rw-r--r--pkgs/applications/audio/qtscrobbler/default.nix8
-rw-r--r--pkgs/applications/audio/renoise/default.nix2
-rw-r--r--pkgs/applications/audio/sonic-visualiser/default.nix11
-rw-r--r--pkgs/applications/audio/spotify/default.nix4
-rw-r--r--pkgs/applications/audio/svox/default.nix43
-rw-r--r--pkgs/applications/backup/crashplan/default.nix4
-rw-r--r--pkgs/applications/display-managers/lightdm/default.nix6
-rw-r--r--pkgs/applications/editors/atom/default.nix36
-rw-r--r--pkgs/applications/editors/atom/env.nix19
-rw-r--r--pkgs/applications/editors/eclipse/build-eclipse.nix4
-rw-r--r--pkgs/applications/editors/eclipse/plugins.nix17
-rw-r--r--pkgs/applications/editors/emacs-25/default.nix6
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-generated.nix689
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-packages.nix12
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-generated.nix19375
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-packages.nix11
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix7991
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix17
-rw-r--r--pkgs/applications/editors/focuswriter/default.nix8
-rw-r--r--pkgs/applications/editors/idea/default.nix18
-rw-r--r--pkgs/applications/editors/neovim/default.nix6