No description
Find a file
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
doc Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00
lib Add photoqt-1.1.0.1 2014-12-27 22:13:41 +01:00
maintainers Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
nixos Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00
pkgs Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -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
README.md http://nixos.org -> https://nixos.org 2014-12-14 11:26:45 +01:00

Nixpkgs is a collection of packages for Nix package manager. Nixpkgs also includes NixOS linux distribution source code.