From 05ce88e6dd1a4fdc52851a2b2038a72d5a45efc2 Mon Sep 17 00:00:00 2001 From: Eshin Kunishima Date: Tue, 21 Nov 2017 19:45:08 +0900 Subject: [PATCH 1/2] migmix: init at 20150712 --- lib/maintainers.nix | 1 + pkgs/data/fonts/migmix/default.nix | 40 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/data/fonts/migmix/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f050904896fc..0aed862af522 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -414,6 +414,7 @@ michelk = "Michel Kuhlmann "; midchildan = "midchildan "; mikefaille = "Michaƫl Faille "; + mikoim = "Eshin Kunishima "; miltador = "Vasiliy Solovey "; mimadrid = "Miguel Madrid "; mirdhyn = "Merlin Gaillard "; diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix new file mode 100644 index 000000000000..7a1511f87065 --- /dev/null +++ b/pkgs/data/fonts/migmix/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "migmix-${version}"; + version = "20150712"; + + srcs = [ + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1p-${version}.zip"; + sha256 = "0wp44axcalaak04nj3dgpx0vk13nqa3ihx2vjv4acsgv83x8ciph"; + }) + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2p-${version}.zip"; + sha256 = "0y7s3rbxrp5bv56qgihk8b847lqgibfhn2wlkzx7z655fbzdgxw9"; + }) + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1m-${version}.zip"; + sha256 = "1sfym0chy8ilyd9sr3mjc0bf63vc33p05ynpdc11miivxn4qsshx"; + }) + (fetchzip { + url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2m-${version}.zip"; + sha256 = "0hg04rvm39fh4my4akmv4rhfc14s3ipz2aw718h505k9hppkhkch"; + }) + ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype/migmix + find ${toString srcs} -name '*.ttf' | xargs -I % cp % $out/share/fonts/truetype/migmix + ''; + + meta = with stdenv.lib; { + description = "A high-quality Japanese font based on M+ fonts and IPA fonts"; + homepage = http://mix-mplus-ipa.osdn.jp/migmix; + license = stdenv.lib.licenses.ipa; + platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.mikoim ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e9c3e9bec9a..cd309f4c1bf6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13471,6 +13471,8 @@ with pkgs; meslo-lg = callPackage ../data/fonts/meslo-lg {}; + migmix = callPackage ../data/fonts/migmix {}; + miscfiles = callPackage ../data/misc/miscfiles { }; media-player-info = callPackage ../data/misc/media-player-info {}; From 759c815c22207687a5072156946a1e2e4d716f47 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 21 Nov 2017 18:01:48 +0000 Subject: [PATCH 2/2] migmix: make it a fixed-output derivation Then we do not need to rebuild it for every platform and on mass-rebuilds. Also it speedup evaluation. --- pkgs/data/fonts/migmix/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 7a1511f87065..14b08e140ea8 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -23,18 +23,22 @@ stdenv.mkDerivation rec { }) ]; - phases = [ "installPhase" ]; + unpackPhase = ":"; installPhase = '' mkdir -p $out/share/fonts/truetype/migmix - find ${toString srcs} -name '*.ttf' | xargs -I % cp % $out/share/fonts/truetype/migmix + find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migmix ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1fhh8wg6lxwrnsg9rl4ihffl0bsp1wqa5gps9fx60kr6j9wpvmbg"; + meta = with stdenv.lib; { description = "A high-quality Japanese font based on M+ fonts and IPA fonts"; homepage = http://mix-mplus-ipa.osdn.jp/migmix; - license = stdenv.lib.licenses.ipa; - platforms = stdenv.lib.platforms.unix; + license = licenses.ipa; + platforms = platforms.unix; maintainers = [ maintainers.mikoim ]; }; }