public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronized stdenv-updates branch with trunk.

Browse Source 
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
This commit is contained in:
Peter Simons
2011-10-06 09:37:22 +00:00
parent f74e361e45 dce7ac1f10
commit 1abdc56a12
70 changed files with 2323 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release-notes.xml
View File

@@ -80,7 +80,7 @@ worth listing:
<listitem><para>Support for building derivations in a virtual
machine, including RPM and Debian builds in automatically generated
VM images. See
<filename>pkgs/build-support/vm.default.nix</filename> for
<filename>pkgs/build-support/vm/default.nix</filename> for
details.</para></listitem>
<listitem><para>Improved support for building Haskell