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

Conflicts: pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    description = "MS-Word/Excel/PowerPoint to text converter";
    platforms = platforms.all;
-    license = "GPL2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = [ maintainers.urkud ];
  };
 }
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://www.convertlit.com/;
    description = "A tool for converting Microsoft Reader ebooks to more open formats";
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://waterlan.home.xs4all.nl/dos2unix.html;
    description = "Tools to transform text files from dos to unix formats and vicervesa";
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd2;
    maintainers = with stdenv.lib.maintainers; [viric];
    platforms = with stdenv.lib.platforms; all;
  };
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
        Unicode variants, independently on language.
    '';

-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;

    platforms = stdenv.lib.platforms.all;
  };
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
         it has many options that can be used to customize printouts.
      '';

-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;

    homepage = http://www.gnu.org/software/enscript/;

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
      lines of code.
    '';

-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;

    maintainers = [ stdenv.lib.maintainers.ludo ];
  };
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
      prints the matching lines.
    '';

-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;

    maintainers = [ ];
    platforms = stdenv.lib.platforms.all;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

    homepage = http://savannah.gnu.org/projects/patch;

-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;

    maintainers = [ ];
    platforms = stdenv.lib.platforms.all;
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
      multiple occurrences of a string within a file.
    '';

-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;

    platforms = stdenv.lib.platforms.all;
    maintainers = [ ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "http://www.gnu.org/software/groff/";
    description = "GNU Troff, a typesetting package that reads plain text and produces formatted output";
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
    platforms = stdenv.lib.platforms.all;

    longDescription = ''
@@ -32,7 +32,7 @@ let date = "2009-07-04"; in
        used to validate and fix HTML data.
      '';

-      license = "MIT";
+      license = stdenv.lib.licenses.mit;

      homepage = http://tidy.sourceforge.net/;

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  meta = {
    homepage = http://kdiff3.sourceforge.net/;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    description = "Compares and merges 2 or 3 files or directories";
    maintainers = with stdenv.lib.maintainers; [viric urkud];
    platforms = with stdenv.lib.platforms; linux;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  meta = {
    homepage = http://www.rc0.org.uk/mairix;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    description = "Program for indexing and searching email messages stored in maildir, MH or mbox";
    maintainers = with stdenv.lib.maintainers; [viric];
    platforms = with stdenv.lib.platforms; all;
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://multitran.sourceforge.net/;
    description = "Multitran data english-russian";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
@@ -13,6 +13,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://multitran.sourceforge.net/;
    description = "Multitran lib: library for reading Multitran's BTREE database format";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://multitran.sourceforge.net/;
    description = "Multitran lib: enchanced locale facets";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://multitran.sourceforge.net/;
    description = "Multitran lib: main engine to query translations";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
@@ -13,6 +13,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://multitran.sourceforge.net/;
    description = "Multitran lib: basic useful functions";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://multitran.sourceforge.net/;
    description = "Multitran: simple command line utilities for dictionary maintainance";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = with stdenv.lib.maintainers; [viric];
    platforms = with stdenv.lib.platforms; linux;
  };
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
      but also as a personal search system for email or other files.
    '';

-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    homepage = http://namazu.org/;

    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://qshowdiff.danfis.cz/;
    description = "Colourful diff viewer";
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
  };
 }
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents";
-    license = "BSD";
+    license = stdenv.lib.licenses.mit;
    homepage = http://openjade.sourceforge.net/;
  };
 }
@@ -19,7 +19,7 @@ stdenv.mkDerivation {

  meta = {
    description = "A suite of SGML/XML processing tools";
-    license = "BSD";
+    license = stdenv.lib.licenses.mit;
    homepage = http://openjade.sourceforge.net/;
  };
 }
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
  meta = {
    description = "Source code renderer with syntax highlighting";
    homepage = http://www.gnu.org/software/src-highlite/;
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
    platforms = stdenv.lib.platforms.linux;
    longDescription =
      ''
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
  };

  meta = {
-    license = "GPLv3";
+    license = stdenv.lib.licenses.gpl3;
    homepage = http://billposer.org/Software/uni2ascii.html;
    description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back";

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://www.gnu.org/software/wdiff/;
    description = "GNU wdiff, comparing files on a word by word basis";
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
    maintainers = [ stdenv.lib.maintainers.eelco ];
    platforms = stdenv.lib.platforms.linux;
  };
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Utilities for manipulating HTML and XML files";
    homepage = http://www.w3.org/Tools/HTML-XML-utils/;
-    license = "free-non-copyleft";
+    license = "free-non-copyleft"; #TODO W3C
  };
 }
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
    cp rxp $out/bin
  '';
  meta = {
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl2Plus;
    description = "a validating XML parser written in C";
    homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html";
  };
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
  meta = {
    description = "A command line tool for manipulating and querying XML data";
    homepage = http://xmlstar.sourceforge.net/;
-    license = "bsd";
+    license = stdenv.lib.licenses.mit;
  };
 }