.forgejo/workflows/deploy-dev.yml

@@ -1,5 +1,4 @@
 on:
-  workflow_dispatch:
   push:
     branches:
       - dev

.forgejo/workflows/deploy-prod.yml

@@ -311,3 +311,58 @@ jobs:
               "$API/repos/$REPO/releases/$release_id"
           done < "$DELETE_RELEASES"
           EOF
+
+      - name: Update root flake release hash
+        env:
+          TAG: ${{ steps.version.outputs.tag }}
+        run: |
+          nix develop .#electron --command bash <<'EOF'
+          set -eu
+
+          DEB="$(find releases -maxdepth 1 -type f -name 'Tensamin-*-linux-amd64.deb' -print -quit)"
+          test -n "$DEB"
+
+          HASH="$(node -e 'const fs = require("fs"); const crypto = require("crypto"); const file = process.argv[1]; console.log("sha256-" + crypto.createHash("sha256").update(fs.readFileSync(file)).digest("base64"));' "$DEB")"
+          export HASH
+
+          node -e '
+            const fs = require("fs");
+            const version = process.env.TAG;
+            const hash = process.env.HASH;
+            let content = fs.readFileSync("flake.nix", "utf8");
+            content = content.replace(/version = "[^"]+";/, `version = "${version}";`);
+            content = content.replace(/x86_64DebHash = "sha256-[^"]+";/, `x86_64DebHash = "${hash}";`);
+            fs.writeFileSync("flake.nix", content);
+          '
+
+          if git diff --quiet -- flake.nix; then
+            echo "flake.nix already has the current release hash on main."
+          else
+            git add flake.nix
+            git -c user.name="forgejo-actions" -c user.email="forgejo-actions@localhost" commit -m "(qol): update release flake hash"
+            git push
+          fi
+
+          git fetch origin dev
+          git worktree add ../dev-flake-update origin/dev
+          cd ../dev-flake-update
+
+          node -e '
+            const fs = require("fs");
+            const version = process.env.TAG;
+            const hash = process.env.HASH;
+            let content = fs.readFileSync("flake.nix", "utf8");
+            content = content.replace(/version = "[^"]+";/, `version = "${version}";`);
+            content = content.replace(/x86_64DebHash = "sha256-[^"]+";/, `x86_64DebHash = "${hash}";`);
+            fs.writeFileSync("flake.nix", content);
+          '
+
+          if git diff --quiet -- flake.nix; then
+            echo "flake.nix already has the current release hash on dev."
+            exit 0
+          fi
+
+          git add flake.nix
+          git -c user.name="forgejo-actions" -c user.email="forgejo-actions@localhost" commit -m "(qol): update release flake hash"
+          git push origin HEAD:dev
+          EOF

flake.nix

@@ -17,6 +17,8 @@
       systems = [ "x86_64-linux" ];
       forAllSystems = nixpkgs.lib.genAttrs systems;
       version = "0.0.11";
+      x86_64DebHash = "sha256-iMEgdjY8Ghlx6K/YzKC5JAZbeHNJDIFHm8MKmM4efaI=";
+      forgejoBaseUrl = "https://git.methanium.net/tensamin/client/releases/download/${version}";
     in
     {
       packages = forAllSystems (
@@ -30,6 +32,8 @@
               android_sdk.accept_license = true;
             };
           };
+          debArtifact = "Tensamin-${version}-linux-amd64.deb";
+
           electronRuntimeLibs = with pkgs; [
             alsa-lib
             at-spi2-atk
@@ -71,130 +75,71 @@
             libXtst
             libxcb
           ];
