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
..
advancecomp	advancecomp: 2.0 -> 2.1	2018-02-24 14:16:49 -08:00
brotli	brotli: 1.0.2 -> 1.0.3	2018-03-05 17:41:11 -06:00
bsc
bsdiff
bzip2
dtrx
gzip	gzip: remove darwin format patch	2018-01-27 20:08:35 +01:00
gzrt
kzipmix
lbzip2
lhasa
lrzip
lz4
lzbench
lzfse
lzham
lzip	lzip: 1.19 -> 1.20	2018-03-01 06:06:08 +02:00
lzop
mozlz4a
ncompress
pbzip2
pigz
pixz
pxz
rzip
upx
xar
xdelta
xz	xz: set CONFIG_SHELL to /bin/sh, fix retained reference to bootstrap	2018-02-13 09:44:25 -06:00
zdelta
zopfli
zstd
zstdmt
zsync