Merge master into staging-next

4 files changed, 76 insertions, 7 deletions

diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix
index 6aabf4f485da..eb18f620a2ad 100644
--- a/pkgs/data/fonts/agave/default.nix
+++ b/pkgs/data/fonts/agave/default.nix
@@ -1,20 +1,21 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "agave-${version}";
-  version = "008";
+  pname = "agave";
+  version = "009";
 
   src = fetchurl {
-    url = "https://github.com/agarick/agave/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0g50mqpffn4dq761vibaf8dwfkbcl5da1cc89qz6pq35ircipbns";
+    url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf";
+    sha256 = "05766gp2glm1p2vknk1nncxigq28hg8s58kjwsbn8zpwy8ivywpk";
   };
 
   sourceRoot = ".";
 
+  unpackPhase = ":";
   dontBuild = true;
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
+    cp $src $out/share/fonts/truetype/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 529a727d6c0f..4adb0928d4fa 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "2.0.2";
+  version = "2.1.0";
 in fetchzip rec {
   name = "iosevka-bin-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
-  sha256 = "0jr9d02dk4zbq3kyhpfs6gyynwss60210pc1dfxn0qbw3j9ch2l4";
+  sha256 = "0hx91pdkiw0qvkkl7qnl78p5afldcmn18l5m1iclldnvrghrxizz";
 
   meta = with stdenv.lib; {
     homepage = https://be5invis.github.io/Iosevka/;
diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix
new file mode 100644
index 000000000000..02c8d2b64901
--- /dev/null
+++ b/pkgs/data/themes/greybird/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "greybird";
+  version = "3.22.10";
+
+  src = fetchFromGitHub {
+    owner = "shimmerproject";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1g1mnzxqwlbymq8npd2j294f8dzf9fw9nicd4pajmscg2vk71da9";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    which
+    sassc
+    glib
+    libxml2
+  ];
+
+  buildInputs = [
+    gdk_pixbuf
+    librsvg
+  ];
+
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Grey and blue theme from the Shimmer Project for GTK+-based environments";
+    homepage = https://github.com/shimmerproject/Greybird;
+    license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix
new file mode 100644
index 000000000000..5e4e439f2afd
--- /dev/null
+++ b/pkgs/data/themes/zuki/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "zuki-themes";
+  version = "3.30-1";
+
+  src = fetchFromGitHub {
+    owner = "lassekongo83";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0d7i0jhjiarqnwkc1k505bw8r9bvbwk3x8yzqmc3vnwcd7mr3m9x";
+  };
+
+  buildInputs = [ gdk_pixbuf librsvg ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    install -dm 755 $out/share/themes
+    cp -a Zuki* $out/share/themes/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Themes for GTK3, gnome-shell and more";
+    homepage = https://github.com/lassekongo83/zuki-themes;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}