diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/shells/zsh')
6 files changed, 101 insertions, 29 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/zsh/antibody/default.nix index 325bae4f9cce..bcf091f8e769 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/zsh/antibody/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "The fastest shell plugin manager"; homepage = "https://github.com/getantibody/antibody"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 worldofpeace ]; + maintainers = with maintainers; [ Br1ght0ne worldofpeace ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 73fd6ceeb061..8fbbfd47fb95 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,18 +1,19 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts, git +, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-10-15"; + version = "2020-11-26"; pname = "oh-my-zsh"; - rev = "5b717ab3e4bfb627a936d7c04367a39867734d63"; + rev = "05e2956dc61198d4767b96d97c5d10c93cedd6e3"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0qm0mdvcvf5s6ypbq7z1x286sdv6ii2yfqvv1dss7zqjbg5j08gz"; + sha256 = "1Eh6L92hvSHcQeQL+1bCDrg/2FKaZshKTTF2PeVGhLs="; }; installPhase = '' @@ -65,6 +66,42 @@ stdenv.mkDerivation rec { EOF ''; + passthru = { + tests = { inherit (nixosTests) oh-my-zsh; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + curl + cacert + git + nixfmt + nix + jq + coreutils + gnused + ] + } + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')" + latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" + + if [ ! "null" = "$latestSha" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix" + latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" + update-source-version oh-my-zsh "$latestSha" --version-key=rev + update-source-version oh-my-zsh "$latestDate" --ignore-same-hash + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + meta = with stdenv.lib; { description = "A framework for managing your zsh configuration"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh b/infra/libkookie/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh deleted file mode 100755 index 738c0810737a..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq - -set -eu -o pipefail - -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')" -latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" - -if [ ! "null" = "${latestSha}" ]; then - latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" - update-source-version oh-my-zsh "${latestSha}" --version-key=rev - update-source-version oh-my-zsh "${latestDate}" --ignore-same-hash - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix" - git add "${default_nix}" - git commit -m "oh-my-zsh: ${oldVersion} -> ${latestDate}" -else - echo "oh-my-zsh is already up-to-date" -fi diff --git a/infra/libkookie/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix index bfcd3be5e9cf..ac7035045bb1 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.13.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "16q9v4c8lagp4vxm7qhagilqnwf1g4pbds56x5wfj4cwc0x2gclw"; + sha256 = "0r4y8bglwdq85dwlxh9sm23ppzy1z7i8kmjny5mx9css0likj8qv"; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/shells/zsh/zplugin/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/zsh/zplugin/default.nix new file mode 100644 index 000000000000..c148f60b2eef --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/shells/zsh/zplugin/default.nix @@ -0,0 +1,40 @@ +{ 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 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 5d81ceaba1b2..c8e845eec99e 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -3,21 +3,35 @@ # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` +let + # match gitstatus version with given `gitstatus_version`: + # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info + gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec { + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "romkatv"; + repo = "gitstatus"; + rev = "v${version}"; + sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf"; + }; + }); +in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.12.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "08zg4in70h3kray6lazszzy26gvil9w2cr6xmkbgjsv3k6w3k0jg"; + sha256 = "073d9hlf6x1nq63mzpywc1b8cljbm1dd8qr07fdf0hsk2fcjiqg7"; }; patches = [ (substituteAll { src = ./gitstatusd.patch; - gitstatusdPath = "${pkgs.gitAndTools.gitstatus}/bin/gitstatusd"; + gitstatusdPath = "${gitstatus}/bin/gitstatusd"; }) ]; |