nixpkgs

Go to file

Vladimír Čunát 668310a2b5 Merge stdenv-updates into master

This is a re-merge, in fact. Now the first parent is master
as of right before the "first merge" (ac6761c9).
A few commits pushed in-between into master now look like coming
from stdenv-updates, but otherwise this seems to fix the situation.

Cf. 320209a618 (commitcomment-5125991)

2014-01-21 12:58:55 +01:00

doc

manual: Document Java support

2014-01-13 13:15:59 +01:00

lib

lib/maintainers.nix: add missing entry for 'sprock'

2014-01-20 18:18:35 +01:00

maintainers/scripts

Fix references to pkgs/lib

2013-10-10 13:28:22 +02:00

nixos

Whitespace to force a build