From 8d607118b79b1733a5ab0058f79b7532e87ab95c Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:24:52 +0800
Subject: [PATCH 1/2] waveterm: 0.9.3 -> 0.10.0

---
 pkgs/by-name/wa/waveterm/package.nix | 45 +++++++++++-----------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 98844812d916..e8c013063129 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -31,12 +31,10 @@
   fetchzip,
   unzip,
 }:
-
 let
-  inherit (stdenv.hostPlatform) system;
-  selectSystem = attrs: attrs.${system};
+  selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
   pname = "waveterm";
-  version = "0.9.3";
+  version = "0.10.0";
   passthru.updateScript = ./update.sh;
 
   desktopItems = [
@@ -90,17 +88,17 @@ let
 
     src =
       let
-        suffix = selectSystem {
-          x86_64-linux = "waveterm-linux-x64";
-          aarch64-linux = "waveterm-linux-arm64";
+        arch = selectSystem {
+          x86_64-linux = "x64";
+          aarch64-linux = "arm64";
         };
         hash = selectSystem {
-          x86_64-linux = "sha256-zmmWQnZklnmhVrZp0F0dkVHVMW+K/VynSvbF9Zer/RE=";
-          aarch64-linux = "sha256-HRZRRUV6CVqUQYuvXBmnNcAsbZwgNDZiEf+gjdLDaPQ=";
+          x86_64-linux = "sha256-8q106czSyn+2VauUpPp06yZl3tlQk64s6eB74h/mO9s=";
+          aarch64-linux = "sha256-HxzTCM2csXMqXNyNoyJ+gyyV/n5P61W6lVMgKGGFXBA=";
         };
       in
       fetchzip {
-        url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}-${version}.zip";
+        url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.zip";
         inherit hash;
         stripRoot = false;
       };
@@ -141,13 +139,14 @@ let
     installPhase = ''
       runHook preInstall
 
-      mkdir -p $out/waveterm $out/bin
-      cp -r ./* $out/waveterm/
+      mkdir $out
+      cp -r . $out/waveterm
 
       runHook postInstall
     '';
 
     preFixup = ''
+      mkdir $out/bin
       makeWrapper $out/waveterm/waveterm $out/bin/waveterm \
         --prefix LD_LIBRARY_PATH : "${
           lib.makeLibraryPath [
@@ -167,17 +166,17 @@ let
 
     src =
       let
-        suffix = selectSystem {
-          x86_64-darwin = "Wave-darwin-x64";
-          aarch64-darwin = "Wave-darwin-arm64";
+        arch = selectSystem {
+          x86_64-darwin = "x64";
+          aarch64-darwin = "arm64";
         };
         hash = selectSystem {
-          x86_64-darwin = "sha256-NSpNWUWdRkB2H5l/WnI/Xyv68h0OXX7SIKyDAq0LIJM=";
-          aarch64-darwin = "sha256-QkJMrmqrveFc2StL5gVpE78DlC1OBcEV+tY7p2nJ/6I=";
+          x86_64-darwin = "sha256-LdB0WXxUAxB7yDC+tWx6/qZClyMidExBIpitY3qUC1Q=";
+          aarch64-darwin = "sha256-JEMq/N6d6lHpXag8stAi8s5dV61V5cfc9QADVLmYzeQ=";
         };
       in
       fetchurl {
-        url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/${suffix}-${version}.zip";
+        url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
         inherit hash;
       };
 
@@ -185,20 +184,12 @@ let
       unzip
     ];
 
-    unpackPhase = ''
-      runHook preUnpack
-
-      unzip ${src} -d ./
-
-      runHook postUnpack
-    '';
-
     sourceRoot = "Wave.app";
 
     installPhase = ''
       runHook preInstall
 
-      mkdir -p $out/Applications/Wave.app
+      mkdir -p $out/Applications
       cp -r . $out/Applications/Wave.app
 
       runHook postInstall

From 356192aa9eb785a0723f01b0e9b39d7e6cd61769 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Fri, 13 Dec 2024 06:20:18 +0000
Subject: [PATCH 2/2] waveterm: 0.10.0 -> 0.10.1

---
 pkgs/by-name/wa/waveterm/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index e8c013063129..8537dc221c09 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -34,7 +34,7 @@
 let
   selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
   pname = "waveterm";
-  version = "0.10.0";
+  version = "0.10.1";
   passthru.updateScript = ./update.sh;
 
   desktopItems = [
@@ -93,8 +93,8 @@ let
           aarch64-linux = "arm64";
         };
         hash = selectSystem {
-          x86_64-linux = "sha256-8q106czSyn+2VauUpPp06yZl3tlQk64s6eB74h/mO9s=";
-          aarch64-linux = "sha256-HxzTCM2csXMqXNyNoyJ+gyyV/n5P61W6lVMgKGGFXBA=";
+          x86_64-linux = "sha256-zv8ndwMt4VqsdJEEdfXzK4rnyslxF/gwnFdUu5OavNY=";
+          aarch64-linux = "sha256-6EFk1CDPeYc1KWeIxBQEsMLA9tYpnSxjG+yRg5CkGZA=";
         };
       in
       fetchzip {
@@ -171,8 +171,8 @@ let
           aarch64-darwin = "arm64";
         };
         hash = selectSystem {
-          x86_64-darwin = "sha256-LdB0WXxUAxB7yDC+tWx6/qZClyMidExBIpitY3qUC1Q=";
-          aarch64-darwin = "sha256-JEMq/N6d6lHpXag8stAi8s5dV61V5cfc9QADVLmYzeQ=";
+          x86_64-darwin = "sha256-7TCDg0TU0Bx9WLwLiQRcyzrFTlmkXYQIpya2SUiEXoc=";
+          aarch64-darwin = "sha256-pVxPmTz1bCKREUOvA3Jrf7kiOI5iLzqgnutblEqc4IA=";
         };
       in
       fetchurl {