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

Commits on Jul 12, 2017

  1. google-fonts: 2016-08-30 -> 2017-06-28

    @sternenseemann
    sternenseemann committed Jul 12, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    mcollina Matteo Collina
    GPG key ID: 818674489FBC127E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    08ef468 View commit details

  2. Merge pull request #27333 from sternenseemann/google-fonts 

    google-fonts: 2016-08-30 -> 2017-06-28
    @Mic92
    Mic92 authored Jul 12, 2017
    Copy the full SHA
    f52942d View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/data/fonts/google-fonts/default.nix
8 changes: 4 additions & 4 deletions pkgs/data/fonts/google-fonts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

stdenv.mkDerivation rec {
name = "google-fonts-${version}";
version = "2016-08-30";
version = "2017-06-28";

src = fetchFromGitHub {
owner = "google";
repo = "fonts";
rev = "7a4070f65f2ca85ffdf2d465ff5e095005bae197";
sha256 = "0c20vcsd0jki8drrim68z2ca0cxli4wyh1i1gyg4iyac0a0v8wx3";
rev = "b1cb16c0ce2402242e0106d15b0429d1b8075ecc";
sha256 = "18kyclwipkdv4zxfws87x2l91jwn34vrizw8rmv8lqznnfsjh2lg";
};

outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "13n2icpdp1z7i14rnfwkjdydhbjgdvyl1crd71hfy6l1j2p3kzyf";
outputHash = "0n0j2hi1qb2sc6p3v6lpaqb2aq0m9xjmi7apz3hf2nx97rrsam22";

phases = [ "unpackPhase" "patchPhase" "installPhase" ];