From 8a26beb4be4c1b897ba6b794a0a8f1f82cdbe181 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 29 Jul 2025 02:11:35 +0200 Subject: [PATCH 1/5] psitransfer: use finalAttrs pattern --- pkgs/by-name/ps/psitransfer/package.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix index 63f57bd75ac8..8da34ca2375c 100644 --- a/pkgs/by-name/ps/psitransfer/package.nix +++ b/pkgs/by-name/ps/psitransfer/package.nix @@ -6,18 +6,22 @@ vips, }: -let +buildNpmPackage (finalAttrs: { pname = "psitransfer"; version = "2.2.0"; + src = fetchFromGitHub { owner = "psi-4ward"; repo = "psitransfer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA="; }; + + npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0="; + app = buildNpmPackage { - pname = "${pname}-app"; - inherit version src; + pname = "psitransfer-app"; + inherit (finalAttrs) version src; npmDepsHash = "sha256-q7E+osWIf6VZ3JvxCXoZYeF28aMgmKP6EzQkksUUjeY="; @@ -31,11 +35,6 @@ let cp -r ../public/app $out ''; }; -in -buildNpmPackage { - inherit pname version src; - - npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -44,7 +43,7 @@ buildNpmPackage { postPatch = '' rm -r public/app - cp -r ${app} public/app + cp -r ${finalAttrs.app} public/app ''; dontBuild = true; @@ -56,4 +55,4 @@ buildNpmPackage { maintainers = with lib.maintainers; [ hyshka ]; mainProgram = "psitransfer"; }; -} +}) From 8eee960161e54b3aa84384247f46e993881d7632 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 29 Jul 2025 02:16:02 +0200 Subject: [PATCH 2/5] psitransfer: use tag in fetchFromGitHub --- pkgs/by-name/ps/psitransfer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix index 8da34ca2375c..b8aa9b669c93 100644 --- a/pkgs/by-name/ps/psitransfer/package.nix +++ b/pkgs/by-name/ps/psitransfer/package.nix @@ -13,7 +13,7 @@ buildNpmPackage (finalAttrs: { src = fetchFromGitHub { owner = "psi-4ward"; repo = "psitransfer"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA="; }; From c87822031ad4f559a816b2f8d301bea83b345b7b Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 29 Jul 2025 02:17:27 +0200 Subject: [PATCH 3/5] psitransfer: add meta.changelog --- pkgs/by-name/ps/psitransfer/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix index b8aa9b669c93..3d2acae9149c 100644 --- a/pkgs/by-name/ps/psitransfer/package.nix +++ b/pkgs/by-name/ps/psitransfer/package.nix @@ -49,8 +49,9 @@ buildNpmPackage (finalAttrs: { dontBuild = true; meta = { - homepage = "https://github.com/psi-4ward/psitransfer"; description = "Simple open source self-hosted file sharing solution"; + homepage = "https://github.com/psi-4ward/psitransfer"; + changelog = "https://github.com/psi-4ward/psitransfer/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ hyshka ]; mainProgram = "psitransfer"; From 640d1f3005fcb34e762a5f675685efd8c87b9157 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 29 Jul 2025 02:18:35 +0200 Subject: [PATCH 4/5] psitransfer: add updateScript --- pkgs/by-name/ps/psitransfer/package.nix | 2 ++ pkgs/by-name/ps/psitransfer/update.sh | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100755 pkgs/by-name/ps/psitransfer/update.sh diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix index 3d2acae9149c..529d71891438 100644 --- a/pkgs/by-name/ps/psitransfer/package.nix +++ b/pkgs/by-name/ps/psitransfer/package.nix @@ -48,6 +48,8 @@ buildNpmPackage (finalAttrs: { dontBuild = true; + passthru.updateScript = ./update.sh; + meta = { description = "Simple open source self-hosted file sharing solution"; homepage = "https://github.com/psi-4ward/psitransfer"; diff --git a/pkgs/by-name/ps/psitransfer/update.sh b/pkgs/by-name/ps/psitransfer/update.sh new file mode 100755 index 000000000000..c4d410c717bf --- /dev/null +++ b/pkgs/by-name/ps/psitransfer/update.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update + +set -euo pipefail + +nix-update psitransfer --src-only --version-regex='^v(\d+\.\d+\.\d+)$' +nix-update psitransfer.app --version=skip +nix-update psitransfer --version=skip From 61a2aa95f771d7b01ddc1c38a9910bdd5771845a Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 29 Jul 2025 00:22:31 +0000 Subject: [PATCH 5/5] psitransfer: 2.2.0 -> 2.3.0 Changelog: https://github.com/psi-4ward/psitransfer/releases/tag/v2.3.0 Diff: https://github.com/psi-4ward/psitransfer/compare/v2.2.0...v2.3.0 --- pkgs/by-name/ps/psitransfer/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix index 529d71891438..64779298eaca 100644 --- a/pkgs/by-name/ps/psitransfer/package.nix +++ b/pkgs/by-name/ps/psitransfer/package.nix @@ -8,22 +8,22 @@ buildNpmPackage (finalAttrs: { pname = "psitransfer"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "psi-4ward"; repo = "psitransfer"; tag = "v${finalAttrs.version}"; - hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA="; + hash = "sha256-XUEvR8dWwFBbZdwVM8PQnYBc17SvGF5uO04vb/nAR2A="; }; - npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0="; + npmDepsHash = "sha256-BZpd/fsuV77uj2bGZcqBpIuOq3YlUw2bxovOfu8b9iE="; app = buildNpmPackage { pname = "psitransfer-app"; inherit (finalAttrs) version src; - npmDepsHash = "sha256-q7E+osWIf6VZ3JvxCXoZYeF28aMgmKP6EzQkksUUjeY="; + npmDepsHash = "sha256-zEGYv6TaHzgPCB3mHP2UMh8VkFqSBdrLuP5KjuEU0p8="; postPatch = '' # https://github.com/psi-4ward/psitransfer/pull/284