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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-08-13 11:55:02 -07:00
parent 257db17ee9 bc9bd5c02c
commit 952def0e3c
146 changed files with 14613 additions and 9539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/data/documentation/man-pages/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
let version = "4.01"; in
let version = "4.02"; in
stdenv.mkDerivation rec {
name = "man-pages-${version}";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "116jp2rnsdlnb3cwnbfp0g053frcmchndwyrj714swl1lgabb56i";
sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8";
};
makeFlags = "MANDIR=$(out)/share/man";

8
pkgs/data/fonts/fira-mono/default.nix
View File

@@ -1,16 +1,16 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "fira-mono-3.204";
name = "fira-mono-3.205";
src = fetchurl {
url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3204.zip;
sha256 = "0pnsw7b1i5vkwq0kny4lxzly4h8rlwkj610rykhax6zayfbnz62a";
url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3205.zip;
sha256 = "0zd4wy8ksbz0qiiqgl9w7zyh34q8n983dyb44g5dfdcjakj09qlz";
};
buildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" ];
sourceRoot = "FiraMonoFonts3204";
sourceRoot = "FiraMonoFonts3205";
installPhase = ''
mkdir -p $out/share/fonts/opentype

8
pkgs/data/fonts/fira/default.nix
View File

@@ -1,16 +1,16 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "fira-4.104";
name = "fira-4.105";
src = fetchurl {
url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4104.zip;
sha256 = "1i8l0x2wdx4pw7j52lgy8qcx0wqj0azwjiq0wa9kg26x78bdfk2d";
url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4105.zip;
sha256 = "1857kpn7p7fc1xsmqx9589hk396ggwzd167yc3dmn1mh5dixibfz";
};
buildInputs = [unzip];
phases = [ "unpackPhase" "installPhase" ];
sourceRoot = "FiraFonts4104";
sourceRoot = "FiraFonts4105";
installPhase = ''
mkdir -p $out/share/fonts/opentype

2
pkgs/data/fonts/pecita/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://pecita.eu/b/Pecita.otf";
sha256 = "11v5yzxa38fxpz8j3fc0v3l7py4i12avjnwrgkmd9clq9jhzk78s";
sha256 = "0agml1886jvb0j6jar8hjx4hfbz3n0msszyp625b96ilv09qrcyz";
};
phases = ["installPhase"];

6
pkgs/data/misc/geolite-legacy/default.nix
View File

@@ -8,7 +8,7 @@ let
# 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-08-05";
version = "2015-08-11";
in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
"1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"04qlh6zr8m5qxl2gcysb721bqlnqrxhngh128zj1w8rhqckjndgj";
"1h4wpqs16a1w16znbr2h15b16p5y43vp6qhj0bc7krq5qa484y2k";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
"06p9wnypnffsmqg5bszwygb73in4gc0h5l26wk0s43pdaldrdrx0";
"09qiy2grxnakapvz5xjw3ivbxc0id6srqyd46p68mcy7gwrggcv7";
meta = with stdenv.lib; {
inherit version;