Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with nix #64

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ccb352c
ignore stack.yaml.lock (stale local change)
robx May 17, 2022
0b2c750
rm travis
robx May 17, 2022
8f5e85b
flake copied over from puzzld
robx May 17, 2022
7131743
Data.Kind (fix warning)
robx May 17, 2022
1ba7598
upper bound on SVGFonts
robx May 17, 2022
885e22c
build with aeson 2.0
robx May 17, 2022
7e35773
working flake build
robx May 17, 2022
accbd08
make `make compare` work in `nix develop`
robx May 17, 2022
1944c80
accept greaterwall dotting rendering change
robx May 18, 2022
5d30361
make gallery.sh nix-compatible
robx May 18, 2022
e9cd41c
try patchShebangs
robx May 18, 2022
8bbd829
elm 0.19.1
robx May 18, 2022
c5fb02d
web: build with nix (via elm2nix)
robx May 18, 2022
c4221ea
inline elm-srcs.nix
robx May 18, 2022
a45babb
cut down default.nix
robx May 18, 2022
31fb24a
move elm nix expressions into nix subdir
robx May 19, 2022
c71d90c
elm build in flake
robx May 19, 2022
e88d7ee
puzzle-draw-serve package
robx May 19, 2022
482edda
restore source filtering to avoid puzzle-draw rebuilds
robx May 19, 2022
ad89511
format nix stuff, and a compiling nixos module
robx May 19, 2022
414e470
try optionally disabling puzzle-draw virtual host
robx May 19, 2022
4b519ad
fix nix module typo
robx May 19, 2022
b27feb5
towards actually testing modules
robx May 19, 2022
bdf0724
always set nginx backend, even without virtual host
robx May 19, 2022
862a6c8
puzzle-draw-serve package as an option
robx May 25, 2022
2f93d84
provide puzzle-draw package for test configuration
robx May 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
puzzle-draw-serve package as an option
robx committed May 25, 2022
commit 862a6c8c3321fade4e09a77383e9c6b839e658e5
13 changes: 11 additions & 2 deletions nix/module.nix
Original file line number Diff line number Diff line change
@@ -11,6 +11,15 @@ in {
options.services.puzzle-draw = {
enable = mkEnableOption "puzzle-draw server";

package = mkOption {
default = pkgs.puzzle-draw-serve;
defaultText = "pkgs.puzzle-draw-serve";
type = types.package;
description = ''
puzzle-draw-serve package to use.
'';
};

hostName = mkOption {
type = types.nullOr types.str;
default = null;
@@ -34,8 +43,8 @@ in {
wantedBy = ["multi-user.target"];
after = ["networking.target"];
serviceConfig = {
WorkingDirectory = "${pkgs.puzzle-draw-serve}";
ExecStart = "${pkgs.puzzle-draw-serve}/bin/servepuzzle -b 127.0.0.1 -p 8765";
WorkingDirectory = "${cfg.package}";
ExecStart = "${cfg.package}/bin/servepuzzle -b 127.0.0.1 -p 8765";
Restart = "always";
};
};