Merge branch 'master' into staging-next

2020-10-22 21:20:14 +02:00
parent 90094b0468 4cada0cd31
commit d13fc932cd
103 changed files with 820 additions and 463 deletions
--- 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"
--- 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 = [