diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-10-31 14:30:44 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-10-31 14:30:44 +0100 |
commit | dfd3ede68d58e3f992a0e3befbc820bd931c3437 (patch) | |
tree | 971ae40cf6b50b92a3fef8580c703d9d87b3d088 /pkgs/shells | |
parent | 9c5154b5aaee073eeca7f94359d69c93d4dbf5b3 (diff) | |
parent | 680d3201230c7864755bff80fcdef30d7487500a (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/es/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 16 |
3 files changed, 19 insertions, 5 deletions
diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 761846843feac..992fdc93dcb32 100644 --- a/pkgs/shells/es/default.nix +++ b/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/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index d02e6267940ac..e7433e2de0b83 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-10-18"; + version = "2020-10-29"; pname = "oh-my-zsh"; - rev = "7525b1d533b927bc40e3cfb29e399e5f2e0828d4"; + rev = "852a44094a3bb4df39f8f778bc7ada2ddda09727"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1a92k8yv7zs830z33v9f4aqq1cv2gmvib1x05vb0kzynwv7p3gmd"; + sha256 = "0021rayw5wiwgjfwy7d6g577xidws58vk7y9xxhidnmk9sr4vri7"; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 39cb1f247fcf0..a978ac93a9b05 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -3,6 +3,20 @@ # 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.2.0"; + + src = fetchFromGitHub { + owner = "romkatv"; + repo = "gitstatus"; + rev = "v${version}"; + sha256 = "0xi5ab0rsj6xs4vqgn2j5rih1nncghr83yn395mk1is1f4bsmp0s"; + }; + }); +in stdenv.mkDerivation rec { pname = "powerlevel10k"; version = "1.13.0"; @@ -17,7 +31,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./gitstatusd.patch; - gitstatusdPath = "${pkgs.gitAndTools.gitstatus}/bin/gitstatusd"; + gitstatusdPath = "${gitstatus}/bin/gitstatusd"; }) ]; |