Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-01-10 10:34:04 +01:00
141 changed files with 1935 additions and 876 deletions

View File

@@ -30,13 +30,13 @@ assert (privateBuildPlan != null) -> set != null;
stdenv.mkDerivation rec {
pname = if set != null then "iosevka-${set}" else "iosevka";
version = "2.3.2";
version = "2.3.3";
src = fetchFromGitHub {
owner = "be5invis";
repo = "Iosevka";
rev = "v${version}";
sha256 = "0s0vdvp1sn8p2pi2xm9n05pabk30ki7wjlmr0zz0nkhidb8apw6k";
sha256 = "0k7xij473g5g0lwhb6qpn70v3n2d025dww3nlb7jwbpnp03zliz0";
};
nativeBuildInputs = [

View File

@@ -1,6 +1,6 @@
{
"name": "iosevka-build-deps",
"version": "2.3.2",
"version": "2.3.3",
"scripts": {
"build": "verda -f verdafile.js"
},
@@ -15,12 +15,12 @@
"patrisika-scopes": "^0.11.1",
"primitive-quadify-off-curves": "^0.4.0",
"stylus": "^0.54.5",
"toml": "^2.3.2",
"toml": "^3.0.0",
"topsort": "0.0.2",
"ttf2woff": "^2.0.1",
"ttf2woff2": "^2.0.3",
"unorm": "^1.4.1",
"unorm": "^1.6.0",
"verda": "^1.0.0-0",
"yargs": "^12.0.0"
"yargs": "^14.2.0"
}
}

View File

@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "1.007";
version = "1.008";
in fetchzip {
name = "public-sans-${version}";
@@ -16,7 +16,7 @@ in fetchzip {
unzip -j $downloadedFile binaries/webfonts/\*.woff2 -d $out/share/fonts/woff2
'';
sha256 = "1yzraw08qm1ig7ks850b329xp6zv2znjwl610dppax34kwhqghsm";
sha256 = "1s4xmliri3r1gcn1ws3wa6davj6giliqjdbcv0bh9ryg3dfpjz74";
meta = with lib; {
description = "A strong, neutral, principles-driven, open source typeface for text or display";

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "amber-theme";
version = "3.34-1";
version = "3.34-2";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = pname;
rev = "v${version}";
sha256 = "1fmsjhaxlw2znlbjys3ggmsr7zlfk1wlng7bh54g6b0vjgdbik3r";
sha256 = "0809l4r1qrzs9z04kcs1j962dpsvgpwpksnxs09md5722mynn65l";
};
nativeBuildInputs = [ meson ninja sassc ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GTK, gnome-shell and Xfce theme based on Ubuntu Ambiance";
homepage = https://github.com/lassekongo83/amber-theme;
homepage = "https://github.com/lassekongo83/amber-theme";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];

View File

@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, gdk-pixbuf, gtk_engines, gtk-engine-murrine }:
{ stdenv, fetchFromGitHub, gdk-pixbuf, gtk_engines, gtk-engine-murrine, librsvg }:
stdenv.mkDerivation rec {
pname = "plano-theme";
version = "3.34-1";
version = "3.34-2";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = pname;
rev = "v${version}";
sha256 = "0fdg4jyc3xv98yg2r6c8rccvbpf8y2l3x79qbpiq6ck9k6d34ycq";
sha256 = "0spbyvzb47vyfhcn3gr0z1gdb5xrprynm6442y1z32znai2bgpnd";
};
buildInputs = [ gdk-pixbuf gtk_engines ];
buildInputs = [ gdk-pixbuf gtk_engines librsvg ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
installPhase = ''
install -dm 755 $out/share/themes/Plano
cp -a * $out/share/themes/Plano/
rm $out/share/themes/Plano/{COPYING.LGPL-2.1,LICENSE,README.md}
rm $out/share/themes/Plano/{LICENSE,README.md}
'';
meta = with stdenv.lib; {
description = "Flat theme for GNOME and Xfce";
homepage = https://github.com/lassekongo83/plano-theme;
homepage = "https://github.com/lassekongo83/plano-theme";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "stilo-themes";
version = "3.34-1";
version = "3.34-2";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = pname;
rev = "v${version}";
sha256 = "1qwz7i32jk7wm7m9ah6g1pxldz0rnviancndsr2lqmg55x36rs01";
sha256 = "1i5cl61dk8sxa6h61ghynm4wp1qzp3c7kwf4ks0ddzzk9dbvdrhb";
};
nativeBuildInputs = [ meson ninja sassc ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Minimalistic GTK, gnome shell and Xfce themes";
homepage = https://github.com/lassekongo83/stilo-themes;
homepage = "https://github.com/lassekongo83/stilo-themes";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zuki-themes";
version = "3.34-1";
version = "3.34-2";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = pname;
rev = "v${version}";
sha256 = "19qg60rw5b0caqc542j2nrpkv8d37pai1cr1h0x2nvx0fkc3rmi2";
sha256 = "1nc0qh6qai6ybmz3a44q0rirri0gfg7lyqy4k4l1sci5q5ckl7x4";
};
nativeBuildInputs = [ meson ninja sassc ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Themes for GTK, gnome-shell and Xfce";
homepage = https://github.com/lassekongo83/zuki-themes;
homepage = "https://github.com/lassekongo83/zuki-themes";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];