Go to file
Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
doc doc/meta.xml: fix github links, clarify licensing section 2014-07-30 20:07:54 +02:00
lib Merge recent master into staging 2014-08-21 15:09:31 +02:00
maintainers/scripts Remove broken script 2014-07-30 10:23:05 +02:00
nixos Merge recent master into staging 2014-08-21 15:09:31 +02:00
pkgs Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +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.