Use common licence attributes from lib/licenses.nix

Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.

2 files changed, 7 insertions, 7 deletions

diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix
index 82028722f54c..cb8a22a3c06f 100644
--- a/pkgs/applications/editors/emacs-modes/jabber/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26";
   };
   buildInputs = [ emacs ];
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Jabber client for Emacs";
     longDescription = ''
       jabber.el is a Jabber client for Emacs. It may seem strange to have a
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
       a special case of text editing.
     '';
     homepage = http://emacs-jabber.sourceforge.net/;
-    license = [ "GPLv2+" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; gpl2Plus;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
index ab94dbae9501..a21c73b7e8b0 100644
--- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
@@ -1,4 +1,4 @@
-{trivialBuild, fetchFromGitHub}:
+{trivialBuild, lib, fetchFromGitHub}:
 
 trivialBuild rec {
   pname    = "nyan-mode";
@@ -23,9 +23,9 @@ trivialBuild rec {
     cp -r mus $out
   '';
 
-  meta = {
+  meta = with lib; {
     description = "An analog indicator of the position in the buffer";
     homepage = https://github.com/TeMPOraL/nyan-mode/;
-    license = "GPLv3+";
+    license = with licenses; gpl3Plus;
   };
 }