diff --git a/lib/licenses.nix b/lib/licenses.nix index 612cfba6c730..f54ab464357b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -969,6 +969,11 @@ in mkLicense lset) ({ fullName = "wxWindows Library Licence, Version 3.1"; }; + x11 = { + spdxId = "X11"; + fullName = "X11 License"; + }; + xfig = { fullName = "xfig"; url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken diff --git a/pkgs/data/fonts/garamond-libre/default.nix b/pkgs/data/fonts/garamond-libre/default.nix new file mode 100644 index 000000000000..202ae2ce41f1 --- /dev/null +++ b/pkgs/data/fonts/garamond-libre/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchzip }: + +fetchzip rec { + pname = "garamond-libre"; + version = "1.4"; + + url = "https://github.com/dbenjaminmiller/garamond-libre/releases/download/${version}/garamond-libre_${version}.zip"; + stripRoot = false; + + postFetch = '' + install -Dm644 $out/*.otf -t $out/share/fonts/opentype + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob + ''; + + sha256 = "6WiuUe3CHXXL/0G7wURvSIgWPQ4isl50e3OBQ+ui0U4="; + + meta = with lib; { + homepage = "https://github.com/dbenjaminmiller/garamond-libre"; + description = "Garamond Libre font family"; + maintainers = with maintainers; [ drupol ]; + license = licenses.x11; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e615e8c71acc..2f78644b13a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26603,6 +26603,8 @@ with pkgs; freepats = callPackage ../data/misc/freepats { }; + garamond-libre = callPackage ../data/fonts/garamond-libre { }; + g15daemon = callPackage ../os-specific/linux/g15daemon {}; galatia-sil = callPackage ../data/fonts/galatia-sil { };