diff options
Diffstat (limited to 'pkgs/development/libraries')
44 files changed, 80 insertions, 89 deletions
diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix index d7a8708e540..5309d32382c 100644 --- a/pkgs/development/libraries/allegro/5-unstable.nix +++ b/pkgs/development/libraries/allegro/5-unstable.nix @@ -45,7 +45,7 @@ rec { meta = { description = "A game programming library"; - license = "free-noncopyleft"; # giftware + license = a.lib.licenses.free; # giftware maintainers = with a.lib.maintainers; [ raskin @@ -55,4 +55,3 @@ rec { inherit version; }; }) x - diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index f03dd5b548c..5f67e959230 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -44,7 +44,7 @@ rec { meta = { description = "A game programming library"; - license = "free-noncopyleft"; # giftware + license = a.lib.licenses.free; # giftware maintainers = with a.lib.maintainers; [ raskin @@ -54,4 +54,3 @@ rec { inherit version; }; }) x - diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 213b086c3cc..6d31087968c 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -43,7 +43,7 @@ rec { meta = { branch = "4"; description = "A game programming library"; - license = "free-noncopyleft"; # giftware + license = a.lib.licenses.free; # giftware maintainers = with a.lib.maintainers; [ raskin @@ -57,4 +57,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index 699030b8fe5..813dd2d8687 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "asio-1.10.4"; - + src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://asio.sourceforge.net/; description = "Cross-platform C++ library for network and low-level I/O programming"; - license = "boost"; + license = stdenv.lib.licenses.boost; }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index fdfc8b45a68..ea2710c8e56 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; description = "Collection of C++ libraries"; - license = "boost-license"; + license = stdenv.lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ simons wkennington ]; diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index f489e95f5d4..a520ffd9c0f 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -36,7 +36,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free"; + license = a.lib.licenses.free; branch = "0.5.1"; }; passthru = { diff --git a/pkgs/development/libraries/celt/0.7.nix b/pkgs/development/libraries/celt/0.7.nix index 35cfae9ebb1..db4c0821336 100644 --- a/pkgs/development/libraries/celt/0.7.nix +++ b/pkgs/development/libraries/celt/0.7.nix @@ -1,9 +1,9 @@ x@{builderDefsPackage , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -27,7 +27,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - + meta = { description = "CELT - low-delay audio codec"; maintainers = with a.lib.maintainers; @@ -36,7 +36,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free"; + license = a.lib.licenses.free; branch = "0.7"; }; passthru = { @@ -45,4 +45,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix index ca25be90504..03eba5a8d25 100644 --- a/pkgs/development/libraries/celt/default.nix +++ b/pkgs/development/libraries/celt/default.nix @@ -1,9 +1,9 @@ x@{builderDefsPackage , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -27,7 +27,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - + meta = { description = "Low-delay audio codec"; maintainers = with a.lib.maintainers; @@ -36,7 +36,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -44,4 +44,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/cppnetlib/default.nix b/pkgs/development/libraries/cppnetlib/default.nix index 3eab580c6a8..818e28b0a76 100644 --- a/pkgs/development/libraries/cppnetlib/default.nix +++ b/pkgs/development/libraries/cppnetlib/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://cpp-netlib.github.com/; description = "Provides application layer network support at boost style"; - license = "boost"; + license = stdenv.lib.licenses.boost; }; } diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 3b517d60b27..c326fb7fd38 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Crypto++, a free C++ class library of cryptographic schemes"; homepage = http://cryptopp.com/; - license = "Boost 1.0"; + license = stdenv.lib.licenses.boost; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 9c774e802fc..80afcb343dd 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dbus.freedesktop.org; - license = "AFL-2.1 or GPL-2"; + license = with stdenv.lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 2c4f8da7783..a058fb9cfa2 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://www.audiocoding.com/faac.html; # Incompatible with GPL. Some changes to the base code, included in faac, # are under LGPL though. - license = "unfree-redistributable"; + license = stdenv.lib.licenses.unfreeRedistributable; }; } diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 5b1dc6fc0a4..bf690c020cb 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A small, fast run-time speech synthesis engine"; homepage = http://www.festvox.org/flite/; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 04fbb01a3bf..31be86ee13e 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -1,9 +1,9 @@ x@{builderDefsPackage , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -40,7 +40,7 @@ rec { ''INSTALL_ROOT="$out"'' ''GSM_INSTALL_INC="$out/include/gsm"'' ]; - + meta = { description = "A GSM codec library"; maintainers = with a.lib.maintainers; @@ -49,7 +49,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -57,4 +57,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index eff52cc177b..898813be7f8 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/classpath/; # The exception makes it similar to LGPLv2+ AFAICS. - license = "GPLv2+ + exception"; + license = stdenv.lib.licenses.gpl2ClasspathPlus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index ecd63e98f19..ae5d49f2850 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { description = "Image processing and analysis library"; homepage = http://www.leptonica.org/; # Its own license: http://www.leptonica.org/about-the-license.html - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 8e68e10d940..de2ab0ff3b1 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; - + src = fetchurl { url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz"; sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj"; }; - + configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; - + propagatedBuildInputs = [ncurses]; meta = { homepage = http://libcaca.zoy.org/; description = "A graphics library that outputs text instead of pixels"; - license = "WTFPL"; # http://sam.zoy.org/wtfpl/ + license = stdenv.lib.licenses.wtfpl; }; } diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 51c23451fec..853786c3404 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { description = "USB CEC adapter communication library"; homepage = "http://libcec.pulse-eight.com"; repositories.git = "https://github.com/Pulse-Eight/libcec.git"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; }; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index da5a080521c..6810c8665a7 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -46,10 +46,9 @@ stdenv.mkDerivation rec { homepage = http://sourceware.org/libffi/; # See http://github.com/atgreen/libffi/blob/master/LICENSE . - license = "free, non-copyleft"; + license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 11b3bf4f6d5..eb617ed6b9e 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform, open source library for generating PDF files"; homepage = http://libharu.org/wiki/Main_Page; - license = "ZLIB/LIBPNG"; # see README. + license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix index caeb87ee694..cbe9e20f0b1 100644 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ b/pkgs/development/libraries/libixp_for_wmii/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { homepage = http://libs.suckless.org/libixp; description = "stand-alone client/server 9P library"; - license = "MIT / LPL"; + license = with stdenv.lib.licenses; [ mit lpl-102 ]; }; } diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index bf27e074dd5..07f3d65ffc1 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index d7a1bcb4638..bf2ebb27f37 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, static ? false }: +{ stdenv, fetchurl, static ? false }: with stdenv.lib; stdenv.mkDerivation { name = "libjpeg-8d"; - + src = fetchurl { url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz; sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; configureFlags = optional static "--enable-static --disable-shared"; - + meta = { homepage = http://www.ijg.org/; description = "A library that implements the JPEG image file format"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index b58e2dd257d..234f56863c0 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = http://www.libmng.com; - license = "zlib/libpng"; + license = stdenv.lib.licenses.zlib; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index 2d736411780..1452ec61606 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.dnielectronico.es/descargas/; description = "Opensc plugin to access the Spanish national ID smartcard"; - license = "nonfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index dd19d3f179f..ef194bb0b1e 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { sed -e '/curl\/types/d' -i src/*.c src/*.h ''; - meta = { + meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = "LGPL-2.1 Apache-2.0"; + license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 500acdfb2ec..8c748447ae1 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; - license = "LGPL-2.1 Apache-2.0"; + license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 1acc7c1d73c..551b31d416e 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; homepage = "http://librdf.org/rasqal"; - license = "LGPL-2.1 Apache-2.0"; + license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index dcef77d5919..af3d03cc661 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Version of NaCl with harwdare tests at runtime, not build time"; - license = "ISC"; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 2346e4b7501..3d52fa3ac9d 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Tools and library for the WebP image format"; /* It has its own licence, google-related, but that looks like BSD */ - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 502329226ff..0ea73a3a57f 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "OpenGL utility library"; homepage = http://cgit.freedesktop.org/mesa/glu/; - license = "bsd"; # SGI-B-2.0, which seems BSD-like + license = stdenv.lib.licenses.sgi-b-20; }; } diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 852d72cb9aa..78932259841 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of cuda-enabled texture tools and compressors"; homepage = "http://developer.nvidia.com/object/texture_tools.html"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 16fb46d1698..78cfeb13a2c 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index 3111f71369a..745626e76b0 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Voice recognition library written in C"; homepage = http://cmusphinx.sourceforge.net; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index a82acd2745d..76ceb12b401 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.qhull.org/; description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index c1386277526..8d31978657d 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) - license = "Qwt License, Version 1.0"; + license = stdenv.lib.licenses.qwt; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index fe73e0beabd..aa4f45243e0 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) - license = "Qwt License, Version 1.0"; + license = stdenv.lib.licenses.qwt; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 1bc7eff3181..fa8412ccb6d 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Basic Linear Algebra Subprograms"; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; homepage = "http://www.netlib.org/blas/"; }; } diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index f18107c48a5..1b0039952d7 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -4,7 +4,7 @@ assert stdenv ? gcc && stdenv.gcc.libc != null; stdenv.mkDerivation rec { name = "scmccid-5.0.11"; - + src = if stdenv.system == "i686-linux" then (fetchurl { url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz"; sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.scmmicro.com/support/pc-security-support/downloads.html; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; - license = "nonfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 4c615b81552..02e7dc24159 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; # Public domain + permissive (non-copyleft) licensing of some files. - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; homepage = http://people.csail.mit.edu/jaffer/SLIB; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 48168ceb92d..79a633c6541 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , gawk, alsaLib, ncurses , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -28,7 +28,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doUnpack" "killUsrBin" "doConfigure" "doMakeInstall" "doDeploy" "fixPaths"]; - + killUsrBin = a.fullDepEntry '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . ) @@ -55,7 +55,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -63,4 +63,3 @@ rec { }; }; }) x - diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index f1c8a84fee2..5588646e53a 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the C++ Standard Library"; homepage = http://sourceforge.net/projects/stlport/; - license = "free"; # seems BSD-like + license = stdenv.lib.licenses.free; # seems BSD-like }; } diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index e1cc1f27c1d..7f0a343eba2 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -4,20 +4,20 @@ let version = "2.6.2"; in stdenv.mkDerivation { name = "tinyxml-${version}"; - + src = fetchurl { url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip"; sha256 = "04nmw6im2d1xp12yir8va93xns5iz816pwi25n9cql3g3i8bjsxc"; }; - + patches = [ # add pkgconfig file ./2.6.2-add-pkgconfig.patch - + # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559 ./2.6.2-entity.patch ]; - + buildInputs = [ unzip ]; buildPhase = '' # use STL (xbmc requires it) @@ -26,13 +26,13 @@ in stdenv.mkDerivation { # build xmltest make - + # build the lib as a shared library g++ -Wall -O2 -shared -fpic tinyxml.cpp \ tinyxmlerror.cpp tinyxmlparser.cpp \ tinystr.cpp -o libtinyxml.so ''; - + doCheck = true; checkPhase = '' ./xmltest @@ -41,25 +41,25 @@ in stdenv.mkDerivation { exit $result fi ''; - + installPhase = '' mkdir -pv $out/include/ mkdir -pv $out/lib/pkgconfig/ mkdir -pv $out/share/doc/tinyxml/ - + cp -v libtinyxml.so $out/lib/ cp -v *.h $out/include/ - + substituteInPlace tinyxml.pc --replace "@out@" "$out" substituteInPlace tinyxml.pc --replace "@version@" "${version}" cp -v tinyxml.pc $out/lib/pkgconfig/ - + cp -v docs/* $out/share/doc/tinyxml/ ''; - + meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; - license = "free-non-copyleft"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 3544e984077..d07c1d55047 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://www.cs.unc.edu/Research/vrpn/; - license = "BSL1.0"; # Boost Software License, + license = stdenv.lib.licenses.boost; # see # <http://www.cs.unc.edu/Research/vrpn/obtaining_vrpn.html> }; |