From cd06a25980e5f5274cf5352b1a67d9b388fdb78d Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 13 Jul 2025 12:09:29 -0400 Subject: [PATCH 1/3] gale: 1.7.1 -> 1.8.6, switch to pnpm, add updateScript --- pkgs/by-name/ga/gale/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 8793164a0ce7..96e1844c5648 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -2,11 +2,11 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, jq, moreutils, - fetchNpmDeps, - npmHooks, + pnpm_10, nodejs, cargo-tauri, pkg-config, @@ -20,34 +20,33 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gale"; - version = "1.7.1"; + version = "1.8.6"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-OaUpyG+XdP7AIA55enPf6/viBGBBQVuNi2QxgD5EVNc="; + hash = "sha256-5xUBW9Owyeet8Jyc+7TQr6XQTbkopbJLeyI5c35iqr0="; }; postPatch = '' jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json ''; - npmDeps = fetchNpmDeps { - name = "gale-${finalAttrs.version}-npm-deps"; - inherit (finalAttrs) src; - hash = "sha256-yaPUNtlb2vMwK42u+3/rViGx6YzhYxRDJylPu++tbNs="; + pnpmDeps = pnpm_10.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-QQXP/x7AjDtUpe6h+pC6vUsIAptv1kN/1MJZjHAIdMo="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-v0/A4jUq5t61KB7NLwvsl6wR7N0UUbdVCk7nFZVTOi8="; + cargoHash = "sha256-6yWRl9WAPJoqoXm0kLfZhEf7AYD6J//FlOmDxzeknFo="; nativeBuildInputs = [ jq moreutils - npmHooks.npmConfigHook + pnpm_10.configHook nodejs cargo-tauri.hook pkg-config @@ -61,6 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: { webkitgtk_4_1 ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Lightweight Thunderstore client"; homepage = "https://github.com/Kesomannen/gale"; From 19928598c4d5baec81ba0e6b55b90416e139c604 Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 13 Jul 2025 12:09:53 -0400 Subject: [PATCH 2/3] maintainers: add notohh --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9df4c79ce092..2984874b9aca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18305,6 +18305,13 @@ githubId = 1254858; keys = [ { fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; } ]; }; + notohh = { + email = "contact@notohh.dev"; + github = "notohh"; + githubId = 31116143; + name = "notohh"; + keys = [ { fingerprint = "C3CB 3B31 AF3F 986C 39E0 BE5B BD47 506D 475E E86D"; } ]; + }; notthebee = { email = "moe@notthebe.ee"; github = "notthebee"; From 12de190b5fc98502a6cc89bc9e646de71167800d Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 13 Jul 2025 13:05:24 -0400 Subject: [PATCH 3/3] gale: add maintainer notohh --- pkgs/by-name/ga/gale/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 96e1844c5648..fdd438810854 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -67,7 +67,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/Kesomannen/gale"; license = lib.licenses.gpl3Only; mainProgram = "gale"; - maintainers = with lib.maintainers; [ tomasajt ]; + maintainers = with lib.maintainers; [ + tomasajt + notohh + ]; platforms = lib.platforms.linux; }; })