diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-22 21:20:14 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-22 21:20:14 +0200 |
| commit | d13fc932cd213b2f7d50094fdcf7ef9b2e8439ab (patch) | |
| tree | 1509d22d03bc478df6511fecc3bf8f27891f2d40 /pkgs/shells | |
| parent | 90094b0468e3d706ac6855981787a403b94e4c2b (diff) | |
| parent | 4cada0cd315b1cf0c65815e5250ff308ed5c69e0 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index c3e6c5b67539..d025ed1ddcd8 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -36,11 +36,6 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optional withStableFeatures "--features stable"; - # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - unset SDKROOT - ''; - checkPhase = '' runHook preCheck echo "Running cargo test" diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 5d81ceaba1b2..39cb1f247fcf 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "08zg4in70h3kray6lazszzy26gvil9w2cr6xmkbgjsv3k6w3k0jg"; + sha256 = "0w5rv7z47nys3x113mdddpb2pf1d9pmz9myh4xjzrcy4hp4qv421"; }; patches = [ |