Unverified Commit 19951ca9 authored by markuskowa's avatar markuskowa Committed by GitHub
Browse files

Merge pull request #199244 from markuskowa/fix-licenses 

Fix licenses in various packages
parents e2cf8ac3 f50fabb8

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line 
{ 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

+2 −1
Original line number Diff line number Diff line 
{ 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

+2 −1
Original line number Diff line number Diff line 
{ 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

+1 −0
Original line number Diff line number Diff line
@@ -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;

  };

}