From 98218b19249325b85b8d870ce901127616dacf29 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Thu, 18 Jun 2026 06:47:14 -0500 Subject: [PATCH 1/4] alcom: 1.1.5 -> 1.1.6 (cherry picked from commit 0c3ac859aa0bba60d1c2deeb31eac6b62f67be11) --- .../al/alcom/disable-updater-artifacts.patch | 13 ------------- pkgs/by-name/al/alcom/package.nix | 13 +++++-------- 2 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 pkgs/by-name/al/alcom/disable-updater-artifacts.patch diff --git a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch b/pkgs/by-name/al/alcom/disable-updater-artifacts.patch deleted file mode 100644 index 17e739d312c6..000000000000 --- a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vrc-get-gui/Tauri.toml b/vrc-get-gui/Tauri.toml -index cd180da8..66a81aa9 100644 ---- a/vrc-get-gui/Tauri.toml -+++ b/vrc-get-gui/Tauri.toml -@@ -34,8 +34,6 @@ icon = [ - resources = [] - publisher = "anatawa12" - --createUpdaterArtifacts = "v1Compatible" # remove if ci # we do not generate updater artifacts in CI -- - [[bundle.fileAssociations]] - # note: for macOS we directory use info.plist for registering file association. - description = "ALCOM Project Template" diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index fb58e6d60d59..3a6fb61495a3 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -18,13 +18,13 @@ }: let pname = "alcom"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "vrc-get"; repo = "vrc-get"; tag = "gui-v${version}"; - hash = "sha256-xucU8nXskniHOiuwrtVoZM2FIKNKU45i4DNo6iLjZvM="; + hash = "sha256-TpVHE3e3dMdBOtPVKomKvg5tQf42QWik18k5oVD2Hms="; }; subdir = "vrc-get-gui"; @@ -32,10 +32,6 @@ in rustPlatform.buildRustPackage { inherit pname version src; - patches = [ - ./disable-updater-artifacts.patch - ]; - nativeBuildInputs = [ cargo-about cargo-tauri.hook @@ -55,13 +51,14 @@ rustPlatform.buildRustPackage { webkitgtk_4_1 ]; - cargoHash = "sha256-MeCx3BoEXckMZfecyBcwwVE8+6V9Di6ULkIhUvUFZIA="; + cargoHash = "sha256-J8vCr+B4J3ZqxkkNk+x0jr52qNJJYfBJe2oyLf0GLsc="; + buildFeatures = [ "no-self-updater" ]; buildAndTestSubdir = subdir; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/${subdir}"; - hash = "sha256-snXOfAtanLPhQNo0mg/r8UUXJua2X+52t7+7QS1vOkI="; + hash = "sha256-VyA2c2659Kg1DjLmmtvSAivltdraSBNArIu1XGENGmQ="; }; npmRoot = subdir; From bc04f02413de2400eb123847fdf7f7b8495c1cbb Mon Sep 17 00:00:00 2001 From: Sapphire Date: Thu, 18 Jun 2026 06:52:28 -0500 Subject: [PATCH 2/4] alcom: migrate to finalAttrs (cherry picked from commit b83f400a0fceccdf95877d109370b0dfe12e87d2) --- pkgs/by-name/al/alcom/package.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index 3a6fb61495a3..30268c8c0e23 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -17,21 +17,18 @@ webkitgtk_4_1, }: let + subdir = "vrc-get-gui"; +in +rustPlatform.buildRustPackage (finalAttrs: { pname = "alcom"; version = "1.1.6"; - src = fetchFromGitHub { owner = "vrc-get"; repo = "vrc-get"; - tag = "gui-v${version}"; + tag = "gui-v${finalAttrs.version}"; hash = "sha256-TpVHE3e3dMdBOtPVKomKvg5tQf42QWik18k5oVD2Hms="; }; - subdir = "vrc-get-gui"; -in -rustPlatform.buildRustPackage { - inherit pname version src; - nativeBuildInputs = [ cargo-about cargo-tauri.hook @@ -56,8 +53,8 @@ rustPlatform.buildRustPackage { buildAndTestSubdir = subdir; npmDeps = fetchNpmDeps { - inherit src; - sourceRoot = "${src.name}/${subdir}"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/${subdir}"; hash = "sha256-VyA2c2659Kg1DjLmmtvSAivltdraSBNArIu1XGENGmQ="; }; npmRoot = subdir; @@ -70,4 +67,4 @@ rustPlatform.buildRustPackage { broken = stdenv.hostPlatform.isDarwin; mainProgram = "ALCOM"; }; -} +}) From e60a48c2ea6819368d5425ccffc856952d009370 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Thu, 18 Jun 2026 06:59:35 -0500 Subject: [PATCH 3/4] alcom: add name to npmDeps derivation (cherry picked from commit 3d53a90818cae9413d94aebf5e5c007271a4e230) --- pkgs/by-name/al/alcom/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index 30268c8c0e23..eca1d1b51a5c 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -53,6 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = subdir; npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/${subdir}"; hash = "sha256-VyA2c2659Kg1DjLmmtvSAivltdraSBNArIu1XGENGmQ="; From f4f26e3293807306db5bffdfb0e71bfbdf306fc2 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Thu, 18 Jun 2026 06:59:55 -0500 Subject: [PATCH 4/4] alcom: add me as maintainer (cherry picked from commit c8ebe4ff9aed9f5a3f07426b11f5e1d42bfa947f) --- pkgs/by-name/al/alcom/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index eca1d1b51a5c..eccbad84748d 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -64,7 +64,10 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Experimental GUI application to manage VRChat Unity Projects"; homepage = "https://github.com/vrc-get/vrc-get"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Scrumplex ]; + maintainers = with lib.maintainers; [ + Scrumplex + ImSapphire + ]; broken = stdenv.hostPlatform.isDarwin; mainProgram = "ALCOM"; };