From 9c9db617726b2f144c9932ed1539ad7fbe1c7d7a Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Sun, 2 Feb 2025 16:41:47 +0000 Subject: [PATCH 1/2] pairdrop: 1.7.6 -> 1.10.11 Additionally, remove unnecessary files from closure as per upstream's recommendation. Potentially breaking: flags `--rate-limit --auto-restart` are no longer passed automatically, otherwise there would be no way to turn them off. Upstream now also supports setting these two options through environment variables, which could be used in a future NixOS module. Closes #364866 --- pkgs/by-name/pa/pairdrop/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pa/pairdrop/package.nix b/pkgs/by-name/pa/pairdrop/package.nix index 9d4fce5c23ba..ce06bb7fe791 100644 --- a/pkgs/by-name/pa/pairdrop/package.nix +++ b/pkgs/by-name/pa/pairdrop/package.nix @@ -7,27 +7,31 @@ buildNpmPackage rec { pname = "pairdrop"; - version = "1.7.6"; + version = "1.10.11"; src = fetchFromGitHub { owner = "schlagmichdoch"; repo = "PairDrop"; rev = "v${version}"; - hash = "sha256-AOFATOCLf2KigeqoUzIfNngyeDesNrThRzxFvqtsXBs="; + hash = "sha256-H3XfLBxJZaHzCBnGUKY92EL3ES47IgXkTOUr8zY1sIY="; }; - npmDepsHash = "sha256-3nKjmC5eizoV/mrKDBhsSlVQxEHyIsWR6KHFwZhBugI="; + npmDepsHash = "sha256-CYVcbkpYgY/uqpE5livQQhb+VTMtCdKalUK3slJ3zdQ="; dontNpmBuild = true; installPhase = '' runHook preInstall - mkdir -p $out/bin $out/lib - cp -r * $out/lib + mkdir -p $out/bin $out/libexec/pairdrop + cp -r * $out/libexec/pairdrop - makeWrapper ${nodejs}/bin/node "$out/bin/pairdrop" --add-flags "index.js public --rate-limit --auto-restart" - wrapProgram $out/bin/pairdrop --chdir "$out/lib" + # https://github.com/schlagmichdoch/PairDrop/blob/v1.10.10/.dockerignore + rm -rf $out/libexec/pairdrop/{.github,dev,docs,licenses,pairdrop-cli,*.md,*.yml,Dockerfile,rtc_config_example.json,turnserver_example.conf} + + makeWrapper ${nodejs}/bin/node "$out/bin/pairdrop" \ + --add-flags "server/index.js" \ + --chdir "$out/libexec/pairdrop" runHook postInstall ''; From 2a89cc909241956647e110c7fc68eb104cb11541 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Sun, 2 Feb 2025 16:47:07 +0000 Subject: [PATCH 2/2] pairdrop: add diogotcorreia as maintainer --- pkgs/by-name/pa/pairdrop/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pa/pairdrop/package.nix b/pkgs/by-name/pa/pairdrop/package.nix index ce06bb7fe791..5224dabfee8c 100644 --- a/pkgs/by-name/pa/pairdrop/package.nix +++ b/pkgs/by-name/pa/pairdrop/package.nix @@ -45,6 +45,9 @@ buildNpmPackage rec { ''; homepage = "https://github.com/schlagmichdoch/PairDrop"; license = licenses.gpl3Only; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ + diogotcorreia + dit7ya + ]; }; }