Merge staging-next into staging

pkgs/data/fonts/agave/default.nix

@@ -2,7 +2,7 @@
 
 let
   pname = "agave";
-  version = "22";
+  version = "30";
 in fetchurl {
   name = "${pname}-${version}";
   url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
@@ -13,7 +13,7 @@ in fetchurl {
     install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
   '';
 
-  sha256 = "1jb8f0xcv5z0l5nyx733b6zclswi82vrh2nwyyhbqzgqrl4y1h6s";
+  sha256 = "1f2f1fycwi8xbf8x03yfq78nv11b2msl4ll9flw8rkg023h9vwg7";
 
   meta = with lib; {
     description = "truetype monospaced typeface designed for X environments";

pkgs/data/fonts/sudo/default.nix

@@ -1,11 +1,11 @@
 { lib, fetchzip }:
 
 let
-  version = "0.51";
+  version = "0.52";
 in fetchzip {
   name = "sudo-font-${version}";
   url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
-  sha256 = "19m132183w5hrc5qvlb6cj38hir2302cqiljlfc72qdlb8al6fwi";
+  sha256 = "1j5p7apclyy5gfj2kklmgcncdsp5iik4gd6mdl29anzijknd0kja";
 
   postFetch = ''
     mkdir -p $out/share/fonts/

pkgs/data/icons/zafiro-icons/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zayronxio";
     repo = pname;
-    rev = "${version}";
+    rev = version;
     sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv";
   };
 

pkgs/data/themes/orion/default.nix

@@ -1,11 +1,13 @@
-{ stdenv, fetchgit, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
 
-stdenv.mkDerivation {
-  name = "orion-1.5";
+stdenv.mkDerivation rec {
+  pname = "orion";
+  version = "1.5";
 
-  src = fetchgit {
-    url = "https://github.com/shimmerproject/Orion.git";
-    rev = "refs/tags/v1.5";
+  src = fetchFromGitHub {
+    owner = "shimmerproject";
+    repo = "Orion";
+    rev = "refs/tags/v${version}";
     sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89";
   };