Find a file
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
doc new Go support function 'buildGoPackage' 2015-02-03 14:21:48 +01:00
lib New package: xbindkeys-config 2015-02-09 01:36:01 -08:00
maintainers Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
nixos Fix grub on nodev installs 2015-02-08 22:31:14 -05:00
pkgs Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 2015-02-11 19:37:22 -05:00
.gitignore qt5split: add split submodule build of Qt 5.3 2015-02-07 12:52:20 -06:00
.travis.yml
.version
COPYING
default.nix if we abort with too old Nix, hint docs 2015-01-21 21:41:40 +01:00
README.md add statuses to nixpkgs 2015-02-08 22:54:29 +03:00