liberationsansnarrow: 1.07.3 -> 1.07.6, rename to liberation-sans-narrow

Upstream also moved to github
This commit is contained in:
worldofpeace 2018-12-13 12:36:11 -05:00
parent de6b13db63
commit ec8d663d59
3 changed files with 14 additions and 13 deletions

View File

@ -1,13 +1,14 @@
{stdenv, fetchurl, fontforge, pythonPackages, python}:
{ stdenv, fetchFromGitHub, fontforge, pythonPackages, python }:
stdenv.mkDerivation rec {
pname = "liberationsansnarrow";
version = "1.07.3";
name = "${pname}-${version}";
pname = "liberation-sans-narrow";
version = "1.07.6";
src = fetchurl {
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp";
src = fetchFromGitHub {
owner = "liberationfonts";
repo = pname;
rev = version;
sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm";
};
buildInputs = [ fontforge pythonPackages.fonttools python ];
@ -16,8 +17,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/fonts/truetype
cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype
mkdir -p "$out/doc/${name}"
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
mkdir -p "$out/doc/${pname}-${version}"
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${pname}-${version}" || true
'';
meta = with stdenv.lib; {
@ -32,8 +33,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl2;
homepage = https://fedorahosted.org/liberation-fonts/;
maintainers = [ maintainers.leenaars
];
homepage = https://github.com/liberationfonts;
maintainers = [ maintainers.leenaars ];
};
}

View File

@ -161,6 +161,7 @@ mapAliases ({
libcap_progs = libcap.out; # added 2016-04-29
libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
libdbusmenu-glib = libdbusmenu; # added 2018-05-01
liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
libgumbo = gumbo; # added 2018-01-21

View File

@ -15535,7 +15535,7 @@ in
liberation_ttf_v2_binary;
liberation_ttf = liberation_ttf_v2_binary;
liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { };
liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { };
liberastika = callPackage ../data/fonts/liberastika { };