Find a file
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
doc Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2015-01-20 20:21:03 -05:00
lib Add cocreature as maintainer of openjdk8 2015-01-20 19:07:54 +01:00
maintainers Update vanity to add more special characters. 2015-01-18 18:20:08 +03:00
nixos Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2015-01-20 20:21:03 -05:00
pkgs Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2015-01-20 20:21:03 -05:00
.gitignore
.travis.yml Travis: chop build in install and build phases 2014-10-15 11:05:12 +02:00
.version release: 15.04 -> 15.05 2014-12-09 15:09:06 +01:00
COPYING
default.nix Revert "Revert "mkOverridable: Use functors to allow overridable functions"" 2015-01-13 08:39:54 -05:00
README.md typo 2015-01-04 16:29:25 +01:00