jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7d6cd236c3
nixpkgs/pkgs/applications
History
Vladimír Čunát dbae4f109f Merge branch 'master' into staging 
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
..
audio Merge branch 'master' into staging 2015-01-31 19:34:57 +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 branch 'master' into staging 2015-01-31 19:34:57 +01:00
gis qgis: update from 2.4.0 to 2.6.1 2015-01-19 16:18:01 +01:00
graphics Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
inferno rename <gcc-frontend>.gcc to <gcc-frontend>.cc 2015-01-14 20:59:10 -08:00
kde-apps-14.12 kdeApps: update to 14.12.1 2015-01-26 21:01:06 -06:00
misc Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
networking Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
office Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
science Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
search
taxes Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
version-management version-management/gitolite: Bump version 3.6.1 -> 3.6.2 2015-01-29 23:45:50 +11:00
video Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
virtualization Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00
window-managers i3lock: it's cleaner to use $out/share/man in the first place. 2015-01-28 19:56:13 +01:00