diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 656fc37f46bc..bc393d65625b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8331,6 +8331,12 @@ githubId = 6016963; name = "Patrick Winter"; }; + wishfort36 = { + email = "42300264+wishfort36@users.noreply.github.com"; + github = "wishfort36"; + githubId = 42300264; + name = "wishfort36"; + }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman"; diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix new file mode 100644 index 000000000000..c4a2be00d944 --- /dev/null +++ b/pkgs/data/fonts/tamzen/default.nix @@ -0,0 +1,47 @@ +{ fetchFromGitHub, fontforge, mkfontscale, stdenv }: + +stdenv.mkDerivation rec { + pname = "tamzen-font"; + version = "1.11.4"; + + src = fetchFromGitHub { + owner = "sunaku"; + repo = "tamzen-font"; + rev = "Tamzen-${version}"; + sha256 = "17kgmvg6q32mqhx9g44hjvzv0si0mnpprga4z7na930g2zdd8846"; + }; + + nativeBuildInputs = [ fontforge mkfontscale ]; + + installPhase = '' + # convert pcf fonts to otb + for i in pcf/*.pcf; do + name=$(basename "$i" .pcf) + fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otb\")" + done + + install -m 644 -D pcf/*.pcf -t "$out/share/fonts/misc" + install -m 644 -D psf/*.psf -t "$out/share/consolefonts" + install -m 644 -D *.otb -t "$otb/share/fonts/misc" + mkfontdir "$out/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" + ''; + + outputs = [ "out" "otb" ]; + + meta = with stdenv.lib; { + description = "Bitmapped programming font based on Tamsyn"; + longDescription = '' + Tamzen is a monospace bitmap font. It is programatically forked + from Tamsyn version 1.11, which backports glyphs from older + versions while deleting deliberately empty glyphs to allow + secondary/fallback fonts to provide real glyphs at those codepoints. + Tamzen also has fonts that additionally provide the Powerline + symbols. + ''; + homepage = "https://github.com/sunaku/tamzen-font"; + license = licenses.free; + maintainers = with maintainers; [ wishfort36 ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dfc9b3e340e..1eae241fbf32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18376,6 +18376,8 @@ in tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; + tamzen = callPackage ../data/fonts/tamzen { inherit (buildPackages.xorg) mkfontscale; }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; };