Merge pull request #173101 from dotlambda/timetagger-interpreter

python3Packages.timetagger: use correct interpreter

pkgs/development/python-modules/timetagger/default.nix

@@ -1,13 +1,18 @@
 { lib
-, python3Packages
+, buildPythonPackage
 , fetchFromGitHub
+, asgineer
+, itemdb
+, jinja2
+, markdown
+, pscript
+, pyjwt
+, uvicorn
 , pytestCheckHook
 , requests
-, pytest
-, pythonOlder
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "timetagger";
   version = "22.4.2";
 
@@ -18,7 +23,7 @@ python3Packages.buildPythonPackage rec {
     sha256 = "sha256-CWY+5O4Y1dvKQNy1Cclqj4+U6q5vVVj9hZq41MYqXKs=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     asgineer
     itemdb
     jinja2
@@ -35,12 +40,8 @@ python3Packages.buildPythonPackage rec {
   checkInputs = [
     pytestCheckHook
     requests
-    pytest
   ];
 
-  # fails with `No module named pytest` on python version 3.10
-  doCheck = pythonOlder "3.10";
-
   meta = with lib; {
     homepage = "https://timetagger.app";
     license = licenses.gpl3Only;

pkgs/servers/timetagger/default.nix

@@ -1,6 +1,5 @@
 { lib
-, pkgs
-, python3Packages
+, python3
 , fetchFromGitHub
 
 , addr ? "127.0.0.1"
@@ -13,24 +12,18 @@
 # timetagger.
 #
 
-let
-  tt = python3Packages.timetagger;
-in
-python3Packages.buildPythonPackage rec {
-  pname = tt.name;
-  version = tt.version;
-  src = tt.src;
-  meta = tt.meta;
+python3.pkgs.buildPythonApplication {
+  inherit (python3.pkgs.timetagger) pname version src meta;
 
-  propagatedBuildInputs = [ tt ]
-    ++ (with python3Packages; [
-      setuptools
-    ]);
+  propagatedBuildInputs = with python3.pkgs; [
+    setuptools
+    timetagger
+  ];
 
   format = "custom";
   installPhase = ''
     mkdir -p $out/bin
-    echo "#!${pkgs.python3}/bin/python3" >> $out/bin/timetagger
+    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
     chmod +x $out/bin/timetagger