Merge master into staging-next

pkgs/misc/themes/greybird/default.nix

@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname = "greybird";
-  version = "3.22.9";
-
-  src = fetchFromGitHub {
-    owner = "shimmerproject";
-    repo = "${pname}";
-    rev = "v${version}";
-    sha256 = "0mixs47v0jvqpmfsv0k0d0l24y4w35krah8mgnwamr0b8spmazz3";
-  };
-
-  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 ];
-  };
-}

pkgs/misc/themes/zuki/default.nix

@@ -1,30 +0,0 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  name = "zuki-themes-${version}";
-  version = "3.28-3";
-
-  src = fetchFromGitHub {
-    owner = "lassekongo83";
-    repo = "zuki-themes";
-    rev = "v${version}";
-    sha256 = "0sgp41fpd8lyyb0v82y41v3hmb0ayv3zqqrv0m3ln0dzkr7ym9g7";
-  };
-
-  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 ];
-  };
-}