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
..
adapta-backgrounds	adapta-backgrounds: 0.5.1.1 -> 0.5.2.3	2018-01-01 07:15:17 -02:00
brise
cacert	cacert: use addEnvHooks	2018-01-07 21:25:48 +01:00
ddccontrol-db
dns-root-data
freepats
geolite-legacy	Remove nckx as a maintainer for all packages	2018-01-16 23:00:49 +01:00
hackage	hackage: update database snapshot to latest version	2018-03-06 21:24:50 +01:00
iana-etc	iana-etc: 20171106 -> 20180108	2018-01-13 09:45:51 +00:00
media-player-info	media-player-info: 22 -> 23	2018-02-27 23:54:09 +01:00
mime-types	data/mime-types: make derivation fixed-output	2018-02-22 17:14:43 +00:00
miscfiles
mobile-broadband-provider-info
nixos-artwork
osinfo-db	osinfo-db: init at 20170813	2017-12-19 17:25:53 +01:00
poppler-data	Revert "Revert "Merge staging at '8d490ca9934d0' into master""	2018-02-26 22:54:48 +01:00
scowl	scowl: support installing just words.txt	2018-02-02 21:54:13 +01:00
shared-desktop-ontologies
shared-mime-info
sound-theme-freedesktop	Remove nckx as a maintainer for all packages	2018-01-16 23:00:49 +01:00
tzdata	tzdata: Fix cross-compilation	2018-02-28 15:01:33 -05:00
wireless-regdb	wireless-regdb: 2017.03.07 -> 2017.12.23	2018-01-28 18:52:23 +01:00
xorg-rgb