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

coqPackages: add contribs (close #5242)

2015-01-25 07:36:10 +01:00

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

rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc

2015-01-14 20:27:55 -08:00

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

Update CLX

2015-01-18 01:58:20 +03:00

lua-modules

…

misc

mpc: also rename the attribute to libmpc

2015-01-17 09:55:32 +01:00

mobile

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

ocaml-modules

kill libiconvOr*

2015-02-07 20:29:28 -08:00

perl-modules

perl DB_file: fix build by not changing $out/lib/perl5

2015-01-20 14:08:17 +01:00

pharo

…

pure-modules/pure-gsl

…

python-modules

Adds a new package: cherrytree - A hierarchical note taking application

2015-01-31 02:17:00 +01:00

qtcreator

…

r-modules

rPackages: allow users to override the version of R to be used for building

2015-01-27 14:04:54 +01:00

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