Merge pull request '⬆️ Sable upgrade' (#15) from sable-upgrade into master

Reviewed-on: #15

.gitea/workflows/publish-attic.yaml

@@ -70,6 +70,11 @@ jobs:
           NIXPKGS_ALLOW_UNFREE=1 nix build --impure --sandbox --no-sandbox-fallback --accept-flake-config --no-link --print-out-paths -L \
             ".#packages.${system}.atuinLatest" \
             ".#packages.${system}.cliampLatest" \
+            ".#packages.${system}.lazygitLatest" \
+            ".#packages.${system}.ghDashLatest" \
+            ".#packages.${system}.diffNavLatest" \
+            ".#packages.${system}.k9sLatest" \
+            ".#packages.${system}.sable-web" \
             ".#packages.${system}.musicpresence" \
             ".#packages.${system}.vintage-story" \
             ".#packages.${system}.swaytreesave" \

overlays/diffnav.nix

@@ -12,14 +12,14 @@ in {
       owner = "dlvhdr";
       repo = "diffnav";
       rev = "v${version}";
-      hash = "sha256-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE=";
+      hash = "sha256-DrEbo9YYg4FCXQXuIkbPxO5Z3ZOPZJYeGoLoP/vT0Y0=";
     };
 
-    vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ=";
+    vendorHash = "sha256-2OzHyBPsylQVXhPlqk2owEhiibFi3H1UENvGGDdzGss";
 
     ldflags = [
       "-s"
       "-w"
     ];
   }); 
-}
+}

overlays/gh-dash.nix

@@ -12,10 +12,10 @@ in {
       owner = "dlvhdr";
       repo = "gh-dash";
       rev = "v${version}";
-      hash = "sha256-C06LPVoE23ITJpMG0x75Djgeup+eb5uYwA8wL7xxvWU=";
+      hash = "sha256-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU=";
     };
 
-    vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4=";
+    vendorHash = "sha256-Teu+8jiZE2gZ+0ErKsunhotY9W4Hjg6PAeFkFLgESIk=";
     doCheck = false;
     checkFlags = [
       "-skip=TestFullOutput"
@@ -33,4 +33,4 @@ in {
       };
     };
   });
-}
+}

overlays/k9s.nix

@@ -5,12 +5,14 @@ final: prev: {
       owner = "derailed";
       repo = "k9s";
       rev = "v${version}";
-      hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r";
+      hash = "sha256-70Rfu1BVd/QnwWXRRpwIeZ2UJNWIGixpdiOHo4v7adA=";
     };
 
+    vendorHash = "sha256-PkYDJK2oGl+siCG9p4R8shC0e5BhGFdJsc+ksL9J5zw=";
+
     ldflags = [
       "-X github.com/derailed/k9s/version.Version=${version}"
       "-X github.com/derailed/k9s/version.BuildSource=nix"
     ];
   });
-}
+}

overlays/lazygit.nix

@@ -1,11 +1,11 @@
 final: prev: {
     lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
-    version = "0.64.1";
+    version = "0.65.0";
     src = prev.fetchFromGitHub {
       owner = "jesseduffield";
       repo = "lazygit";
       rev = "v${version}";
-      hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ=";
+      hash = "sha256-W/Z/BnA5L8tXYrKn3bnekNnx7bEaaJRoHSGAeygcK0E=";
     };
 
     vendorHash = null;
@@ -15,4 +15,4 @@ final: prev: {
       "-X main.buildSource=nix"
     ];
   });
-}
+}

pkgs/common/sable.nix

@@ -7,54 +7,81 @@
   nodejs_24,
   fetchFromGitHub,
 }:
