diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:07:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:09:03 +0200 |
| commit | 6b27ceb006ace21f9157034ac743242a0147eeec (patch) | |
| tree | de8c80579090028b8a918796fd7a8eda3c4cecf0 /pkgs/data | |
| parent | 14c038dd0390a9b24969f0138356b5c7520b9fdf (diff) | |
| parent | b3bcb59bd5fddc3c0f74bbe120de561bbea29878 (diff) | |
| download | nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.gz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.bz2 nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.lz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.xz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.zst nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.zip | |
Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e34.
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/emojione/default.nix | 35 | ||||
| -rw-r--r-- | pkgs/data/misc/geolite-legacy/default.nix | 6 |
2 files changed, 38 insertions, 3 deletions
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix new file mode 100644 index 000000000000..3e74ca9270a5 --- /dev/null +++ b/pkgs/data/fonts/emojione/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: + +stdenv.mkDerivation rec { + name = "emojione-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "eosrei"; + repo = "emojione-color-font"; + rev = "v${version}"; + sha256 = "001c2bph4jcdg9arfmyxrscf1i09gvg44kqy28chjmhxzq99hpcg"; + }; + + preBuild = '' + sed -i 's,SCFBUILD :=.*,SCFBUILD := scfbuild,' Makefile + # Shut up inkscape's warnings + export HOME="$NIX_BUILD_ROOT" + ''; + + nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; + + enableParallelBuilding = true; + + installPhase = '' + install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf + ''; + + meta = with stdenv.lib; { + description = "Open source emoji set"; + homepage = "http://emojione.com/"; + licenses = licenses.cc-by-40; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 724a88ce8e46..ae085a145f21 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2016-06-13"; + version = "2016-06-20"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { "0dq5rh08xgwsrmkniww001b2dpd1d7db4sd385p70hkbbry496l3"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "156mkrizbnjs90lg2gqdlx1zzvpn81c83jiyprv12638zfgvqc7z"; + "1q49v1bxmlbd3y0rfimlcbw6jfp8jbh4hyvy3vdaf0lf82nhfs88"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "1wd838achh7wayl6bxmj0yywp5m2zbqk4xghng4mwmmnda6pa0f5"; + "0xqhvf2yyi2fq0bjch9fys22hqakhdhzrhsq9m4d2spmd2pjrp0x"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; |