feat: Update dependencies

sudosubin · Feb 4, 2024 · abbe465 · abbe465
1 parent 97385f9
commit abbe465
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 33 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/libraries/nixpkgs/programs/orbstack/default.nix b/libraries/nixpkgs/programs/orbstack/default.nix
@@ -1,22 +1,17 @@
 { lib, fetchurl, fetchFromGitHub, stdenvNoCC, docker, docker-compose_1, installShellFiles }:
 
 let
-  version = "1.3.0_16556";
+  version = "1.4.1_16644";
   hdiutil = "/usr/bin/hdiutil";
 
-  completions = {
-    docker = docker.src;
-    docker-compose = docker-compose_1.out;
-  };
-
   sources = {
     "aarch64-darwin" = {
       url = "https://cdn-updates.orbstack.dev/arm64/OrbStack_v${version}_arm64.dmg";
-      sha256 = "0v0w2r8mnqjw3z2spdkh401xclay6gkph4sh601fci3rw6zwpay2";
+      sha256 = "1v5p6b84hy7pv4l4dwd8hi7jsrvapvshp5icx5951jq3v299gzb2";
     };
     "x86_64-darwin" = {
       url = "https://cdn-updates.orbstack.dev/amd64/OrbStack_v${version}_amd64.dmg";
-      sha256 = "03dmh6yshgcq5jc7fjzadgm8d91ip1g19vikc8dbx1v3crx1px8d";
+      sha256 = "0w5r5c4m5h3bbmnglvfmr97brl64crm1j8kia0h71ip7k1jshfkz";
     };
   };
 
@@ -46,21 +41,21 @@ stdenvNoCC.mkDerivation rec {
     cp -R . "$out/Applications/${sourceRoot}"
 
     mkdir -p "$out/bin"
+    ln -s "$out/Applications/${sourceRoot}/Contents/MacOS/bin/orb" "$out/bin/orb"
+    ln -s "$out/Applications/${sourceRoot}/Contents/MacOS/bin/orbctl" "$out/bin/orbctl"
     ln -s "$out/Applications/${sourceRoot}/Contents/MacOS/xbin/docker" "$out/bin/docker"
     ln -s "$out/Applications/${sourceRoot}/Contents/MacOS/xbin/docker-buildx" "$out/bin/docker-buildx"
     ln -s "$out/Applications/${sourceRoot}/Contents/MacOS/xbin/docker-compose" "$out/bin/docker-compose"
     ln -s "$out/Applications/${sourceRoot}/Contents/MacOS/xbin/docker-credential-osxkeychain" "$out/bin/docker-credential-osxkeychain"
-    ln -s "$out/Applications/${sourceRoot}/Contents/MacOS/bin/orb" "$out/bin/orb"
-    ln -s "$out/Applications/${sourceRoot}/Contents/MacOS/bin/orbctl" "$out/bin/orbctl"
 
     # completion for docker
-    installShellCompletion --bash ${completions.docker}/contrib/completion/bash/docker
-    installShellCompletion --fish ${completions.docker}/contrib/completion/fish/docker.fish
-    installShellCompletion --zsh  ${completions.docker}/contrib/completion/zsh/_docker
+    installShellCompletion --bash "$out/Applications/${sourceRoot}/Contents/Resources/completions/docker.bash"
+    installShellCompletion --fish "$out/Applications/${sourceRoot}/Contents/Resources/completions/docker.fish"
+    installShellCompletion --zsh  "$out/Applications/${sourceRoot}/Contents/Resources/completions/zsh/_docker"
 
     # completion for docker-compose
-    installShellCompletion --bash ${completions.docker-compose}/share/bash-completion/completions/docker-compose
-    installShellCompletion --zsh ${completions.docker-compose}/share/zsh/site-functions/_docker-compose
+    installShellCompletion --bash ${docker-compose_1.out}/share/bash-completion/completions/docker-compose
+    installShellCompletion --zsh ${docker-compose_1.out}/share/zsh/site-functions/_docker-compose
   '';
 
   meta = with lib; {

diff --git a/libraries/nixpkgs/programs/redisinsight/default.nix b/libraries/nixpkgs/programs/redisinsight/default.nix
@@ -4,18 +4,18 @@ let
   sources = {
     "aarch64-darwin" = {
       url = "https://download.redisinsight.redis.com/latest/RedisInsight-mac-arm64.dmg";
-      sha256 = "09a375xydr78y4dgbsczs7rkxzgsbs202gcj54nc17sn30zdcral";
+      sha256 = "1h512cny1028xda94ip89ffsm5dsx92bafz21s39ixmjd5x48laa";
     };
     "x86_64-darwin" = {
       url = "https://download.redisinsight.redis.com/latest/RedisInsight-mac-x64.dmg";
-      sha256 = "16xqnlx2ajckbsdhyzkp8ah80x2lb8acx4sw5d8pb29i0qjb1qqr";
+      sha256 = "19b9yzzfmsfclb3a1i49qlfn8jzmbqavxdhvf498a4k4b0ia97xc";
     };
   };
 
 in
 stdenvNoCC.mkDerivation rec {
   pname = "redisinsight";
-  version = "2.40.0";
+  version = "2.42.0";
 
   src = fetchurl {
     inherit (sources.${stdenvNoCC.hostPlatform.system}) url sha256;