Unverified Commit f5ffd578 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #218030 from MangoIV/mangoiv/update-nushell 

nushell: 0.75.0 -> 0.76.0
parents 506360c8 2a42048c

pkgs/shells/nushell/default.nix

+17 −15
Original line number Diff line number Diff line
@@ -16,43 +16,45 @@ 
, Security

, nghttp2

, libgit2

, withExtraFeatures ? true

, doCheck ? true

, withDefaultFeatures ? true

, additionalFeatures ? (p: p)

, testers

, nushell

, nix-update-script

}:



rustPlatform.buildRustPackage rec {

rustPlatform.buildRustPackage (

  let

    version =  "0.76.0";

    pname = "nushell";

  version = "0.75.0";

  in {

  inherit version pname;



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = version;

    sha256 = "sha256-u8/SvuR/RpJaBX4Dr3Onrk0AVpIAeVb+399+NUpgkfI=";

    sha256 = "sha256-dGsnbKsg0nQFFXZDRDei2uGhGWEQSeSHGpXJp+8QUC8=";

  };



  cargoSha256 = "sha256-hnSumfZd9ylEx3dkTGW2s4VSv107MHOn21ytOcimhPw=";



  # enable pkg-config feature of zstd

  cargoPatches = [ ./zstd-pkg-config.patch ];

  cargoSha256 = "sha256-9oXMojQA4tSoIxY1lwMPGhQz3WHcxEKtwl+4LsAYbDo=";



  nativeBuildInputs = [ pkg-config ]

    ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]

    ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]

    ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ];



  buildInputs = [ openssl zstd ]

    ++ lib.optionals stdenv.isDarwin [ zlib libiconv Libsystem Security ]

    ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ]

    ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];

    ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ xorg.libX11 ]

    ++ lib.optionals (withDefaultFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];



  buildFeatures = lib.optional withExtraFeatures "extra";

  buildFeatures = additionalFeatures [ (lib.optional withDefaultFeatures "default") ];



  # TODO investigate why tests are broken on darwin

  # failures show that tests try to write to paths

  # outside of TMPDIR

  doCheck = ! stdenv.isDarwin;

  doCheck = doCheck && !stdenv.isDarwin;



  checkPhase = ''

    runHook preCheck
@@ -76,4 +78,4 @@ rustPlatform.buildRustPackage rec { 
    };

    updateScript = nix-update-script { };

  };

}
 
})

pkgs/shells/nushell/zstd-pkg-config.patch

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
diff --git a/Cargo.lock b/Cargo.lock

index 7376ffe6a..a7d3335cc 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -2751,6 +2751,7 @@ dependencies = [

  "which",

  "windows",

  "winreg",

+ "zstd",

 ]

 

 [[package]]

@@ -5881,4 +5882,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"

 dependencies = [

  "cc",

  "libc",

+ "pkg-config",

 ]

diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml

index d293f3e39..a462d67dc 100644

--- a/crates/nu-command/Cargo.toml

+++ b/crates/nu-command/Cargo.toml

@@ -93,6 +93,8 @@ wax = { version =  "0.5.0", features = ["diagnostics"] }

 rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }

 sqlparser = { version = "0.23.0", features = ["serde"], optional = true }

 

+zstd = { version = "*", features = [ "pkg-config" ] }

+

 [target.'cfg(windows)'.dependencies]

 winreg = "0.10.1"