diff options
Diffstat (limited to 'pkgs/shells/nushell')
-rw-r--r-- | pkgs/shells/nushell/default.nix | 24 | ||||
-rw-r--r-- | pkgs/shells/nushell/nu_scripts/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/nushell/plugins/formats.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/nushell/plugins/gstat.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/nushell/plugins/polars.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/nushell/plugins/query.nix | 2 |
6 files changed, 21 insertions, 17 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index e0a6994381773..34bdab129b238 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -13,9 +13,6 @@ , Security , nghttp2 , libgit2 -# string interpolation dependends on a date that is erroring out -# this will be fixed in releases after 0.90.1 -, doCheck ? false , withDefaultFeatures ? true , additionalFeatures ? (p: p) , testers @@ -24,7 +21,7 @@ }: let - version = "0.94.1"; + version = "0.95.0"; in rustPlatform.buildRustPackage { @@ -35,10 +32,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-uwtmSyNJJUtaFrBd9W89ZQpWzBOswOLWTevkPlg6Ano="; + hash = "sha256-NxdqQ5sWwDptX4jyQCkNX2pVCua5nN4v/VYHZ/Q1LpQ="; }; - cargoHash = "sha256-4caqvbNxXRZksQrySydPlzn9S6gr2xPLFLSEcAEGnI8="; + cargoHash = "sha256-PNZPljUDXqkyQicjwjaZsiSltxgO6I9/9VJDWKkvUFA="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] @@ -52,12 +49,19 @@ rustPlatform.buildRustPackage { buildNoDefaultFeatures = !withDefaultFeatures; buildFeatures = additionalFeatures [ ]; - inherit doCheck; - checkPhase = '' runHook preCheck - echo "Running cargo test" - HOME=$(mktemp -d) cargo test + ( + # The skipped tests all fail in the sandbox because in the nushell test playground, + # the tmp $HOME is not set, so nu falls back to looking up the passwd dir of the build + # user (/var/empty). The assertions however do respect the set $HOME. + set -x + HOME=$(mktemp -d) cargo test -j $NIX_BUILD_CORES --offline -- \ + --test-threads=$NIX_BUILD_CORES \ + --skip=repl::test_config_path::test_default_config_path \ + --skip=repl::test_config_path::test_xdg_config_bad \ + --skip=repl::test_config_path::test_xdg_config_empty + ) runHook postCheck ''; diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 8ed6bb21091cf..e270a895c42c2 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-06-22"; + version = "0-unstable-2024-06-29"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "a992f5b4fa2f7d907cbe32cb8933f05546b598a4"; - hash = "sha256-TVRqwvIwVZQDmrj20bna9oU8jtVp5FAzEp4L2mcyHVU="; + rev = "61a805eb06f27dfb4651877ae4e0fd85e2b9f1b7"; + hash = "sha256-ZcpcxRKtx2lS39c09txLGysRkLq6dNyy+9aZNrfGcT0="; }; installPhase = '' diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 80d29c4dcadcb..a4e3b5dfc4511 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-r5r+LdG6isZiKzwaZM/RIzQnZwrVBDCbdM1SMbvVU0E="; + cargoHash = "sha256-DI49nEm7CSoXGspTNvzzR7GsXAbMLcozsLd8d3KsEcQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 7a937b33aa464..f1f59e66e2b51 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-ENDDkEpUp+3a0Numb7+McVP04VtSZaU4pbu4uEFT9Jc="; + cargoHash = "sha256-stbW+XJvVOMcf93BpcaD1/yFwPioLKvxVQe6kRlJuJ4="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index d1bda99acafb4..f014c4a939e0a 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-GkVX12MEHFP4g183zUzOUn4MNeTEBEpB+D5s0OXa4nc="; + cargoHash = "sha256-OgrJNUVVyoqjRT0SPoX3PGRksLiAz254piw08k3gibo="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 0473b291aff31..f9d573f413488 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-l4fmO2LQpiSpGQVfuqJLcuYIryIlq/iYlPuI4FS+RlQ="; + cargoHash = "sha256-zFkq+rx1GN6TQvm5jK8O2ocR0pUbtVFk051IlwCu100="; nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; |