public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
William A. Kennington III
2015-05-01 15:57:09 -07:00
parent 8591db4b10 cf0b6b7be8
commit 00df204c82
122 changed files with 2018 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/documentation/zeal/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
description = "Zeal is a simple offline API documentation browser";
description = "A simple offline API documentation browser";
longDescription = ''
Zeal is a simple offline API documentation browser inspired by Dash (OS X
app), available for Linux and Windows.
pkgs/data/fonts/powerline-fonts/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = https://github.com/powerline/fonts;
description = "Patched fonts for Powerline users.";
description = "Patched fonts for Powerline users";
longDescription = ''
Pre-patched and adjusted fonts for usage with the Powerline plugin.
'';
pkgs/data/misc/geolite-legacy/builder.sh
+2 -1
View File
@@ -16,4 +16,5 @@ for var in "${!src@}"; do
cp "$src" "$dest"
done
gunzip -v *.gz
gzip -dv *.gz
xz -dv *.xz
pkgs/data/misc/geolite-legacy/default.nix
+9 -8
View File
@@ -3,7 +3,7 @@
let
fetchDB = name: sha256: fetchurl {
inherit sha256;
url = "https://geolite.maxmind.com/download/geoip/database/${name}.dat.gz";
url = "https://geolite.maxmind.com/download/geoip/database/${name}";
};
# Annoyingly, these files are updated without a change in URL. This means that
@@ -13,20 +13,21 @@ in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
srcGeoIP = fetchDB "GeoLiteCountry/GeoIP"
srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
"15c7j6yyjl0k42ij7smdz2j451y3hhfbmxwkx8kp5ja0afrlw41k";
srcGeoIPv6 = fetchDB "GeoIPv6"
srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
"0kz6yjprzqr2pi4rczbmw7489gdjzf957azahdqjai8fx0s5w93i";
srcGeoLiteCity = fetchDB "GeoLiteCity"
"0lc696axcdgz7xrh9p6ac5aa7nlxfgngwyabjwqiwazz3wcmw05a";
srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6"
srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
"1z40kfjwn90fln7nfnk5pwcn1wl9imw5jz6bcdy8yr552m2n31y7";
srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
"1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv";
srcGeoIPASNum = fetchDB "asnum/GeoIPASNum"
srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
"0r4v2zs4alxb46kz679hw4w34s7n9pxw32wcfs5x4nhnq051y6ms";
srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6"
srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
"04ciwh5gaxja4lzlsgbg1p7rkrhnn637m4nj9ld8sb36bl2ph6gc";
meta = with stdenv.lib; {
inherit version;
description = "GeoLite Legacy IP geolocation databases";
homepage = https://geolite.maxmind.com/download/geoip;
license = with licenses; cc-by-sa-30;