Merge remote-tracking branch 'origin/master' into staging.

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

pkgs/tools/security/aespipe/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "AES encrypting or decrypting pipe";
     homepage = http://loop-aes.sourceforge.net/aespipe.README;
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl2;
     maintainers = stdenv.lib.maintainers.goibhniu;
     platforms = stdenv.lib.platforms.linux;
   };

pkgs/tools/security/ccid/default.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ccid drivers for pcsclite";
     homepage = http://pcsclite.alioth.debian.org/;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };

pkgs/tools/security/ccrypt/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://ccrypt.sourceforge.net/;
     description = "Utility for encrypting and decrypting files and streams with AES-256";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; all; 
   };

pkgs/tools/security/gnupg/git.nix

@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://gnupg.org/;
 
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
   };
 }

pkgs/tools/security/gnupg1/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "free implementation of the OpenPGP standard for encrypting and signing data";
     homepage = http://www.gnupg.org/;
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.gnu; # arbitrary choice
   };
 }

pkgs/tools/security/meo/default.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only;
     description = "Tools to use cryptography for things like four-eyes principles";
-    license = "AGPLv3+";
+    license = stdenv.lib.licenses.agpl3Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };

pkgs/tools/security/muscletool/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Smart card applications for use with MUSCLE plugins";
     homepage = http://muscleapps.alioth.debian.org/;
-    license = "BSD";
+    license = "BSD"; # http://anonscm.debian.org/viewvc/muscleapps/trunk/muscleTool/COPYING?view=markup
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };

pkgs/tools/security/paperkey/default.nix

@@ -0,0 +1,28 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+
+  version = "1.3";
+  name = "paperkey-${version}";
+  
+  src = fetchurl {
+    url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz";
+    sha256 = "5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb";
+  };
+
+  enableParallelBuilding = true;
+  
+  meta = with stdenv.lib; {
+    description = "Store OpenPGP or GnuPG on paper";
+    longDescription = ''
+      A reasonable way to achieve a long term backup of OpenPGP (GnuPG, PGP, etc)
+      keys is to print them out on paper. Paper and ink have amazingly long
+      retention qualities - far longer than the magnetic or optical means that
+      are generally used to back up computer data.
+    '';
+    homepage = "http://www.jabberwocky.com/software/paperkey/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.skeidel ];
+  };
+}

pkgs/tools/security/pass/default.nix

@@ -7,12 +7,12 @@
 assert withX -> xclip != null;
 
 stdenv.mkDerivation rec {
-  version = "1.6.2";
+  version = "1.6.3";
   name    = "password-store-${version}";
 
   src = fetchurl {
     url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-    sha256 = "1d32y6k625pv704icmhg46zg02kw5zcyxscgljxgy8bb5wv4lv2j";
+    sha256 = "1xs00c7ffqd0093i452kryw9sjip6dkp1pclx69zihb5l45d86fl";
   };
 
   patches = [ ./darwin-getopt.patch ];

pkgs/tools/security/pinentry/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://gnupg.org/aegypten2/";
     description = "GnuPG's interface to passphrase input";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
 
     longDescription = ''
       Pinentry provides a console and a GTK+ GUI that allows users to

pkgs/tools/security/pius/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation {
          to the process.
       '';
 
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
 
     platforms = stdenv.lib.platforms.gnu;
     maintainers = [ ];

pkgs/tools/security/tor/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libevent, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.4.22";
+  name = "tor-0.2.4.23";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
-    sha256 = "0k39ppcvld6p08yaf4rpspb34z4f5863j0d605yrm4dqjcp99xvb";
+    sha256 = "0a8l6d82hk4wbn7nlphd3c1maxhgdli8338wbg5r9dk6zcy7k8q5";
   };
 
   buildInputs = [ libevent openssl zlib ];

pkgs/tools/security/tor/torsocks.nix

@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     description = "use socks-friendly applications with Tor";
     homepage = http://code.google.com/p/torsocks/;
     repositories.git = https://git.torproject.org/torsocks.git;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }