From 6680e9f30b92c38daa8b5215c0f5e507cde78164 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 27 Apr 2011 12:49:55 +0000
Subject: [PATCH] =?UTF-8?q?xapian:=20fixed=20version:=20GPL=20->=20GPLv2+?=
 =?UTF-8?q?=20-=20thanks=20Ludo=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixpkgs/trunk/; revision=26988
---
 pkgs/development/libraries/xapian/1.0.x.nix            | 4 ++--
 pkgs/development/libraries/xapian/bindings/1.0.x.nix   | 2 +-
 pkgs/development/libraries/xapian/bindings/default.nix | 2 +-
 pkgs/development/libraries/xapian/default.nix          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/xapian/1.0.x.nix b/pkgs/development/libraries/xapian/1.0.x.nix
index e2354cd6abfd..57240eb73356 100644
--- a/pkgs/development/libraries/xapian/1.0.x.nix
+++ b/pkgs/development/libraries/xapian/1.0.x.nix
@@ -8,12 +8,12 @@ stdenv.mkDerivation {
     sha256 = "0aed7296bd56b4b49aba944cc744e1e76fff8cfb0a70fd5b1f49d4c62a97ecc6";
   };
 
-  buildInputs = [zlib];
+  buildInputs = [ zlib ];
 
   meta = { 
     description = "Xapian Probabilistic Information Retrieval library";
     homepage = "http://xapian.org";
-    license = "GPL";
+    license = "GPLv2+";
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };
 }
diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix
index ea49c3cbd9e7..3417596c3930 100644
--- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix
+++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix
@@ -68,7 +68,7 @@ composableDerivation.composableDerivation {} rec {
   meta = { 
     description = "Bindings for the Xapian library";
     homepage = xapian10.meta.homepage;
-    license = "GPL";
+    license = "GPLv2+";
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };
 }
diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index 973f8dd3143d..7dee0da9eedc 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -68,7 +68,7 @@ composableDerivation.composableDerivation {} rec {
   meta = { 
     description = "Bindings for the Xapian library";
     homepage = xapian.meta.homepage;
-    license = "GPL";
+    license = "GPLv2+";
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };
 }
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 86daacb5d75c..ac86c24af6cc 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   meta = { 
     description = "Xapian Probabilistic Information Retrieval library";
     homepage = "http://xapian.org";
-    license = "GPL";
+    license = "GPLv2+";
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };
 }