From 158e1cfdd0ddb8380e266dcf16a4167455335bc3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 28 May 2015 19:20:29 +0200
Subject: Don't use "with licenses;" for single licences

And don't use square brackets on such lines.
---
 pkgs/development/libraries/bobcat/default.nix                 | 2 +-
 pkgs/development/libraries/boost-process/default.nix          | 2 +-
 pkgs/development/libraries/git2/default.nix                   | 2 +-
 pkgs/development/libraries/hwloc/default.nix                  | 2 +-
 pkgs/development/libraries/jsoncpp/default.nix                | 2 +-
 pkgs/development/libraries/kde-frameworks-5.10/default.nix    | 2 +-
 pkgs/development/libraries/libcli/default.nix                 | 2 +-
 pkgs/development/libraries/libkeyfinder/default.nix           | 2 +-
 pkgs/development/libraries/libpseudo/default.nix              | 2 +-
 pkgs/development/libraries/libpsl/default.nix                 | 2 +-
 pkgs/development/libraries/libre/default.nix                  | 2 +-
 pkgs/development/libraries/librem/default.nix                 | 2 +-
 pkgs/development/libraries/libtermkey/default.nix             | 2 +-
 pkgs/development/libraries/libviper/default.nix               | 2 +-
 pkgs/development/libraries/libvterm/default.nix               | 2 +-
 pkgs/development/libraries/libxcomp/default.nix               | 2 +-
 pkgs/development/libraries/qca-qt5/default.nix                | 2 +-
 pkgs/development/libraries/qmltermwidget/default.nix          | 2 +-
 pkgs/development/libraries/quesoglc/default.nix               | 2 +-
 pkgs/development/libraries/rabbitmq-c/0.4.nix                 | 2 +-
 pkgs/development/libraries/re2/default.nix                    | 2 +-
 pkgs/development/libraries/science/math/liblapack/3.5.0.nix   | 2 +-
 pkgs/development/libraries/science/math/liblapack/default.nix | 2 +-
 pkgs/development/libraries/spandsp/default.nix                | 2 +-
 pkgs/development/libraries/unibilium/default.nix              | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index d89a27638349b..abd8a284e62fa 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Brokken's Own Base Classes And Templates";
     downloadPage = http://sourceforge.net/projects/bobcat/files/;
-    license = with licenses; gpl3;
+    license = licenses.gpl3;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix
index 86cdd08db64c0..92e02c6ca08f5 100644
--- a/pkgs/development/libraries/boost-process/default.nix
+++ b/pkgs/development/libraries/boost-process/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "http://www.highscore.de/boost/process0.5/";
     description = "Library to manage system processes";
-    license = with licenses; boost;
+    license = licenses.boost;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 7ddbc408ca6d4..823f09b8bced9 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "the Git linkable library";
     homepage = http://libgit2.github.com/;
-    license = with stdenv.lib.licenses; gpl2;
+    license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index da658e398eb17..c357d808cac46 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     '';
 
     # http://www.open-mpi.org/projects/hwloc/license.php
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
 
     homepage = http://www.open-mpi.org/projects/hwloc/;
 
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 07563364e3400..c90a248164815 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/open-source-parsers/jsoncpp;
     description = "A simple API to manipulate JSON data in C++";
     maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    license = with stdenv.lib.licenses; [ mit ];