-buildNpmPackage (finalAttrs:
-let
-  pnpm = pnpm_10.override {
+buildNpmPackage (
+  finalAttrs:
+  let
+    pnpm = pnpm_10.override {
+      nodejs = nodejs_24;
+    };
+    matrixrtcSrc = fetchFromGitHub {
+      owner = "SableClient";
+      repo = "matrix-rtc";
+      rev = "519fe6b863cfac78700f4e2b1748649103bb8a8d";
+      hash = "sha256-n5f7529RdRxY8/a43Xkgrhg4yRz5aNgfoZqWrB7kvak=";
+    };
+    livekitMobileSrc = fetchFromGitHub {
+      owner = "SableClient";
+      repo = "tauri-plugin-livekit-mobile";
+      rev = "c6f0d02ab3da1174535bc1dc8e598a2e6873f977";
+      hash = "sha256-ZPx6Ic+Gkvzg9LXYP9BaQALzOrvLCcQHOms8U3VfnU0=";
+    };
+  in
+  {
+    pname = "sable-unwrapped";
+    version = "1.21.0";
+
+    src = fetchFromGitHub {
+      owner = "SableClient";
+      repo = "Sable";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-vYoKNflV4vdJpgYVxYCxAQhvqDh1Qf+7qgIFHxriTTU=";
+    };
+
     nodejs = nodejs_24;
-  };
-in {
-  pname = "sable-unwrapped";
-  version = "1.14.0";
 
-  src = fetchFromGitHub {
-    owner = "SableClient";
-    repo = "Sable";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-zoGKs0pm9m42JrTNAdU33LP139JlVz3RZnkTyY0aiqY=";
-  };
+    nativeBuildInputs = [ pnpm ];
+    npmConfigHook = pnpmConfigHook;
 
-  nodejs = nodejs_24;
+    npmDeps = finalAttrs.pnpmDeps;
+    pnpmDeps = fetchPnpmDeps {
+      inherit (finalAttrs) pname version src;
+      inherit pnpm;
+      fetcherVersion = 3;
+      hash = "sha256-tzIU/5DQ4SpLABKOt6/Z2aD2d6nVt+MJvY7vHHnO4No=";
+    };
 
-  nativeBuildInputs = [ pnpm ];
-  npmConfigHook = pnpmConfigHook;
-
-  npmDeps = finalAttrs.pnpmDeps;
-  pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
-    inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-2GwUz0jsuVKQZyeidM0F4rDzijm9AFcAxN7x/m/b3Is=";
-  };
-
-  npmInstallFlags = [
-    "--ignore-scripts"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    cp -r dist $out
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "An almost stable Matrix client";
-    homepage = "https://app.sable.moe/";
-    maintainers = with lib.maintainers; [
-      wymillerlinux
+    npmInstallFlags = [
+      "--ignore-scripts"
     ];
-    license = lib.licenses.agpl3Only;
-    platforms = lib.platforms.all;
-  };
-})
+
+    preBuild = ''
+      cp -r --no-preserve=mode ${matrixrtcSrc}/. node_modules/@sableclient/matrixrtc/
+      pnpm exec tsc -p node_modules/@sableclient/matrixrtc/tsconfig.build.json
+      cp -r --no-preserve=mode ${livekitMobileSrc}/. node_modules/@sableclient/tauri-plugin-livekit-mobile/
+      pnpm exec tsc \
+        -p node_modules/@sableclient/tauri-plugin-livekit-mobile/tsconfig.json \
+        --noEmit false \
+        --declaration \
+        --rootDir node_modules/@sableclient/tauri-plugin-livekit-mobile/guest-js \
+        --outDir node_modules/@sableclient/tauri-plugin-livekit-mobile/dist-js
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      cp -r dist $out
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "An almost stable Matrix client";
+      homepage = "https://app.sable.moe/";
+      maintainers = with lib.maintainers; [
+        wymillerlinux
+      ];
+      license = lib.licenses.agpl3Only;
+      platforms = lib.platforms.all;
+    };
+  }
+)

pkgs/default.nix

@@ -18,7 +18,7 @@
   inherit caitsith;
 
   # any packages that build instructions are in this repo, they go here
-  # sable-web = pkgs.callPackage ./common/sable.nix {};
+  sable-web = pkgs.callPackage ./common/sable.nix { };
   swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix { };
   musicpresence = pkgs.callPackage ./linux/musicpresence.nix { };
   vintage-story = pkgs.callPackage ./linux/vintage-story.nix { };