dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #199244 from markuskowa/fix-licenses

Browse Source 
Fix licenses in various packages
This commit is contained in:
markuskowa 2022-11-05 12:42:48 +01:00 committed by GitHub
commit 19951ca9bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/licenses.nix
View File

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

3
pkgs/data/fonts/arkpandora/default.nix
View File

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

3
pkgs/data/fonts/dosemu-fonts/default.nix
View File

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

3
pkgs/data/fonts/tipa/default.nix
View File

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

1
pkgs/data/icons/hicolor-icon-theme/default.nix
View File

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

5
pkgs/data/icons/tango-icon-theme/default.nix
View File

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

1
pkgs/data/misc/dns-root-data/default.nix
View File

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

6
pkgs/development/tools/database/indradb/default.nix
View File

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

2
pkgs/development/tools/misc/luarocks/luarocks-nix.nix
View File

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