From bfb26144e7fb8c6839d076252ddc405fe3199700 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 10 Jul 2023 11:09:58 +0300 Subject: [PATCH] timetagger: unbreak --- pkgs/development/python-modules/timetagger/default.nix | 1 - pkgs/servers/timetagger/default.nix | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index f0635aa8a8a0..04b093299394 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -59,6 +59,5 @@ buildPythonPackage rec { changelog = "https://github.com/almarklein/timetagger/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ matthiasbeyer ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/timetagger/default.nix b/pkgs/servers/timetagger/default.nix index 2b060ed51740..8505a897a675 100644 --- a/pkgs/servers/timetagger/default.nix +++ b/pkgs/servers/timetagger/default.nix @@ -1,6 +1,4 @@ -{ lib -, python3 -, fetchFromGitHub +{ python3 , addr ? "127.0.0.1" , port ? 8082 @@ -24,9 +22,10 @@ python3.pkgs.buildPythonApplication { installPhase = '' mkdir -p $out/bin echo "#!${python3.interpreter}" >> $out/bin/timetagger - cat run.py >> $out/bin/timetagger - sed -Ei 's,0\.0\.0\.0:80,${addr}:${toString port},' $out/bin/timetagger + cat timetagger/__main__.py >> $out/bin/timetagger chmod +x $out/bin/timetagger + wrapProgram $out/bin/timetagger \ + --set TIMETAGGER_BIND "${addr}:${toString port}" ''; }