From 3bcaf161cc227c121bc5922ca9bc2035acd246f1 Mon Sep 17 00:00:00 2001
From: jupblb <michal.kielbowicz@sourcegraph.com>
Date: Thu, 18 Jun 2026 12:40:08 +0200
Subject: [PATCH 1/3] Upgrade nixpkgs to 26.05

---
 flake.lock | 8 ++++----
 flake.nix  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 86c022cd9..b80a7b64e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778737229,
-        "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
+        "lastModified": 1781216227,
+        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
+        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 62d73eb00..2ff066158 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
       url = "github:numtide/flake-utils";
     };
     nixpkgs = {
-      url = "github:NixOS/nixpkgs/nixos-25.11";
+      url = "github:NixOS/nixpkgs/nixos-26.05";
     };
   };
 

From 078d6d27ddc59f5e0e954987ebb2e2f351daef82 Mon Sep 17 00:00:00 2001
From: jupblb <michal.kielbowicz@sourcegraph.com>
Date: Thu, 18 Jun 2026 14:16:07 +0200
Subject: [PATCH 2/3] Use Temurin binary for JDK 11 to avoid segfault

---
 flake.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2ff066158..02de9d72a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,12 +70,19 @@
           '';
         };
 
-        devShells = {
-          default = mkDevShell pkgs.jdk11;
-          jdk11 = mkDevShell pkgs.jdk11;
-          jdk17 = mkDevShell pkgs.jdk17;
-          jdk21 = mkDevShell pkgs.jdk21;
-        };
+        devShells =
+          let
+            # The source-built openjdk 11 segfaults at runtime (UB in markOop
+            # exposed by the toolchain in nixpkgs 26.05), so use the prebuilt
+            # Temurin binary instead. See NixOS/nixpkgs#526834.
+            jdk11 = pkgs.temurin-bin-11;
+          in
+          {
+            default = mkDevShell jdk11;
+            jdk11 = mkDevShell jdk11;
+            jdk17 = mkDevShell pkgs.jdk17;
+            jdk21 = mkDevShell pkgs.jdk21;
+          };
       }
     );
 }

From 5fe622c2efac08f785399ccde0c52575add0edb7 Mon Sep 17 00:00:00 2001
From: jupblb <michal.kielbowicz@sourcegraph.com>
Date: Thu, 18 Jun 2026 14:23:54 +0200
Subject: [PATCH 3/3] Simplify config

---
 flake.nix | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 02de9d72a..c8dcb7c4b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,19 +70,13 @@
           '';
         };
 
-        devShells =
-          let
-            # The source-built openjdk 11 segfaults at runtime (UB in markOop
-            # exposed by the toolchain in nixpkgs 26.05), so use the prebuilt
-            # Temurin binary instead. See NixOS/nixpkgs#526834.
-            jdk11 = pkgs.temurin-bin-11;
-          in
-          {
-            default = mkDevShell jdk11;
-            jdk11 = mkDevShell jdk11;
-            jdk17 = mkDevShell pkgs.jdk17;
-            jdk21 = mkDevShell pkgs.jdk21;
-          };
+        devShells = {
+          default = mkDevShell pkgs.temurin-bin-11;
+          # https://github.com/NixOS/nixpkgs/issues/526834
+          jdk11 = mkDevShell pkgs.temurin-bin-11;
+          jdk17 = mkDevShell pkgs.jdk17;
+          jdk21 = mkDevShell pkgs.jdk21;
+        };
       }
     );
 }