Merge staging-next into staging

1 files changed, 5 insertions, 4 deletions

diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index ceed830700406..c8d8ca42f9e46 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchgit, fontforge, python3 }:
+{ lib, stdenv, fetchFromGitHub, fontforge, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "rictydiminished-with-firacode";
   version = "1.2.2";
 
-  src = fetchgit {
-    url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
+  src = fetchFromGitHub {
+    owner = "hakatashi";
+    repo = "RictyDiminished-with-FiraCode";
     rev = version;
-    sha256 = "0khnbp1y5xrd77gfb2b19mzi3ll07im3d0rlbciwbq0cn347f25p";
+    sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
     fetchSubmodules = true;
   };