+    license = stdenv.lib.licenses.mit;
     branch = "1.6";
   };
 }
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
index 397eec61a781c..4423f9c157d6f 100644
--- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
@@ -113,7 +113,7 @@ let
         meta =
           let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in
           {
-            license = with stdenv.lib.licenses; [ bsd2 ];
+            license = stdenv.lib.licenses.bsd2;
             platforms = stdenv.lib.platforms.linux;
             maintainers = with stdenv.lib.maintainers; [ ttuegel ];
             homepage = "http://www.kde.org";
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index dd0de49a4bdb2..bbeb75d0b8dd6 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Emulate a Cisco-style telnet command-line interface";
     homepage = http://sites.dparrish.com/libcli;
-    license = with licenses; lgpl21Plus;
+    license = licenses.lgpl21Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index 40efafdea3da2..6ab80d55a4551 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Musical key detection for digital audio (C++ library)";
     homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix
index 8a7054db20a0d..8d1288f98ce5b 100644
--- a/pkgs/development/libraries/libpseudo/default.nix
+++ b/pkgs/development/libraries/libpseudo/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://libpseudo.sourceforge.net/;
     description = "Simple, thread-safe messaging between threads";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index d642309ed7469..4a2d7be7b8bbe 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       the domain in a user interface or sorting domain lists by site.
     '';
     homepage = http://rockdaboot.github.io/libpsl/;
-    license = with licenses; mit;
+    license = licenses.mit;
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 56e7084292cd0..0b9b79f0c6053 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/re.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 165e16a88238b..817e1c79bc7c6 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/rem.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 4316b2dda6b99..e5965a10f67b5 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Terminal keypress reading library";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix
index 1dcd578da2937..c0880ee896f6c 100644
--- a/pkgs/development/libraries/libviper/default.nix
+++ b/pkgs/development/libraries/libviper/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://libviper.sourceforge.net/;
     description = "Simple window creation and management facilities for the console";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix
index b52db39042f01..e58d964a62537 100644
--- a/pkgs/development/libraries/libvterm/default.nix
+++ b/pkgs/development/libraries/libvterm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://libvterm.sourceforge.net/;
     description = "Terminal emulator library to mimic both vt100 and rxvt";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index c900cfbc68412..84dbb0c156f4d 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "NX compression library";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index 37b0db4ef6ceb..d0bcb73151f08 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "Qt 5 Cryptographic Architecture";
     homepage = http://delta.affinix.com/qca;
     maintainers = with maintainers; [ ttuegel ];
-    license = with licenses; [ lgpl21Plus ];
+    license = licenses.lgpl21Plus;
   };
 }
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 32d9bd0a8e5f7..9c657ec52d7f4 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A QML port of qtermwidget";
     homepage = "https://github.com/Swordifish90/qmltermwidget";
-    license = with stdenv.lib.licenses; [ gpl2 ];
+    license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix
index 928095a4e29b9..46df5459dca60 100644
--- a/pkgs/development/libraries/quesoglc/default.nix
+++ b/pkgs/development/libraries/quesoglc/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       platform that supports both FreeType and the OpenGL API.
     '';
     homepage = http://quesoglc.sourceforge.net/;
-    license = with licenses; [ lgpl21Plus ];
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ astsmtl ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/development/libraries/rabbitmq-c/0.4.nix b/pkgs/development/libraries/rabbitmq-c/0.4.nix
index 84a7a9b4ccf7f..2c92ba5618cf6 100644
--- a/pkgs/development/libraries/rabbitmq-c/0.4.nix
+++ b/pkgs/development/libraries/rabbitmq-c/0.4.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "RabbitMQ C AMQP client library";
     homepage = https://github.com/alanxz/rabbitmq-c;
-    license = with stdenv.lib.licenses; mit;
+    license = stdenv.lib.licenses.mit;
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index 301fcc84b9f21..b2dfa8884e9ee 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://code.google.com/p/re2/;
     description = "An efficient, principled regular expression library";
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
index 3427bf1c4e982..35fca306d6c4b 100644
--- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
+++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
 
     platforms = platforms.all;
     maintainers = [ maintainers.simons ];
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index cbe03b8eb632e..f2d64bbc9baf5 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
 
     platforms = platforms.all;
     maintainers = [ maintainers.simons ];
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 24dc443ca705e..16e7b09a0f209 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/baresip.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; gpl2;
+    license = stdenv.lib.licenses.gpl2;
     downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
     inherit version;
     updateWalker = true;
diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 11f3294b28944..663432f8ec868 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A very basic terminfo library";
-    license = with licenses; [ lgpl3Plus ];
+    license = licenses.lgpl3Plus;
   };
 }
-- 
cgit 1.4.1