diff --git a/flake-profiles/system-sodium/flake.nix b/flake-profiles/system-sodium/flake.nix index 13c481c..771dc6f 100644 --- a/flake-profiles/system-sodium/flake.nix +++ b/flake-profiles/system-sodium/flake.nix @@ -74,6 +74,9 @@ (final: super: { check-gits = inputs.soup.legacyPackages."aarch64-darwin".check-gits; }) + (final: super: { + lute3 = inputs.soup.legacyPackages."aarch64-darwin".lute3; + }) ]; config = import ./../../venus/app-configs/nixpkgs-config.nix; # Configures pkgs for evaluating this darwinConfiguration ("buildtime" config) }; diff --git a/soup/extraPackages.nix b/soup/extraPackages.nix index 7038b22..cbf84d0 100644 --- a/soup/extraPackages.nix +++ b/soup/extraPackages.nix @@ -13,7 +13,7 @@ let inherit maybe-flake-inputs flake-lock; }); in -{ +rec { # The `lib`, `modules`, and `overlays` names are special #lib = import ./lib { inherit pkgs; }; # functions #modules = import ./modules; # NixOS modules @@ -25,4 +25,8 @@ in love = callPackageWithMaybeFlakeInputs ./pkgs/love { }; jujutsu = callPackageWithMaybeFlakeInputs ./pkgs/jujutsu.nix { }; jujutsu-bin = (callPackageWithMaybeFlakeInputs ./pkgs/jujutsu-bin/main.nix { }).latest.${system}; + natto-py = callPackageWithMaybeFlakeInputs ./pkgs/natto-py/default.nix { }; + lute3 = callPackageWithMaybeFlakeInputs ./pkgs/lute3/default.nix { + natto-py = natto-py; + }; } diff --git a/soup/pkgs/lute3/default.nix b/soup/pkgs/lute3/default.nix new file mode 100644 index 0000000..d36f0d8 --- /dev/null +++ b/soup/pkgs/lute3/default.nix @@ -0,0 +1,41 @@ +{ + lib, + python3Packages, + fetchPypi, + natto-py, +}: + +python3Packages.buildPythonPackage rec { + pname = "lute3"; + version = "3.10.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gqwoyINuP54ve6R2OonLUT2oZYmpjvUopyWbJ+stJrE="; + }; + + # do not run tests + doCheck = false; + + # specific to buildPythonPackage, see its reference + pyproject = true; + build-system = with python3Packages; [ + setuptools + wheel + flit-core + ]; + dependencies = with python3Packages; [ + flask-sqlalchemy + flask-wtf + natto-py + jaconv + platformdirs + requests + beautifulsoup4 + pyyaml + toml + waitress + pyparsing + pypdf + ]; +} \ No newline at end of file diff --git a/soup/pkgs/natto-py/default.nix b/soup/pkgs/natto-py/default.nix new file mode 100644 index 0000000..d0d18c1 --- /dev/null +++ b/soup/pkgs/natto-py/default.nix @@ -0,0 +1,28 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonPackage rec { + pname = "natto-py"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dgEDuzlyMu4DPJkk0TV+MrFCu+Ey/GpDuM+C3WtlToY="; + }; + + # do not run tests + doCheck = false; + + # specific to buildPythonPackage, see its reference + pyproject = true; + build-system = with python3Packages; [ + setuptools + wheel + ]; + dependencies = with python3Packages; [ + cffi + ]; +} \ No newline at end of file diff --git a/venus/modules/home-manager/sodium.nix b/venus/modules/home-manager/sodium.nix index 95c2133..c04fbe8 100644 --- a/venus/modules/home-manager/sodium.nix +++ b/venus/modules/home-manager/sodium.nix @@ -41,6 +41,7 @@ pkgs.kubectl pkgs.claude-code pkgs.sox + pkgs.lute3 ]; home.sessionVariables = {