nixpkgs/pkgs/applications
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
..
audio Add game-music-emu, a decoder plugin for mpd (close #5431) 2015-01-20 16:08:01 +01:00
backup/crashplan crashplan: install desktop file 2014-12-19 23:26:35 +01:00
display-managers fix sha for a slim's theme 2014-11-08 22:40:36 +03:00
editors Merge pull request #5756 from fredlebel/atom_0.171.0 2015-01-14 11:32:23 +01:00
gis qgis: update from 2.4.0 to 2.6.1 2015-01-19 16:18:01 +01:00
graphics geeqie: update from 1.1 to 1.2 2015-01-14 14:23:46 +01:00
inferno Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
misc ikiwiki: maintenance update, and use a stable URL 2015-01-20 14:05:25 +01:00
networking Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2015-01-20 20:21:03 -05:00
office abiword: update from 3.0.0 to 3.0.1 2015-01-18 18:20:28 +01:00
science unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
search Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
taxes Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
version-management Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2015-01-20 20:21:03 -05:00
video unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
virtualization Merge pull request #5425 from ts468/xen 2015-01-02 12:01:40 +01:00
window-managers Update StumpWM 2015-01-12 02:11:13 +03:00