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

Merging from trunk.

Browse Source 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
This commit is contained in:
Lluís Batlle i Rossell
2010-08-02 15:48:19 +00:00
parent 9724fb271b fd268b4852
commit 5417c720fd
674 changed files with 10063 additions and 117749 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/patchelf/0.6.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "patchelf-0.6pre20950";
name = "patchelf-0.6pre22275";
src = fetchurl {
url = "http://hydra.nixos.org/build/504657/download/2/patchelf-0.6pre22813.tar.bz2";