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
Find a file
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
doc doc: mention nix-prefetch-scripts package 2014-07-27 15:21:38 +02:00
lib Upgrade docker to 1.1.2 and add docker module 2014-07-28 21:45:49 +02:00
maintainers/scripts Remove broken script 2014-07-30 10:23:05 +02:00
nixos Merge recent master into x-updates 2014-08-02 05:08:07 +02:00
pkgs Merge recent master into x-updates 2014-08-02 05:08:07 +02:00
.gitignore gitignore: result-* and make absolute doc ignores 2014-06-23 16:58:49 +02:00
.version
COPYING
default.nix
README.md

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