diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
commit | 30f31c9afcc34336d1d47c62ad4ed39d2dee402a (patch) | |
tree | e3549d198c833f11e5f6062e10a3fefb9d25a670 /pkgs/data | |
parent | c1cc2348e4d49ab742e964593a7f74cc53c7f9b7 (diff) | |
parent | 2cb3dc68120701406ac48d7a4da5ff097b092f85 (diff) |
Merge 'master' into staging
(relatively simple conflicts)
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/documentation/man-pages/default.nix | 14 | ||||
-rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/fira-mono/default.nix | 33 | ||||
-rw-r--r-- | pkgs/data/fonts/fira/default.nix | 16 | ||||
-rw-r--r-- | pkgs/data/fonts/powerline-fonts/default.nix | 34 | ||||
-rw-r--r-- | pkgs/data/misc/geolite-legacy/default.nix | 49 | ||||
-rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 6 |
7 files changed, 107 insertions, 47 deletions
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index f339be3954b87..5c93ecc94690a 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl }: +let version = "3.83"; in stdenv.mkDerivation rec { - name = "man-pages-3.78"; + name = "man-pages-${version}"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "0zm3sc0zbfng440jjqha8qnzivvg5nqpwgi7zv9h8qxwgyhrfa65"; + sha256 = "1wksxxfvn8avfl01qk0i61zzgkkay29lpmbfal26a542yahydz3j"; }; - preBuild = - '' - makeFlagsArray=(MANDIR=$out/share/man) - ''; + makeFlags = "MANDIR=$(out)/share/man"; - meta = { + meta = with stdenv.lib; { + inherit version; description = "Linux development manual pages"; homepage = http://www.kernel.org/doc/man-pages/; repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index adcb4fa42e960..c2bec7707c29c 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { app), available for Linux and Windows. ''; homepage = "http://zealdocs.org/"; - licenses = with stdenv.lib.licenses; [ gpl3 ]; + license = with stdenv.lib.licenses; [ gpl3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix new file mode 100644 index 0000000000000..92d6b1e25b5cf --- /dev/null +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "fira-mono-3.2"; + + src = fetchurl { + url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3200.zip; + sha256 = "0g3i54q8czf3vylgasj62w2n7l1a2yrbyibjlx1qk3awh7fr1r7p"; + }; + + buildInputs = [ unzip ]; + phases = [ "unpackPhase" "installPhase" ]; + sourceRoot = "FiraMonoFonts3200"; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + ''; + + meta = with stdenv.lib; { + homepage = http://www.carrois.com/fira-4-1/; + description = "Monospace font for Firefox OS"; + longDescription = '' + Fira Mono is a monospace font designed by Erik Spiekermann, + Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois + Type Design for Mozilla Firefox OS. Available in Regular, + Medium, and Bold. + ''; + license = licenses.ofl; + maintainers = [ maintainers.rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 532abd4e58714..151c945ee9e6f 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-4.004"; + name = "fira-4.1"; src = fetchurl { - url = "http://www.carrois.com/downloads/fira_4_0/FiraFonts4004.zip"; - sha256 = "0mab1n4i8ayhzmpfm0dj07annghrfpnsfr2rhnwsyhkk5zxlh6v7"; + url = "http://www.carrois.com/downloads/fira_4_1/FiraFonts4100.zip"; + sha256 = "0mqmmq1m2p0hb0x4mr74gghqr75iglilah7psfb3vdc80fc9h6yk"; }; buildInputs = [unzip]; phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraFonts4004"; + sourceRoot = "FiraFonts4100"; installPhase = '' mkdir -p $out/share/fonts/opentype @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.carrois.com/fira-4-0/; - description = "Sans-serif and monospace font for Firefox OS"; + homepage = http://www.carrois.com/fira-4-1/; + description = "Sans-serif font for Firefox OS"; longDescription = '' Fira Sans is a sans-serif font designed by Erik Spiekermann, Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois @@ -27,9 +27,7 @@ stdenv.mkDerivation rec { Spiekermann's FF Meta typeface. Available in Two, Four, Eight, Hair, Thin, Ultra Light, Extra Light, Light, Book, Regular, Medium, Semi Bold, Bold, Extra Bold, Heavy weights with - corresponding italic versions. Fira Mono is a matching - monospace variant of Fira Sans. It is available in regular, and - bold weights. + corresponding italic versions. ''; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix new file mode 100644 index 0000000000000..0d3d9c104d46a --- /dev/null +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "powerline-fonts-2014-12-27"; + + src = fetchFromGitHub { + owner = "powerline"; + repo = "fonts"; + rev = "39c99c02652f25290b64e24a7e9a7cfb8ce89a3e"; + sha256 = "9c83a30f36dc980582c0a079bd2896f95d19e1cb0ba5afbd8cae936c944256dd"; + }; + + buildPhase = "true"; + + installPhase = + '' + mkdir -p $out/share/fonts/opentype + cp -v */*.otf $out/share/fonts/opentype + + mkdir -p $out/share/fonts/truetype + cp -v */*.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/powerline/fonts; + description = "Patched fonts for Powerline users."; + longDescription = '' + Pre-patched and adjusted fonts for usage with the Powerline plugin. + ''; + license = "asl20 free ofl"; + platforms = platforms.all; + maintainer = with maintainers; [ malyn ]; + }; +} diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index c36e6f83106fa..cf8e7ab47aea4 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -1,35 +1,30 @@ { stdenv, fetchurl }: -# Annoyingly, these files are updated without a change in URL. This means that -# builds will start failing every month or so, until the hashes are updated. -let version = "2015-03-26"; in +let + fetchDB = name: sha256: fetchurl { + inherit sha256; + url = "https://geolite.maxmind.com/download/geoip/database/${name}.dat.gz"; + }; + + # Annoyingly, these files are updated without a change in URL. This means that + # builds will start failing every month or so, until the hashes are updated. + version = "2015-04-21"; +in stdenv.mkDerivation { name = "geolite-legacy-${version}"; - srcGeoIP = fetchurl { - url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz; - sha256 = "01xw896n9wcm1pv7sixfbh4gv6isl6m1i6lwag1c2bbcx6ci1zvr"; - }; - srcGeoIPv6 = fetchurl { - url = https://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz; - sha256 = "07l10hd7fkgk1nbw5gx4hjp61kdqqgri97fidn78dlk837rb02d0"; - }; - srcGeoLiteCity = fetchurl { - url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz; - sha256 = "1xqjyz9xnga3dvhj0f38hf78wv781jflvqkxm6qni3sj781nfr4a"; - }; - srcGeoLiteCityv6 = fetchurl { - url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz; - sha256 = "03s41ffc5a13qy5kgx8jqya97jkw2qlvdkak98hab7xs0i17z9pd"; - }; - srcGeoIPASNum = fetchurl { - url = https://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz; - sha256 = "1h766l8dsfgzlrz0q76877xksaf5qf91nwnkqwb6zl1gkczbwy6p"; - }; - srcGeoIPASNumv6 = fetchurl { - url = https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz; - sha256 = "0dwi9b3amfpmpkknf9ipz2r8aq05gn1j2zlvanwwah3ib5cgva9d"; - }; + srcGeoIP = fetchDB "GeoLiteCountry/GeoIP" + "15c7j6yyjl0k42ij7smdz2j451y3hhfbmxwkx8kp5ja0afrlw41k"; + srcGeoIPv6 = fetchDB "GeoIPv6" + "0kz6yjprzqr2pi4rczbmw7489gdjzf957azahdqjai8fx0s5w93i"; + srcGeoLiteCity = fetchDB "GeoLiteCity" + "0lc696axcdgz7xrh9p6ac5aa7nlxfgngwyabjwqiwazz3wcmw05a"; + srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6" + "1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv"; + srcGeoIPASNum = fetchDB "asnum/GeoIPASNum" + "0r4v2zs4alxb46kz679hw4w34s7n9pxw32wcfs5x4nhnq051y6ms"; + srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6" + "04ciwh5gaxja4lzlsgbg1p7rkrhnn637m4nj9ld8sb36bl2ph6gc"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 1953152fdd805..57417022176da 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2015a"; in +let version = "2015c"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "0k4fy5x1813az0dwh82v5dhnvivfxxjin2szkgyfga00gn8r0965"; + sha256 = "0nin48g5dmkfgckp25bngxchn3sw3yyjss5sq7gs5xspbxgsq3w6"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "06fxf9yw39wcpqifxf3lr8cn64nlwznqcyhd0cs2z1c6y88snnw8"; + sha256 = "0bplibiy70dvlrhwqzkzxgmg81j6d2kklvjgi2f1g2zz1nkb3vkz"; }) ]; |