philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs/applications
History
Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
..
audio Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 2015-02-11 19:37:22 -05:00
backup/crashplan
display-managers
editors Purification in preparation for pure-darwin merge (shouldsn't hurt anything in the meantime) 2015-02-08 19:15:09 -05:00
gis
graphics mcomix: update to 1.01 2015-02-09 12:16:38 +00:00
inferno
kde-apps-14.12 kdeApps.kmix: remove Qt 4 dependencies 2015-02-01 10:26:55 -06:00
misc kill libiconvOr* 2015-02-07 20:29:28 -08:00
networking Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 2015-02-11 19:37:22 -05:00
office mendeley: gcc.gcc -> gcc.cc (fix evaluation) 2015-02-04 07:16:19 +01:00
science kill libiconvOr* 2015-02-07 20:29:28 -08:00
search kill libiconvOr* 2015-02-07 20:29:28 -08:00
taxes
version-management kill libiconvOr* 2015-02-07 20:29:28 -08:00
video Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 2015-02-11 19:37:22 -05:00
virtualization Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 2015-02-02 21:14:28 -05:00
window-managers i3: Set checkPhase only when on Linux. 2015-02-04 20:44:19 +01:00