Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 85fda489f892
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2184d7649722
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 16, 2021

  1. Copy the full SHA
    c25e63f View commit details

Commits on Jan 17, 2021

  1. Merge pull request #109563 from marsam/update-3270font

    _3270font: 2.1.0 -> 2.2.1
    marsam authored Jan 17, 2021
    Copy the full SHA
    2184d76 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/data/fonts/3270font/default.nix
9 changes: 5 additions & 4 deletions pkgs/data/fonts/3270font/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{ lib, fetchzip }:
let
version = "2.1.0";
version = "2.2.1";
in
fetchzip {
name = "3270font-${version}";

url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip";
url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_70de9c7.zip";

sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9";
sha256 = "0spz9abp87r3bncjim6hs47fmhg86qbgips4x6nfpqzg5qh2xd2m";

postFetch = ''
mkdir -p $out/share/fonts/
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff
unzip -j $downloadedFile \*.afm -d $out/share/fonts/type1
'';

meta = with lib; {
description = "Monospaced font based on IBM 3270 terminals";
homepage = "https://github.com/rbanffy/3270font";
changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md";
license = [ licenses.bsd3 licenses.ofl ];
maintainers = [ maintainers.marsam ];
platforms = platforms.all;