nixpkgs/pkgs/applications
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
..
altcoins Merge pull request #36717 from Lassulus/freicoin 2018-03-10 12:58:38 +00:00
audio Revert "spotify: 1.0.69 -> 1.0.72" 2018-03-10 13:31:55 +01:00
backup tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
display-managers Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 16:22:37 +01:00
editors Merge #36663: hexcurse: fix build with gcc7 2018-03-09 20:51:30 +01:00
gis qgis: 2.18.15 -> 2.18.16 2018-02-28 14:22:48 +00:00
graphics gocr: 0.50 -> 0.51 2018-03-08 12:33:16 -08:00
inferno
kde okular: exclude chmlib on ARM 2018-03-07 09:57:34 +08:00
misc Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
networking errbot: fix build 2018-03-10 12:54:55 +01:00
office Merge branch 'master' 2018-03-05 14:53:27 +01:00
science Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
search recoll: Avoid using substituteInPlace on zip files 2018-02-28 17:44:42 -08:00
taxes treewide: checkMeta fixes for x86_64-linux 2017-12-07 07:50:47 -05:00
version-management Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
video avidemux: restrict platforms 2018-03-06 13:58:14 +03:00
virtualization virtualbox: drop headless patch that no longer applies, fixed upstream 2018-03-07 18:12:02 -06:00
window-managers Merge branch 'master' 2018-03-05 14:53:27 +01:00