Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
analog
ansible	ansible_2_{1,2}: fix for jinja src change	2017-12-26 20:39:26 +01:00
aws-auth
aws-vault	aws-vault: Fix eval	2018-01-11 21:38:32 +08:00
aws_shell	aws_shell: Move out of python-packages.nix	2017-11-11 02:35:42 +08:00
awscli	awscli: refactor	2018-02-27 09:35:05 +01:00
awslogs	awslogs: 0.7 -> 0.10	2017-10-13 00:00:28 +02:00
bubblewrap	bubblewrap: 0.1.8 -> 0.2.0	2017-11-11 13:10:50 +01:00
certbot	certbot: 0.11.1 -> 0.19.0	2017-11-16 09:14:27 -08:00
cli53	pythonPackages: rename dns -> dnspython	2017-12-10 15:27:06 +01:00
daemontools
dehydrated	dehydrated: 0.4.0 -> 0.5.0	2018-02-25 19:59:45 -08:00
docker-credential-gcr	Remove empty dependencies and related file	2018-02-20 10:54:31 +01:00
fastlane	fastlane: 2.75.1 -> 2.80.0	2018-02-05 16:50:53 +08:00
gixy	gixy: 0.1.8 -> 0.1.9	2018-03-04 14:17:26 +01:00
google-cloud-sdk	google-cloud-sdk: also fix darwin	2018-03-08 22:28:09 +00:00
gtk-vnc
intecture	rust: update cargo builder to fetch registry dynamically	2017-10-23 00:30:47 +01:00
lego	lego: init at unstable-2018-02-02	2018-02-11 12:17:25 -08:00
lxd
mycli
nxproxy	nxproxy: 3.5.0.32 -> 3.5.0.33	2018-02-28 15:00:55 +00:00
salt	Update salt-pepper from 0.5.0 to 0.5.5	2018-03-03 17:33:45 +01:00
scaleway-cli
sec	sec: 2.7.7 -> 2.7.12	2018-02-27 15:53:17 -08:00
simp_le	Remove nckx as a maintainer for all packages	2018-01-16 23:00:49 +01:00
tigervnc	treewide: transition from mesa_glu to libGLU	2018-02-24 17:05:43 +02:00
tightvnc
vncdo	vncdo: init at 0.11.2	2017-12-08 10:43:14 -08:00