nixpkgs/pkgs/applications/networking
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
..
bittorrentsync
browsers flashplayer: Minor security update to 11.2.202.442 2015-02-07 11:04:48 +11:00
cluster panamax: rewrite using 'pleasent ruby' 2015-02-07 15:32:20 +01:00
copy-com rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
davmail
dropbox rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
dropbox-cli
enhanced-ctorrent enhanced-ctorrent: Add package 2015-01-13 00:38:06 -08:00
esniper
feedreaders kill libiconvOr* 2015-02-07 20:29:28 -08:00
ftp/filezilla
google-drive-ocamlfuse google-drive-ocamlfuse: new expression 2015-01-25 22:10:09 +01:00
ids bro: update from 2.3.1 to 2.3.2 2015-02-09 12:20:10 +01:00
ike rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
instant-messengers tkabber: update version 2015-02-09 13:10:12 +03:00
iptraf
irc weechat: update to 1.1.1 2015-02-05 08:40:07 +01:00
jmeter
linssid
mailreaders Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 2015-02-02 21:14:28 -05:00
msmtp
mumble mumble: add pulseaudio support 2015-01-10 23:36:42 +03:00
netperf
newsreaders liferea: minor update 2015-01-13 19:48:27 +01:00
notbit
offrss
owncloud-client owncloud: update to 1.7.1 2015-02-02 18:28:55 +01:00
p2p kill libiconvOr* 2015-02-07 20:29:28 -08:00
pjsip
pond Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
remote Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 2015-02-02 21:14:28 -05:00
seafile-client
siproxd
sniffers
spideroak
sync fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
syncthing Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
umurmur umurmur: Add meta platforms 2015-02-06 13:15:23 -08:00
vnstat Update vnstat 1.11 -> 1.13 2015-01-19 17:10:57 +01:00
yafc
znc ZNC: added "privmsg" module. 2015-01-16 18:45:03 +00:00