From 3405842ff883b8dd290a9aca4ca1df110b48a728 Mon Sep 17 00:00:00 2001 From: Shaun Ren Date: Wed, 15 Jul 2026 18:42:27 -0400 Subject: [PATCH] tinyauth: 5.0.7 -> 5.1.1 (cherry picked from commit a0e3766f7ba1bc43171dec55d24b4fecf7032201) --- pkgs/by-name/ti/tinyauth/package.nix | 62 ++++++++++++---------------- 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/ti/tinyauth/package.nix b/pkgs/by-name/ti/tinyauth/package.nix index b70cf0f74a1c..82ef20f84070 100644 --- a/pkgs/by-name/ti/tinyauth/package.nix +++ b/pkgs/by-name/ti/tinyauth/package.nix @@ -3,23 +3,27 @@ buildGoModule, fetchFromGitHub, stdenvNoCC, - bun, + nodejs-slim, + pnpmConfigHook, + pnpmBuildHook, + pnpm_11, + fetchPnpmDeps, nixosTests, nix-update-script, }: buildGoModule (finalAttrs: { pname = "tinyauth"; - version = "5.0.7"; + version = "5.1.1"; src = fetchFromGitHub { - owner = "steveiliop56"; + owner = "tinyauthapp"; repo = "tinyauth"; tag = "v${finalAttrs.version}"; - hash = "sha256-VeII5jSNUJpGZgqons1o1fp6KXxDOBhSMciSqtQfaC4="; + hash = "sha256-leXqelsPCLixhxqJbL7aDgGIzj1KcZMnR/1UxRPa1bo="; }; - vendorHash = "sha256-XP+kVfcDKWAvBdrvGjiTdWh7jNe6qiDsgVjPrFFPoDU="; + vendorHash = "sha256-rlMttXywppA39Vip6pIos4tY5434vvtN8dbhVn+S2Kg="; subPackages = [ "cmd/tinyauth" ]; @@ -27,8 +31,8 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" "-w" - "-X github.com/steveiliop56/tinyauth/internal/config.Version=v${finalAttrs.version}" - "-X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${finalAttrs.src.rev}" + "-X github.com/tinyauthapp/tinyauth/internal/model.Version=v${finalAttrs.version}" + "-X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${finalAttrs.src.rev}" ]; preBuild = '' @@ -38,46 +42,32 @@ buildGoModule (finalAttrs: { frontend = stdenvNoCC.mkDerivation { pname = "tinyauth-frontend"; inherit (finalAttrs) version src; - sourceRoot = "${finalAttrs.src.name}/frontend"; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "GIT_PROXY_COMMAND" - "SOCKS_SERVER" - ]; nativeBuildInputs = [ - bun + nodejs-slim + pnpmConfigHook + pnpmBuildHook + pnpm_11 ]; - configurePhase = '' - runHook preConfigure + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.src.name}/frontend"; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-WLPJ1ZH2mEoQKFa6F5TOmTfbcgN5lXKZZHHvgI4mMq4="; + }; - bun install --no-progress --frozen-lockfile - substituteInPlace node_modules/.bin/{tsc,vite} \ - --replace-fail "/usr/bin/env node" "${lib.getExe bun}" - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - bun run build - - runHook postBuild - ''; + pnpmRoot = "frontend"; installPhase = '' runHook preInstall mkdir -p $out/dist - cp -r dist $out + cp -r frontend/dist $out runHook postInstall ''; - - outputHashMode = "recursive"; - outputHash = "sha256-FRACDa1akm+JnYIRwNXRcomzDIMCIAlJDbjMyS77sNA="; }; passthru = { @@ -95,8 +85,8 @@ buildGoModule (finalAttrs: { meta = { description = "Simple authentication middleware for web apps"; homepage = "https://tinyauth.app"; - changelog = "https://github.com/steveiliop56/tinyauth/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Only; + changelog = "https://github.com/tinyauthapp/tinyauth/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.agpl3Only; mainProgram = "tinyauth"; maintainers = with lib.maintainers; [ shaunren