diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-10-10 10:18:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-10-10 11:32:10 +0200 |
| commit | 338b25697c952b17ef9b012cbe068f2d0b8fc4b3 (patch) | |
| tree | 31123d2ef6ddcddb682c67d3c85a6f6b1a894fd9 /pkgs/shells | |
| parent | ec28e32c9e1f5b4d6857e9c7f2e57cf946b75655 (diff) | |
| parent | 8bc409e546590137cd43651ee6f2909c6c9f5c73 (diff) | |
Merge branch 'master' into staging-next
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
> 3926 x86_64-darwin
> 4645 x86_64-linux
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/xonsh/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index e775ab04dc1e..8ff2b4d270ee 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.22"; + version = "0.9.23"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "04yd8y4lksmxbgl6v6bw1k32r8v5mia3sm8y9v39cgfzjbkvys1p"; + sha256 = "1by13ryq9ldc9wln3fk5mm6zvjp4aim57ikw49v0dfmz8irnpglp"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f3fbd25e3027..9ce47ae674d5 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-08"; + version = "2020-10-09"; pname = "oh-my-zsh"; - rev = "58ff4e1d2e6a81ea97a05b142c28a931a9924b70"; + rev = "1bb402190d53c118f47a0851f5714dd4faa52809"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "096pkq91njg7pvlxar5r39slkzyfky6wcm7p6kfwrlbwh6wx46kz"; + sha256 = "0alm6253mz8yq5l17q7hj89aa0c0nfknds9vqx8pd619bsa6kf4g"; }; installPhase = '' |