From af8617118733aa5deb5709a22224dd3cbb9748d3 Mon Sep 17 00:00:00 2001
From: Luna Schwalbe <88447041+lunagl@users.noreply.github.com>
Date: Fri, 4 Oct 2024 19:36:45 +0200
Subject: [PATCH] Update and fix nix flake (#63)

---
 .direnv/flake-profile        |  1 -
 .direnv/flake-profile-3-link |  1 -
 .gitignore                   |  5 ++++-
 build.gradle                 |  4 ++++
 flake.lock                   |  6 +++---
 flake.nix                    | 16 ++++++----------
 6 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 120000 .direnv/flake-profile
 delete mode 120000 .direnv/flake-profile-3-link

diff --git a/.direnv/flake-profile b/.direnv/flake-profile
deleted file mode 120000
index 519b17b..0000000
--- a/.direnv/flake-profile
+++ /dev/null
@@ -1 +0,0 @@
-flake-profile-3-link
\ No newline at end of file
diff --git a/.direnv/flake-profile-3-link b/.direnv/flake-profile-3-link
deleted file mode 120000
index 7546133..0000000
--- a/.direnv/flake-profile-3-link
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/yyknb49mg70qy0q3aqr7ads4ila0389z-nix-shell-env
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 2341391..793d309 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,4 +181,7 @@ gradle-app.setting
 exampleProject/
 
 grading-config-example.json
-.intellijPlatform/
\ No newline at end of file
+.intellijPlatform/
+
+# Direnv state
+.direnv/
diff --git a/build.gradle b/build.gradle
index 52bd0d6..a8f082c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,6 +31,10 @@ dependencies {
         bundledPlugin("com.intellij.java")
         bundledPlugin("org.jetbrains.idea.maven")
         instrumentationTools()
+        def localJbr = System.getenv("LOCAL_JBR")
+        if (localJbr != null) {
+            jetbrainsRuntimeLocal(localJbr)
+        }
     }
     implementation 'edu.kit.kastel.sdq:artemis4j:7.5.0-SNAPSHOT'
     // Tests
diff --git a/flake.lock b/flake.lock
index 47ba68e..c1fad22 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720418205,
-        "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
+        "lastModified": 1727802920,
+        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "655a58a72a6601292512670343087c2d75d859c1",
+        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e56558e..b22e827 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,12 +5,12 @@
 
   outputs = { self, nixpkgs }:
     let
-      javaVersion = 17; # Change this value to update the whole stack
+      javaVersion = 21; # Change this value to update the whole stack
       overlays = [
         (final: prev: rec {
           jdk = prev."jdk${toString javaVersion}";
           gradle = prev.gradle.override { java = jdk; };
-          maven = prev.maven.override { inherit jdk; };
+          maven = prev.maven.override { jdk_headless = jdk; };
         })
       ];
       supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
@@ -22,17 +22,13 @@
       devShells = forEachSupportedSystem ({ pkgs }: {
         default = pkgs.mkShell {
           packages = with pkgs; [
-            gradle 
-            jdk 
-            maven 
+            jdk
+            gradle
+            maven
             jdt-language-server
           ];
           
-          #NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
-          #  pkgs.cc.cc
-          #];
-
-          # NIX_LD = builtins.readFile "${pkgs.cc}/nix-support/dynamic-linker";
+          LOCAL_JBR = pkgs.jetbrains.jdk;
         };
       });
     };