nixpkgs

History

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/manual

document options to nixos-install script

2015-01-06 14:49:24 +01: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

Minor fixes to EC2 image generation script. Set autoresponder, so no interaction is necessary. Write output in a format that can be easily included in ec2-amis.nix of nixops.

2015-01-05 09:35:48 +01:00

modules

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

2015-01-20 20:21:03 -05:00

tests

Paranoia

2015-01-15 18:37:55 +01: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

java: Normalize to the default jre / jdk

2015-01-07 14:55:41 -08:00

release.nix

nixos: add cadvisor service

2014-12-28 20:21:41 +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.