From 7a459962331e095cabd0cf5d56106727648a1824 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 19 Jun 2014 06:19:00 +0200 Subject: Turn some license strings into lib.licenses values --- pkgs/development/ocaml-modules/camlimages/default.nix | 2 +- pkgs/development/ocaml-modules/cryptgps/default.nix | 2 +- pkgs/development/ocaml-modules/expat/default.nix | 2 +- pkgs/development/ocaml-modules/gmetadom/default.nix | 2 +- pkgs/development/ocaml-modules/http/default.nix | 2 +- pkgs/development/ocaml-modules/lablgl/default.nix | 2 +- pkgs/development/ocaml-modules/lablgtk/default.nix | 2 +- pkgs/development/ocaml-modules/lablgtkmathview/default.nix | 2 +- pkgs/development/ocaml-modules/mysql/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-cairo/default.nix | 2 +- pkgs/development/ocaml-modules/ocamlsdl/default.nix | 2 +- pkgs/development/ocaml-modules/sqlite3/default.nix | 2 +- pkgs/development/ocaml-modules/ulex/0.8/default.nix | 2 +- pkgs/development/ocaml-modules/ulex/default.nix | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 21610f8f3103..ff344ef6f327 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://cristal.inria.fr/camlimages; description = "Image manipulation library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 7379a62d4244..8f18658b0f65 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { i.e. this is not a binding to some C library, but the implementation itself. ''; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index b2702a5cade6..f4837bd047f5 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; description = "An ocaml wrapper for the Expat XML parsing library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 4d46bda243f3..f1ec69143b07 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://gmetadom.sourceforge.net/; description = "GMetaDOM is a collection of librares, each library providing a DOM implementation"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 46398d26114b..8b611c65a41d 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; description = "do it yourself (OCaml) HTTP daemon"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 75c8d7ad2244..7cefe26746f8 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.pSub ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 392cf5c9772d..c2f50c4e5b83 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (rec { ]; homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; description = "LablGTK is is an Objective Caml interface to gtk+"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 976910aae29a..333e86fa3fe9 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; description = "OCaml bindings for gtkmathview"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index ed70d1b9c3ee..0ae60ab07e4a 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; description = "Bindings for interacting with MySQL databases from ocaml"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 8f19847680b6..94395f601aa4 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://cairographics.org/cairo-ocaml; description = "ocaml bindings for cairo library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 6361dbd9ae64..51af8d99d69b 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://ocamlsdl.sourceforge.net/; description = "OCaml bindings for SDL 1.2"; - license = "LGPL 2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 63dc06634d71..d92207cd20b1 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = https://bitbucket.org/mmottl/sqlite3-ocaml; description = "OCaml bindings to the SQLite 3 database access library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index e996b6223b1e..77ffa7528981 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 19beeec1ec54..72efaa0606d7 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } -- cgit 1.4.1