diff options
| author | ilkecan <ilkecan@protonmail.com> | 2022-10-26 07:09:10 +0000 |
|---|---|---|
| committer | ilkecan <ilkecan@protonmail.com> | 2022-10-26 07:09:10 +0000 |
| commit | 70bd5c960e1109bc9db47f83debd0f828944eb82 (patch) | |
| tree | a1c1681a78a21eb31bbc65560e5910042fc4e5f7 /pkgs/shells/nushell | |
| parent | 0614d5d969ad00573a6bc51498a8af0047b93d6a (diff) | |
nushell: 0.69.1 -> 0.70.0
Diffstat (limited to 'pkgs/shells/nushell')
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/shells/nushell/zstd-pkg-config.patch | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 5c988c59f9048..c8645262b20ea 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -24,16 +24,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.69.1"; + version = "0.70.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-aEEuzl3HRWNk2zJq+Vh5ZLyT26Qk7oI3bQKUr4SlDr8="; + sha256 = "sha256-krsycaqT+MmpWEVNVqQQO2zrO9ymZIskgGgrzEMFP1s="; }; - cargoSha256 = "sha256-qaBiTZUe4RSYdXAEWPVv0ATWDN/+aOYiEpq+oztwNEc="; + cargoSha256 = "sha256-Etw8F5alUNMlH0cvREPk2LdBQKl70dj6JklFZWInvow="; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; diff --git a/pkgs/shells/nushell/zstd-pkg-config.patch b/pkgs/shells/nushell/zstd-pkg-config.patch index 762f1f3f0bcbd..280db6c2e6b18 100644 --- a/pkgs/shells/nushell/zstd-pkg-config.patch +++ b/pkgs/shells/nushell/zstd-pkg-config.patch @@ -1,31 +1,31 @@ diff --git a/Cargo.lock b/Cargo.lock -index d4c2ebe3a..bc78478c3 100644 +index 7376ffe6a..a7d3335cc 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -2641,6 +2641,7 @@ dependencies = [ - "wax", +@@ -2751,6 +2751,7 @@ dependencies = [ "which", "windows", + "winreg", + "zstd", ] [[package]] -@@ -5604,4 +5605,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +@@ -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 8a9d29562..374ffa153 100644 +index d293f3e39..a462d67dc 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml -@@ -89,6 +89,8 @@ wax = { version = "0.5.0", features = ["diagnostics"] } +@@ -93,6 +93,8 @@ wax = { version = "0.5.0", features = ["diagnostics"] } rusqlite = { version = "0.28.0", features = ["bundled"], optional = true } - sqlparser = { version = "0.16.0", features = ["serde"], optional = true } + sqlparser = { version = "0.23.0", features = ["serde"], optional = true } +zstd = { version = "*", features = [ "pkg-config" ] } + - [target.'cfg(unix)'.dependencies] - umask = "2.0.0" - users = "0.11.0" + [target.'cfg(windows)'.dependencies] + winreg = "0.10.1" + |