flake.lock

@@ -2,17 +2,18 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716509168,
+        "lastModified": 1716293225,
-        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+        "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
+        "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "nixos",
         "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {

flake.nix

@@ -1,73 +1,48 @@
 {
-  description = "CI, devshell and package definition for learningpulse";
+  description = "Learning Pulse";
+
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
   };
-  outputs = { self, nixpkgs, ... }:
+
+  outputs =
+    { self
+    , nixpkgs
+    , maven
+    , makeWrapper
+    }:
     let
-
+      javaVersion = 22;
-      # TODO add more systems
+      overlays = [
-      system = "x86_64-linux";
+        (final: prev: rec {
-      pkgs = import nixpkgs { inherit system; };
+          jdk = prev."jdk${toString javaVersion}";
-
+          gradle = prev.gradle.override { java = jdk; };
-      buildPackages = with pkgs; [
+          maven = prev.maven.override { inherit jdk; };
-        jdk22
+        })
-        makeWrapper
       ];
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
+        pkgs = import nixpkgs { inherit overlays system; };
+      });
+
     in
-    rec {
-      packages.${system} =
     {
-          learningpulse-gateway = pkgs.maven.buildMavenPackage rec {
-            pname = "gateway";
-            version = "0.0.1";
-
-            src = ./.;
-            # todo get automatically
-            mvnHash = "sha256-YCK1Qujgx73cZdEx2mRip+y+66px5TxL247fBIMyoy4=";
-
-            nativeBuildInputs = buildPackages;
-
-            installPhase = ''
-              mkdir -p $out/bin $out/share/${pname}
-              install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}-${version}
-
-              makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname}- \
-                --add-flags "-jar $out/share/${pname}/${pname}-${version}.jar"
-            '';
-          };
-          learningpulse-eureka = pkgs.maven.buildMavenPackage rec {
-            pname = "eureka";
-            version = "0.0.1";
-
-            src = ./.;
-            # todo get automatically
-            mvnHash = "sha256-YCK1Qujgx73cZdEx2mRip+y+66px5TxL247fBIMyoy4=";
-
-            nativeBuildInputs = buildPackages;
-
-            installPhase = ''
-              mkdir -p $out/bin $out/share/${pname}
-              install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}-${version}
-
-              makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname}- \
-                --add-flags "-jar $out/share/${pname}/${pname}-${version}.jar"
-            '';
-          };
-
-        };
       hydraJobs = {
-        inherit (self)
+        gateway = maven.buildMavenPackage rec {
-          packages;
+          pname = "learningpulse-gateway";
+          version = "1.2.1";
+          # 
+          # hello i wrote something here to test pulling
+        };
       };
 
-      devShells."${system}".default = pkgs.mkShell {
+      devShells = forEachSupportedSystem ({ pkgs }: {
-        buildInputs = with pkgs; [
+        default = pkgs.mkShell {
+          packages = with pkgs; [
+            jdk
             maven
-          jdk22
-          jre8
           ];
         };
+      });
     };
-
 }

gateway/pom.xml

@@ -6,6 +6,7 @@
 		<groupId>com.learningpulse</groupId>
 		<artifactId>server</artifactId>
 		<version>0.0.1</version>
+		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>gateway</artifactId>
 	<version>0.0.1</version>

result

@@ -1 +0,0 @@
-/nix/store/v6lrgj18jgvwli3irsdabgj5nc712gfc-gateway-0.0.1