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
..
all-packages.nix	Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging	2015-02-11 19:37:22 -05:00
go-packages.nix	Port influxdb-backup to buildGoPackage	2015-02-05 10:55:50 +01:00
guile-2-test.nix
haskell-defaults.nix	haskell-defaults.nix: "xhtml" is a core library in GHC 7.8.x	2015-01-28 12:43:46 +01:00
haskell-ng.nix	Add purity to GHC builds on Darwin.	2015-02-10 22:08:01 +01:00
haskell-packages.nix	Added Haskell package vector-fftw.	2015-02-07 22:29:40 -08:00
lua-packages.nix
make-tarball.nix
node-packages-generated.nix	nodePackages: fix evaluation by fixing npm2nix	2015-01-25 01:42:50 +01:00
node-packages.json	nodePackages: fix evaluation by fixing npm2nix	2015-01-25 01:42:50 +01:00
node-packages.nix	nodePackages.bip-pod: fix package	2015-01-26 02:09:04 +01:00
perl-packages.nix	Added Perl/Tk	2015-02-09 02:08:53 +01:00
php-packages.nix
platforms.nix	Add platform definition for BeagleBone and default to it on armv7l-linux.	2015-02-05 21:26:43 +01:00
python-packages-generated.nix
python-packages.json	python-html2text: add package	2015-01-26 10:36:30 +00:00
python-packages.nix	Merge pull request #6076 (vdirsyncer).	2015-02-07 17:10:30 +01:00
release-cross.nix
release-lib.nix
release-python.nix	Adds a new package: cherrytree - A hierarchical note taking application	2015-01-31 02:17:00 +01:00
release-small.nix
release.nix