nixpkgs

History

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

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

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

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

default.nix

Fix nixos-option

2013-10-28 22:45:58 +01:00

README

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

release-combined.nix

add chromium test to the tested job

2014-12-14 13:47:19 +01:00

release-small.nix

Add nodejs to the small channel

2014-10-27 10:40:49 +01:00

release.nix

nixos/gitlab: enable tests in release

2014-12-14 13:05:35 +01:00

README

*** 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.