From 59f88b478f676f4f67a1269926256c38d508a2f7 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Mon, 13 Aug 2018 16:15:47 -0400 Subject: [PATCH 1/2] maintainers: add @illegalprime --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2ca02c20c5c..49df1b8f488 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1679,6 +1679,11 @@ github = "ikervagyok"; name = "Balázs Lengyel"; }; + illegalprime = { + email = "themichaeleden@gmail.com"; + github = "illegalprime"; + name = "Michael Eden"; + }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; github = "ilya-kolpakov"; From eca17c4a7f363469562fdc1f5c903bd87cab6c7c Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Mon, 13 Aug 2018 16:23:19 -0400 Subject: [PATCH 2/2] libphonenumber: init at 8.9.9 --- .../libraries/libphonenumber/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/libphonenumber/default.nix diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix new file mode 100644 index 00000000000..4cb327ff527 --- /dev/null +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkgconfig, protobuf, icu }: + +let + version = "8.9.9"; +in +stdenv.mkDerivation { + name = "phonenumber-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "googlei18n"; + repo = "libphonenumber"; + rev = "v${version}"; + sha256 = "005visnfnr84blgdi0yp4hrzskwbsnawrzv6lqfi9f073l6w5j6w"; + }; + + nativeBuildInputs = [ + cmake + gmock + pkgconfig + ]; + + buildInputs = [ + boost + protobuf + icu + ]; + + cmakeDir = "../cpp"; + + checkPhase = "./libphonenumber_test"; + + meta = with stdenv.lib; { + description = "Google's i18n library for parsing and using phone numbers"; + license = licenses.asl20; + maintainers = with maintainers; [ illegalprime ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8358d28bcf2..41720196913 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10672,6 +10672,8 @@ with pkgs; libpgf = callPackage ../development/libraries/libpgf { }; + libphonenumber = callPackage ../development/libraries/libphonenumber { }; + libpng = callPackage ../development/libraries/libpng { }; libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { };