From ba600f39d85dd606ef32b1ddf41529db252b6cba Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Fri, 19 Jun 2020 12:30:58 +0200 Subject: [PATCH] unicode: 2.6 -> 2.7 upstream: - add East Asian width - hack to consider regular expressions ending with `$' - do not flush stdout - better upper/lowercase from internal python db packaging: - include manual page - update to unicode-13 --- pkgs/tools/misc/unicode/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index c4ae9cc5e36d..b83dd17d0bc1 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchurl, python3Packages }: +{ stdenv, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "unicode"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "garabik"; repo = "unicode"; rev = "v${version}"; - sha256 = "17hh4nwl5njsh7lnff583j2axn6rfvfbiqwp72n7vcsgkiszw4kg"; + sha256 = "15d9yvarxsiy0whx1mxzsjnnkrjdm3ga4qv2yy398mk0jh763q9v"; }; ucdtxt = fetchurl { - url = "http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt"; - sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; + url = "https://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt"; + sha256 = "1fz8fcd23lxyl97ay8h42zvkcgcg8l81b2dm05nklkddr2zzpgxx"; }; + nativeBuildInputs = [ installShellFiles ]; + postFixup = '' substituteInPlace "$out/bin/.unicode-wrapped" \ --replace "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" ''; + postInstall = '' + installManPage paracode.1 unicode.1 + ''; + meta = with stdenv.lib; { description = "Display unicode character properties"; homepage = "https://github.com/garabik/unicode";