Merge branch 'master' into staging-next

This commit is contained in:
Jonathan Ringer
2019-11-27 22:57:50 -08:00
207 changed files with 4017 additions and 3629 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
version = "2.3.2";
version = "2.3.3";
in fetchzip {
name = "iosevka-bin-${version}";
@@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
'';
sha256 = "1dkfh354scjgzq7kgy4cn70z030wmfgxixqp8p9m6i0ps8gccjgs";
sha256 = "1dfm1888rii5kfmkxp5hnx8ycji57cbs5gazpgkxg1mnmn7i35wl";
meta = with stdenv.lib; {
homepage = https://be5invis.github.io/Iosevka/;
+3 -3
View File
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "3.0.3";
version = "3.0.4";
in fetchzip rec {
name = "overpass-${version}";
@@ -12,10 +12,10 @@ in fetchzip rec {
mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name}
'';
sha256 = "1m6p7rrlyqikjvypp4698sn0lp3a4z0z5al4swblfhg8qaxzv5pg";
sha256 = "13b4yam0nycclccxidzj2fa3nwms5qji7gfkixdnl4ybf0f56b64";
meta = with lib; {
homepage = http://overpassfont.org/;
homepage = "https://overpassfont.org/";
description = "Font heavily inspired by Highway Gothic";
license = licenses.ofl;
platforms = platforms.all;
+28
View File
@@ -0,0 +1,28 @@
{ lib, fetchFromGitHub }:
let
pname = "RhodiumLibre";
version = "1.2.0";
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "DunwichType";
repo = pname;
rev = version;
postFetch = ''
tar xf $downloadedFile --strip=1
install -Dm444 -t $out/share/fonts/opentype/ RhodiumLibre-Regular.otf
install -Dm444 -t $out/share/fonts/truetype/ RhodiumLibre-Regular.ttf
'';
sha256 = "04ax6bri5vsji465806p8d7zbdf12r5bpvcm9nb8isfqm81ggj0r";
meta = with lib; {
description = "F/OSS/Libre font for Latin and Devanagari";
homepage = "https://github.com/DunwichType/RhodiumLibre";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.marsam ];
};
}
@@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub , gtk3 }:
stdenv.mkDerivation rec {
pname = "flat-remix-icon-theme";
version = "20191018";
src = fetchFromGitHub {
owner = "daniruiz";
repo = "flat-remix";
rev = version;
sha256 = "13ibxvrvri04lb5phm49b6d553jh0aigm57z5i0nsins405gixn9";
};
nativeBuildInputs = [ gtk3 ];
installPhase = ''
mkdir -p $out/share/icons
mv Flat-Remix* $out/share/icons/
'';
postFixup = ''
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
'';
meta = with stdenv.lib; {
description = "Flat remix is a pretty simple icon theme inspired on material design";
homepage = https://drasite.com/flat-remix;
license = with licenses; [ gpl3 ];
platforms = platforms.linux;
maintainers = with maintainers; [ mschneider ];
};
}