diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/shells')
19 files changed, 141 insertions, 63 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/shells/bash/4.4.nix b/infra/libkookie/nixpkgs/pkgs/shells/bash/4.4.nix index deeb4093c682..d06157fa77cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/bash/4.4.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/bash/4.4.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, binutils ? null, bison, autoconf, utillinux +, fetchurl, binutils ? null, bison, autoconf, util-linux # patch for cygwin requires readline support , interactive ? stdenv.isCygwin, readline70 ? null @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { "SHOBJ_LIBS=-lbash" ]; - checkInputs = [ utillinux ]; + checkInputs = [ util-linux ]; doCheck = false; # dependency cycle, needs to be interactive postInstall = '' diff --git a/infra/libkookie/nixpkgs/pkgs/shells/bash/5.0.nix b/infra/libkookie/nixpkgs/pkgs/shells/bash/5.0.nix index 09030493fb60..7120910d79e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/bash/5.0.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/bash/5.0.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, binutils ? null, bison, utillinux +, fetchurl, binutils ? null, bison, util-linux # patch for cygwin requires readline support , interactive ? stdenv.isCygwin, readline80 ? null @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { "SHOBJ_LIBS=-lbash" ]; - checkInputs = [ utillinux ]; + checkInputs = [ util-linux ]; doCheck = false; # dependency cycle, needs to be interactive postInstall = '' diff --git a/infra/libkookie/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index eeb175a5e789..5fda57048121 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bash-completion"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "scop"; repo = "bash-completion"; rev = version; - sha256 = "047yjryy9d6hp18wkigbfrw9r0sm31inlsp8l28fhxg8ii032sgq"; + sha256 = "0m3brd5jx7w07h8vxvvcmbyrlnadrx6hra3cvx6grzv6rin89liv"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/shells/dash/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/dash/default.nix index 030e5695b225..bc270daf09cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/dash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/dash/default.nix @@ -1,17 +1,25 @@ { stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.11.2"; + pname = "dash"; + version = "0.5.11.2"; src = fetchurl { - url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; + url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; }; hardeningDisable = [ "format" ]; # Temporary fix until a proper one is accepted upstream - patches = stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + patches = [ + (fetchurl { + # Dash executes code when noexec ("-n") is specified + # https://www.openwall.com/lists/oss-security/2020/11/11/3 + url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; + sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; diff --git a/infra/libkookie/nixpkgs/pkgs/shells/es/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/es/default.nix index 761846843fea..992fdc93dcb3 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/es/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/es/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-readline" ]; meta = with stdenv.lib; { - description = "Es is an extensible shell"; + description = "An extensible shell with higher order functions"; longDescription = '' Es is an extensible shell. The language was derived diff --git a/infra/libkookie/nixpkgs/pkgs/shells/fish/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/fish/default.nix index 3faa7f996575..eabed40e8ebc 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/fish/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/fish/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , coreutils -, utillinux +, util-linux , which , gnused , gnugrep @@ -178,7 +178,7 @@ let EOF '' + optionalString stdenv.isLinux '' - sed -e "s| ul| ${utillinux}/bin/ul|" \ + sed -e "s| ul| ${util-linux}/bin/ul|" \ -i "$out/share/fish/functions/__fish_print_help.fish" for cur in $out/share/fish/functions/*.fish; do sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \ diff --git a/infra/libkookie/nixpkgs/pkgs/shells/liquidprompt/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/liquidprompt/default.nix index 783c07d16009..9893624eaf86 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/liquidprompt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; rev = "v${version}"; - sha256 = "0ibp1bz9s4bp3y5anivg5gp31q78024w39v7hbfw05qy25ax5h60"; + sha256 = "0vlwwkdbkxjsjcfmcspmq3f163kf0x4mwa8svxkzgnn2g4kl41ja"; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/shells/mksh/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/mksh/default.nix index 7abf75c70f49..c19406e5f55c 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/mksh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/mksh/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mksh"; - version = "59b"; + version = "59c"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "1rp0farbylypyiaald2hw5avg5w3m8x7cjnxxyyihzvfb2lx2zlh"; + sha256 = "01n5ggw33bw4jv4d3148wlw9n4aj7vdn3ffnc66c9w9pldjidbkp"; }; dontConfigure = true; diff --git a/infra/libkookie/nixpkgs/pkgs/shells/mrsh/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/mrsh/default.nix index bbd56e510b7d..c72f23c143b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/mrsh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/mrsh/default.nix @@ -2,23 +2,26 @@ stdenv.mkDerivation rec { pname = "mrsh"; - version = "2020-01-08"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "emersion"; repo = "mrsh"; - rev = "ef21854fc9ce172fb1f7f580b19a89d030d67c65"; - sha256 = "1iyxmwl61p2x9v9b22416n4lnrlwjqyxybq35x8bcbjxkwypp943"; + rev = "1738e41b2a35e5f99b9a1300a5f687478458226a"; + sha256 = "08gak5261d4sd6b2w2kscmdwa4gwcp5drgfyb3swyrj9cl0nlcbn"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ readline ]; + doCheck = true; + meta = with stdenv.lib; { description = "A minimal POSIX shell"; homepage = "https://mrsh.sh"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/shells/nushell/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/nushell/default.nix index c3e6c5b67539..44961696195f 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/nushell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.21.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "19bpxx9pi3cl5y7h5qg4a2pmvwqavm1vciyvsq96kxkc7rq2xwvl"; + sha256 = "0rbg0jchg59x0g4h0xahdm9qah8l8g4i2s8lkaqzdkm4yv29gqx4"; }; - cargoSha256 = "1ghbzahz8lbk11sjy2kis12w22rjr92aaw451rmc86pk2lsxn0dx"; + cargoSha256 = "1sbgn68n0rqh1m98dm3r2a3pqqqx4v7axw5djw8qlx4gv7xw1ql0"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; @@ -36,11 +36,6 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optional withStableFeatures "--features stable"; - # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - unset SDKROOT - ''; - checkPhase = '' runHook preCheck echo "Running cargo test" @@ -52,7 +47,7 @@ rustPlatform.buildRustPackage rec { description = "A modern shell written in Rust"; homepage = "https://www.nushell.sh/"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 johntitor marsam ]; + maintainers = with maintainers; [ Br1ght0ne johntitor marsam ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/shells/oil/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/oil/default.nix index 94fd062e45ca..0896b8a50462 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/oil/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.1"; + version = "0.8.5"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "0mhzys1siry848v7swr1iv2wp329ksw0gpz1qd82fmlakml5brc1"; + sha256 = "1z0p08q4808h78bp6nwdszpfavhr4y7n313bp0gg5qdbssnciq1v"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/shells/powershell/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/powershell/default.nix index 3d412a30afb2..d776e64fa49d 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/powershell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/powershell/default.nix @@ -5,7 +5,7 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; platformSha = if stdenv.isDarwin then "0zv02h3njphrs8kgmicy7w40mmhmigdfl38f2dpwrs6z67f8vrm2" - else if stdenv.isLinux then "1zgdah397az0n3db6132h4bql0xzri7j98q5wg3s57sp4irlwx9w" + else if stdenv.isLinux then "0dka2q8ijg3ryzwmxapf8aq55d0sgaj6jj0rzj2738in9g4w2hbh" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.0.3"; + version = "7.1.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/infra/libkookie/nixpkgs/pkgs/shells/xonsh/default.nix b/infra/libkookie/nixpkgs/pkgs/shells/xonsh/default.nix index 8ff2b4d270ee..711d7060fa55 100644 --- a/infra/libkookie/nixpkgs/pkgs/shells/xonsh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.23"; + version = "0.9.24"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1by13ryq9ldc9wln3fk5mm6zvjp4aim57ikw49v0dfmz8irnpglp"; + sha256 = "1nk7kbiv7jzmr6narsnr0nyzkhlc7xw3b2bksyq2j6nda67b9b3y"; }; LC_ALL = "en_US.UTF-8"; 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"; }) ]; |