From 297a5627af613d72b08842f0f201dafd6f446a6a Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 19 Dec 2019 11:17:23 +0200 Subject: [PATCH 1/2] nushell: 0.6.1 -> 0.7.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 981853bdaf89..3e3080aff8cc 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0fdi5c9l8ij2vqcxwi9203mh1qj3lcqsl4kl2rkshqj45hn4ab2a"; + sha256 = "09kcyvhnhf5qsaivgrw58l9jh48rx40i9lkf10cpmk7jvqxgqyks"; }; - cargoSha256 = "11cr88jmy34lzjka7agzfvm13hvg66ksa735rzcdx7lcxha538f3"; + cargoSha256 = "0bdxlbl33kilp9ai40dvdzlx9vcl8r21br82r5ljs2pg521jd66p"; nativeBuildInputs = [ pkg-config ] ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ]; From 7c7e2afc5cb11bd6d95fb8b2884128fd33ee273a Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 19 Dec 2019 16:26:35 +0200 Subject: [PATCH 2/2] nushell: change --all-features to --features=stable --- pkgs/shells/nushell/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 3e3080aff8cc..05fef442c318 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -8,7 +8,7 @@ , libiconv , AppKit , Security -, withAllFeatures ? true +, withStableFeatures ? true }: rustPlatform.buildRustPackage rec { @@ -25,14 +25,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0bdxlbl33kilp9ai40dvdzlx9vcl8r21br82r5ljs2pg521jd66p"; nativeBuildInputs = [ pkg-config ] - ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ]; + ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ] - ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ stdenv.lib.optionals (withAllFeatures && stdenv.isDarwin) [ AppKit ]; + ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ stdenv.lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ]; - cargoBuildFlags = stdenv.lib.optional withAllFeatures "--all-features"; + cargoBuildFlags = stdenv.lib.optional withStableFeatures "--features=stable"; preCheck = '' export HOME=$TMPDIR