nixpkgs/pkgs/top-level
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
..
all-packages.nix svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
guile-2-test.nix
haskell-packages.nix haskell-unix-compat: updated to version 0.3.0.1 2012-01-06 13:30:08 +00:00
make-tarball.nix
mingw.nix
perl-packages.nix * DBD::SQLite updated to 1.35. 2012-01-04 14:23:41 +00:00
platforms.nix Adding cgroups to the sheevaplug kernel. 2011-12-27 19:33:36 +00:00
python-packages.nix * Fix the download site for Python nose. 2011-11-18 17:07:40 +00:00
release-cross.nix release-cross: Add OpenSSL for cross-GNU builds. 2012-01-06 14:07:08 +00:00
release-lib.nix
release-small.nix release-small.nix: updated name of "dbus" attribute 2011-10-06 13:21:07 +00:00
release.nix * Firefox 9.0. 2011-12-20 14:51:26 +00:00