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
..
2.0-immodules.cache.patch	gtk2: make gtk2 look for immodule cache in $NIX_PROFILE	2016-04-16 17:51:32 +09:00
2.x.nix	gtk2: 2.24.31 -> 2.24.32 (maintenance)	2018-01-21 16:13:03 +01:00
3.0-immodules.cache.patch	gtk3: make gtk3 look for immodule cache in $NIX_PROFILE	2016-04-16 17:51:32 +09:00
3.x.nix	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
gtk2-theme-paths.patch	gtk2: search for themes in XDG_DATA_DIRS	2017-05-18 06:32:45 +01:00
setup-hook.sh	gtk2: fixup splitting	2015-04-20 20:24:47 +02:00