Go to file
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
doc doc/meta.xml: fix github links, clarify licensing section 2014-07-30 20:07:54 +02:00
lib Merge remote-tracking branch 'origin/master' into staging 2014-08-15 02:15:14 +02:00
maintainers/scripts Remove broken script 2014-07-30 10:23:05 +02:00
nixos Add user attribute isNormalUser 2014-08-15 02:16:04 +02:00
pkgs merge 'staging' into modular-stdenv 2014-09-08 18:16:54 +02:00
.gitignore Add .DS_Store to gitignore so we Mac users don't accidentally pollute nixpkgs with ugliness 2014-08-09 20:53:36 -04:00
.version Update version 2014-04-23 08:02:18 -04:00
COPYING * Applying an MIT-style license to Nixpkgs. 2006-04-25 16:50:34 +00:00
default.nix Explicitly require Nix 1.6 2014-03-17 11:33:36 +01:00
README.md Fixed link to installation instructions in README 2014-05-26 22:19:22 +02:00

Nixpkgs is a collection of packages for Nix package manager. Nixpkgs also includes NixOS linux distribution source code.