This is the master branch of nixpkgs, initially pulled from commit 8debf2f9a63d54ae4f28994290437ba54c681c7b The intent of this repo is to be merged onto nixpkgs master. This will also be of help for https://git.suyu.dev/BoomMicrophone/suyu-nix-test which I will need in order for development (it will also be helpful to know what to do for setting up the environment for the master server. Currently I am focusing on this so I can actually see what is still missing) This repo will be removed once the PR to the nixpkgs github goes through

Peter Simons ee0a88ba01 Merge remote-tracking branch 'origin/master' into stdenv-updates.		2013-10-19 13:55:06 +02:00
doc	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
lib	mkEnableOption: Add a period at the end of the description	2013-10-17 14:29:51 +02:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Add services.xserver.s3tcSupport option	2013-10-19 00:40:45 +03:00
pkgs	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-19 13:55:06 +02:00
.gitignore	Merge .gitignore files	2013-10-10 13:28:22 +02:00
.version	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
COPYING	* Applying an MIT-style license to Nixpkgs.	2006-04-25 16:50:34 +00:00
default.nix	* For convenience, provide a top-level Nix expression that simply	2007-04-26 14:32:57 +00:00