flake-based builds, makefile release target
2 files changed,  +22, -3
M Makefile
+19, -1
 1@@ -4,9 +4,19 @@ SHELL := /bin/bash
 2 GRAPHHOPPER := $(shell command -v graphhopper)
 3 
 4 build: build-deps
 5-	cd server && $(MAKE) build
 6+	nix build .#rtw
 7 .PHONY: build
 8 
 9+release: build-deps
10+	VERSION=$$(date +%Y.%m.%d%H%M); \
11+	sed -i '/rtw-package = {/,/};/s/version = "[^"]*";/version = "'"$${VERSION}"'";/' flake.nix
12+	nix build .#rtw
13+.PHONY: release
14+
15+build-local: build-deps
16+	cd server && $(MAKE) build
17+.PHONY: build-local
18+
19 build-deps:
20 	cd client && pnpm i --frozen-lockfile
21 	cd client && pnpm run build
22@@ -19,6 +29,14 @@ preview:
23 	cd server && $(MAKE) preview
24 .PHONY: preview
25 
26+update-ygo:
27+	cd server && go get -u git.kilimanjaro.io/ygo
28+	nix flake lock --update-input ygo
29+	sed -i 's/vendorHash = "sha256-[^"]*";/vendorHash = lib.fakeHash;/' flake.nix
30+	@echo "vendorHash reset to lib.fakeHash. Run 'nix build .#rtw' and copy the 'got:' hash into flake.nix."
31+
32+.PHONY: update-ygo
33+
34 check-concurrently:
35 	@if ! command -v concurrently >/dev/null 2>&1; then \
36 		echo "Error: 'concurrently' not found. Please run 'devenv shell' first." >&2; \
M flake.nix
+3, -2
 1@@ -70,7 +70,7 @@
 2 
 3           # Compute by running: nix build .#rtw
 4           # Then copy the hash from the error message
 5-          vendorHash = "sha256-EzV57oX4Wgvn1KITyoBwycE0pt3QMj6IpK+8v6ndczs=";
 6+          vendorHash = "sha256-QPAYsfLvWdEt0PHc2UCJjpgW07nShaht394unskjjn8=";
 7 
 8           doCheck = false;
 9 
10@@ -91,7 +91,8 @@
11 
12           meta = {
13             description = "RTW adventure motorcycle trip planning server";
14-            license = lib.licenses.mit;
15+            license = lib.licenses.agpl3Plus;
16+            homepage = "https://kilimanjaro.io/rtw";
17             mainProgram = "rtw";
18           };
19         };