JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #111295 from pasqui23/zinit

Browse Source
This commit is contained in:
Sandro 2021-02-08 10:15:10 +01:00 committed by GitHub
commit 93498b1526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/shells/zsh/zplugin/default.nix → pkgs/shells/zsh/zinit/default.nix
View File

@ -1,12 +1,13 @@
{ stdenvNoCC, lib, fetchFromGitHub, installShellFiles }: { stdenvNoCC, lib, fetchFromGitHub, installShellFiles }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "zplugin"; pname = "zinit";
version = "2.3"; version = "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zdharma"; owner = "zdharma";
repo = pname; repo = pname;
rev = "v${version}"; 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 # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git
dontBuild = true; dontBuild = true;
@ -18,11 +19,12 @@ stdenvNoCC.mkDerivation rec {
# Zplugin's source files # Zplugin's source files
install -dm0755 "$outdir" 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" install -m0755 git-process-output.zsh "$outdir"
# Zplugin autocompletion # Zplugin autocompletion
installShellCompletion --zsh _zplugin installShellCompletion --zsh _zinit
#TODO:Zplugin-module files #TODO:Zplugin-module files
# find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \; # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \;
@ -32,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
#TODO:doc output #TODO:doc output
meta = with lib; { meta = with lib; {
homepage = "https://github.com/zdharma/zplugin"; homepage = "https://github.com/zdharma/zinit";
description = "Flexible zsh plugin manager"; description = "Flexible zsh plugin manager";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ pasqui23 ]; maintainers = with maintainers; [ pasqui23 ];

2
pkgs/top-level/aliases.nix
View File

@ -848,6 +848,8 @@ mapAliases ({
/* Added 2021-01-02 */ /* Added 2021-01-02 */
ttyrec = ovh-ttyrec; ttyrec = ovh-ttyrec;
zplugin = zinit; # Added 2021-01-30
/* If these are in the scope of all-packages.nix, they cause collisions /* If these are in the scope of all-packages.nix, they cause collisions
between mixed versions of qt. See: between mixed versions of qt. See:
https://github.com/NixOS/nixpkgs/pull/101369 */ https://github.com/NixOS/nixpkgs/pull/101369 */

2
pkgs/top-level/all-packages.nix
View File

@ -9237,7 +9237,7 @@ in
zplug = callPackage ../shells/zsh/zplug { }; zplug = callPackage ../shells/zsh/zplug { };
zplugin = callPackage ../shells/zsh/zplugin {} ; zinit = callPackage ../shells/zsh/zinit {} ;
zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };