powershell: 6.0.4 -> 6.1.0 (#48130)

This commit is contained in:
Yurii Rashkovskii 2018-10-10 13:52:38 -07:00 committed by xeji
parent 6a5a5b9fa0
commit fd9518a532

View file

@ -4,8 +4,8 @@
let platformString = if stdenv.isDarwin then "osx" let platformString = if stdenv.isDarwin then "osx"
else if stdenv.isLinux then "linux" else if stdenv.isLinux then "linux"
else throw "unsupported platform"; else throw "unsupported platform";
platformSha = if stdenv.isDarwin then "01j92myljgphf68la9q753m5wgfmd0kwlsk441yic7qshcly5xkw" platformSha = if stdenv.isDarwin then "0jngmqxjiiz5dpgky027wl0s3nn321rxs6kxab27kmp031j65x8g"
else if stdenv.isLinux then "0al1mrlz3m5ksnq86mqm0axb8bjdxa05j2p5y9bmcykrgkdwi3vk" else if stdenv.isLinux then "0nmqv32mck16b7zljfpb9ydg3h2jvcqrid9ga2i5wac26x3ix531"
else throw "unsupported platform"; else throw "unsupported platform";
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
else if stdenv.isLinux then "LD_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH"
@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx"
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "powershell-${version}"; name = "powershell-${version}";
version = "6.0.4"; version = "6.1.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; 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; buildInputs = [ less ] ++ libraries;
nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; 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 = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
mkdir -p $out/share/powershell mkdir -p $out/share/powershell
cp -r * $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}" \ 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; dontStrip = true;