Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

nix: read the release version from api/package.json

gerrydoro29c5bf18aaae
diff --git a/contrib/nix/dataset.nix b/contrib/nix/dataset.nix
new file mode 100644
index 000000000..727e6488c
--- /dev/null
+++ b/contrib/nix/dataset.nix
@@ -0,0 +1,4 @@
+# Pinned hasaneyldrm/exercises-dataset commit — the build-time fetch (media.nix) and the
+# runtime download (media-script.nix) must agree on the same tree, and it matches the pin
+# the Docker/CI builds use (frontend/package.json, .gitlab-ci.yml).
+"7455efae41b330c265e7cd4b78dfa848e7ce5ebd"
diff --git a/contrib/nix/default.nix b/contrib/nix/default.nix
index f31d4a63c..6878112ac 100644
--- a/contrib/nix/default.nix
+++ b/contrib/nix/default.nix
@@ -4,12 +4,16 @@
}:
let
- versions = import ./version.nix;
+ # The release version is whatever api/package.json says — the same file release:preflight
+ # checks a v* tag against, so the Nix packages can never drift from the release they ship.
+ version = (builtins.fromJSON (builtins.readFile ../../api/package.json)).version;
+
+ datasetRev = import ./dataset.nix;
in
{
- opengym-frontend = callPackage ./frontend.nix { inherit (versions) version; };
- opengym-api = callPackage ./api.nix { inherit (versions) version; };
- opengym-mcp = callPackage ./mcp.nix { inherit (versions) version; };
- opengym-media = callPackage ./media.nix { inherit (versions) datasetRev; };
- opengym-fetch-media = callPackage ./media-script.nix { inherit (versions) datasetRev; };
+ opengym-frontend = callPackage ./frontend.nix { inherit version; };
+ opengym-api = callPackage ./api.nix { inherit version; };
+ opengym-mcp = callPackage ./mcp.nix { inherit version; };
+ opengym-media = callPackage ./media.nix { inherit datasetRev; };
+ opengym-fetch-media = callPackage ./media-script.nix { inherit datasetRev; };
}
diff --git a/contrib/nix/version.nix b/contrib/nix/version.nix
deleted file mode 100644
index e1f40ac65..000000000
--- a/contrib/nix/version.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-# Single source of truth for the openGym release version and the pinned exercise-dataset
-# commit the media packages (build-time media.nix and runtime media-script.nix) agreed on.
-{
- version = "1.3.10";
-
- # hasaneyldrm/exercises-dataset — same commit for build-time fetch and runtime download.
- datasetRev = "7455efae41b330c265e7cd4b78dfa848e7ce5ebd";
-}
diff --git a/docs/NIX.md b/docs/NIX.md
index 0e447455d..08534951c 100644
--- a/docs/NIX.md
+++ b/docs/NIX.md
@@ -73,8 +73,9 @@ contrib/nix/
mcp.nix buildNpmPackage → bin/opengym-mcp
media.nix fetchFromGitHub pin of the exercise dataset (build-time)
media-script.nix runtime media-fetch shell script
- version.nix version = "1.2.14" + pinned dataset commit (single source of truth)
- default.nix package-set aggregator (used by both the flake and the module)
+ dataset.nix pinned exercise-dataset commit (both media packages share it)
+ default.nix package-set aggregator (used by both the flake and the module); reads the
+ release version from api/package.json
```
Everything Nix lives under `contrib/nix/` so the flake stays out of the way of the project's own