From 1c8fd6eb611d27ff7e410a33d73ed5df1363c3d3 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 30 Apr 2024 17:13:38 +0200 Subject: [PATCH] joypixels: Switch to general JoyPixels Free License Our references to the Free License have never been updated. I've received permission to link to the general license instead. This means the license version is no longer pinned, though that does not seem worse than being out of sync with the actual font and they don't seem to have versioned references. If the license is updated again before we receive new links for the font files users will be prompted to agree to a newer version of the license than the font. On the JoyPixels website if you navigate to older font versions, which are still available for download, you're also pointed to the newest version of the license. So we aren't doing worse. Note, although it's the JoyPixels Free License, this is actually an unfree license because it prohibits commercial use. --- pkgs/data/fonts/joypixels/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index f10ecd0483c7..1371634dbf52 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -20,9 +20,9 @@ let }; joypixels-free-license = with systemSpecific; { - spdxId = "LicenseRef-JoyPixels-Free-6.5"; - fullName = "JoyPixels Free License Agreement 6.5"; - url = "https://cdn.joypixels.com/distributions/${systemTag}/license/free-license.pdf"; + spdxId = "LicenseRef-JoyPixels-Free"; + fullName = "JoyPixels Free License Agreement"; + url = "https://cdn.joypixels.com/free-license.pdf"; free = false; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { free-license = joypixels-free-license; appendix = joypixels-license-appendix; in with systemSpecific; { - spdxId = "LicenseRef-JoyPixels-Free-6.5-with-${capitalized}-Appendix"; + spdxId = "LicenseRef-JoyPixels-Free-with-${capitalized}-Appendix"; fullName = "${free-license.fullName} with ${appendix.fullName}"; url = free-license.url; appendixUrl = appendix.url;