Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-09-04 20:03:30 +02:00
182 changed files with 4683 additions and 7025 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "1.062";
version = "1.064";
in
fetchzip {
name = "recursive-${version}";
@@ -15,7 +15,7 @@ fetchzip {
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
'';
sha256 = "06qilfa0c897shh7m7rpwia02nay8cjwnizzzba27ylzy5pwd96r";
sha256 = "1pbrqk848nkaambvsz0n8f88xdm8hyib83in27rmal739qh9d1z6";
meta = with lib; {
homepage = "https://recursive.design/";
@@ -0,0 +1,46 @@
{ stdenv
, fetchFromGitHub
, gdk-pixbuf
, gtk-engine-murrine
, gtk_engines
, librsvg
}:
stdenv.mkDerivation rec {
pname = "marwaita-manjaro";
version = "2020-08-29";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = "d97e852931732ae5134784d11b332eadd71b6bbf";
sha256 = "1qa2mlc6k82i4fkgbkahjz3fhghcf8rx1ayxw0r4xl21mkna7bfy";
};
buildInputs = [
gdk-pixbuf
gtk_engines
librsvg
];
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
cp -a Marwaita* $out/share/themes
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Manjaro Style (green version) of Marwaita GTK theme";
homepage = "https://www.pling.com/p/1351213/";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
}
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yaru";
version = "20.10.1";
version = "20.10.2";
src = fetchFromGitHub {
owner = "ubuntu";
repo = "yaru";
rev = version;
sha256 = "08zws1qwvfr126fgdkqxxmpsqgfk02s31n90555bd5d66cfgdh72";
sha256 = "0vxs17nbahrdix1q9xj06nflm344lfgj2mrafsvyfcr2isn61iv6";
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];