pyrox.dev
Don't barf JSON at users in error messages
+5
-3
pkgs/stdenv/generic/default.nix
+5
-3
pkgs/stdenv/generic/default.nix
···
27
27
lib.lists.all (license:
28
28
let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
29
29
if license == l then true else
30
-
throw ''‘${builtins.toJSON license}’ is not an attribute of lib.licenses''
30
+
throw ''‘${showLicense license}’ is not an attribute of lib.licenses''
31
31
) list;
32
32
33
33
mutuallyExclusive = a: b:
···
72
72
hasLicense attrs &&
73
73
isUnfree (lib.lists.toList attrs.meta.license) &&
74
74
!allowUnfreePredicate attrs;
75
+
76
+
showLicense = license: license.shortName or "unknown";
75
77
76
78
defaultNativeBuildInputs = extraBuildInputs ++
77
79
[ ../../build-support/setup-hooks/move-docs.sh
···
121
123
122
124
licenseAllowed = attrs:
123
125
if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then
124
-
throwEvalHelp "Unfree" "has an unfree license ‘${builtins.toJSON attrs.meta.license}’ which is not whitelisted"
126
+
throwEvalHelp "Unfree" "has an unfree license (‘${showLicense attrs.meta.license}’)"
125
127
else if hasBlacklistedLicense attrs then
126
-
throwEvalHelp "blacklisted" "has the ‘${builtins.toJSON attrs.meta.license}’ license which is blacklisted"
128
+
throwEvalHelp "blacklisted" "has a blacklisted license (‘${showLicense attrs.meta.license}’)"
127
129
else if !allowBroken && attrs.meta.broken or false then
128
130
throwEvalHelp "Broken" "is marked as broken"
129
131
else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then