nixpkgs

History

Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix

2014-10-07 00:09:37 +02:00

doc/manual

Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgs

2014-09-22 01:27:00 +01:00

gui

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

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

lib

test-driver: Use netpbm instead of imagemagick

2014-09-25 00:07:30 +02:00

maintainers

Initial configuration + image generation script for Micro$oft Azure. Work in progress for #3986 .

2014-09-06 21:37:46 +02:00

modules

Merge remote-tracking branch 'origin/master' into staging

2014-10-07 00:09:37 +02:00

tests

Merge remote-tracking branch 'origin/master' into staging

2014-10-07 00:09:37 +02: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 all default NixOS packages to the channel

2014-09-25 00:25:54 +02:00

release.nix

Add all default NixOS packages to the channel

2014-09-25 00:25:54 +02: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.