diff options
author | markuskowa <markus.kowalewski@gmail.com> | 2020-06-27 13:17:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-27 13:17:14 +0200 |
commit | e26d99a7ee664c1cc8da1499f4acf0ef3733c6c9 (patch) | |
tree | 8d63711ed480105c8c064201d969a2740432dc5d | |
parent | 4c8fd0e2eb9d30ebd6515e9cf41d57d9cc9e6976 (diff) | |
parent | 5c220d8784fc0af34dbbc7fff3aa028182e289fa (diff) | |
download | nixpkgs-e26d99a7ee664c1cc8da1499f4acf0ef3733c6c9.tar nixpkgs-e26d99a7ee664c1cc8da1499f4acf0ef3733c6c9.tar.gz nixpkgs-e26d99a7ee664c1cc8da1499f4acf0ef3733c6c9.tar.bz2 nixpkgs-e26d99a7ee664c1cc8da1499f4acf0ef3733c6c9.tar.lz nixpkgs-e26d99a7ee664c1cc8da1499f4acf0ef3733c6c9.tar.xz nixpkgs-e26d99a7ee664c1cc8da1499f4acf0ef3733c6c9.tar.zst nixpkgs-e26d99a7ee664c1cc8da1499f4acf0ef3733c6c9.zip |
Merge pull request #91661 from markuskowa/fix-lics
Fix licenses
-rw-r--r-- | lib/licenses.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/misc/xpdf/libxpdf.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/kristall/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/links2/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/science/math/qalculate-gtk/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 1 | ||||
-rw-r--r-- | pkgs/data/misc/cacert/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/cgui/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/cm256cc/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/dclib/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/json-c/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/libblocksruntime/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/nuspell/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/pdf2xml/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/serialdv/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/wasilibc/default.nix | 7 |
17 files changed, 41 insertions, 12 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index b799a6ae8a4..641184af639 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -482,6 +482,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { url = "https://opensource.franz.com/preamble.html"; }; + llvm-exception = spdx { + spdxId = "LLVM-exception"; + fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License + }; + lppl12 = spdx { spdxId = "LPPL-1.2"; fullName = "LaTeX Project Public License v1.2"; diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index 3b982b1766f..7b7d9051ada 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz"; sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; }; - + patches = [ (fetchurl { url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch"; @@ -39,14 +39,15 @@ stdenv.mkDerivation { cp -v goo/libGoo.a $out/lib/goo cp -v fofi/libfofi.a $out/lib/fofi cp -v xpdf/libxpdf.a $out/lib/xpdf - + cp -v *.h $out/include cp -v goo/*.h $out/include cp -v fofi/*.h $out/include cp -v xpdf/*.h $out/include ''; - - meta = { - platforms = stdenv.lib.platforms.unix; + + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix index c9b15b6d4fc..4028f8622c3 100644 --- a/pkgs/applications/networking/browsers/kristall/default.nix +++ b/pkgs/applications/networking/browsers/kristall/default.nix @@ -25,6 +25,7 @@ mkDerivation rec { "Graphical small-internet client, supports gemini, http, https, gopher, finger"; homepage = "https://random-projects.net/projects/kristall.gemini"; maintainers = with maintainers; [ ehmry ]; + license = licenses.gpl3; inherit (qtmultimedia.meta) platforms; }; } diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index d58fc8fd19b..0312c3b6895 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "http://links.twibright.com/"; description = "A small browser with some graphics support"; maintainers = with maintainers; [ raskin ]; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e9ae6696def..3b0be4dad19 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -336,5 +336,6 @@ stdenv.mkDerivation rec { pierron ]; platforms = platforms.linux; + license = licenses.mpl20; }; } diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index e393111590a..213530b60a9 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "The ultimate desktop calculator"; homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner ]; + license = licenses.gpl2Plus; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 58cc8f8f59e..cab26577bd0 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -86,5 +86,6 @@ stdenv.mkDerivation rec { description = "A data analysis framework"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 27aa60ac09f..f72431c5a27 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation { description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; + license = licenses.mpl20; }; } diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix index 39ed74d0075..d6c550a8da8 100644 --- a/pkgs/development/libraries/cgui/default.nix +++ b/pkgs/development/libraries/cgui/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "A multiplatform basic GUI library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.free; }; } diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix index aaf40998102..eaddcb86f54 100644 --- a/pkgs/development/libraries/cm256cc/default.nix +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/f4exb/cm256cc"; platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; + license = licenses.gpl3; }; } diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index 6b42af05c11..a9929ea2add 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { buildInputs = [libxml2 openssl bzip2]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Peer-to-Peer file sharing client"; + homepage = "http://dcgui.berlios.de"; + platforms = platforms.linux; + license = [ licenses.openssl licenses.gpl2 ]; }; } diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index a3ddfe4c63c..c7a9b3c4a12 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/json-c/json-c/wiki"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + license = licenses.mit; longDescription = '' JSON-C implements a reference counting object model that allows you to diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix index 7863e596e1b..aff56994f49 100644 --- a/pkgs/development/libraries/libblocksruntime/default.nix +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -24,4 +24,10 @@ stdenv.mkDerivation { doCheck = false; # hasdescriptor.c test fails, hrm. installPhase = ''prefix="/" DESTDIR=$out ./installlib''; + + meta = with stdenv.lib; { + description = "Installs the BlocksRuntime library from the compiler-rt"; + homepage = "https://github.com/mackyle/blocksruntime"; + license = licenses.mit; + }; } diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 57c47c79f84..38f3a1134ee 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; maintainers = with maintainers; [ fpletz ]; + license = licenses.gpl3; }; } diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 08d57cda6c1..855df954eb1 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -32,7 +32,9 @@ stdenv.mkDerivation { cp exe/* $out/bin ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "PDF to XML converter"; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix index 178cee5e69a..d711cd9fc80 100644 --- a/pkgs/development/libraries/serialdv/default.nix +++ b/pkgs/development/libraries/serialdv/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/f4exb/serialdv"; platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; + license = licenses.gpl3; }; } diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index fb8c0e0fa21..bca025d622a 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation { ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports ''; - meta = { + meta = with stdenv.lib; { description = "WASI libc implementation for WebAssembly"; homepage = "https://wasi.dev"; - platforms = lib.platforms.wasi; - maintainers = [ lib.maintainers.matthewbauer ]; + platforms = platforms.wasi; + maintainers = [ maintainers.matthewbauer ]; + license = with licenses; [ asl20 mit llvm-exception ]; }; } |