Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ...

Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix

2012-11-21 16:20:36 +01:00

doc

Document that Java packages should install JARs in $out/lib/java

2012-11-08 16:31:08 +01:00

maintainers

svn path=/nixpkgs/trunk/; revision=32961

2012-03-09 17:53:04 +00:00

pkgs

Merge branch 'master' into stdenv-updates.

2012-11-21 16:20:36 +01:00

.gitignore

Tell git to ignore .*.swp - Vim swap files

2012-10-04 11:27:57 +04: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

VERSION

* Bump version number.

2012-06-04 03:53:25 +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%