diff --git a/pkgs/ghexport.nix b/pkgs/ghexport.nix index 6bef4a4..48718c9 100644 --- a/pkgs/ghexport.nix +++ b/pkgs/ghexport.nix @@ -7,8 +7,10 @@ }: buildPythonPackage rec { pname = "ghexport"; - version = "20220828"; + version = "20231020"; + pyproject = true; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ PyGithub pytz ]; @@ -25,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "karlicoss"; repo = pname; - rev = "e7704dc5b984731a53e74cbcadcbc3dd9c3024cd"; - hash = "sha256-m/iqeBvCXHlN7GsNW6A2AX1g+ZaH3W62+Ulcfgup0KQ="; + rev = "03207b63da4a0f570700f373867ff67deb4f43d1"; + hash = "sha256-QfYpi59q5uqOEAcxLC72972HMsgRlMngjuRULwRbmUc="; }; } diff --git a/pkgs/hpi.nix b/pkgs/hpi.nix index 732958a..3898fef 100644 --- a/pkgs/hpi.nix +++ b/pkgs/hpi.nix @@ -2,7 +2,6 @@ , buildPythonPackage , setuptools-scm , pytest -, fetchPypi , appdirs , click , decorator @@ -21,17 +20,35 @@ with pkgs; let orgparse = pkgs.python3Packages.callPackage ./orgparse.nix { inherit pkgs; }; kobuddy = pkgs.python3Packages.callPackage ./kobuddy.nix { inherit pkgs; }; ghexport = pkgs.python3Packages.callPackage ./ghexport.nix { inherit pkgs; }; + kompress = buildPythonPackage rec { + pname = "kompress"; + version = "0.1.20240829"; + + pyproject = true; + + nativeBuildInputs = [ setuptools-scm ]; + + src = fetchFromGitHub { + owner = "karlicoss"; + repo = pname; + rev = "b4127543d8ca22988335d2640f905b8d939f85a1"; + hash = "sha256-U7o5FG2FscAhbsYd/KS/vess/eJU/A2jH/WOve0anHo="; + }; + }; in buildPythonPackage rec { pname = "HPI"; - version = "0.3.20230207"; + version = "0.5.20240824"; + pyproject = true; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ appdirs click decorator geopy + kompress kobuddy logzero lxml @@ -60,8 +77,10 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-i3C1Lmj6K48zVG960uv1epQm38qQnxalwy8kHnLTZrE="; + src = fetchFromGitHub { + owner = "karlicoss"; + repo = pname; + rev = "d58453410c34d75715b71c041f7a58a4f0954436"; + hash = "sha256-UMccXFUwcyQOQdJuR3f9OgjskUs99zR5HPZ5NjKdVRI="; }; } diff --git a/pkgs/orgparse.nix b/pkgs/orgparse.nix index 58a4e7b..b85b271 100644 --- a/pkgs/orgparse.nix +++ b/pkgs/orgparse.nix @@ -1,13 +1,15 @@ { buildPythonPackage , setuptools-scm , pytest -, fetchPypi +, fetchFromGitHub , ... }: buildPythonPackage rec { pname = "orgparse"; - version = "0.3.2"; + version = "0.4.20231004"; + pyproject = true; + nativeBuildInputs = [ setuptools-scm ]; #propagatedBuildInputs = [ ]; @@ -15,8 +17,10 @@ buildPythonPackage rec { doCheck = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-RRBQ55rLelHGXcmbkJXq5NUL1ZhUE1T552PLTL31mlU="; + src = fetchFromGitHub { + owner = "karlicoss"; + repo = pname; + rev = "da56aae64a6373ae8bab2dde9dc756f904f1d8f8"; + sha256 = "sha256-Vx7WDL6svMtlhuxXBQsh9gcCZTnVD4RV8lz6ijK6qbw="; }; } diff --git a/pkgs/promnesia.nix b/pkgs/promnesia.nix index 1b94c84..6960ebd 100644 --- a/pkgs/promnesia.nix +++ b/pkgs/promnesia.nix @@ -9,6 +9,7 @@ , mistletoe , more-itertools , mypy +, magic , pytz , setuptools , tzlocal @@ -19,6 +20,7 @@ , websockets , setuptools-scm , starlette +, python-dotenv , pkgs , ... }: @@ -27,7 +29,7 @@ with pkgs; let sqlcipher3 = pkgs.python3Packages.callPackage ./sqlcipher3.nix { inherit pkgs; }; cachew = pkgs.python3Packages.callPackage ./cachew.nix { inherit pkgs; }; - python-dotenv = pkgs.python3Packages.callPackage ./python-dotenv.nix { }; + # python-dotenv = pkgs.python3Packages.callPackage ./python-dotenv.nix { }; in buildPythonPackage rec { pname = "promnesia"; @@ -57,6 +59,7 @@ buildPythonPackage rec { cachew fastapi hpi + magic httptools starlette logzero diff --git a/pkgs/sqlcipher3.nix b/pkgs/sqlcipher3.nix index c85c516..fa9f55c 100644 --- a/pkgs/sqlcipher3.nix +++ b/pkgs/sqlcipher3.nix @@ -1,20 +1,22 @@ { buildPythonPackage , setuptools-scm , sqlcipher -, fetchPypi +, fetchFromGitHub , ... }: buildPythonPackage rec { pname = "sqlcipher3"; - version = "0.5.0"; + version = "0.5.3"; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ sqlcipher ]; doCheck = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-+wa7UzaCWvIE6Obb/Ihema8UnFPr2P+HeDe1R4+iU+U="; + src = fetchFromGitHub { + owner = "coleifer"; + repo = "sqlcipher3"; + rev = "0.5.3"; + hash = "sha256-eRXwovBBzEKP7K97lDXeKXWwBTO6pW9FSzKx4TAD29U="; }; }