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

---
 pkgs/shells/zsh/zinit/default.nix   | 42 +++++++++++++++++++++++++++++++++++++
 pkgs/shells/zsh/zplugin/default.nix | 40 -----------------------------------
 2 files changed, 42 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/shells/zsh/zinit/default.nix
 delete mode 100644 pkgs/shells/zsh/zplugin/default.nix

(limited to 'pkgs/shells')

diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix
new file mode 100644
index 000000000000..d59f50ce3b9c
--- /dev/null
+++ b/pkgs/shells/zsh/zinit/default.nix
@@ -0,0 +1,42 @@
+{ stdenvNoCC, lib, fetchFromGitHub, installShellFiles }:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "zinit";
+  version = "3.7";
+  src = fetchFromGitHub {
+    owner = "zdharma";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE=";
+  };
+  # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git
+  dontBuild = true;
+  nativeBuildInputs = [ installShellFiles ];
+  installPhase = ''
+    outdir="$out/share/$pname"
+
+    cd "$src"
+
+    # Zplugin's source files
+    install -dm0755 "$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 _zinit
+
+    #TODO:Zplugin-module files
+    # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \;
+    # find zmodules/ -type f -exec install -m 744 "{}" "$outdir/{}" \;
+
+  '';
+  #TODO:doc output
+
+  meta = with lib; {
+    homepage = "https://github.com/zdharma/zinit";
+    description = "Flexible zsh plugin manager";
+    license = licenses.mit;
+    maintainers = with maintainers; [ pasqui23 ];
+  };
+}
diff --git a/pkgs/shells/zsh/zplugin/default.nix b/pkgs/shells/zsh/zplugin/default.nix
deleted file mode 100644
index c148f60b2eef..000000000000
--- a/pkgs/shells/zsh/zplugin/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenvNoCC, lib, fetchFromGitHub, installShellFiles }:
-stdenvNoCC.mkDerivation rec {
-  pname = "zplugin";
-  version = "2.3";
-  src = fetchFromGitHub {
-    owner = "zdharma";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0qqv5p19s8jb06d6h55dm4acji9x2rpxb2ni3h7fb0q43iz6y85w";
-  };
-  # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git
-  dontBuild = true;
-  nativeBuildInputs = [ installShellFiles ];
-  installPhase = ''
-    outdir="$out/share/$pname"
-
-    cd "$src"
-
-    # Zplugin's source files
-    install -dm0755 "$outdir"
-    install -m0644 zplugin{,-side,-install,-autoload}.zsh "$outdir"
-    install -m0755 git-process-output.zsh "$outdir"
-
-    # Zplugin autocompletion
-    installShellCompletion --zsh _zplugin
-
-    #TODO:Zplugin-module files
-    # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \;
-    # find zmodules/ -type f -exec install -m 744 "{}" "$outdir/{}" \;
-
-  '';
-  #TODO:doc output
-
-  meta = with lib; {
-    homepage = "https://github.com/zdharma/zplugin";
-    description = "Flexible zsh plugin manager";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pasqui23 ];
-  };
-}
-- 
cgit 1.4.1