Go to file
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 meta.xml: fixed small omission 2014-08-24 16:36:46 +02:00
lib Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
maintainers/scripts Remove broken script 2014-07-30 10:23:05 +02:00
nixos Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
pkgs Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +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.