Tuomas Tynkkynen 1a06373c0a Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/libraries/libclc/default.nix pkgs/top-level/all-packages.nix		2018-02-13 16:42:55 +02:00
..
config	nixos/powerManagement: remove duplicate definition	2018-01-28 21:53:07 +01:00
hardware	intel-ocl: r4.0-59481 -> 5.0-63503	2017-11-01 17:59:49 +00:00
i18n/input-method
installer	nixos/sd-image-armv7l-multiplatform: Port RPi config.txt changes from aarch64 image	2018-02-07 06:30:34 +02:00
misc	Merge pull request #33700 from roberth/nixos-externalpkgs	2018-02-09 18:47:48 +00:00
profiles	Add setFunctionArgs lib function.	2018-01-31 14:02:19 -05:00
programs	Merge pull request #33898 from oxij/nixos/related-packages-v5	2018-02-09 20:36:27 -05:00
security	nixos/pam: support for Google Authenticator	2018-02-09 21:09:03 -08:00
services	Merge pull request #34905 from vcunat/p/kresd-TLS	2018-02-13 10:41:52 +00:00
system	systemd: 234 -> 237	2018-02-13 01:24:24 +01:00
tasks	nixos/zfs: fix typo in enableLegacyCrypto description	2018-02-08 10:24:47 +00:00
testing	nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix	2018-01-30 16:57:27 +02:00
virtualisation	nixos/xen-dom0: add related packages, make it play well with them	2018-02-09 19:51:07 +00:00
module-list.nix	nixos/rdma-core: add module for soft RoCE and test (#34607)	2018-02-10 07:52:03 +00:00
rename.nix	nixos/xen-dom0: add related packages, make it play well with them	2018-02-09 19:51:07 +00:00