From 9e3bdb02d8d2944ca6526ab5b031d6a23e77382a Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Fri, 1 Aug 2025 22:44:32 +0200 Subject: [PATCH] licenses: Add CERN Open Hardware Licence. * guix/licenses.scm (ohl2-s): New variable. (ohl2-p): New variable. (ohl2-w): New variable. * guix/import/utils.scm (%spdx-license-identifiers): Add references to them. Change-Id: I212332041b6438af0ea7b869e38665147f6ce798 Signed-off-by: Danny Milosavljevic --- guix/import/utils.scm | 4 ++++ guix/licenses.scm | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 0ef84c9cdfee5e0ec18e72f83f85ce87668ddcb8..24cb5ef74738f228f1eb969c1556dbd85db5746b 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Alice Brenon ;;; Copyright © 2022 Kyle Meyer ;;; Copyright © 2022 Philip McGrath +;;; Copyright © 2025 Cayetano Santos ;;; ;;; This file is part of GNU Guix. ;;; @@ -271,6 +272,9 @@ thrown." ("MS-PL" . license:ms-pl) ("NCSA" . license:ncsa) ("OGL-UK-1.0" . license:ogl-psi1.0) + ("CERN-OHL-S-2.0" . license:ohl2-s) + ("CERN-OHL-P-2.0" . license:ohl2-p) + ("CERN-OHL-W-2.0" . license:ohl2-w) ("OpenSSL" . license:openssl) ("OLDAP-2.8" . license:openldap2.8) ("OPL-1.0" . license:opl1.0+) diff --git a/guix/licenses.scm b/guix/licenses.scm index 8fd4f363929233094cf4bbbaa11eb5a1f79b5c67..5550c48376a167fb3c12390f429b8479ca4690c6 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Noisytoot ;;; Copyright © 2021 Kyle Meyer +;;; Copyright © 2025 Cayetano Santos ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +91,7 @@ ncsa nmap ogl-psi1.0 + ohl2-s ohl2-w ohl2-p openldap2.8 openssl perl-license psfl public-domain @@ -648,6 +650,21 @@ at URI, which may be a file:// URI pointing the package's tree." "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/1/" #f)) +(define ohl2-s + (license "Cern OHL version 2 - Strongly reciprocal variant" + "https://ohwr.org/cern_ohl_s_v2.txt" + "https://cern-ohl.web.cern.ch/home")) + +(define ohl2-w + (license "Cern OHL version 2 - Weakly reciprocal variant" + "https://ohwr.org/cern_ohl_w_v2.txt" + "https://cern-ohl.web.cern.ch/home")) + +(define ohl2-p + (license "Cern OHL version 2 - Permissive variant" + "https://ohwr.org/cern_ohl_p_v2.txt" + "https://cern-ohl.web.cern.ch/home")) + (define openssl (license "OpenSSL" "http://directory.fsf.org/wiki/License:OpenSSL"