mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #329681 from 1adept/update-nushell
nushell: 0.95.0 -> 0.96.0
This commit is contained in:
commit
3032a3844c
5 changed files with 15 additions and 9 deletions
|
@ -21,7 +21,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.95.0";
|
||||
version = "0.96.0";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
|
@ -32,10 +32,10 @@ rustPlatform.buildRustPackage {
|
|||
owner = "nushell";
|
||||
repo = "nushell";
|
||||
rev = version;
|
||||
hash = "sha256-NxdqQ5sWwDptX4jyQCkNX2pVCua5nN4v/VYHZ/Q1LpQ=";
|
||||
hash = "sha256-FHTOibm8p8hFvopFgBO3yWBSc9Gk8WroraxV/1Jhar0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PNZPljUDXqkyQicjwjaZsiSltxgO6I9/9VJDWKkvUFA=";
|
||||
cargoHash = "sha256-/saQSOBAAxkvtxsboFpEYUNCUzTgMRbLS1B2wZgX6oY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]
|
||||
|
@ -49,6 +49,8 @@ rustPlatform.buildRustPackage {
|
|||
buildNoDefaultFeatures = !withDefaultFeatures;
|
||||
buildFeatures = additionalFeatures [ ];
|
||||
|
||||
doCheck = ! stdenv.isDarwin; # Skip checks on darwin. Failing tests since 0.96.0
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
(
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell_plugin_formats";
|
||||
inherit (nushell) version src;
|
||||
cargoHash = "sha256-DI49nEm7CSoXGspTNvzzR7GsXAbMLcozsLd8d3KsEcQ=";
|
||||
cargoHash = "sha256-VaRaoDKZzCOxNlRWaipoh5oSX8cDJfQfhdXfArJgYt8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell_plugin_gstat";
|
||||
inherit (nushell) version src;
|
||||
cargoHash = "sha256-stbW+XJvVOMcf93BpcaD1/yFwPioLKvxVQe6kRlJuJ4=";
|
||||
cargoHash = "sha256-GHZW0FdGnaY+4mLADJSLzwMliYnRJCtbRA0aaaj6ZbY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
|
|
|
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
|
|||
pname = "nushell_plugin_polars";
|
||||
inherit (nushell) version src;
|
||||
|
||||
cargoHash = "sha256-OgrJNUVVyoqjRT0SPoX3PGRksLiAz254piw08k3gibo=";
|
||||
cargoHash = "sha256-VLWLAVoCHLPgUcD+/5Ty3LSLndSt/7VjwbVmrcDMC70=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
buildInputs =
|
||||
|
|
|
@ -5,15 +5,19 @@
|
|||
, IOKit
|
||||
, CoreFoundation
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, openssl
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "nushell_plugin_query";
|
||||
inherit (nushell) version src;
|
||||
cargoHash = "sha256-zFkq+rx1GN6TQvm5jK8O2ocR0pUbtVFk051IlwCu100=";
|
||||
cargoHash = "sha256-z4heSGHWWhzvFyFcITwSfETPeFNXCaH7Eg8Ij9Zihzw=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
|
||||
cargoBuildFlags = [ "--package nu_plugin_query" ];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
Loading…
Reference in a new issue