diff --git a/.hgignore b/.hgignore index 8a85df1..2a68fe3 100644 --- a/.hgignore +++ b/.hgignore @@ -11,3 +11,4 @@ deploy.yaml resources .direnv .envrc +result diff --git a/flake.nix b/flake.nix index 88fabcd..b119686 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,26 @@ inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem - (system: - let pkgs = nixpkgs.legacyPackages.${system}; in - { - devShell = import ./shell.nix { inherit pkgs; }; - } - ); + flake-utils.lib.eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in { + defaultPackage = pkgs.stdenv.mkDerivation { + name = "erambler-html"; + src = ./.; + nativeBuildInputs = [ pkgs.hugo ]; + buildPhase = "hugo"; + installPhase = '' + mkdir $out + cp -R public/* $out + ''; + }; + devShell = pkgs.mkShell { + buildInputs = with pkgs; [ + (python38.withPackages + (py: with py; [ python invoke rich requests ruamel_yaml sh ])) + yarn + hugo + ]; + }; + }); } diff --git a/shell.nix b/shell.nix deleted file mode 100644 index b6e47ae..0000000 --- a/shell.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -let - python = pkgs.python38; - pythonWithPackages = python.withPackages (py: [ - py.python - - # For locally-run tasks - py.invoke - py.rich - py.requests - py.ruamel_yaml - py.sh - ]); -in pkgs.mkShell { buildInputs = with pkgs; [ pythonWithPackages yarn hugo ]; }