Skip to content

Commit

Permalink
powershell: 6.1.0 -> 6.1.1
Browse files Browse the repository at this point in the history
Also fix libraries for darwin.

Closes #50966

Co-authored-by: Robin Gloster <mail@glob.in>
  • Loading branch information
worldofpeace and globin committed Nov 24, 2018
1 parent af9ba37 commit 598fcb0
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions pkgs/shells/powershell/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl,
makeWrapper, less, openssl, pam, lttng-ust }:
{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl
, darwin, makeWrapper, less, openssl, pam, lttng-ust }:

let platformString = if stdenv.isDarwin then "osx"
else if stdenv.isLinux then "linux"
else throw "unsupported platform";
platformSha = if stdenv.isDarwin then "0jngmqxjiiz5dpgky027wl0s3nn321rxs6kxab27kmp031j65x8g"
else if stdenv.isLinux then "0nmqv32mck16b7zljfpb9ydg3h2jvcqrid9ga2i5wac26x3ix531"
platformSha = if stdenv.isDarwin then "1zm5q25ny2x6wvdqfrc380467zq0nbrzh2rzldwdkdpkb6wbvpj8"
else if stdenv.isLinux then "0wh5vvh8pk75fy37bm5av4xvp76slqyjhb6a0al55vw9rlg5q3xw"
else throw "unsupported platform";
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
else if stdenv.isLinux then "LD_LIBRARY_PATH"
else throw "unsupported platform";
libraries = [ libunwind libuuid icu curl openssl lttng-ust ] ++ (if stdenv.isLinux then [ pam ] else []);
libraries = [ libunwind libuuid icu curl openssl ] ++
(if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]);
in
stdenv.mkDerivation rec {
name = "powershell-${version}";
version = "6.1.0";
version = "6.1.1";

src = fetchzip {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
Expand Down

2 comments on commit 598fcb0

@worldofpeace
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@globin platforms = platforms.unix; includes darwin?

@globin
Copy link
Member

@globin globin commented on 598fcb0 Nov 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, see lib/systems/inspect.nix:

    isUnix         = [ isBSD isDarwin isLinux isSunOS isCygwin ];

Please sign in to comment.