Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ...

Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix

2014-01-18 14:46:20 +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

Whitespace to force a rebuild

2014-01-17 12:15:49 -05:00

pkgs

Merge master into stdenv-updates

2014-01-18 14:46:20 +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

* Applying an MIT-style license to Nixpkgs.

2006-04-25 16:50:34 +00:00

default.nix

* For convenience, provide a top-level Nix expression that simply

2007-04-26 14:32:57 +00:00

Description

No description provided

1.5 GiB

Languages

Nix 96.3%

Shell 1.8%

Python 0.7%

Perl 0.4%

C 0.3%

Other 0.1%