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: 41dd4fbbeddd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8ed5c2075aba
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 7, 2019

  1. unifont_upper: 10.0.06 -> 11.0.03 

    Also move to GNU mirror for the file, as we do for unifont.

(cherry picked from commit e78d7c5)
    @dtzWill @rycee
    dtzWill authored and rycee committed Mar 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e694957 View commit details

  2. unifont: 11.0.03 -> 12.0.01 

    http://lists.gnu.org/archive/html/info-gnu/2019-03/msg00002.html
(cherry picked from commit 5531e13)
    @dtzWill @rycee
    dtzWill authored and rycee committed Mar 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    493bafc View commit details

  3. unifont_upper: 11.0.03 -> 12.0.01 

    (cherry picked from commit 27fd948)
    @dtzWill @rycee
    dtzWill authored and rycee committed Mar 7, 2019
    Copy the full SHA
    8ed5c20 View commit details
Showing with 7 additions and 7 deletions.
  1. +4 −4 pkgs/data/fonts/unifont/default.nix
  2. +3 −3 pkgs/data/fonts/unifont_upper/default.nix
8 changes: 4 additions & 4 deletions pkgs/data/fonts/unifont/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

stdenv.mkDerivation rec {
name = "unifont-${version}";
version = "11.0.03";
version = "12.0.01";

ttf = fetchurl {
url = "mirror://gnu/unifont/${name}/${name}.ttf";
sha256 = "1fqlf3kczh1y7vhpcdcs1i9043idg5x9jisfqfd99sikvcbw7w75";
sha256 = "191vgddv5fksg7g01q692nfcb02ks2y28fi9fv8aghvs36q4iana";
};

pcf = fetchurl {
url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
sha256 = "0wqcmvkqdww60hqh245whzh4mx3frrx2712lay826f9h5s4ywz6g";
sha256 = "14xbrsdrnllly8h2afan3b4v486vd4y8iff8zqmcfliw0cipm8v4";
};

nativeBuildInputs = [ mkfontscale mkfontdir ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "006jbla4zfwccyy84sm4ck869sq5az5s5cfkcmdgj7ah3rz4d7dn";
outputHash = "1jccbz7wyyk7rpyapgsppcgakgpm1l9fqqxs7fg9naav7i0nzzpg";

meta = with stdenv.lib; {
description = "Unicode font for Base Multilingual Plane";
6 changes: 3 additions & 3 deletions pkgs/data/fonts/unifont_upper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, fetchzip }:

let
version = "10.0.06";
version = "12.0.01";
in fetchzip rec {
name = "unifont_upper-${version}";

url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf";
url = "mirror://gnu/unifont/unifont-${version}/${name}.ttf";

postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";

sha256 = "13x5z8iyh9xz5fllcy89yinnz1iy16a2pjf3vip66nz10sq8crlr";
sha256 = "1mmbndyi91fcdj7ykk5y7rypmm5jf2zf5pp5ab8hq3aa9y7invw3";

meta = with stdenv.lib; {
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";