diff options
| author | Yurii Rashkovskii <yrashk@gmail.com> | 2018-10-10 13:52:38 -0700 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-10-10 22:52:38 +0200 |
| commit | fd9518a53272a22c07e20b788200badbb9c597f4 (patch) | |
| tree | d17398df8bd2ec77c5aae4c51aa049badc1aa477 /pkgs/shells/powershell | |
| parent | 6a5a5b9fa0a0e2865f62de9824835f875c617db9 (diff) | |
powershell: 6.0.4 -> 6.1.0 (#48130)
Diffstat (limited to 'pkgs/shells/powershell')
| -rw-r--r-- | pkgs/shells/powershell/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index a9b34824e494..2c89ea0f2c60 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "01j92myljgphf68la9q753m5wgfmd0kwlsk441yic7qshcly5xkw" - else if stdenv.isLinux then "0al1mrlz3m5ksnq86mqm0axb8bjdxa05j2p5y9bmcykrgkdwi3vk" + platformSha = if stdenv.isDarwin then "0jngmqxjiiz5dpgky027wl0s3nn321rxs6kxab27kmp031j65x8g" + else if stdenv.isLinux then "0nmqv32mck16b7zljfpb9ydg3h2jvcqrid9ga2i5wac26x3ix531" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.0.4"; + version = "6.1.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; @@ -25,15 +25,12 @@ stdenv.mkDerivation rec { buildInputs = [ less ] ++ libraries; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - # TODO: remove PAGER after upgrading to v6.1.0-preview.1 or later as it has been addressed in - # https://github.com/PowerShell/PowerShell/pull/6144 installPhase = '' mkdir -p $out/bin mkdir -p $out/share/powershell cp -r * $out/share/powershell - rm $out/share/powershell/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ - --set PAGER ${less}/bin/less --set TERM xterm + --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 ''; dontStrip = true; |