nixpkgs-suyu/nixos
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/manual Merge pull request #5362 from nbp/update-channels 2014-12-20 16:49:18 -08:00
gui
lib nixos: allow adding extra modules through environment 2014-12-16 19:13:15 +01:00
maintainers http://nixos.org -> https://nixos.org 2014-12-14 11:26:45 +01:00
modules Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00
tests nixos/mesos: Parameterize mesos slave attributes 2014-12-18 14:47:24 -08:00
COPYING
default.nix
README
release-combined.nix add chromium test to the tested job 2014-12-14 13:47:19 +01:00
release-small.nix
release.nix nixos/gitlab: enable tests in release 2014-12-14 13:05:35 +01:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.