alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/nixos
History
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
..
doc/manual Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
gui
lib Merge pull request #3779 from offlinehacker/docker 2014-09-02 01:04:05 +04:00
maintainers Replace depricated gcutil with gcloude compute in gce/create-gce.sh 2014-08-28 21:42:49 +00:00
modules Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
tests Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
COPYING
default.nix
README
release-combined.nix Revert "Merge pull request #2449 from wkennington/master.grub" 2014-08-31 12:58:37 +04:00
release.nix Revert "Merge pull request #2449 from wkennington/master.grub" 2014-08-31 12:58:37 +04: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.