Merge pull request #199244 from markuskowa/fix-licenses

Fix licenses in various packages

lib/licenses.nix

@@ -109,6 +109,11 @@ in mkLicense lset) ({
     fullName = "Apache License 2.0";
   };
 
+  bitstreamVera = {
+    spdxId = "Bitstream-Vera";
+    fullName = "Bitstream Vera Font License";
+  };
+
   bola11 = {
     url = "https://blitiri.com.ar/p/bola/";
     fullName = "Buena Onda License Agreement 1.1";

pkgs/data/fonts/arkpandora/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl }:
+{ lib, fetchurl }:
 
 let
   version = "2.04";
@@ -21,5 +21,6 @@ in fetchurl {
 
   meta = {
     description = "Font, metrically identical to Arial and Times New Roman";
+    license = lib.licenses.bitstreamVera;
   };
 }

pkgs/data/fonts/dosemu-fonts/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:
+{ lib, stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
   pname = "dosemu-fonts";
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Various fonts from the DOSEmu project";
+    license = lib.licenses.gpl2Only;
   };
 }

pkgs/data/fonts/tipa/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "tipa";
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Phonetic font for TeX";
+    license = lib.licenses.lppl13c;
   };
 }
 

pkgs/data/icons/hicolor-icon-theme/default.nix

@@ -15,5 +15,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Default fallback theme used by implementations of the icon theme specification";
     homepage = "https://icon-theme.freedesktop.org/releases/";
     platforms = platforms.unix;
+    license = licenses.gpl2Only;
   };
 }

pkgs/data/icons/tango-icon-theme/default.nix

@@ -24,9 +24,10 @@ stdenv.mkDerivation rec {
 
   postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';
 
-  meta = {
+  meta = with lib; {
     description = "A basic set of icons";
     homepage = "http://tango.freedesktop.org/Tango_Icon_Library";
-    platforms = lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.publicDomain;
   };
 }

pkgs/data/misc/dns-root-data/default.nix

@@ -32,5 +32,6 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "DNS root data including root zone and DNSSEC key";
     maintainers = with maintainers; [ fpletz vcunat ];
+    license = licenses.gpl3Plus;
   };
 }

pkgs/development/tools/database/indradb/default.nix

@@ -16,7 +16,7 @@ let
   meta = with lib; {
     description = "A graph database written in rust ";
     homepage = "https://github.com/indradb/indradb";
-    license = licenses.asl20;
+    license = licenses.mpl20;
     maintainers = with maintainers; [ happysalada ];
     platforms = platforms.unix;
   };
@@ -25,7 +25,7 @@ in
   indradb-server = rustPlatform.buildRustPackage {
     pname = "indradb-server";
     version = "unstable-2021-01-05";
-    inherit src;
+    inherit src meta;
 
     cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js=";
 
@@ -43,7 +43,7 @@ in
   indradb-client = rustPlatform.buildRustPackage {
     pname = "indradb-client";
     version = "unstable-2021-01-05";
-    inherit src;
+    inherit src meta;
 
     cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
 

pkgs/development/tools/misc/luarocks/luarocks-nix.nix

@@ -17,7 +17,7 @@ luarocks.overrideAttrs (old: {
     updateScript = unstableGitUpdater { };
   };
 
-  meta = {
+  meta = old.meta // {
     mainProgram = "luarocks";
   };
 })