mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

Merge pull request #241138 from figsoda/nu

Browse source 
nushell: refactor
This commit is contained in:
Weijia Wang 2023-07-04 10:12:00 +03:00 committed by GitHub
parent c67590170e 90e4770f81
commit 3248e26928
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
pkgs/shells/nushell/default.nix
View file

@ -8,7 +8,6 @@
, pkg-config
, python3
, xorg
, libiconv
, Libsystem
, AppKit
, Security
@ -22,16 +21,17 @@
, nix-update-script
}:
rustPlatform.buildRustPackage (
let
let
version = "0.82.0";
in
rustPlatform.buildRustPackage {
pname = "nushell";
in {
inherit version pname;
inherit version;
src = fetchFromGitHub {
owner = pname;
repo = pname;
owner = "nushell";
repo = "nushell";
rev = version;
hash = "sha256-D/R+/60Lo2rLUA/313CTJQookqSNtbD7LnVf0vBC9Qc=";
};
@ -43,32 +43,22 @@ rustPlatform.buildRustPackage (
++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ];
buildInputs = [ openssl zstd ]
++ lib.optionals stdenv.isDarwin [ zlib libiconv Libsystem Security ]
++ lib.optionals stdenv.isDarwin [ zlib Libsystem Security ]
++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ xorg.libX11 ]
++ lib.optionals (withDefaultFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
buildFeatures = additionalFeatures [ (lib.optional withDefaultFeatures "default") ];
buildNoDefaultFeatures = !withDefaultFeatures;
buildFeatures = additionalFeatures [ ];
# TODO investigate why tests are broken on darwin
# failures show that tests try to write to paths
# outside of TMPDIR
doCheck = doCheck && !stdenv.isDarwin;
inherit doCheck;
checkPhase = ''
runHook preCheck
echo "Running cargo test"
HOME=$TMPDIR cargo test
HOME=$(mktemp -d) cargo test
runHook postCheck
'';
meta = with lib; {
description = "A modern shell written in Rust";
homepage = "https://www.nushell.sh/";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne johntitor marsam ];
mainProgram = "nu";
};
passthru = {
shellPath = "/bin/nu";
tests.version = testers.testVersion {
@ -76,4 +66,12 @@ rustPlatform.buildRustPackage (
};
updateScript = nix-update-script { };
};
})
meta = with lib; {
description = "A modern shell written in Rust";
homepage = "https://www.nushell.sh/";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne johntitor marsam ];
mainProgram = "nu";
};
}