philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Yury G. Kudryashov 2bca92e32d Merge trunk 
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
..
applications Merge trunk 2012-01-03 17:25:24 +00:00
build-support Merge trunk 2012-01-02 14:12:40 +00:00
data shared-desktop-ontologies-0.8.1 2011-12-15 20:16:46 +00:00
desktops Revert "Use qt-4.8 by default" 2012-01-02 12:54:22 +00:00
development Merge trunk 2012-01-03 17:25:24 +00:00
games Merge trunk 2012-01-03 17:25:24 +00:00
lib
misc Merge trunk 2012-01-02 14:12:40 +00:00
os-specific Merge trunk 2012-01-03 17:25:24 +00:00
servers moved parts of extra.list back to tarballs-7.6.list 2011-12-31 15:37:51 +00:00
shells Merge trunk 2012-01-02 14:12:40 +00:00
stdenv * Add ‘xz’ to stdenv, as suggested by Michael Raskin. 2011-12-20 10:32:14 +00:00
test
tools Merge trunk 2012-01-03 17:25:24 +00:00
top-level Merge trunk 2012-01-03 17:25:24 +00:00