6 files changed, 15 insertions, 16 deletions
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index 9c88a646214..e88f62a1337 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -13,7 +13,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "brickd-${version}";
-  
+
   src = fetchgit {
     url = "git://github.com/Tinkerforge/brickd.git";
     rev = "refs/tags/v${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libusb pkgconfig pmutils udev ];
- 
+
   # shell thing didn't work so i replaced it using nix
   prePatch = ''
     substituteInPlace src/brickd/Makefile --replace 'PKG_CONFIG := $(shell which pkg-config 2> /dev/null)' "PKG_CONFIG := $pkgconfig/bin/pkg_config";
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.tinkerforge.com/;
     description = "The Brick Daemon is a daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages.";
     maintainers = [ stdenv.lib.maintainers.qknight ];
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 88837f9bb42..cab91409654 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://storm-project.net";
     description = "Distributed realtime computation system";
-    license = "Eclipse Public License 1.0";
+    license = stdenv.lib.licenses.epl10;
     maintainers = [ lib.maintainers.vizanto ];
   };
 }
diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix
index f42ae81a700..59f9fd8624d 100644
--- a/pkgs/servers/http/joseki/default.nix
+++ b/pkgs/servers/http/joseki/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , unzip
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -47,13 +47,13 @@ rec {
   phaseNames = ["doDeploy" "fixScripts"];
 
   fixScripts = a.doPatchShebangs ''$TARGET/bin'';
-      
+
   doDeploy = a.fullDepEntry (''
     ${a.lib.concatStringsSep ";" (map (y : "unzip ${y}") tarballFiles)}
     for i in */; do cp -rTf $i merged; done
     cd merged
-    
-    for i in "lib/"jsp-*/*.jar; do 
+
+    for i in "lib/"jsp-*/*.jar; do
       ln -s "''${i#lib/}" "lib" || true
     done
 
@@ -67,7 +67,7 @@ rec {
       ls "lib/"tdb-[0-9]*.jar | sort | tac | tail -n +2
       ls "lib/"jetty-[0-9]*.jar | sort | tac | tail -n +2
       ls "lib/"jetty-util-[0-9]*.jar | sort | tac | tail -n +2
-    ) | 
+    ) |
       xargs -I @@ mv @@  lib/obsolete
 
     mv lib/slf4j-simple-*.jar lib/obsolete
@@ -106,8 +106,7 @@ rec {
       raskin
     ];
     hydraPlatforms = []; # Builder is just unpacking/mixing what is needed
-    license = "free"; # mix of packages under different licenses
+    license = a.lib.licenses.free; # mix of packages under different licenses
     homepage = "http://openjena.org/";
   };
 }) x
-
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index a1d9940c887..c4a5fcc4284 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
     homepage = http://freeswitch.org/;
-    license = "MPL1.1";
+    license = stdenv.lib.licenses.mpl11;
     maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix
index bc1ebf4eb43..b9cedfc4679 100644
--- a/pkgs/servers/x11/xorg/unichrome/default.nix
+++ b/pkgs/servers/x11/xorg/unichrome/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://unichrome.sourceforge.net/";
     description = "Xorg video driver for the S3 Unichrome family of integrated graphics devices";
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
     broken = true;
diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix
index c841f8431de..34e67e171f4 100644
--- a/pkgs/servers/xinetd/default.nix
+++ b/pkgs/servers/xinetd/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
     description = "Secure replacement for inetd";
     platforms = stdenv.lib.platforms.linux;
     homepage = http://xinetd.org;
-    license = "free";
+    license = stdenv.lib.licenses.free;
   };
 }