about summary refs log tree commit diff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-03-31 12:02:10 +0000
committerGitHub <noreply@github.com>2022-03-31 12:02:10 +0000
commit9aa014c46a227ba5d0223851e8b0386f0869aa23 (patch)
treefe8c9aa62289b371d9edbfe88273025fc2144607 /pkgs/shells
parent22c23dbb8de9969e8c9b898a06d2f36b10d0b809 (diff)
parentac5a927919638e6a9c69cd35084c7e7801472498 (diff)
Merge staging-next into staging
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/oil/default.nix4
-rw-r--r--pkgs/shells/zsh/oh-my-zsh/default.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 516d4c43f6fa3..2b82d4882789c 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "oil";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "sha256-OsrxfJ5dF9Anpg1r6Hj+aD194l99X9Yh4vIZ+R+aH8E=";
+    sha256 = "sha256-b2tMS5z4oejh3C/3vznIWhG4cd3anp5RuffhoORrKCQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 82f231405a905..851d5b08ff361 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2022-03-28";
+  version = "2022-03-29";
   pname = "oh-my-zsh";
-  rev = "3f214329d631b3ae39d6b283262c77819a0078de";
+  rev = "93435bff4947ca0855d4d8ecc4786877578f0dd3";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "rmSS8RnTbraA8yoU70/Mwx7wZ+uGuxkw4MO4BeuLulM=";
+    sha256 = "w9DU2eTf8fID/xDhkJYVPuvYbVIXE9GKW8pycKZ9jVA=";
   };
 
   installPhase = ''