summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Friesdorf <flo@chaoflow.net>2011-04-27 12:49:55 +0000
committerFlorian Friesdorf <flo@chaoflow.net>2011-04-27 12:49:55 +0000
commit6680e9f30b92c38daa8b5215c0f5e507cde78164 (patch)
tree16839261706b5b09530ba9c9a8d957f7b583855c
parent0387298eaaf0b4522d151f454ea549cf6a77ec5a (diff)
downloadnixpkgs-6680e9f30b92c38daa8b5215c0f5e507cde78164.tar
nixpkgs-6680e9f30b92c38daa8b5215c0f5e507cde78164.tar.gz
nixpkgs-6680e9f30b92c38daa8b5215c0f5e507cde78164.tar.bz2
nixpkgs-6680e9f30b92c38daa8b5215c0f5e507cde78164.tar.lz
nixpkgs-6680e9f30b92c38daa8b5215c0f5e507cde78164.tar.xz
nixpkgs-6680e9f30b92c38daa8b5215c0f5e507cde78164.tar.zst
nixpkgs-6680e9f30b92c38daa8b5215c0f5e507cde78164.zip
xapian: fixed version: GPL -> GPLv2+ - thanks Ludo’
svn path=/nixpkgs/trunk/; revision=26988
-rw-r--r--pkgs/development/libraries/xapian/1.0.x.nix4
-rw-r--r--pkgs/development/libraries/xapian/bindings/1.0.x.nix2
-rw-r--r--pkgs/development/libraries/xapian/bindings/default.nix2
-rw-r--r--pkgs/development/libraries/xapian/default.nix2
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 e2354cd6abf..57240eb7335 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 ea49c3cbd9e..3417596c393 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 973f8dd3143..7dee0da9eed 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 86daacb5d75..ac86c24af6c 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 ];
   };
 }