Merge pull request #55522 from romildo/upd.greybird

greybird: 3.22.9 -> 3.22.10
NixOS · Feb 10, 2019 · 01cf4c2 · 01cf4c2
2 parents 20e2f83 + b84ca81
commit 01cf4c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pkgs/misc/themes/greybird/default.nix → pkgs/data/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix → pkgs/data/themes/greybird/default.nix
@@ -1,15 +1,14 @@
 { 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";
+  version = "3.22.10";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
-    repo = "${pname}";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "0mixs47v0jvqpmfsv0k0d0l24y4w35krah8mgnwamr0b8spmazz3";
+    sha256 = "1g1mnzxqwlbymq8npd2j294f8dzf9fw9nicd4pajmscg2vk71da9";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -15592,6 +15592,8 @@ in
 
   go-font = callPackage ../data/fonts/go-font { };
 
+  greybird = callPackage ../data/themes/greybird { };
+
   gyre-fonts = callPackage ../data/fonts/gyre {};
 
   hack-font = callPackage ../data/fonts/hack { };
@@ -22455,8 +22457,6 @@ in
     binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
-  greybird = callPackage ../misc/themes/greybird { };
-
   guetzli = callPackage ../applications/graphics/guetzli { };
 
   gummi = callPackage ../applications/misc/gummi { };