diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-26 18:01:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-26 18:01:19 +0000 |
| commit | b529eccbb3eac58913ff0dfa71cab94ed838b5fe (patch) | |
| tree | 2891571a6076f37802c77b3e4724c6e2b154aff8 /pkgs/shells | |
| parent | 956b399ffadb4115975fbc958fb6269fa7f6871c (diff) | |
| parent | 9dc12546ab3d3b619a79ebecc1d6759b4f1f2024 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/nix-bash-completions/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index 2034eed1f5dab..2e8b49385fb43 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -32,5 +32,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ hedning ]; + # Set a lower priority such that the newly provided completion from Nix 2.4 are preferred. + priority = 10; }; } diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index ffc93bff6b735..4f4ad91e82880 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-eN1tTKNuZMU3qObHaqq70bdkmZeAD6LNAQau9JGSXpE="; + sha256 = "sha256-ebIU632dYCKaU1Hh8Q3k6W2SRdZ49kcVx6eTzcKAzQw="; }; - cargoSha256 = "sha256-6TZz8b8fALPTDRxzp+7ZWCHjOwVtqRjdSO6aEwZcMnc="; + cargoSha256 = "sha256-/AIARaMAxxMgBMMVecp2BXTyCe99pf/eXGJB6O1MyuU="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; |