From 988f0cf3c5c7f4372dd353ed148935cd943ff8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Wed, 4 Nov 2020 07:45:44 -0300 Subject: [PATCH] iosevka-bin: Use iosevka's meta The two packages have the same metadata, except for the maintainers. --- pkgs/data/fonts/iosevka/bin.nix | 16 +++++----------- pkgs/data/fonts/iosevka/update.sh | 10 +++++----- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index c3e77c1051f..e624e85dd48 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip +{ stdenv, lib, fetchurl, iosevka, unzip , variant ? "" }: @@ -29,16 +29,10 @@ in stdenv.mkDerivation rec { unzip -d $out/share/fonts/truetype $src ''; - meta = with lib; { - homepage = "https://be5invis.github.io/Iosevka/"; - downloadPage = "https://github.com/be5invis/Iosevka/releases"; - description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; + meta = iosevka.meta // { + maintainers = with lib.maintainers; [ + cstrahan + ]; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/data/fonts/iosevka/update.sh b/pkgs/data/fonts/iosevka/update.sh index df78c62a6ce..a402f152d8a 100755 --- a/pkgs/data/fonts/iosevka/update.sh +++ b/pkgs/data/fonts/iosevka/update.sh @@ -1,11 +1,12 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl jq -set -e +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" release=$(curl -s https://api.github.com/repos/be5invis/Iosevka/releases/latest) -oldVersion=$(nix-instantiate --eval -E 'with import ./. {}; lib.getVersion iosevka-bin' | tr -d '"') +oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-bin' | tr -d '"') version=$(echo "$release" | jq -r .tag_name | tr -d v) if test "$oldVersion" = "$version"; then @@ -13,8 +14,7 @@ if test "$oldVersion" = "$version"; then exit 0 fi -file=$(nix-instantiate --eval -A iosevka-bin.meta.position | sed -r 's/^"(.*):[0-9]+"$/\1/') -sed -i "s/$oldVersion/$version/" "$file" +sed -i "s/$oldVersion/$version/" bin.nix { echo '# This file was autogenerated. DO NOT EDIT!' @@ -25,4 +25,4 @@ sed -i "s/$oldVersion/$version/" "$file" $(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset") done echo '}' -} >$(dirname "$file")/variants.nix +} >variants.nix