Compare commits

...

3 commits

Author SHA1 Message Date
5ee637cf4d update makefile 2022-05-04 18:49:00 +02:00
d61101f786 nix cleanup 2022-05-04 18:35:43 +02:00
f5f2c4399e move lib to subdir 2022-05-04 17:44:38 +02:00
29 changed files with 13 additions and 17 deletions

View file

@ -1,20 +1,20 @@
all: quox all: quox
quox: quox:
(cd exe; sirdi build) nix build '.#quox-exe'
ln -sf exe/build/exec/main $@ ln -sfL $$(realpath result/bin/quox) quox
quox-tests: quox-tests:
(cd tests; sirdi build) nix build '.#quox-tests'
ln -sf tests/build/exec/main $@ ln -sfL $$(realpath result/bin/quox-tests) quox-tests
.PHONY: lib .PHONY: lib
lib: lib:
sirdi build nix build '.#quox'
.PHONY: test .PHONY: test
test: quox-tests test:
./quox-tests -V 14 nix run -- '.#quox-tests' -V 14
.PHONY: prove .PHONY: prove
prove: quox-tests prove: quox-tests
@ -22,7 +22,4 @@ prove: quox-tests
.PHONY: clean .PHONY: clean
clean: clean:
$(RM) quox quox-tests rm -f quox quox-tests result
sirdi clean
(cd exe; sirdi clean)
(cd tests; sirdi clean)

View file

@ -14,17 +14,16 @@
inherit system; inherit system;
overlays = [ idris2-pkgs.overlay ]; overlays = [ idris2-pkgs.overlay ];
}; };
inherit (pkgs.idris2-pkgs._builders) idrisPackage devEnv;
quox = idrisPackage ./. { }; inherit (pkgs.idris2-pkgs._builders) idrisPackage;
quox = idrisPackage ./lib { };
quox-exe = idrisPackage ./exe { extraPkgs.quox = quox; }; quox-exe = idrisPackage ./exe { extraPkgs.quox = quox; };
quox-tests = idrisPackage ./tests { extraPkgs.quox = quox; }; quox-tests = idrisPackage ./tests { extraPkgs.quox = quox; };
in in
{ {
defaultPackage = quox-exe;
packages = { inherit quox quox-exe quox-tests; }; packages = { inherit quox quox-exe quox-tests; };
defaultPackage = quox;
devShell = pkgs.mkShell { buildInputs = [ (devEnv quox) ]; };
} }
); );
} }