From fccbb2a9e6bf059f67953f557d7a777b2e510511 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 14 Jul 2018 15:51:42 +0200 Subject: [PATCH] =?UTF-8?q?gucharmap:=2010.0.0=20=E2=86=92=2011.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/core/gucharmap/default.nix | 52 ++++++++++++------- .../gnome-3/core/gucharmap/unicode-data.nix | 29 ++++++----- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 45a4a97205b..1562c42b374 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,41 +1,55 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, defaultIconTheme -, glib, desktop-file-utils, bash, appdata-tools +{ stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme +, glib, desktop-file-utils, bash, appdata-tools, gtk-doc, autoconf, automake, libtool , wrapGAppsHook, gnome3, itstool, libxml2 , callPackage, unzip, gobjectIntrospection }: -stdenv.mkDerivation rec { +let + unicode-data = callPackage ./unicode-data.nix {}; +in stdenv.mkDerivation rec { name = "gucharmap-${version}"; - version = "10.0.4"; + version = "11.0.1"; - src = fetchurl { - url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gucharmap"; + rev = version; + sha256 = "13iw4fa6mv8vi8bkwk0bbhamnzbaih0c93p4rh07khq6mxa6hnpi"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gucharmap"; }; - }; - - doCheck = true; - - preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; - nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools + autoconf automake libtool gtk-doc gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ]; - unicode-data = callPackage ./unicode-data.nix {}; + configureFlags = [ + "--with-unicode-data=${unicode-data}" + ]; - configureFlags = "--with-unicode-data=${unicode-data}"; + doCheck = true; + + postPatch = '' + patchShebangs gucharmap/gen-guch-unicode-tables.pl + ''; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gucharmap"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gucharmap; description = "GNOME Character Map, based on the Unicode Character Database"; - maintainers = gnome3.maintainers; + homepage = https://wiki.gnome.org/Apps/Gucharmap; license = licenses.gpl3; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix index 72299b8a369..6bf2fd39a2d 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -1,30 +1,31 @@ { fetchurl, stdenv, gnome3 }: -stdenv.mkDerivation { - name = "unicode-data-10.0.0"; +stdenv.mkDerivation rec { + name = "unicode-data-${version}"; + version = "11.0.0"; srcs = [ (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/Blocks.txt"; - sha256 = "19zf2kd198mcv1paa194c1zf36hay1irbxssi35yi2pd8ad69qas"; + url = "http://www.unicode.org/Public/${version}/ucd/Blocks.txt"; + sha256 = "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/DerivedAge.txt"; - sha256 = "1h9p1g0wnh686l6cqar7cmky465vwc6vjzzn1s7v0i9zcjaqkr4h"; + url = "http://www.unicode.org/Public/${version}/ucd/DerivedAge.txt"; + sha256 = "0rlqqd0b1sqbzvrj29dwdizx8lyvrbfirsnn8za9lb53x5fml4gb"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/NamesList.txt"; - sha256 = "0gvpcyq852rnlqmx4y5i1by7bavvcw6rj40i54w48yc7xr3zmgd1"; + url = "http://www.unicode.org/Public/${version}/ucd/NamesList.txt"; + sha256 = "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/Scripts.txt"; - sha256 = "0b9prz2hs6w61afqaplcxnv115f8yk4d5hn9dc5hks8nqpj28bnh"; + url = "http://www.unicode.org/Public/${version}/ucd/Scripts.txt"; + sha256 = "1mbnvf97nwa3pvyzx9nd2wa94f8s0npg9740kic2p2ag7jmc1wz9"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt"; - sha256 = "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj"; + url = "http://www.unicode.org/Public/${version}/ucd/UnicodeData.txt"; + sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/Unihan.zip"; - sha256 = "199kz6laypkvc0ykms6d7bkb571jmpds39sv2p7kd5jjm1ij08q1"; + url = "http://www.unicode.org/Public/${version}/ucd/Unihan.zip"; + sha256 = "0cy8gxb17ksi5h4ysypk4c09z61am1svjrvg97hm5m5ccjfrs1vj"; }) ]; phases = "installPhase";