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
..
arduino	arduino: set meta.platforms and add myself as maintainer	2015-02-07 10:47:53 +01:00
compilers	Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging	2015-02-11 19:37:22 -05:00
coq-modules
eclipse
go-modules/generic	Use go1.4 instead of go-1.4 in derivation names. Closes #6243	2015-02-09 10:16:14 +01:00
guile-modules
haskell-modules	Add purity to GHC builds on Darwin.	2015-02-10 22:08:01 +01:00
interpreters	Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging	2015-02-11 19:37:22 -05:00
libraries	Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging	2015-02-11 19:37:22 -05:00
lisp-modules
lua-modules
misc
mobile
ocaml-modules	kill libiconvOr*	2015-02-07 20:29:28 -08:00
perl-modules
pharo
pure-modules/pure-gsl
python-modules
qtcreator
r-modules
ruby-modules
tools	Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging	2015-02-11 19:37:22 -05:00
web	Patch npm packages to ignore npm requirements	2015-02-07 15:17:15 +01:00