diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 08:57:41 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 08:57:41 +0100 |
commit | 911d1853ca990a7af6725105e7cda8c24cac025f (patch) | |
tree | 61aac8cb7c86d87fa2cdffe4b01e721e5e6fff64 /pkgs/data | |
parent | 826ab7026e0f18c85fb861ae5f97bad1e9f37006 (diff) | |
parent | b9307eddd67e0e3f087dec608ccc84fec72deda5 (diff) | |
download | nixlib-911d1853ca990a7af6725105e7cda8c24cac025f.tar nixlib-911d1853ca990a7af6725105e7cda8c24cac025f.tar.gz nixlib-911d1853ca990a7af6725105e7cda8c24cac025f.tar.bz2 nixlib-911d1853ca990a7af6725105e7cda8c24cac025f.tar.lz nixlib-911d1853ca990a7af6725105e7cda8c24cac025f.tar.xz nixlib-911d1853ca990a7af6725105e7cda8c24cac025f.tar.zst nixlib-911d1853ca990a7af6725105e7cda8c24cac025f.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/liberation-sans-narrow/default.nix (renamed from pkgs/data/fonts/liberationsansnarrow/default.nix) | 24 | ||||
-rw-r--r-- | pkgs/data/fonts/liberationsansnarrow/binary.nix | 22 | ||||
-rw-r--r-- | pkgs/data/fonts/redhat-liberation-fonts/default.nix | 56 |
3 files changed, 35 insertions, 67 deletions
diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix index 0027d44d9db5..97a1ff70f491 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/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; -} diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 88d438096c10..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 ]; @@ -49,37 +53,23 @@ let }; in { - liberation_ttf_v1_from_source = common rec { - version = "1.07.4"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; - sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; + liberation_ttf_v1 = common rec { + repo = "liberation-1.7-fonts"; + version = "1.07.5"; 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"; + sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; + outputHash = "16jn17p22z2vip58aza2dfg1ri31ki6z3hsnmidfqfi7v8k83vq4"; }; - liberation_ttf_v2_from_source = common rec { - version = "2.00.1"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; - sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; + liberation_ttf_v2 = common rec { + 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"; - }; - 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"; + sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa"; + outputHash = "14c0c5n4vzd5y0hf9jkh48h12kkd8hlg94npbmv41j449g6wv6vn"; }; } |