Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1512490
This commit is contained in:
Vladimír Čunát
2019-04-02 20:56:53 +02:00
677 changed files with 14350 additions and 6998 deletions
+3 -3
View File
@@ -1,14 +1,14 @@
{ stdenv, fetchzip, lib }:
let
version = "1.003";
version = "1.008";
pname = "b612";
in
fetchzip rec {
name = "${pname}-font-${version}";
url = "http://git.polarsys.org/c/${pname}/${pname}.git/snapshot/${pname}-bd14fde2544566e620eab106eb8d6f2b7fb1347e.zip";
sha256 = "07gadk9b975k69pgw9gj54qx8d5xvxphid7wrmv4cna52jyy4464";
url = "https://github.com/polarsys/b612/archive/${version}.zip";
sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq";
postFetch = ''
mkdir -p $out/share/fonts/truetype/${pname}
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}
+26
View File
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "behdad-fonts";
version = "0.0.3";
src = fetchFromGitHub {
owner = "font-store";
repo = "BehdadFont";
rev = "v${version}";
sha256 = "0rlmyv82qmyy90zvkjnlva44ia7dyhiyk7axbq526v7zip3g79w0";
};
installPhase = ''
mkdir -p $out/share/fonts/behdad-fonts
cp -v $( find . -name '*.ttf') $out/share/fonts/behdad-fonts
'';
meta = with stdenv.lib; {
homepage = https://github.com/font-store/BehdadFont;
description = "A Persian/Arabic Open Source Font";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.linarcx ];
};
}
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
version = "5.7.2";
version = "5.8.1";
in fetchzip rec {
name = "font-awesome-${version}";
@@ -12,7 +12,7 @@ in fetchzip rec {
unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype
'';
sha256 = "0b3syzz8baxmwzjgz09dnamm4nzmyvb2yddlrm94ww5j9bjk25al";
sha256 = "1fc177sgf4qd231dmpr7cwr1j03wzb927ylpng2gn94iksln924d";
meta = with stdenv.lib; {
description = "Font Awesome - OTF font";
+26
View File
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "gandom-fonts";
version = "0.6";
src = fetchFromGitHub {
owner = "rastikerdar";
repo = "gandom-font";
rev = "v${version}";
sha256 = "1pdbqhvcsz6aq3qgarhfd05ip0wmh7bxqkmxrwa0kgxsly6zxz9x";
};
installPhase = ''
mkdir -p $out/share/fonts/gandom-fonts
cp -v $( find . -name '*.ttf') $out/share/fonts/gandom-fonts
'';
meta = with stdenv.lib; {
homepage = https://github.com/rastikerdar/gandom-font;
description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.linarcx ];
};
}
+39 -33
View File
@@ -1,49 +1,55 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale, bdf2psf }:
{ stdenv, fetchurl, fetchFromGitHub
, mkfontdir, mkfontscale, bdf2psf, bdftopcf
}:
stdenv.mkDerivation rec {
name = "gohufont-2.0";
name = "gohufont-${version}";
version = "2.1";
pcf = fetchurl {
url = "http://font.gohu.org/gohufont-2.0.tar.gz";
sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s";
src = fetchurl {
url = "http://font.gohu.org/${name}.tar.gz";
sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm";
};
bdf = fetchurl {
url = "http://font.gohu.org/gohufont-bdf-2.0.tar.gz";
sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr";
bdf = fetchFromGitHub {
owner = "hchargois";
repo = "gohufont";
rev = "cc36b8c9fed7141763e55dcee0a97abffcf08224";
sha256 = "1hmp11mrr01b29phw0xyj4h9b92qz19cf56ssf6c47c5j2c4xmbv";
};
nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf ];
nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf bdftopcf ];
unpackPhase = ''
mkdir pcf bdf
tar -xzf $pcf --strip-components=1 -C pcf
tar -xzf $bdf --strip-components=1 -C bdf
buildPhase = ''
# convert bdf to psf fonts
build=$(pwd)
mkdir psf
cd ${bdf2psf}/usr/share/bdf2psf
for i in $bdf/*.bdf; do
bdf2psf \
--fb "$i" standard.equivalents \
ascii.set+useful.set+linux.set 512 \
"$build/psf/$(basename $i .bdf).psf"
done
cd $build
# convert hidpi variant to pcf
for i in $bdf/hidpi/*.bdf; do
name=$(basename $i .bdf).pcf
bdftopcf -o "$name" "$i"
done
'';
installPhase = ''
# convert bdf to psf fonts
sourceRoot="$(pwd)"
mkdir psf
cd "${bdf2psf}/usr/share/bdf2psf"
for i in $sourceRoot/bdf/*.bdf; do
bdf2psf --fb $i standard.equivalents \
ascii.set+useful.set+linux.set 512 \
"$sourceRoot/psf/$(basename $i .bdf).psf"
done
cd "$sourceRoot"
# install the psf fonts (for the virtual console)
fontDir="$out/share/consolefonts"
mkdir -p "$fontDir"
mv psf/*.psf "$fontDir"
mv -t "$fontDir" psf/*.psf
# install the pcf fonts (for xorg applications)
fontDir="$out/share/fonts/misc"
mkdir -p "$fontDir"
mv pcf/*.pcf.gz "$fontDir"
mv -t "$fontDir" *.pcf.gz *.pcf
cd "$fontDir"
mkfontdir
@@ -52,15 +58,15 @@ stdenv.mkDerivation rec {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0msl5y9q6hjbhc85v121x1b1rhsh2rbqqy4k234i5mpp8l3087r7";
outputHash = "0kl7k8idl0fnsap2c4j02i33z017p2s4gi2cgspy6ica46fczcc1";
meta = with stdenv.lib; {
description = ''
A monospace bitmap font well suited for programming and terminal use
'';
homepage = http://font.gohu.org/;
license = licenses.wtfpl;
maintainers = with maintainers; [ epitrochoid ];
platforms = platforms.linux;
homepage = http://font.gohu.org/;
license = licenses.wtfpl;
maintainers = with maintainers; [ epitrochoid rnhmjoj ];
platforms = platforms.unix;
};
}
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
version = "3.3";
version = "3.4";
in fetchzip {
name = "inter-${version}";
@@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
sha256 = "17fv33ryvbla4f4mfgw7m7gjlwyjlni90a8gpb7jws1qzn0vgazg";
sha256 = "1dl4zc1a5dl9xkg094zmzy6bk7gms8vhsiln58ix7sffzcf3pri8";
meta = with stdenv.lib; {
homepage = https://rsms.me/inter/;
+23
View File
@@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "manrope";
version = "3";
src = fetchFromGitHub {
owner = "sharanda";
repo = pname;
rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9";
sha256 = "1k6nmczbl97b9j2a8vx6a1r3q4gd1c2qydv0y9gn8xyl7x8fcvhs";
};
dontBuild = true;
installPhase = ''
install -Dm644 -t $out/share/fonts/opentype "desktop font"/*
'';
meta = with stdenv.lib; {
description = "Open-source modern sans-serif font family";
homepage = https://github.com/sharanda/manrope;
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ dtzWill ];
};
}
+26
View File
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "nika-fonts";
version = "1.0.0";
src = fetchFromGitHub {
owner = "font-store";
repo = "NikaFont";
rev = "v${version}";
sha256 = "16dhk87vmjnywl5wqsl9dzp12ddpfk57w08f7811m3ijqadscdwc";
};
installPhase = ''
mkdir -p $out/share/fonts/nika-fonts
cp -v $( find . -name '*.ttf') $out/share/fonts/nika-fonts
'';
meta = with stdenv.lib; {
homepage = https://github.com/font-store/NikaFont/;
description = "Persian/Arabic Open Source Font";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.linarcx ];
};
}
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "parastoo-fonts";
version = "1.0.0-alpha5";
src = fetchFromGitHub {
owner = "rastikerdar";
repo = "parastoo-font";
rev = "v${version}";
sha256 = "1nya9cbbs6sgv2w3zyah3lb1kqylf922q3fazh4l7bi6zgm8q680";
};
installPhase = ''
mkdir -p $out/share/fonts/parastoo-fonts
cp -v $( find . -name '*.ttf') $out/share/fonts/parastoo-fonts
'';
meta = with stdenv.lib; {
homepage = https://github.com/rastikerdar/parastoo-font;
description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.linarcx ];
};
}
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ricty-${version}";
version = "4.1.0";
version = "4.1.1";
src = fetchurl {
url = "http://www.rs.tus.ac.jp/yyusa/ricty/ricty_generator-${version}.sh";
sha256 = "1cv0xh81fi6zdjb62zqjw46kbc89jvwbyllw1x1xbnpz2il6aavf";
sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6";
};
unpackPhase = ''
+26
View File
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "sahel-fonts";
version = "1.0.0-alpha22";
src = fetchFromGitHub {
owner = "rastikerdar";
repo = "sahel-font";
rev = "v${version}";
sha256 = "1kx7byzb5zxspq0i4cvgf4q7sm6xnhdnfyw9zrb1wfmdv3jzaz7p";
};
installPhase = ''
mkdir -p $out/share/fonts/sahel-fonts
cp -v $( find . -name '*.ttf') $out/share/fonts/sahel-fonts
'';
meta = with stdenv.lib; {
homepage = https://github.com/rastikerdar/sahel-font;
description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.linarcx ];
};
}
+26
View File
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "samim-fonts";
version = "3.1.0";
src = fetchFromGitHub {
owner = "rastikerdar";
repo = "samim-font";
rev = "v${version}";
sha256 = "1mp0pgbn9r098ilajwzag7c21shwb13mq61ly9av0mfbpnhkkjqk";
};
installPhase = ''
mkdir -p $out/share/fonts/samim-fonts
cp -v $( find . -name '*.ttf') $out/share/fonts/samim-fonts
'';
meta = with stdenv.lib; {
homepage = https://github.com/rastikerdar/samim-font;
description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.linarcx ];
};
}
+26
View File
@@ -0,0 +1,26 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
stdenv.mkDerivation rec {
pname = "spleen";
version = "1.0.4";
src = fetchurl {
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
sha256 = "1x62a5ygn3rpgzbaacz64rp8mn7saymdnxci4l3xasvsjjp60s3g";
};
buildPhase = "gzip -n9 *.pcf";
installPhase = ''
d="$out/share/fonts/X11/misc/spleen"
install -Dm644 *.pcf.gz -t $d
install -Dm644 *.bdf -t $d
install -m644 fonts.alias-spleen $d/fonts.alias
'';
meta = with stdenv.lib; {
description = "Monospaced bitmap fonts";
homepage = https://www.cambus.net/spleen-monospaced-bitmap-fonts;
license = licenses.bsd2;
maintainers = with maintainers; [ dtzWill ];
};
}
+27
View File
@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "vazir-fonts";
version = "19.2.0";
src = fetchFromGitHub {
owner = "rastikerdar";
repo = "vazir-font";
rev = "v${version}";
sha256 = "0p96y4q20nhpv7hxca6rncfcb14iqy2vacv0xl55wkwqkm4wvzgr";
};
installPhase = ''
mkdir -p $out/share/fonts/vazir-fonts
cp -v $( find . -name '*.ttf') $out/share/fonts/vazir-fonts
'';
meta = with stdenv.lib; {
homepage = https://github.com/rastikerdar/vazir-font;
description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.linarcx ];
};
}