diff options
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/oil/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/powershell/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/zsh/pure-prompt/default.nix | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 38ff6a76818..3d9a2ec24e6 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.0"; + version = "0.9.3"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-xk4io2ZXVupU6mCqmD94k1AaE8Kk0cf3PIx28X6gNjY="; + sha256 = "sha256-YvNgcvafM3jgO3nY1SVcHRNglOwRQQ208W7oLxZg79o="; }; postPatch = '' diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 5c082641e9f..4d3038079a8 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation rec { '' + lib.optionalString (!stdenv.isDarwin && !stdenv.isAarch64) '' patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so + '' + lib.optionalString (!stdenv.isDarwin) '' + # Remove liblttng-ust from dependencies once + # https://github.com/PowerShell/PowerShell/pull/14688 is in a release + patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $pslibs/libcoreclrtraceptprovider.so '' + '' mkdir -p $out/bin @@ -69,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; - maintainers = with maintainers; [ yrashk srgom ]; + maintainers = with maintainers; [ yrashk srgom p3psi ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux"]; license = with licenses; [ mit ]; }; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 4cdad61a8ab..bff4ee38df8 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-09-15"; + version = "2021-09-22"; pname = "oh-my-zsh"; - rev = "93b557e291ba60286bcd49f5d3e4ac61730b3f7c"; + rev = "5b3d2b2f0c02ef059fcbcbdb619b22318b8cc13a"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "71vJHlr+g8a+mTGBn4Bupog1lsmukJhl+qT8aVnd8pk="; + sha256 = "SSvPU/YWFcGN8oyOyQXZhNOuOS7Z8a6Vel94z9EoyAU="; }; installPhase = '' diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 527c95676fa..0e176d0505f 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-sk7uAYVw/9OLKi3ClBXwEEnfaiprM/gQcNJMDFGqhE0="; + sha256 = "sha256-WNixw2vVn1mBEDSeIFrWZHHUcX4TNgr+motBemBQfr0="; }; installPhase = '' |