diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-06 12:01:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 12:01:50 +0000 |
| commit | 241b3652c3046093a94e8ddfc8051ef2f025a1a9 (patch) | |
| tree | a14ce38d3a0dda3748b9e5f56063f0ba24db09fc /pkgs/shells | |
| parent | a5b67b42a4ec3b26c5707dc2c01cb7baeea35730 (diff) | |
| parent | d9940cda91b72f751979101a0a8053bca7ef018b (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/shells/nushell/use-system-zstd-lib.diff | 26 |
2 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 51261ac1de8b6..b77cad3d12b13 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.44.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-LMG72XfDHA9dKiBbaB09v0rDdUKRy/Czu/lsYw6jUog="; + sha256 = "1qfqn2q2bam0jrr4yqq9rb29k8qj9w9g0j9x4n8h0zp28vn7c2bq"; }; - cargoSha256 = "sha256-wgaRTf+ZQ7alibCdeCjSQhhR9MC77qM1n0jakDgr114="; + cargoSha256 = "sha256-gZ9r1Ryp5a7MjG9yM0pGCBYtM4GylZg7Sg9wCiB+SW0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/nushell/use-system-zstd-lib.diff b/pkgs/shells/nushell/use-system-zstd-lib.diff index 271ad6c692ed1..232ee9420104a 100644 --- a/pkgs/shells/nushell/use-system-zstd-lib.diff +++ b/pkgs/shells/nushell/use-system-zstd-lib.diff @@ -1,32 +1,32 @@ diff --git a/Cargo.lock b/Cargo.lock -index 8833c3e5..0c90d2fe 100644 +index 4261c06..6d6e537 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -3188,6 +3188,7 @@ dependencies = [ - "nu_plugin_xpath", +@@ -2166,6 +2166,7 @@ dependencies = [ "rstest", "serial_test", + "tempfile", + "zstd-sys", ] - + [[package]] -@@ -6954,4 +6955,5 @@ checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" +@@ -4962,4 +4963,5 @@ checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml -index 89e8a311..4cc2331a 100644 +index e214da1..b78919a 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -63,6 +63,9 @@ serial_test = "0.5.1" - hamcrest2 = "0.3.0" - rstest = "0.10.0" - +@@ -67,6 +69,9 @@ hamcrest2 = "0.3.0" + rstest = "0.12.0" + itertools = "0.10.3" + +# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library +zstd-sys = { version = "1", features = [ "pkg-config" ] } + - [build-dependencies] - - [features] + [target.'cfg(windows)'.build-dependencies] + embed-resource = "1" + |