From bd602e99b4c288019e62e7c45752d0f5db334097 Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 2 Sep 2025 08:41:57 +0800 Subject: [PATCH 1/3] tremc: 0.9.3 -> 0.9.4 --- pkgs/by-name/tr/tremc/package.nix | 40 ++++++++++--------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/tr/tremc/package.nix b/pkgs/by-name/tr/tremc/package.nix index 5268128e41fa..828b8393f706 100644 --- a/pkgs/by-name/tr/tremc/package.nix +++ b/pkgs/by-name/tr/tremc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, python3Packages, x11Support ? !stdenv.hostPlatform.isDarwin, xclip ? null, @@ -10,36 +9,20 @@ useGeoIP ? false, # Require /var/lib/geoip-databases/GeoIP.dat }: let - wrapperPath = lib.makeBinPath ( - lib.optional x11Support xclip ++ lib.optional stdenv.hostPlatform.isDarwin pbcopy - ); + version = "0.9.4"; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "tremc"; - version = "0.9.3"; - format = "other"; + inherit version; + pyproject = false; src = fetchFromGitHub { owner = "tremc"; repo = "tremc"; - rev = version; - hash = "sha256-219rntmetmj1JFG+4NyYMFTWmrHKJL7fnLoMIvnTP4Y="; + tag = version; + hash = "sha256-vVqFADu1arAe29NYYhxSUqEIxup1nNVmWrpz1wuSDPE="; }; - patches = [ - # Remove when tremc > 0.9.3 is released - (fetchpatch { - url = "https://github.com/tremc/tremc/commit/a8aaf9a6728a9ef3d8f13b3603456b0086122891.patch"; - hash = "sha256-+HYdWTbcpvZqjshdHLZ+Svmr6U/aKFc3sy0aka6rn/A="; - name = "support-transmission-4.patch"; - }) - ]; - - buildInputs = with python3Packages; [ - python - wrapPython - ]; - pythonPath = with python3Packages; [ @@ -51,12 +34,13 @@ python3Packages.buildPythonApplication rec { dontBuild = true; doCheck = false; - makeWrapperArgs = [ "--prefix PATH : ${lib.escapeShellArg wrapperPath}" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; - installPhase = '' - make DESTDIR=$out install - wrapPythonPrograms - ''; + makeWrapperArgs = [ + "--prefix PATH : ${ + lib.makeBinPath (lib.optional x11Support xclip ++ lib.optional stdenv.hostPlatform.isDarwin pbcopy) + }" + ]; meta = with lib; { description = "Curses interface for transmission"; From ce9ae91eaab28c26fb36cd84d595830d8039a9c0 Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 2 Sep 2025 08:42:21 +0800 Subject: [PATCH 2/3] tremc: remove with lib --- pkgs/by-name/tr/tremc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/tremc/package.nix b/pkgs/by-name/tr/tremc/package.nix index 828b8393f706..f1164ecd805b 100644 --- a/pkgs/by-name/tr/tremc/package.nix +++ b/pkgs/by-name/tr/tremc/package.nix @@ -42,11 +42,11 @@ python3Packages.buildPythonApplication { }" ]; - meta = with lib; { + meta = { description = "Curses interface for transmission"; mainProgram = "tremc"; homepage = "https://github.com/tremc/tremc"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ kashw2 ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ kashw2 ]; }; } From 8b85bbf3fe7ad0d27f224b9fb03fba2ecfa1fbcd Mon Sep 17 00:00:00 2001 From: kyehn Date: Sat, 18 Oct 2025 00:29:42 +0000 Subject: [PATCH 3/3] tremc: 0.9.4 -> 0.9.5 --- pkgs/by-name/tr/tremc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/tremc/package.nix b/pkgs/by-name/tr/tremc/package.nix index f1164ecd805b..213185c421d2 100644 --- a/pkgs/by-name/tr/tremc/package.nix +++ b/pkgs/by-name/tr/tremc/package.nix @@ -9,7 +9,7 @@ useGeoIP ? false, # Require /var/lib/geoip-databases/GeoIP.dat }: let - version = "0.9.4"; + version = "0.9.5"; in python3Packages.buildPythonApplication { pname = "tremc"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication { owner = "tremc"; repo = "tremc"; tag = version; - hash = "sha256-vVqFADu1arAe29NYYhxSUqEIxup1nNVmWrpz1wuSDPE="; + hash = "sha256-t7GH3flTLN8O+nnv/kwwzu5x3VoCyF11bqb1EJ8LQs8="; }; pythonPath =