From a9cda5f14c836d40c961dfe72c6632c3614f59e8 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 27 Nov 2019 08:49:18 +0200 Subject: [PATCH 1/2] nushell: add filalex77 to maintainers --- pkgs/shells/nushell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 91684504774..43917946ec7 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { description = "A modern shell written in Rust"; homepage = "https://www.nushell.sh/"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ filalex77 marsam ]; }; passthru = { From 160a9764ae1d00361765c63e24d66df631a330b7 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 27 Nov 2019 08:49:59 +0200 Subject: [PATCH 2/2] nushell: 0.5.0 -> 0.6.0 --- 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 43917946ec7..3b37610eced 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "0_5_0"; - sha256 = "1s60w29c8sv0a4nmpggls9pkqyfrwwxjzd65p68d1xxxsdb36rzj"; + rev = version; + sha256 = "012fhy7ni4kyxypn25ssj6py1zxwk41bj4xb1ni4zaw47fqsj1nw"; }; - cargoSha256 = "0b8alc3si6y4xmn812izknbkfkz64kz7kcnq4xaqws6iqn7pqidp"; + cargoSha256 = "17r6g80qcy1mb195fl5iwcr83d35q2hs71camhwjbdh8yrs9l1la"; nativeBuildInputs = [ pkg-config ] ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ stdenv.lib.optionals (withAllFeatures && stdenv.isDarwin) [ AppKit ]; - cargoBuildFlags = stdenv.lib.optionals withAllFeatures [ "--features" "all" ]; + cargoBuildFlags = stdenv.lib.optional withAllFeatures "--all-features"; preCheck = '' export HOME=$TMPDIR