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

Merge branch 'staging' into closure-size

Browse Source
This commit is contained in:
Vladimír Čunát
2016-01-19 09:55:31 +01:00
parent f8472457a4 53b389327e
commit 716aac2519
1293 changed files with 75245 additions and 28520 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/documentation/man-pages/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
let version = "4.03"; in
let version = "4.04"; in
stdenv.mkDerivation rec {
name = "man-pages-${version}";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "177w71rwsw3lsh9pjqy625s5iwz1ahdaj7prys1bpc4bqi78q5mh";
sha256 = "0v8zxq4scfixy3pjpw9ankvv5v8frv62khv4xm1jpkswyq6rbqcg";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
pkgs/data/documentation/zeal/default.nix
+4 -4
View File
@@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase
, qtimageformats, qtwebkit, xorg }:
, qtimageformats, qtwebkit, qtx11extras, xorg }:
stdenv.mkDerivation rec {
version = "0.1.1";
version = "0.2.1";
name = "zeal-${version}";
src = fetchFromGitHub {
owner = "zealdocs";
repo = "zeal";
rev = "v${version}";
sha256 = "172wf50fq1l5p8hq1irvpwr7ljxkjaby71afrm82jz3ixl6dg2ii";
sha256 = "1j1nfvkwkb2xdh289q5gdb526miwwqmqjyd6fz9qm5dg467wmwa3";
};
buildInputs = [
xorg.xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit libarchive
xorg.xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive
];
configurePhase = ''
pkgs/data/fonts/cantarell-fonts/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "cantarell-fonts-0.0.16";
name = "cantarell-fonts-0.0.17";
src = fetchurl {
url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.16.tar.xz;
sha256 = "071g2l89gdjgqhapw9dbm1ch6hnzydhf7b38pi86fm91adaqggqm";
url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.17.tar.xz;
sha256 = "0kx05fw1i11zcqx5yv9y9iprpl49k51sibz86bc58a50n1w6gcwn";
};
meta = {
pkgs/data/fonts/fira-code/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "fira-code-${version}";
version = "1.101";
version = "1.102";
src = fetchurl {
url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip";
sha256 = "0wbjk4cyibyjp7kjvwnm7as1ch312zwjbi469v26sl41svf53s5v";
sha256 = "0vcrzf7dmcy3n2ic05ihadmfgzmmmp0vz8grnqaxfi3y1jpw8ggy";
};
buildInputs = [ unzip ];
pkgs/data/fonts/hack/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip }:
let version = "2.018"; in
let version = "2.019"; in
stdenv.mkDerivation {
name = "hack-font-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
version_ = with stdenv.lib;
concatStringsSep "_" (splitString "." version);
in fetchurl {
sha256 = "0k1k6pi9znrdc8a4kv0gkdnyzi2w932m2zi27dvb1ignn7lzmfkx";
sha256 = "0fhrl7y5z3d5fkiycbsi621f8nzfnpz8khxpd6hkc1hrg7nzmrk4";
url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
};
pkgs/data/fonts/powerline-fonts/default.nix
+9
View File
@@ -19,6 +19,15 @@ stdenv.mkDerivation {
mkdir -p $out/share/fonts/truetype
cp -v */*.ttf $out/share/fonts/truetype
mkdir -p $out/share/fonts/bdf
cp -v */BDF/*.bdf $out/share/fonts/bdf
mkdir -p $out/share/fonts/pcf
cp -v */PCF/*.pcf.gz $out/share/fonts/pcf
mkdir -p $out/share/fonts/psf
cp -v */PSF/*.psf.gz $out/share/fonts/psf
'';
meta = with stdenv.lib; {
pkgs/data/fonts/source-code-pro/default.nix
+7 -5
View File
@@ -1,13 +1,15 @@
{ stdenv, fetchurl }:
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "source-code-pro-${version}";
version = "2.010";
version_italic = "1.030";
src = fetchurl {
url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R-ro/${version_italic}R-it.tar.gz";
sha256="1y44p2i7hd1klq81xbh796y7n4rzjvn37jrqw0nz31k59v8a1r9y";
src = fetchFromGitHub {
owner = "adobe-fonts";
repo = "source-code-pro";
rev = "2.010R-ro/1.030R-it";
name = "2.010R-ro-1.030R-it";
sha256 = "0f40g23lfcajpd5m9r1z7v8x011dsfs6ba7fihjal6yzaf5hb6mh";
};
phases = "unpackPhase installPhase";
pkgs/data/misc/geolite-legacy/default.nix
+7 -7
View File
@@ -8,29 +8,29 @@ 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-11-23";
version = "2016-01-11";
in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
"18nwbxy6l153zhd7fi4zdyibnmpcb197p3jlb9cjci852asd465l";
"07h1ha7z9i877ph41fw4blcfb11ynv8k9snrrsgsjrvv2yqvsc37";
srcGeoIPv6 = fetchDB
"GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
"0dm8qvsx8vpwdv9y4z70jiws9bwmw10vdn5sc8jdms53p4rgr4n4";
"14wsc0w8ir5q1lq6d9bpr03qvrbi2i0g04gkfcwbnh63yqxc31m9";
srcGeoLiteCity = fetchDB
"GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
"1bq9kg6fsdsjssd3i6phq26n1px9jmljnq60gfsh8yb9s18hymfq";
"1nra64shc3bp1d6vk9rdv7wyd8jmkgsybqgr3imdg7fv837kwvnh";
srcGeoLiteCityv6 = fetchDB
"GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
"0anx3kppql6wzkpmkf7k1322g4ragb5hh96apl71n2lmwb33i148";
"1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"0zlc5gb0qy9am2xzpfv41i9wdydasrscmjwy1drccfsspqwrjvs7";
"06lhgkycyxisnvcrcdqcxlbhawyqw302yv1p3836bm0fjhyr7v4r";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
"0p9lwngvrk88an3kqx3v2b3kcs0l51mbrr7lwxg3ckkjyl9si1k3";
"1scn63zd8di5jzxx4nfic4ggfy4jas9l56h0mcyvgypzlyvxgz43";
meta = with stdenv.lib; {
inherit version;
pkgs/data/misc/wireless-regdb/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
inherit version;
description = "Wireless regulatory database for CRDA";
homepage = https://git.kernel.org/cgit/linux/kernel/git/sforshee/wireless-regdb.git/;
homepage = http://wireless.kernel.org/en/developers/Regulatory/;
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ nckx ];