svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
parent a88fdf8ef7 e657e2c455
commit 57fd764a39
42 changed files with 622 additions and 181 deletions
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lzo}:

 stdenv.mkDerivation {
-  name = "lzop-1.02rc1";
+  name = "lzop-1.03";
  src = fetchurl {
-    url = http://www.lzop.org/download/lzop-1.02rc1.tar.gz;
-    sha256 = "1dc32bfd82b130727bcec1de3b8a7cf090b78b3f14981d375ceb862b1e0e6873";
+    url = http://www.lzop.org/download/lzop-1.03.tar.gz;
+    sha256 = "1jdjvc4yjndf7ihmlcsyln2rbnbaxa86q4jskmkmm7ylfy65nhn1";
  };

  buildInputs = [ lzo ];