From b87da0fa916fcd6ff019dbd3780e20c9d5e1093c Mon Sep 17 00:00:00 2001 From: vtaku0 Date: Thu, 15 Jan 2015 14:05:46 +0100 Subject: [PATCH] source-han-sans: update, and refactor expressions Close #5778. @vcunat nitpicks: truetype -> opentype, remove empty buildInputs. --- pkgs/data/fonts/source-han-sans/base.nix | 26 ---------- pkgs/data/fonts/source-han-sans/default.nix | 47 +++++++++++++++++++ pkgs/data/fonts/source-han-sans/japanese.nix | 6 --- pkgs/data/fonts/source-han-sans/korean.nix | 6 --- .../source-han-sans/simplified-chinese.nix | 6 --- .../source-han-sans/traditional-chinese.nix | 6 --- pkgs/top-level/all-packages.nix | 9 ++-- 7 files changed, 52 insertions(+), 54 deletions(-) delete mode 100644 pkgs/data/fonts/source-han-sans/base.nix create mode 100644 pkgs/data/fonts/source-han-sans/default.nix delete mode 100644 pkgs/data/fonts/source-han-sans/japanese.nix delete mode 100644 pkgs/data/fonts/source-han-sans/korean.nix delete mode 100644 pkgs/data/fonts/source-han-sans/simplified-chinese.nix delete mode 100644 pkgs/data/fonts/source-han-sans/traditional-chinese.nix diff --git a/pkgs/data/fonts/source-han-sans/base.nix b/pkgs/data/fonts/source-han-sans/base.nix deleted file mode 100644 index d319f41f2e5..00000000000 --- a/pkgs/data/fonts/source-han-sans/base.nix +++ /dev/null @@ -1,26 +0,0 @@ -{version ? "1.000", prefix, url, sha256, description}: - -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - inherit version; - name = "${prefix}-${version}"; - - src = fetchurl { - inherit url sha256; - }; - - buildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp $( find . -name '*.otf' ) $out/share/fonts/truetype - ''; - - meta = { - inherit description; - - homepage = http://sourceforge.net/adobe/source-han-sans/; - license = stdenv.lib.licenses.asl20; - }; -} diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix new file mode 100644 index 00000000000..9e0bf750571 --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchurl}: + +let + makePackage = {language, region, description}: stdenv.mkDerivation rec { + version = "1.001R"; + name = "source-han-sans-${language}-${version}"; + + src = fetchurl { + url = "https://github.com/adobe-fonts/source-han-sans/archive/${version}.tar.gz"; + sha256 = "0cwz3d8jancl0a7vbjxhnh1vgwsjba62lahfjya9yrjkp1ndxlap"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp $( find SubsetOTF/${region} -name '*.otf' ) $out/share/fonts/opentype + ''; + + meta = { + inherit description; + + homepage = https://github.com/adobe-fonts/source-han-sans; + license = stdenv.lib.licenses.asl20; + }; + }; +in +{ + japanese = makePackage { + language = "japanese"; + region = "JP"; + description = "Japanese subset of an open source Pan-CJK typeface"; + }; + korean = makePackage { + language = "korean"; + region = "KR"; + description = "Korean subset of an open source Pan-CJK typeface"; + }; + simplified-chinese = makePackage { + language = "simplified-chinese"; + region = "CN"; + description = "Simplified Chinese subset of an open source Pan-CJK typeface"; + }; + traditional-chinese = makePackage { + language = "traditional-chinese"; + region = "TW"; + description = "Traditional Chinese subset of an open source Pan-CJK typeface"; + }; +} diff --git a/pkgs/data/fonts/source-han-sans/japanese.nix b/pkgs/data/fonts/source-han-sans/japanese.nix deleted file mode 100644 index 4aacdbf62e2..00000000000 --- a/pkgs/data/fonts/source-han-sans/japanese.nix +++ /dev/null @@ -1,6 +0,0 @@ -import ./base.nix { - prefix = "source-han-sans-japanese"; - url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansJP-1.000.zip"; - sha256 = "c5930036660bea22ffceaa9e2df765776494800d330a59be7936ab3c763c4c82"; - description = "Japanese subset of an open source Pan-CJK typeface"; -} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/korean.nix b/pkgs/data/fonts/source-han-sans/korean.nix deleted file mode 100644 index cf3ecd9e12e..00000000000 --- a/pkgs/data/fonts/source-han-sans/korean.nix +++ /dev/null @@ -1,6 +0,0 @@ -import ./base.nix { - prefix = "source-han-sans-korean"; - url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansKR-1.000.zip"; - sha256 = "8eed4ad092fcf640e44f73ba510e0ed1c1cabf79776f68d02820734bbba21cf8"; - description = "Korean subset of an open source Pan-CJK typeface"; -} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/simplified-chinese.nix b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix deleted file mode 100644 index 8e920455e45..00000000000 --- a/pkgs/data/fonts/source-han-sans/simplified-chinese.nix +++ /dev/null @@ -1,6 +0,0 @@ -import ./base.nix { - prefix = "source-han-sans-simplified-chinese"; - url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansCN-1.000.zip"; - sha256 = "88117aa8f8b4ab65d6f7a919a5e1b06d6c00f75b1abecccf120246536123754d"; - description = "Simplified Chinese subset of an open source Pan-CJK typeface"; -} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/traditional-chinese.nix b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix deleted file mode 100644 index b25db8a2515..00000000000 --- a/pkgs/data/fonts/source-han-sans/traditional-chinese.nix +++ /dev/null @@ -1,6 +0,0 @@ -import ./base.nix { - prefix = "source-han-sans-traditional-chinese"; - url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansTWHK-1.000.zip"; - sha256 = "2371a726757a51322243b1ed7a9fde562621b0813b5e6d6443e06847ad7bbd20"; - description = "Traditional Chinese subset of an open source Pan-CJK typeface"; -} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3804668fc99..32b1d77a7e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9183,10 +9183,11 @@ let source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; - source-han-sans-japanese = callPackage ../data/fonts/source-han-sans/japanese.nix {}; - source-han-sans-korean = callPackage ../data/fonts/source-han-sans/korean.nix {}; - source-han-sans-simplified-chinese = callPackage ../data/fonts/source-han-sans/simplified-chinese.nix {}; - source-han-sans-traditional-chinese = callPackage ../data/fonts/source-han-sans/traditional-chinese.nix {}; + sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { }; + source-han-sans-japanese = sourceHanSansPackages.japanese; + source-han-sans-korean = sourceHanSansPackages.korean; + source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese; + source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { };