Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: af9ba3758fe4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 598fcb04211a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 2 contributors

Commits on Nov 24, 2018

  1. powershell: 6.1.0 -> 6.1.1 

    Also fix libraries for darwin.

Closes #50966

Co-authored-by: Robin Gloster <mail@glob.in>
    @worldofpeace @globin
    worldofpeace and globin committed Nov 24, 2018
    2
    Copy the full SHA
    598fcb0 View commit details
Showing with 7 additions and 6 deletions.
  1. +7 −6 pkgs/shells/powershell/default.nix
13 changes: 7 additions & 6 deletions pkgs/shells/powershell/default.nix
View file
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";