From 79b28e837273286eb3c22ca0c0d886bfc3af3288 Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Mon, 19 Aug 2024 11:28:50 +0200 Subject: [PATCH 1/2] lib.licenses: add CockroachDB Community License Agreement --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 67744b499d8a..2e1785dd98f4 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -403,6 +403,12 @@ lib.mapAttrs mkLicense ({ fullName = "CeCILL-C Free Software License Agreement"; }; + cockroachdb-community-license = { + fullName = "CockroachDB Community License Agreement"; + url = "https://www.cockroachlabs.com/cockroachdb-community-license/"; + free = false; + }; + cpal10 = { spdxId = "CPAL-1.0"; fullName = "Common Public Attribution License 1.0"; From 855b8f7f4957f893a822d89025bf4349e0909ce2 Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Mon, 19 Aug 2024 11:33:18 +0200 Subject: [PATCH 2/2] cockroach-bin: Update licenses Update licenses according to - https://www.cockroachlabs.com/docs/releases/#licenses and - https://github.com/cockroachdb/cockroach/blob/master/LICENSE --- pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix index 594cdc1a36b2..547cf12508d5 100644 --- a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix +++ b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix @@ -39,7 +39,11 @@ buildFHSEnv { meta = with lib; { homepage = "https://www.cockroachlabs.com"; description = "Scalable, survivable, strongly-consistent SQL database"; - license = licenses.bsl11; + license = with licenses; [ + bsl11 + mit + cockroachdb-community-license + ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; maintainers = with maintainers; [ rushmorem thoughtpolice neosimsim ]; };