Merge pull request #75932 from filalex77/nushell-0.7.0

nushell: 0.6.1 -> 0.7.0
This commit is contained in:
Mario Rodas 2019-12-19 10:00:39 -05:00 committed by GitHub
commit 54d52ec0bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,31 +8,31 @@
, libiconv , libiconv
, AppKit , AppKit
, Security , Security
, withAllFeatures ? true , withStableFeatures ? true
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nushell"; pname = "nushell";
version = "0.6.1"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0fdi5c9l8ij2vqcxwi9203mh1qj3lcqsl4kl2rkshqj45hn4ab2a"; sha256 = "09kcyvhnhf5qsaivgrw58l9jh48rx40i9lkf10cpmk7jvqxgqyks";
}; };
cargoSha256 = "11cr88jmy34lzjka7agzfvm13hvg66ksa735rzcdx7lcxha538f3"; cargoSha256 = "0bdxlbl33kilp9ai40dvdzlx9vcl8r21br82r5ljs2pg521jd66p";
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ]; ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]
++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ]
++ stdenv.lib.optionals (withAllFeatures && stdenv.isDarwin) [ AppKit ]; ++ stdenv.lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ];
cargoBuildFlags = stdenv.lib.optional withAllFeatures "--all-features"; cargoBuildFlags = stdenv.lib.optional withStableFeatures "--features=stable";
preCheck = '' preCheck = ''
export HOME=$TMPDIR export HOME=$TMPDIR