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

Vladimír Čunát ae0c9b626f llvm: add 3.4, urge for versioned usage ... The 3.4 code was tested preliminary in x-updates, described by 2e4eab1228. Updates to llvm break builds of dependent packages (in all cases I've seen), and often upstream isn't too fast in porting to the newest version. Consequently, it seems better to keep more versions (two ATM), both in one file to share eventual changes. Also, using versioned llvm_* attributes is proposed because of this.		2014-01-13 21:53:50 +01:00
doc	manual: Document Java support	2014-01-13 13:15:59 +01:00
lib	connman: new packages ConnMan v1.20 and connman-ui	2014-01-11 20:22:53 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Merge branch 'java'	2014-01-13 13:16:17 +01:00
pkgs	llvm: add 3.4, urge for versioned usage	2014-01-13 21:53:50 +01:00
.gitignore	Merge .gitignore files	2013-10-10 13:28:22 +02:00
.version	Next release will be 14.02 Baboon	2013-11-01 09:16:36 +01:00
COPYING
default.nix