diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix similarity index 63% rename from pkgs/data/fonts/liberationsansnarrow/default.nix rename to pkgs/data/fonts/liberation-sans-narrow/default.nix index 0027d44d9db..97a1ff70f49 100644 --- a/pkgs/data/fonts/liberationsansnarrow/default.nix +++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix @@ -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 ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d29370c876..b92c02e9fa4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a24d8c84050..4843d2e1a48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };