diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
| commit | 95b828de42adaa2f825e5588d1cccb0d6398b20a (patch) | |
| tree | abfa4798c91b9932173212e7fbc6e5f7bd85f5d6 /pkgs/data | |
| parent | 421ce6439c2e685065fe9c256b751225de51e0b3 (diff) | |
| parent | 1ecae5c2c123c0ca615d011b9ce32f501198e7c4 (diff) | |
| download | nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.gz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.bz2 nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.lz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.xz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.zst nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/anonymous-pro/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/data/fonts/anonymous-pro/default.upstream | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index cca775d941e1..5b51ee36c5c7 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -10,16 +10,16 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="1.002"; + version = "1.002"; name="anonymousPro"; url="http://www.ms-studio.com/FontSales/AnonymousPro-${version}.zip"; - hash="86665847a51cdfb58a1e1dfd8b1ba33f183485affe50b53e3304f63d3d3552ab"; + sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = sourceInfo.sha256; }; name = "${sourceInfo.name}-${sourceInfo.version}"; @@ -43,11 +43,8 @@ rec { license = with a.lib.licenses; ofl; hydraPlatforms = []; homepage = "http://www.marksimonson.com/fonts/view/anonymous-pro"; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.ms-studio.com/FontSales/anonymouspro.html"; - }; + downloadPage = "http://www.ms-studio.com/FontSales/anonymouspro.html"; + inherit (sourceInfo) version; }; }) x diff --git a/pkgs/data/fonts/anonymous-pro/default.upstream b/pkgs/data/fonts/anonymous-pro/default.upstream new file mode 100644 index 000000000000..dde536cbcae1 --- /dev/null +++ b/pkgs/data/fonts/anonymous-pro/default.upstream @@ -0,0 +1,6 @@ +attribute_name anonymousPro +url http://www.ms-studio.com/FontSales/anonymouspro.html +version_link '/AnonymousPro-.*[.]zip$' +do_overwrite (){ + do_overwrite_just_version +} |