Merge pull request #99390 from marsam/update-nushell

nushell 0.19.0 -> 0.20.0
This commit is contained in:
Mario Rodas 2020-10-02 19:15:48 -05:00 committed by GitHub
commit b6e751a3b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,6 +3,7 @@
, fetchFromGitHub
, rustPlatform
, openssl
, zlib
, pkg-config
, python3
, xorg
@ -14,35 +15,36 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "08r6f71cy4j22k0mllm134x4dfixaircpaz5arrj93xsbp38nk92";
sha256 = "038c61605b92a97h84hlifwks0q6miv6rn7spr5h6h2nwvaqlyk6";
};
cargoSha256 = "15kvl490abxdv6706zs7pv0q5fhghmdvlfbn19037sldkcsfl86b";
cargoSha256 = "1vr0pqcv9gm4cwlkd06672jzz9rbm77c6j5r05waypc1lv4ln2cg";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ]
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ]
++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ];
cargoBuildFlags = lib.optional withStableFeatures "--features stable";
preCheck = ''
export HOME=$TMPDIR
# Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
unset SDKROOT
'';
checkPhase = ''
runHook preCheck
echo "Running cargo test"
cargo test
HOME=$TMPDIR cargo test
runHook postCheck
'';