From 701e3ee6b9ec8f5b2cf8e86fb0308b6743256898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 28 Mar 2009 19:28:59 +0000
Subject: [PATCH] Adding lzop and updating lzo.

svn path=/nixpkgs/trunk/; revision=14749
---
 pkgs/development/libraries/lzo/default.nix |  5 +++--
 pkgs/tools/compression/lzop/default.nix    | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix            |  8 ++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/compression/lzop/default.nix

diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 834b7abf5930..6ce1e786dbee 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "lzo-2.02";
+  name = "lzo-2.03";
   
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "1i9g9bdrmyn6546rnck3kkh8nssfaw75m2rxir4sn7bwvnsfryx2";
+    sha256 = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591";
   };
   
   configureFlags = "--enable-shared --disable-static";
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A data compresion library suitable for real-time data de-/compression";
     homepage = http://www.oberhumer.com/opensource/lzo;
+    license = "GPLv2+";
   };
 }
diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix
new file mode 100644
index 000000000000..c15a34ca6f6e
--- /dev/null
+++ b/pkgs/tools/compression/lzop/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, lzo}:
+
+stdenv.mkDerivation {
+  name = "lzop-1.02rc1";
+  src = fetchurl {
+    url = http://www.lzop.org/download/lzop-1.02rc1.tar.gz;
+    sha256 = "1dc32bfd82b130727bcec1de3b8a7cf090b78b3f14981d375ceb862b1e0e6873";
+  };
+
+  buildInputs = [ lzo ];
+
+  meta = {
+    homepage = http://www.lzop.org;
+    description = "Fast file compressor";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed7a20dc703d..9b3955d72029 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -914,12 +914,16 @@ let
     inherit fetchurl stdenv zlib lzo bzip2 nasm;
   };
 
+  lsh = import ../tools/networking/lsh {
+    inherit stdenv fetchurl gperf guile gmp zlib liboop gnum4 pam;
+  };
+
   lzma = import ../tools/compression/lzma {
     inherit fetchurl stdenv;
   };
 
-  lsh = import ../tools/networking/lsh {
-    inherit stdenv fetchurl gperf guile gmp zlib liboop gnum4 pam;
+  lzop = import ../tools/compression/lzop {
+    inherit fetchurl stdenv lzo;
   };
 
   man = import ../tools/misc/man {