pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #174751 from shanesveller/shanesveller/nushell-0.63.0

nushell: 0.62.0 -> 0.63.0

authored by

Maximilian Bosch and committed by
GitHub 3a2de147 6a375870

+19 -14
+8 -3
pkgs/shells/nushell/default.nix
··· 14 14 , nghttp2 15 15 , libgit2 16 16 , withExtraFeatures ? true 17 + , testers 18 + , nushell 17 19 }: 18 20 19 21 rustPlatform.buildRustPackage rec { 20 22 pname = "nushell"; 21 - version = "0.62.0"; 23 + version = "0.63.0"; 22 24 23 25 src = fetchFromGitHub { 24 26 owner = pname; 25 27 repo = pname; 26 28 rev = version; 27 - sha256 = "sha256-fEwsoAbrV4fSreyB4+xcN8PGDlkLyaK+ptwgZrsBuLk="; 29 + sha256 = "sha256-4thvUSOSvH/bv0aW7hGGQMvtXdS+yDfZzPRLZmPZQMQ="; 28 30 }; 29 31 30 - cargoSha256 = "sha256-C4Eynvk3ogIl/RDwyA28hYKlkHA2eMYSCyIvAbp+NQo="; 32 + cargoSha256 = "sha256-ALUp6sPcmnJy/A078umyKg8KBv23P0vv8mwoO9OU+DQ="; 31 33 32 34 nativeBuildInputs = [ pkg-config ] 33 35 ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; ··· 74 76 75 77 passthru = { 76 78 shellPath = "/bin/nu"; 79 + tests.version = testers.testVersion { 80 + package = nushell; 81 + }; 77 82 }; 78 83 }
+11 -11
pkgs/shells/nushell/use-system-zstd-lib.diff
··· 1 1 diff --git a/Cargo.lock b/Cargo.lock 2 - index 4261c06..6d6e537 100644 2 + index 6cebf66d..b6e40cd9 100644 3 3 --- a/Cargo.lock 4 4 +++ b/Cargo.lock 5 - @@ -2166,6 +2166,7 @@ dependencies = [ 5 + @@ -2443,6 +2443,7 @@ dependencies = [ 6 6 "rstest", 7 7 "serial_test", 8 8 "tempfile", ··· 10 10 ] 11 11 12 12 [[package]] 13 - @@ -4962,4 +4963,5 @@ checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" 13 + @@ -5365,4 +5366,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" 14 14 dependencies = [ 15 15 "cc", 16 16 "libc", 17 17 + "pkg-config", 18 18 ] 19 19 diff --git a/Cargo.toml b/Cargo.toml 20 - index e214da1..b78919a 100644 20 + index 0791d462..d520d9ae 100644 21 21 --- a/Cargo.toml 22 22 +++ b/Cargo.toml 23 - @@ -67,6 +69,9 @@ hamcrest2 = "0.3.0" 24 - rstest = "0.12.0" 25 - itertools = "0.10.3" 23 + @@ -58,6 +58,9 @@ rayon = "1.5.1" 24 + reedline = { version = "0.6.0", features = ["bashisms"]} 25 + is_executable = "1.0.1" 26 26 27 27 +# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library 28 - +zstd-sys = { version = "1", features = [ "pkg-config" ] } 28 + +zstd-sys = { version = "2", features = [ "pkg-config" ] } 29 29 + 30 - [target.'cfg(windows)'.build-dependencies] 31 - embed-resource = "1" 32 - 30 + [dev-dependencies] 31 + nu-test-support = { path="./crates/nu-test-support", version = "0.63.0" } 32 + tempfile = "3.2.0"