Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-04-06 16:01:14 +02:00
493 changed files with 4687 additions and 2055 deletions

View File

@@ -1,12 +1,12 @@
{ lib, fetchzip }:
let
version = "0.034";
version = "0.035";
in fetchzip {
name = "JuliaMono-${version}";
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip";
sha256 = "sha256:0xx3mhzs17baaich67kvwyzqg8h9ga11jrja2i8sxx4861dp1z85";
sha256 = "sha256:17w8rn37wadxnmakhd6mpmqdx14dsrc3qym4k9b47albl1a34i1j";
postFetch = ''
mkdir -p $out/share/fonts/truetype

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
version = "2021-02-04";
version = "2021-04-05";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "sha256-CDym+yqLu7QpqmdUpXAbJTCjQf/r9D1sl7ZdpaWaXFE=";
sha256 = "0bm7hr4lqqz3z2miif38628r4qcy7i5hdk6sm0ngjacm43cl0qvg";
};
buildInputs = [ gdk-pixbuf librsvg ];
@@ -16,16 +16,18 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
installPhase = ''
runHook preInstall
patchShebangs .
mkdir -p $out/share/themes
name= ./install.sh -d $out/share/themes
install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml
mkdir -p $out/share/doc/${pname}
cp -a src/extra/firefox $out/share/doc/${pname}
runHook postInstall
'';
meta = with lib; {
description = "A stylish flat Design theme for GTK based desktop environments";
description = "A stylish flat design theme for GTK based desktop environments";
homepage = "https://vinceliuice.github.io/theme-matcha";
license = licenses.gpl3Only;
platforms = platforms.unix;