From de6b13db63d3ff3cbc53d4152e31bc742ddf0991 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:32:19 -0500 Subject: liberationsansnarrow_binary: remove --- pkgs/data/fonts/liberationsansnarrow/binary.nix | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 pkgs/data/fonts/liberationsansnarrow/binary.nix (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/liberationsansnarrow/binary.nix b/pkgs/data/fonts/liberationsansnarrow/binary.nix deleted file mode 100644 index c7afc91af84f..000000000000 --- a/pkgs/data/fonts/liberationsansnarrow/binary.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, liberationsansnarrow }: - -stdenv.mkDerivation rec { - version = "1.07.3"; - name = "liberationsansnarrow-${version}"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - 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 - ''; - - inherit (liberationsansnarrow) meta; -} -- cgit 1.4.1 From ec8d663d597204402a6deea6600a070870ecf2f7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:36:11 -0500 Subject: liberationsansnarrow: 1.07.3 -> 1.07.6, rename to liberation-sans-narrow Upstream also moved to github --- pkgs/data/fonts/liberation-sans-narrow/default.nix | 39 ++++++++++++++++++++++ pkgs/data/fonts/liberationsansnarrow/default.nix | 39 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 41 insertions(+), 40 deletions(-) create mode 100644 pkgs/data/fonts/liberation-sans-narrow/default.nix delete mode 100644 pkgs/data/fonts/liberationsansnarrow/default.nix (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix new file mode 100644 index 000000000000..97a1ff70f491 --- /dev/null +++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, fontforge, pythonPackages, python }: + +stdenv.mkDerivation rec { + pname = "liberation-sans-narrow"; + version = "1.07.6"; + + src = fetchFromGitHub { + owner = "liberationfonts"; + repo = pname; + rev = version; + sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm"; + }; + + buildInputs = [ fontforge pythonPackages.fonttools python ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype + + mkdir -p "$out/doc/${pname}-${version}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${pname}-${version}" || true + ''; + + meta = with stdenv.lib; { + description = "Liberation Sans Narrow Font Family is a replacement for Arial Narrow"; + longDescription = '' + Liberation Sans Narrow is a font originally created by Ascender + Inc and licensed to Oracle Corporation under a GPLv2 license. It is + metrically compatible with the commonly used Arial Narrow fonts + on Microsoft systems. It is no longer distributed with the + latest versions of the Liberation Fonts, as Red Hat has changed the + license to the Open Font License. + ''; + + license = licenses.gpl2; + homepage = https://github.com/liberationfonts; + maintainers = [ maintainers.leenaars ]; + }; +} diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberationsansnarrow/default.nix deleted file mode 100644 index 0027d44d9db5..000000000000 --- a/pkgs/data/fonts/liberationsansnarrow/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, fontforge, pythonPackages, python}: - -stdenv.mkDerivation rec { - pname = "liberationsansnarrow"; - version = "1.07.3"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp"; - }; - - buildInputs = [ fontforge pythonPackages.fonttools python ]; - - installPhase = '' - 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 - ''; - - meta = with stdenv.lib; { - description = "Liberation Sans Narrow Font Family is a replacement for Arial Narrow"; - longDescription = '' - Liberation Sans Narrow is a font originally created by Ascender - Inc and licensed to Oracle Corporation under a GPLv2 license. It is - metrically compatible with the commonly used Arial Narrow fonts - on Microsoft systems. It is no longer distributed with the - latest versions of the Liberation Fonts, as Red Hat has changed the - license to the Open Font License. - ''; - - license = licenses.gpl2; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ maintainers.leenaars - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d29370c8763..b92c02e9fa48 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 a24d8c840502..4843d2e1a481 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 { }; -- cgit 1.4.1 From b2c6efeaed7a5897de33dae7ab632b9b582f6a2f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:54:38 -0500 Subject: liberation_ttf: drop binary packages That means the following attributes are gone: - liberation_ttf_v1_binary - liberation_ttf_v2_binary Because of this Libreoffice uses liberation source fonts I've renamed these attributes because the binary form is gone: - liberation_ttf_v1_from_source -> liberation_ttf_v1 - liberation_ttf_v2_from_source -> liberation_ttf_v2 They're aliases for these. --- pkgs/data/fonts/redhat-liberation-fonts/default.nix | 18 ++---------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 13 ++++++------- 3 files changed, 10 insertions(+), 23 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 88d438096c10..bd83e16b89c0 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -49,21 +49,14 @@ let }; in { - liberation_ttf_v1_from_source = common rec { + liberation_ttf_v1 = common rec { version = "1.07.4"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; nativeBuildInputs = [ fontforge ]; outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p"; }; - liberation_ttf_v1_binary = common rec { - version = "1.07.4"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1"; - nativeBuildInputs = [ ]; - outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab"; - }; - liberation_ttf_v2_from_source = common rec { + liberation_ttf_v2 = common rec { version = "2.00.1"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; @@ -75,11 +68,4 @@ in { ''; outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn"; }; - liberation_ttf_v2_binary = common rec { - version = "2.00.1"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; - nativeBuildInputs = [ ]; - outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk"; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b92c02e9fa48..8360bf447064 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -161,6 +161,8 @@ mapAliases ({ libcap_progs = libcap.out; # added 2016-04-29 libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libdbusmenu-glib = libdbusmenu; # added 2018-05-01 + liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 + liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12 liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4843d2e1a481..0688b2853f97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15529,11 +15529,10 @@ in league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) - liberation_ttf_v1_from_source - liberation_ttf_v1_binary - liberation_ttf_v2_from_source - liberation_ttf_v2_binary; - liberation_ttf = liberation_ttf_v2_binary; + liberation_ttf_v1 + liberation_ttf_v2 + ; + liberation_ttf = liberation_ttf_v2; liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { }; @@ -17910,8 +17909,8 @@ in fontDirectories = [ carlito dejavu_fonts freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1_binary - liberation_ttf_v2_binary + liberation_ttf_v1 + liberation_ttf_v2 ]; }; clucene_core = clucene_core_2; -- cgit 1.4.1 From 0adf200ad593273543c7be9ea9391bea56501ad9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:58:09 -0500 Subject: liberation_ttf: v1: 1.07.4 -> 1.07.5 v2: 2.00.1 -> 2.00.4 Upstream moved to github. Using fetchFromGitHub. --- .../data/fonts/redhat-liberation-fonts/default.nix | 38 ++++++++++++---------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index bd83e16b89c0..0ee2a0c308c5 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, fontforge, python2}: +{ stdenv, fetchFromGitHub, fontforge, python3 }: let - inherit (python2.pkgs) fonttools; + inherit (python3.pkgs) fonttools; common = - {version, url, sha256, nativeBuildInputs, postPatch ? null, outputHash}: + { version, repo, sha256, nativeBuildInputs, postPatch ? null, outputHash }: stdenv.mkDerivation rec { - name = "liberation-fonts-${version}"; - src = fetchurl { - inherit url sha256; + pname = "liberation-fonts"; + inherit version; + + src = fetchFromGitHub { + owner = "liberationfonts"; + rev = version; + inherit repo sha256; }; inherit nativeBuildInputs postPatch; @@ -17,8 +21,8 @@ let mkdir -p $out/share/fonts/truetype cp -v $( find . -name '*.ttf') $out/share/fonts/truetype - mkdir -p "$out/share/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${name}" || true + mkdir -p "$out/share/doc/${pname}-${version}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${pname}-${version}" || true ''; outputHashAlgo = "sha256"; @@ -40,7 +44,7 @@ let ''; license = licenses.ofl; - homepage = https://pagure.io/liberation-fonts/; + homepage = https://github.com/liberationfonts; maintainers = [ maintainers.raskin ]; @@ -50,22 +54,22 @@ let in { liberation_ttf_v1 = common rec { - version = "1.07.4"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; - sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; + repo = "liberation-1.7-fonts"; + version = "1.07.5"; nativeBuildInputs = [ fontforge ]; - outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p"; + sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; + outputHash = "16jn17p22z2vip58aza2dfg1ri31ki6z3hsnmidfqfi7v8k83vq4"; }; liberation_ttf_v2 = common rec { - version = "2.00.1"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; - sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; + repo = "liberation-fonts"; + version = "2.00.4"; nativeBuildInputs = [ fontforge fonttools ]; postPatch = '' substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ 'font = ttLib.TTFont(fontfile)' \ 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' ''; - outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn"; + sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa"; + outputHash = "14c0c5n4vzd5y0hf9jkh48h12kkd8hlg94npbmv41j449g6wv6vn"; }; } -- cgit 1.4.1