Merge branch 'master.upstream' into staging.upstream

2015-11-05 10:07:28 -08:00
parent bf41c5c233 3d87c5f9c3
commit 2837a5e091
362 changed files with 16069 additions and 19241 deletions
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip }:

-let version = "2.015"; in
+let version = "2.017"; in
 stdenv.mkDerivation {
  name = "hack-font-${version}";

@@ -8,7 +8,7 @@ stdenv.mkDerivation {
    version_ = with stdenv.lib;
      concatStringsSep "_" (splitString "." version);
  in fetchurl {
-    sha256 = "0x0c3wwxiidl5a6axbcwizxny5q2yc6l4724smdj4gmn1xa137g5";
+    sha256 = "1bspjdllmwbb7bs5rcdghyvvl4xf3pw5nss1z3zxc805pysxyy0c";
    url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
  };