From b84ca8131aabdfbe7d361219fc22174119704a4d Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Sun, 10 Feb 2019 13:38:12 -0200
Subject: greybird: 3.22.9 -> 3.22.10

---
 pkgs/misc/themes/greybird/default.nix | 39 -----------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 pkgs/misc/themes/greybird/default.nix

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
deleted file mode 100644
index 8cc1a6415fbe..000000000000
--- a/pkgs/misc/themes/greybird/default.nix
+++ /dev/null
@@ -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 ];
-  };
-}
-- 
cgit 1.4.1


From 692b978df49b38808a0eda3a9290698f21a9ede3 Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Sun, 10 Feb 2019 23:05:24 -0200
Subject: zuki-themes: 3.28-3 -> 3.30-1

---
 pkgs/data/themes/zuki/default.nix | 30 ++++++++++++++++++++++++++++++
 pkgs/misc/themes/zuki/default.nix | 30 ------------------------------
 pkgs/top-level/all-packages.nix   |  4 ++--
 3 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/data/themes/zuki/default.nix
 delete mode 100644 pkgs/misc/themes/zuki/default.nix

(limited to 'pkgs/misc')

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 ];
+  };
+}
diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
deleted file mode 100644
index 2c293ecbc4ac..000000000000
--- a/pkgs/misc/themes/zuki/default.nix
+++ /dev/null
@@ -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 ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98131dc032f9..3feae1858d07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16004,6 +16004,8 @@ in
 
   zilla-slab = callPackage ../data/fonts/zilla-slab { };
 
+  zuki-themes = callPackage ../data/themes/zuki { };
+
 
   ### APPLICATIONS
 
@@ -23275,8 +23277,6 @@ in
 
   zk-shell = callPackage ../applications/misc/zk-shell { };
 
-  zuki-themes = callPackage ../misc/themes/zuki { };
-
   tora = libsForQt5.callPackage ../development/tools/tora {};
 
   xulrunner = firefox-unwrapped;
-- 
cgit 1.4.1