aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/shells
diff options
context:
space:
mode:
authorKatharina Fey <kookie@spacekookie.de>2020-06-13 07:10:12 +0200
committerKatharina Fey <kookie@spacekookie.de>2020-06-13 07:10:12 +0200
commitde94c6c62e2f86b3667386a42690d6bb376a2f58 (patch)
tree2b4bc87db0d46095a7aff46635227a0d7d4b9e06 /nixpkgs/pkgs/shells
parent880bc0f8c1c70c65fd97d722a81d834ce43fbcd4 (diff)
parent029a5de08390bb03c3f44230b064fd1850c6658a (diff)
Merge commit '029a5de08390bb03c3f44230b064fd1850c6658a'
Diffstat (limited to 'nixpkgs/pkgs/shells')
-rw-r--r--nixpkgs/pkgs/shells/powershell/default.nix2
-rw-r--r--nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/shells/powershell/default.nix b/nixpkgs/pkgs/shells/powershell/default.nix
index 58c18fb695b..d9374498774 100644
--- a/nixpkgs/pkgs/shells/powershell/default.nix
+++ b/nixpkgs/pkgs/shells/powershell/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
doInstallCheck = true;
- installCheck = ''
+ installCheckPhase = ''
$out/bin/pwsh --help > /dev/null
'';
diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
index 4c4fbfaefef..a2de44412ad 100644
--- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2020-06-02";
+ version = "2020-06-05";
pname = "oh-my-zsh";
- rev = "c58572d5fe51b3ba09801837b6eee2cb6f0bf913";
+ rev = "94e784360e2ad34faa6a4a648c67a5c6ed6c987f";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
- sha256 = "1gvw90ma96wrg6bpphdgfqfhrgf5327q7dwqjmxxy67xspczm9v4";
+ sha256 = "032ba9mjf72jlzn6kcd9dygz28q1kj34fz54ss7rpw17di8hnydb";
};
pathsToLink = [ "/share/oh-my-zsh" ];