nixpkgs/pkgs/applications
Jan Malakhovski ad35019501 Merge branch 'master' into staging
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
..
altcoins Merge pull request #41009 from matthewbauer/normalize-names 2018-05-25 16:32:48 -05:00
audio Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
backup treewide: remove placeholder usage 2018-03-27 20:14:44 +02:00
display-managers treewide: move "extensions" drvs to dir 2018-04-17 13:50:49 -05:00
editors Merge pull request #41009 from matthewbauer/normalize-names 2018-05-25 16:32:48 -05:00
gis grass: compile with libLAS 2018-04-17 09:29:02 +01:00
graphics Merge pull request #41009 from matthewbauer/normalize-names 2018-05-25 16:32:48 -05:00
inferno
kde kdeApplications.konquest: init at 2.4 2018-05-18 13:51:42 +01:00
misc Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
networking Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
office atlassian-cli: add some spaces, inherit meta.platforms from jre 2018-05-25 15:48:27 -05:00
science Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
search grepcidr: init at 2.0 (#38685) 2018-04-20 15:40:28 +02:00
version-management Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
video Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
virtualization Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 10:57:33 -04:00
window-managers qtile: 0.10.7 -> 0.11.1 2018-05-24 17:25:14 +02:00