Update flake, build from zips

flake.nix

@@ -1,104 +1,76 @@
 {
   description = "fit4s flake";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
+    devshell-tools.url = "github:eikek/devshell-tools";
     sbt.url = "github:zaninime/sbt-derivation";
     sbt.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, sbt }:
-    let
-      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
-      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-    in
-    rec
-    {
-      overlays.default = final: prev: {
-        fit4s = with final; sbt.lib.mkSbtDerivation {
-          pkgs = final;
+  outputs = {
+    self,
+    nixpkgs,
+    devshell-tools,
+    sbt,
+  }: let
+    supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin"];
+    forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
 
-          version = "dynamic";
-          pname = "fit4s-cli";
-
-          nativeBuildInputs = [ pkgs.nodejs ];
-
-          # depsWarmupCommand = ''
-          #   sbt compile webviewJS/tzdbCodeGen
-          # '';
-
-          src = lib.sourceByRegex ./. [
-            "^build.sbt$"
-            "^modules$"
-            "^modules/.*$"
-            "^project$"
-            "^project/.*$"
-            "^make-cli.sh$"
-          ];
-
-          depsSha256 = "sha256-+Yj69e4d3o2Nf2kGvK6hmD7fpYyZAqAmoKxC3/10Kmk=";
-
-          buildPhase = ''
-            env
-            ls -lha
-            bash make-cli.sh
-          '';
-
-          installPhase = ''
-            mkdir -p $out
-            cp -R modules/cli/target/universal/stage/* $out/
-
-            cat > $out/bin/fit4s <<-EOF
-            #!${bash}/bin/bash
-            $out/bin/fit4s-cli -java-home ${jdk} "\$@"
-            EOF
-            chmod 755 $out/bin/fit4s
-          '';
-        };
+    fit4sPkgs = pkgs: {
+      fit4s-dev = import ./nix/pkg-dev.nix {
+        inherit pkgs;
+        inherit sbt;
+        lib = pkgs.lib;
       };
+      fit4s = pkgs.callPackage (import ./nix/pkg-bin.nix) {};
+    };
+  in rec
+  {
+    overlays.default = final: prev: (fit4sPkgs final);
 
-      apps = forAllSystems (system:
-        { default = {
-            type = "app";
-            program = "${self.packages.${system}.default}/bin/fit4s";
-          };
-        });
+    formatter = forAllSystems (
+      system:
+        nixpkgs.legacyPackages.${system}.alejandra
+    );
 
-      packages = forAllSystems (system:
-        {
-          default = (import nixpkgs {
-            inherit system;
-            overlays = [ self.overlays.default ];
-          }).fit4s;
-        });
+    apps = forAllSystems (system: {
+      default = {
+        type = "app";
+        program = "${self.packages.${system}.default}/bin/fit4s";
+      };
+    });
 
+    packages = forAllSystems (system: let
+      pkgs = import nixpkgs {
+          inherit system;
+          overlays = [self.overlays.default];
+      };
+      in {
+      default = pkgs.fit4s;
+    fit4s = pkgs.fit4s;
+    fit4s-dev = pkgs.fit4s-dev;
+    });
 
-      devShells = forAllSystems(system:
-        { default =
-            let
-              overlays = import ./nix/overlays.nix;
-              pkgs = import nixpkgs {
-                inherit system;
-                overlays = [
-                  overlays.sbt
-                  overlays.postgres-fg
-                ];
-              };
-            in
-              pkgs.mkShell {
-                buildInputs = [
-                  pkgs.sbt
-                  pkgs.openjdk
-                  pkgs.nodejs
-                  pkgs.postgres-fg
-                  pkgs.scala-cli
-                ];
-                nativeBuildInputs =
-                  [
-                  ];
+    devShells = forAllSystems (system: {
+      default = let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [
+            devshell-tools.overlays.default
+          ];
+        };
+      in
+        pkgs.mkShell {
+          buildInputs = [
+            pkgs.sbt17
+            pkgs.nodejs
+            pkgs.scala-cli
+          ];
+          nativeBuildInputs = [
+          ];
 
-                SBT_OPTS = "-Xmx2G";
-                JAVA_HOME = "${pkgs.openjdk19}/lib/openjdk";
-              };
-        });
-    };
+          SBT_OPTS = "-Xmx2G";
+        };
+    });
+  };
 }

nix/meta.nix

@@ -0,0 +1,24 @@
+lib: rec {
+  version = "0.8.0-SNAPSHOT";
+
+  latest-release = "0.7.0";
+
+  license = lib.licenses.gpl3;
+  homepage = https://github.com/eikek/fit4s;
+
+  meta-bin = {
+    description = ''
+      Scala library for reading FIT files.
+    '';
+
+    inherit license homepage;
+  };
+
+  meta-src = {
+    description = ''
+      Scala library for reading FIT files.
+    '';
+
+    inherit license homepage;
+  };
+}

nix/pkg-bin.nix

@@ -0,0 +1,34 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  jdk17,
+  unzip,
+  bash,
+}: let
+  meta = (import ./meta.nix) lib;
+  version = meta.latest-release;
+in
+  stdenv.mkDerivation {
+    inherit version;
+    name = "fit4s-bin-${version}";
+
+    src = fetchzip {
+      url = "https://github.com/eikek/fit4s/releases/download/v${version}/fit4s-cli-${version}.zip";
+      sha256 = "sha256-b9sJSIgh7C1nzNYDItxKePwJuYEDQ+bYw3oeb8qpSy0=";
+    };
+
+    buildPhase = "true";
+
+    installPhase = ''
+      mkdir -p $out/{bin,fit4s-${version}}
+      cp -R * $out/fit4s-${version}/
+      cat > $out/bin/fit4s <<-EOF
+      #!${bash}/bin/bash
+      $out/fit4s-${version}/bin/fit4s-cli -java-home ${jdk17} "\$@"
+      EOF
+      chmod 755 $out/bin/fit4s
+    '';
+
+    meta = meta.meta-bin;
+  }