-          electron = pkgs.electron;
+          packageDeb =
-          pnpm = pkgs.pnpm;
+            src:
-          mtpTypeMaps = pkgs.fetchgit {
+            pkgs.stdenv.mkDerivation {
-            url = "https://git.methanium.net/tensamin/mtp-type-maps";
+              pname = "tensamin";
-            rev = "6e5122fe44f793c0e0d3229b3d34145ce17c2d31";
+              inherit version src;
-            hash = "sha256-/4n8F0YLJaLncefKL907P5l+en1CTjpgdFmLBF3gbiQ=";
+
-          };
+              nativeBuildInputs = with pkgs; [
-          mtpSource = pkgs.fetchzip {
+                autoPatchelfHook
-            url = "https://git.methanium.net/methanium/mtp/releases/download/0.3.0-dev-c7c7afe/mtp-0.3.0.tgz";
+                dpkg
-            hash = "sha256-XLTa8DxP93Q4hBHRCLUzCPOqkbdb4V3aZxE5Iuq+kW0=";
+                makeWrapper
-          };
+              ];
-          mtpCargoDeps = pkgs.rustPlatform.fetchCargoVendor {
+              buildInputs = electronRuntimeLibs;
-            src = mtpSource;
+
-            hash = "sha256-8MZ65N/EtWPAggal0JkGDx3WSn+LxWQORinkqVbsrys=";
+              dontConfigure = true;
-          };
+              dontBuild = true;
-          wasmBindgenCliSource = pkgs.fetchCrate {
+
-            pname = "wasm-bindgen-cli";
+              unpackPhase = ''
-            version = "0.2.127";
+                runHook preUnpack
-            hash = "sha256-di+qBAdd7pENLiIB9CoZoab+W5xeDoByMREcCGTSzWo=";
+                dpkg-deb -x "$src" .
-          };
+                runHook postUnpack
-          wasmBindgenCli = pkgs.buildWasmBindgenCli {
+              '';
-            src = wasmBindgenCliSource;
+
-            cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
+              installPhase = ''
-              src = wasmBindgenCliSource;
+                runHook preInstall
-              hash = "sha256-FTv2GZIAQs0ePdIZXIXil7JbZ6kIT05VG6vqC1qNFxQ=";
+
+                mkdir -p "$out"
+                cp -r opt "$out/"
+                cp -r usr/* "$out/"
+
+                mkdir -p "$out/bin"
+                makeWrapper "$out/opt/Tensamin/tensamin" "$out/bin/tensamin" \
+                  --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath electronRuntimeLibs}"
+
+                substituteInPlace "$out/share/applications/Tensamin.desktop" \
+                  --replace-fail "Exec=/opt/Tensamin/tensamin" "Exec=tensamin"
+
+                runHook postInstall
+              '';
             };
-          };
+          defaultPackage = packageDeb (
-          desktopItem = pkgs.makeDesktopItem {
+            pkgs.fetchurl {
-            name = "tensamin";
+              url = "${forgejoBaseUrl}/${debArtifact}";
-            desktopName = "Tensamin";
+              hash = x86_64DebHash;
-            exec = "tensamin";
+            }
-            icon = "tensamin";
+          );
-            startupWMClass = "Tensamin";
+          localDebPath = builtins.getEnv "TENSAMIN_DEB";
-            categories = [ "Network" ];
+          localPathPackage =
-          };
+            if localDebPath == "" then
-          defaultPackage = pkgs.stdenv.mkDerivation (finalAttrs: {
+              pkgs.writeShellScriptBin "tensamin" ''
-            pname = "tensamin";
+                echo "Set TENSAMIN_DEB to a local .deb path and run with --impure." >&2
-            inherit version;
+                exit 1
-            src = self;
+              ''
-
+            else
-            pnpmDeps = pkgs.fetchPnpmDeps {
+              packageDeb (
-              inherit (finalAttrs) pname version src;
+                builtins.path {
-              inherit pnpm;
+                  path = localDebPath;
-              fetcherVersion = 4;
+                  name = debArtifact;
-              hash = "sha256-imP3MTr1YLc28Z9n617m0Wt/6vPirFznzoriKzojlEg=";
+                }
-            };
+              );
-
-            nativeBuildInputs = with pkgs; [
-              copyDesktopItems
-              makeWrapper
-              nodejs_22
-              pnpm
-              pnpmConfigHook
-              cargo
-              lld
-              rustc
-              wasm-pack
-              wasmBindgenCli
-              binaryen
-            ];
-
-            env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
-
-            postPatch = ''
-              rm -rf mtp-type-maps
-              ln -s ${mtpTypeMaps} mtp-type-maps
-
-              node -e '
-                const fs = require("fs");
-                const path = "apps/electron/package.json";
-                const pkg = JSON.parse(fs.readFileSync(path, "utf8"));
-                pkg.version = "${version}";
-                fs.writeFileSync(path, JSON.stringify(pkg, null, 2) + "\n");
-              '
-            '';
-
-            buildPhase = ''
-              runHook preBuild
-
-              mkdir -p "$HOME/.cargo"
-              substitute ${mtpCargoDeps}/.cargo/config.toml "$HOME/.cargo/config.toml" \
-                --replace-fail @vendor@ ${mtpCargoDeps}
-
-              pnpm run copy-licenses
-              pnpm run build:packages
-              pnpm run build:web
-              pnpm --dir apps/tauri run gen-icons
-              pnpm --dir apps/electron run build
-              pnpm --dir apps/electron exec electron-builder --dir --linux --publish never \
-                --config.electronDist=${electron.dist} \
-                --config.electronVersion=${electron.version}
-
-              runHook postBuild
-            '';
-
-            installPhase = ''
-              runHook preInstall
-
-              mkdir -p "$out/lib/tensamin" "$out/bin"
-              cp -r apps/electron/release/linux-unpacked/. "$out/lib/tensamin/"
-
-              makeWrapper "$out/lib/tensamin/tensamin" "$out/bin/tensamin" \
-                --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath electronRuntimeLibs}"
-
-              install -Dm644 apps/electron/build/icons/icon.png \
-                "$out/share/icons/hicolor/512x512/apps/tensamin.png"
-
-              runHook postInstall
-            '';
-
-            desktopItems = [ desktopItem ];
-
-            meta = {
-              description = "Tensamin desktop client";
-              homepage = "https://git.methanium.net/tensamin/client";
-              mainProgram = "tensamin";
-              platforms = pkgs.lib.platforms.linux;
-            };
-          });
         in
         {
           default = defaultPackage;
           tensamin = defaultPackage;
           electron = defaultPackage;
+          localPathForDev = localPathPackage;
         }
       );
 

mtp-type-maps

@@ -1 +1 @@
-Subproject commit f4e45aa3a3ad0e3c3a257f66857b904a1af7901c
+Subproject commit a70085b0c41844745449c9913a361f5bb9bee529