git.iko.soy/typeable/nixpkgs
on master help sign in
Revert "xorg: mark fonts with proprietary licences as unfree"

This reverts commit c45160366b824a2d7a70c14b9ef1f797718fdd45 and hopefully fixes #99236: evaluation on Hydra. For lack of a better method, I used the live jobset to bisect. On the reverted commit it failed (tried several times because sometimes evaluation fail transiently, possibly due to exhausting some resources) and on the parent it succeeded: https://hydra.nixos.org/eval/1617490 Right now I don't have energy to find what exactly is wrong in the commit, and it doesn't seem important in comparison to nixos-unstable channel being stuck on a commit over one week old.

commit5d993eeb849fe4b90f8723291a4987b5d5a96173 authorVladimír Čunát <v@cunat.cz> dateSun 4 Oct 2020, 18:44 (6 years ago) parentb28298e
1 file changed+4−38
pkgs/servers/x11/xorg/overrides.nix+4−38
pkgs/servers/x11/xorg/overrides.nix+4−38
@@ -50,6 +50,10 @@ self: super:
5050 hardeningDisable = [ "format" ];
5151 });
5252
53+ fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
54+ meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
55+ });
56+
5357 fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
5458 postInstall =
5559 ''
@@ -866,41 +870,3 @@ self: super:
866870 });
867871
868872}
869−
870−# mark some packages as unfree
871−// (
872− let
873− # unfree but redistributable
874− redist = [
875− "fontadobeutopiatype1"
876− "fontadobeutopia100dpi"
877− "fontadobeutopia75dpi"
878− "fontbhtype1"
879− "fontibmtype1"
880− "fontbhttf"
881− "fontbh100dpi"
882− "fontbh75dpi"
883− ];
884−
885− # unfree, possibly not redistributable
886− unfree = [
887− # no license, just a copyright notice
888− "fontbhlucidatypewriter100dpi"
889− "fontbhlucidatypewriter75dpi"
890− "fontdaewoomisc"
891−
892− # unclear license, "permission to use"?
893− "fontjismisc"
894− ];
895−
896− setLicense = license: name:
897− super.${name}.overrideAttrs (attrs: {
898− meta = attrs.meta // { inherit license; };
899− });
900− mapNamesToAttrs = f: names: with lib;
901− listToAttrs (zipListsWith nameValuePair names (map f names));
902−
903− in
904− mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist //
905− mapNamesToAttrs (setLicense lib.licenses.unfree) unfree
906−)