summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.version2
-rw-r--r--CONTRIBUTING.md17
-rw-r--r--doc/stdenv.xml6
-rw-r--r--lib/maintainers.nix2
-rw-r--r--nixos/lib/testing.nix12
-rw-r--r--nixos/modules/installer/tools/nixos-generate-config.pl6
-rw-r--r--nixos/modules/misc/ids.nix2
-rw-r--r--nixos/modules/rename.nix3
-rw-r--r--nixos/modules/services/networking/charybdis.nix6
-rw-r--r--nixos/modules/services/networking/dnscrypt-proxy.nix179
-rw-r--r--nixos/modules/services/networking/firefox/sync-server.nix2
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix5
-rw-r--r--nixos/release.nix2
-rw-r--r--nixos/tests/avahi.nix8
-rw-r--r--nixos/tests/bittorrent.nix3
-rw-r--r--nixos/tests/blivet.nix3
-rw-r--r--nixos/tests/boot.nix17
-rw-r--r--nixos/tests/cadvisor.nix7
-rw-r--r--nixos/tests/check-filesystems.nix3
-rw-r--r--nixos/tests/chromium.nix3
-rw-r--r--nixos/tests/cjdns.nix7
-rw-r--r--nixos/tests/containers.nix7
-rw-r--r--nixos/tests/docker-registry.nix7
-rw-r--r--nixos/tests/docker.nix8
-rw-r--r--nixos/tests/etcd.nix7
-rw-r--r--nixos/tests/firefox.nix3
-rw-r--r--nixos/tests/firewall.nix8
-rw-r--r--nixos/tests/fleet.nix7
-rw-r--r--nixos/tests/gitlab.nix7
-rw-r--r--nixos/tests/gnome3.nix8
-rw-r--r--nixos/tests/i3wm.nix7
-rw-r--r--nixos/tests/influxdb.nix7
-rw-r--r--nixos/tests/installer.nix7
-rw-r--r--nixos/tests/ipv6.nix8
-rw-r--r--nixos/tests/jenkins.nix7
-rw-r--r--nixos/tests/kde4.nix3
-rw-r--r--nixos/tests/kexec.nix8
-rw-r--r--nixos/tests/kubernetes.nix7
-rw-r--r--nixos/tests/lightdm.nix7
-rw-r--r--nixos/tests/login.nix3
-rw-r--r--nixos/tests/logstash.nix7
-rw-r--r--nixos/tests/mesos.nix7
-rw-r--r--nixos/tests/misc.nix8
-rw-r--r--nixos/tests/mpich.nix7
-rw-r--r--nixos/tests/mumble.nix5
-rw-r--r--nixos/tests/munin.nix7
-rw-r--r--nixos/tests/mysql-replication.nix5
-rw-r--r--nixos/tests/mysql.nix7
-rw-r--r--nixos/tests/nat.nix5
-rw-r--r--nixos/tests/networking-proxy.nix8
-rw-r--r--nixos/tests/networking.nix5
-rw-r--r--nixos/tests/nfs.nix6
-rw-r--r--nixos/tests/nsd.nix7
-rw-r--r--nixos/tests/openssh.nix3
-rw-r--r--nixos/tests/panamax.nix7
-rw-r--r--nixos/tests/peerflix.nix8
-rw-r--r--nixos/tests/phabricator.nix3
-rw-r--r--nixos/tests/printing.nix4
-rw-r--r--nixos/tests/proxy.nix6
-rw-r--r--nixos/tests/quake3.nix5
-rw-r--r--nixos/tests/rabbitmq.nix3
-rw-r--r--nixos/tests/simple.nix7
-rw-r--r--nixos/tests/subversion.nix5
-rw-r--r--nixos/tests/tomcat.nix8
-rw-r--r--nixos/tests/trac.nix3
-rw-r--r--nixos/tests/udisks2.nix3
-rw-r--r--nixos/tests/virtualbox.nix3
-rw-r--r--nixos/tests/xfce.nix8
-rw-r--r--pkgs/applications/editors/emacs-modes/flycheck/default.nix6
-rw-r--r--pkgs/applications/misc/bleachbit/default.nix34
-rw-r--r--pkgs/applications/misc/blender/default.nix4
-rw-r--r--pkgs/applications/misc/merkaartor/default.nix4
-rw-r--r--pkgs/applications/misc/redshift/default.nix35
-rw-r--r--pkgs/applications/misc/rofi/default.nix4
-rw-r--r--pkgs/applications/misc/vifm/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix6
-rw-r--r--pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock2
-rw-r--r--pkgs/applications/networking/cluster/panamax/ui/gemset.nix8
-rw-r--r--pkgs/applications/networking/cluster/spark/default.nix6
-rw-r--r--pkgs/applications/networking/ftp/filezilla/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/blink/default.nix19
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix234
-rw-r--r--pkgs/applications/networking/mumble/default.nix6
-rw-r--r--pkgs/applications/networking/p2p/tribler/default.nix49
-rw-r--r--pkgs/applications/networking/syncthing/default.nix4
-rw-r--r--pkgs/applications/science/astronomy/stellarium/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix8
-rw-r--r--pkgs/applications/version-management/gitlab/Gemfile.lock2
-rw-r--r--pkgs/applications/version-management/gitlab/gemset.nix8
-rw-r--r--pkgs/applications/virtualization/qboot/default.nix24
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix15
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix2
-rw-r--r--pkgs/data/fonts/fira-code/default.nix31
-rw-r--r--pkgs/data/fonts/fira-mono/default.nix8
-rw-r--r--pkgs/data/fonts/fira/default.nix8
-rw-r--r--pkgs/data/fonts/symbola/default.nix6
-rw-r--r--pkgs/data/fonts/unifont/default.nix10
-rw-r--r--pkgs/development/compilers/rustc/1.0.0.nix16
-rw-r--r--pkgs/development/compilers/rustc/default.nix33
-rw-r--r--pkgs/development/compilers/rustc/generic.nix9
-rw-r--r--pkgs/development/compilers/rustc/head.nix20
-rw-r--r--pkgs/development/compilers/rustc/patches/head.patch61
-rw-r--r--pkgs/development/coq-modules/fiat/default.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix19
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix1001
-rw-r--r--pkgs/development/interpreters/jruby/default.nix4
-rw-r--r--pkgs/development/interpreters/python/2.6/default.nix5
-rw-r--r--pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix10
-rw-r--r--pkgs/development/interpreters/ruby/ruby-2.2.2.nix2
-rw-r--r--pkgs/development/libraries/gdal/default.nix4
-rw-r--r--pkgs/development/libraries/gdal/gdal-1_11_2.nix59
-rw-r--r--pkgs/development/libraries/libressl/default.nix4
-rw-r--r--pkgs/development/libraries/libspatialite/default.nix2
-rw-r--r--pkgs/development/libraries/libunistring/default.nix34
-rw-r--r--pkgs/development/libraries/libxcomp/default.nix5
-rw-r--r--pkgs/development/libraries/openscenegraph/default.nix2
-rw-r--r--pkgs/development/libraries/shhmsg/default.nix20
-rw-r--r--pkgs/development/libraries/shhopt/default.nix19
-rw-r--r--pkgs/development/libraries/v8/3.16.14.nix4
-rw-r--r--pkgs/development/libraries/vigra/default.nix35
-rw-r--r--pkgs/development/libraries/wvstreams/default.nix4
-rw-r--r--pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch34
-rw-r--r--pkgs/development/r-modules/bioc-packages.nix319
-rw-r--r--pkgs/development/r-modules/cran-packages.nix1065
-rw-r--r--pkgs/development/r-modules/default.nix4
-rw-r--r--pkgs/development/tools/activator/default.nix4
-rw-r--r--pkgs/development/tools/build-managers/cargo/default.nix8
-rw-r--r--pkgs/development/tools/build-managers/cargo/snapshot.nix10
-rw-r--r--pkgs/development/tools/database/sqlitebrowser/default.nix23
-rw-r--r--pkgs/development/tools/misc/pahole/default.nix27
-rw-r--r--