From d5bef142d44138e18865199df0e4e81aa8bdd792 Mon Sep 17 00:00:00 2001
From: Charith Amarasinghe <995136+char8@users.noreply.github.com>
Date: Sun, 29 Mar 2020 20:49:35 +0100
Subject: [PATCH 1/4] Fix missing dependency on helper module for helpers added
 in #1793 (#1811)

PR #1793 introduced helper functions for OS detection in some modules.
These helpers require a module dependency on the 'helper' module.
---
 modules/haskell/init.zsh  | 3 +++
 modules/macports/init.zsh | 3 +++
 modules/osx/init.zsh      | 3 +++
 modules/perl/init.zsh     | 3 +++
 modules/python/init.zsh   | 3 +++
 modules/rsync/init.zsh    | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/modules/haskell/init.zsh b/modules/haskell/init.zsh
index 7863528..cb76864 100644
--- a/modules/haskell/init.zsh
+++ b/modules/haskell/init.zsh
@@ -10,6 +10,9 @@ if (( ! $+commands[ghc] )); then
   return 1
 fi
 
+# Load dependencies.
+pmodload 'helper'
+
 # Prepend Cabal per user directories to PATH.
 if is-darwin && [[  -d $HOME/Library/Haskell ]]; then
   path=($HOME/Library/Haskell/bin(/N) $path)
diff --git a/modules/macports/init.zsh b/modules/macports/init.zsh
index 943ff5b..7bf4ab2 100644
--- a/modules/macports/init.zsh
+++ b/modules/macports/init.zsh
@@ -6,6 +6,9 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# Load dependencies.
+pmodload 'helper'
+
 # Return if requirements are not found.
 if ! is-darwin; then
   return 1
diff --git a/modules/osx/init.zsh b/modules/osx/init.zsh
index 2b74d3a..62f2194 100644
--- a/modules/osx/init.zsh
+++ b/modules/osx/init.zsh
@@ -5,6 +5,9 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# Load dependencies.
+pmodload 'helper'
+
 # Return if requirements are not found.
 if ! is-darwin; then
   return 1
diff --git a/modules/perl/init.zsh b/modules/perl/init.zsh
index 50e9b64..8f097f6 100644
--- a/modules/perl/init.zsh
+++ b/modules/perl/init.zsh
@@ -10,6 +10,9 @@ if (( ! $+commands[perl] )); then
   return 1
 fi
 
+# Load dependencies.
+pmodload 'helper'
+
 #
 # Load Perlbrew or plenv
 #
diff --git a/modules/python/init.zsh b/modules/python/init.zsh
index a7e8b6e..809ab40 100644
--- a/modules/python/init.zsh
+++ b/modules/python/init.zsh
@@ -7,6 +7,9 @@
 #   Patrick Bos <egpbos@gmail.com>
 #
 
+# Load dependencies
+pmodload 'helper'
+
 # Load manually installed pyenv into the path
 if [[ -s "${PYENV_ROOT:=$HOME/.pyenv}/bin/pyenv" ]]; then
   path=("${PYENV_ROOT}/bin" $path)
diff --git a/modules/rsync/init.zsh b/modules/rsync/init.zsh
index f2eb891..79432c1 100644
--- a/modules/rsync/init.zsh
+++ b/modules/rsync/init.zsh
@@ -10,6 +10,9 @@ if (( ! $+commands[rsync] )); then
   return 1
 fi
 
+# Load dependencies.
+pmodload 'helper'
+
 #
 # Aliases
 #

From 5b03d7fa32cae51cee7903d3338f87c2d7d89657 Mon Sep 17 00:00:00 2001
From: Ackerley Tng <ackerleytng@gmail.com>
Date: Mon, 30 Mar 2020 03:51:11 +0800
Subject: [PATCH 2/4] prompt: fix usage of zsh-async in sorin prompt (#1810)

---
 modules/prompt/functions/prompt_sorin_setup | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup
index 41ac7d0..a7d341e 100644
--- a/modules/prompt/functions/prompt_sorin_setup
+++ b/modules/prompt/functions/prompt_sorin_setup
@@ -54,6 +54,13 @@ function prompt_sorin_async_callback {
         zle && zle reset-prompt
       fi
       ;;
+    "[async]")
+      # Code is 1 for corrupted worker output and 2 for dead worker.
+      if [[ $2 -eq 2 ]]; then
+	  # Our worker died unexpectedly.
+          typeset -g prompt_prezto_async_init=0
+      fi
+      ;;
   esac
 }
 

From 95ff0360aeef951111c5ca6a80939e9329ddb434 Mon Sep 17 00:00:00 2001
From: Srijan R Shetty <srijan.shetty@gmail.com>
Date: Mon, 6 Apr 2020 15:25:01 +0530
Subject: [PATCH 3/4] fix: regression in homebrew module (#1816)

---
 modules/homebrew/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/homebrew/init.zsh b/modules/homebrew/init.zsh
index 6605426..fb05042 100644
--- a/modules/homebrew/init.zsh
+++ b/modules/homebrew/init.zsh
@@ -6,7 +6,7 @@
 #
 
 # Return if requirements are not found.
-if ! is-darwin || ! is-linux; then
+if ! is-darwin && ! is-linux; then
   return 1
 fi
 

From de7b3b7fdc99f8a67320dc64085dea44914969c7 Mon Sep 17 00:00:00 2001
From: Vladimir Bauer <vbauerster@gmail.com>
Date: Thu, 9 Apr 2020 01:15:23 +0500
Subject: [PATCH 4/4] Use shallow clone for powerlevel9k and powerlevel10k
 submodules (#1819)

---
 .gitmodules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index fcc4826..547effa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,6 +28,8 @@
 [submodule "modules/prompt/external/powerlevel9k"]
 	path = modules/prompt/external/powerlevel9k
 	url = https://github.com/bhilburn/powerlevel9k.git
+	shallow = true
 [submodule "modules/prompt/external/powerlevel10k"]
 	path = modules/prompt/external/powerlevel10k
 	url = https://github.com/romkatv/powerlevel10k.git
+	shallow = true