From a98090337f7c1121d110ce3daf68e80bb61a53fc Mon Sep 17 00:00:00 2001
From: Pasquale <p3dimaria@hotmail.it>
Date: Sat, 30 Jan 2021 00:56:55 +0100
Subject: [PATCH] zinit: 2.3 -> 3.7

---
 pkgs/shells/zsh/{zplugin => zinit}/default.nix | 14 ++++++++------
 pkgs/top-level/aliases.nix                     |  2 ++
 pkgs/top-level/all-packages.nix                |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
 rename pkgs/shells/zsh/{zplugin => zinit}/default.nix (73%)

diff --git a/pkgs/shells/zsh/zplugin/default.nix b/pkgs/shells/zsh/zinit/default.nix
similarity index 73%
rename from pkgs/shells/zsh/zplugin/default.nix
rename to pkgs/shells/zsh/zinit/default.nix
index c148f60b2eef..d59f50ce3b9c 100644
--- a/pkgs/shells/zsh/zplugin/default.nix
+++ b/pkgs/shells/zsh/zinit/default.nix
@@ -1,12 +1,13 @@
 { stdenvNoCC, lib, fetchFromGitHub, installShellFiles }:
+
 stdenvNoCC.mkDerivation rec {
-  pname = "zplugin";
-  version = "2.3";
+  pname = "zinit";
+  version = "3.7";
   src = fetchFromGitHub {
     owner = "zdharma";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0qqv5p19s8jb06d6h55dm4acji9x2rpxb2ni3h7fb0q43iz6y85w";
+    hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE=";
   };
   # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git
   dontBuild = true;
@@ -18,11 +19,12 @@ stdenvNoCC.mkDerivation rec {
 
     # Zplugin's source files
     install -dm0755 "$outdir"
-    install -m0644 zplugin{,-side,-install,-autoload}.zsh "$outdir"
+    # Installing also backward compatibility layer
+    install -m0644 z{plugin,init}{,-side,-install,-autoload}.zsh "$outdir"
     install -m0755 git-process-output.zsh "$outdir"
 
     # Zplugin autocompletion
-    installShellCompletion --zsh _zplugin
+    installShellCompletion --zsh _zinit
 
     #TODO:Zplugin-module files
     # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \;
@@ -32,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
   #TODO:doc output
 
   meta = with lib; {
-    homepage = "https://github.com/zdharma/zplugin";
+    homepage = "https://github.com/zdharma/zinit";
     description = "Flexible zsh plugin manager";
     license = licenses.mit;
     maintainers = with maintainers; [ pasqui23 ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 22ceedfe4e10..e471cdb73afb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -840,6 +840,8 @@ mapAliases ({
   /* Added 2021-01-02 */
   ttyrec = ovh-ttyrec;
 
+  zplugin = zinit; # Added 2021-01-30
+
   /* If these are in the scope of all-packages.nix, they cause collisions
   between mixed versions of qt. See:
   https://github.com/NixOS/nixpkgs/pull/101369 */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f823ee0f8be6..012c0e969a78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9184,7 +9184,7 @@ in
 
   zplug = callPackage ../shells/zsh/zplug { };
 
-  zplugin = callPackage ../shells/zsh/zplugin {} ;
+  zinit = callPackage ../shells/zsh/zinit {} ;
 
   zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };