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: f52942d13f27
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2bb961ffb16c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 12, 2017

  1. terminus: 4.40 -> 4.46

    @NickHu
    NickHu committed Jul 12, 2017
    Copy the full SHA
    1f1001c View commit details

  2. Merge pull request #27328 from NickHu/terminus 

    terminus-font: 4.40 -> 4.46
    @Mic92
    Mic92 authored Jul 12, 2017
    Copy the full SHA
    2bb961f View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/data/fonts/terminus-font/default.nix
8 changes: 4 additions & 4 deletions pkgs/data/fonts/terminus-font/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }:
{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }:

stdenv.mkDerivation rec {
name = "terminus-font-4.40";
name = "terminus-font-4.46";

src = fetchurl {
url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
sha256 = "0487cyx5h1f0crbny5sg73a22gmym5vk1i7646gy7hgiscj2rxb4";
sha256 = "1kavqw38aarz0vpwz4b7l6l8xkyc5096zaf9ypqnvdwraqz46aaf";
};

buildInputs = [ perl bdftopcf mkfontdir mkfontscale ];
buildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];

patchPhase = ''
substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'