diff --git a/lib/licenses.nix b/lib/licenses.nix index 940baf53b7c3..092cbbbdb25a 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -400,6 +400,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { free = false; }; + jasper = spdx { + spdxId = "JasPer-2.0"; + fullName = "JasPer License"; + }; lgpl2 = spdx { spdxId = "LGPL-2.0"; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 2b95742c44c0..eec68015c25b 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation { buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "An image loading and rendering library for X11"; + platforms = platforms.unix; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index b9781ba9aa08..a4a009c66580 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "incrtcl-${version}"; version = "4.0.4"; - + src = fetchurl { url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz; sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3"; @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { libPrefix = "itcl3.4"; }; - meta = { + meta = with stdenv.lib; { homepage = http://incrtcl.sourceforge.net/; description = "Object Oriented Enhancements for Tcl/Tk"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.tcltk; }; } diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 36eedadc4c2e..29fabdbb3b63 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "jama-${version}"; version = "1.2.5"; - + src = fetchurl { url = https://math.nist.gov/tnt/jama125.zip; sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl"; @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { cp *.h $out/include ''; - meta = { + meta = with stdenv.lib; { homepage = https://math.nist.gov/tnt/; description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.publicDomain; }; } diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index de4848c7dda4..eb9282274328 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; platforms = platforms.unix; + license = licenses.jasper; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index daee9adb1fdc..5ec10cc7e0df 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation { -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile ''; - meta = { - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.sander ]; + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = [ maintainers.sander ]; + license = licenses.afl21; }; } diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix index b9d66fdc9716..e34699d7740e 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix +++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix @@ -3,13 +3,14 @@ stdenv.mkDerivation { name = "gwt-dnd-2.6.5"; builder = ./builder.sh; - + src = fetchurl { url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar; sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw"; - }; + }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix index b182964f6579..ec407076906d 100644 --- a/pkgs/development/libraries/java/gwt-widgets/default.nix +++ b/pkgs/development/libraries/java/gwt-widgets/default.nix @@ -3,13 +3,14 @@ stdenv.mkDerivation { name = "gwt-widgets-0.2.0"; builder = ./builder.sh; - + src = fetchurl { url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz; sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; - }; + }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + platforms = platforms.unix; + license = with licenses; [ afl21 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 97ffcb647d62..a478ab0fc502 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; - - meta = { - platforms = stdenv.lib.platforms.unix; + + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index 221a2e93e4fc..500c575f73aa 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation { inherit unzip; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + homepage = http://httpunit.sourceforge.net; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 99d213a01dac..16755471acd7 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation { sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code"; + homepage = http://www.jdom.org; + platforms = platforms.unix; + license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index ad5192f94ce2..98291a7763ca 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { PREFIX=''''${out}''; buildInputs = [ jdk ]; - meta = { - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.sander ]; + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = [ maintainers.sander ]; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index 6f6534cee3ea..691b9905b04f 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Java full-text search engine"; + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index 551375d33bd6..ae93765ff981 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Generic unit testing framework and methodology for testing any kind of code"; + platforms = platforms.unix; + license = licenses.asl20; }; }