From e174d249df771929f540e0c2e9047aad4bb2ec5e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 11:37:41 +0200 Subject: [PATCH 01/11] hdf4: add license --- pkgs/tools/misc/hdf4/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 8d694aa88b75..d5b8291d78ed 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -84,10 +84,11 @@ stdenv.mkDerivation rec { moveToOutput bin "$bin" ''; - meta = { + meta = with stdenv.lib; { description = "Data model, library, and file format for storing and managing data"; homepage = "https://support.hdfgroup.org/products/hdf4/"; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ knedlsepp ]; + platforms = platforms.unix; + license = licenses.bsdOriginal; }; } From 97f1c250288076a08e3a6f8bda53c13896df6386 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:00:49 +0200 Subject: [PATCH 02/11] mokeysAudio: add license and description --- pkgs/applications/audio/monkeys-audio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 58bb4d3e3274..adc8eb2087e5 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + description = "Lossless audio codec"; platforms = platforms.linux; + license = licenses.lgpl2; maintainers = [ ]; }; } From 40a04df6fef3f9a156d7755f5a3c82bf4946edcf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:03:41 +0200 Subject: [PATCH 03/11] rubyripper: add license and description --- pkgs/applications/audio/rubyripper/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index 82aa86f795bb..eb6de8431803 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { --prefix PATH : "${cdparanoia}/bin" ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "High quality CD audio ripper"; + platforms = platforms.linux; + license = licenses.gpl3; }; } From 74fb58b60101ce9fa63234ac0a7f26cd9b0c2392 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:06:16 +0200 Subject: [PATCH 04/11] dashpay: add license --- pkgs/applications/blockchains/dashpay.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index d0c3fed4350b..b88aa3af19e3 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://www.dash.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + license = licenses.mit; }; } From d00013fd7cd27cd5dd90bada7bcbb1b6608769ac Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:08:38 +0200 Subject: [PATCH 05/11] jpeg-archive: add license --- pkgs/applications/graphics/jpeg-archive/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix index 97c15d2eec09..8beaf43c089c 100644 --- a/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/pkgs/applications/graphics/jpeg-archive/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Utilities for archiving photos for saving to long term storage or serving over the web"; homepage = "https://github.com/danielgtaylor/jpeg-archive"; - # license = ...; # mixed? + license = licenses.mit; maintainers = [ maintainers.srghma ]; platforms = platforms.all; }; From d162c97a73bb81b0889f78d29e9a18d67690c08f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:11:56 +0200 Subject: [PATCH 06/11] gosmore: add license --- pkgs/applications/misc/gosmore/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 350cb56695f9..4da6c6d07cc4 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { patches = [ ./pointer_int_comparison.patch ]; patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol - + meta = with stdenv.lib; { description = "Open Street Map viewer"; homepage = "https://sourceforge.net/projects/gosmore/"; @@ -33,5 +33,6 @@ stdenv.mkDerivation { raskin ]; platforms = platforms.linux; + license = licenses.bsd2; }; } From 5d87992126fb9bd2b9b11bdce776b30f92c89985 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:41:52 +0200 Subject: [PATCH 07/11] qemu-utils: inherit meta data from qemu --- pkgs/applications/virtualization/qemu/utils.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix index 430d71221797..436716e0a8c3 100644 --- a/pkgs/applications/virtualization/qemu/utils.nix +++ b/pkgs/applications/virtualization/qemu/utils.nix @@ -13,4 +13,6 @@ stdenv.mkDerivation rec { cp "${qemu}/bin/qemu-io" "$out/bin/qemu-io" cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd" ''; + + inherit (qemu) meta; } From 22ff32d74087650d70e0464199b4d49c3f953189 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:43:47 +0200 Subject: [PATCH 08/11] xhyve: add license --- pkgs/applications/virtualization/xhyve/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index 921a54b11a2e..db9a7ef82577 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { cp build/xhyve $out/bin ''; - meta = { + meta = with lib; { description = "Lightweight Virtualization on macOS Based on bhyve"; homepage = "https://github.com/mist64/xhyve"; - maintainers = [ lib.maintainers.lnl7 ]; - platforms = lib.platforms.darwin; + maintainers = [ maintainers.lnl7 ]; + license = licenses.bsd2; + platforms = platforms.darwin; }; } From b2955e5000f54e89ec14fba648fb4589e09e0430 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:45:19 +0200 Subject: [PATCH 09/11] tinywm: add license --- pkgs/applications/window-managers/tinywm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix index 0e30857267bd..d6ff4ad51a2e 100644 --- a/pkgs/applications/window-managers/tinywm/default.nix +++ b/pkgs/applications/window-managers/tinywm/default.nix @@ -42,10 +42,11 @@ stdenv.mkDerivation rec { - Resize windows interactively with Alt+Button3 drag (right mouse button) - Raise windows with Alt+F1 (not high on usability I know, but I needed a keybinding in there somewhere) - - Focus windows with the mouse pointer (X does this on its own) + - Focus windows with the mouse pointer (X does this on its own) ''; homepage = "http://incise.org/tinywm.html"; maintainers = with maintainers; [ AndersonTorres ]; platforms = libX11.meta.platforms; + license = licenses.publicDomain; }; } From d75a478ff24323ea32f29b740c77b414ae99f177 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:51:05 +0200 Subject: [PATCH 10/11] licenses: add GNU Free Documentation License v1.1 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 4c07797b16c2..b799a6ae8a43 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -276,6 +276,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "European Union Public License 1.2"; }; + fdl11 = spdx { + spdxId = "GFDL-1.1-only"; + fullName = "GNU Free Documentation License v1.1 only"; + }; + fdl12 = spdx { spdxId = "GFDL-1.2-only"; fullName = "GNU Free Documentation License v1.2 only"; From 49ce43a460cf657ef4f977741a5ad852ed35fad7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:51:30 +0200 Subject: [PATCH 11/11] pan: add license --- pkgs/applications/networking/newsreaders/pan/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 454e19fd8974..6dc0630d2db2 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -37,10 +37,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "A GTK-based Usenet newsreader good at both text and binaries"; homepage = "http://pan.rebelbase.com/"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 fdl11 ]; }; }