From cef634c8e855ff3ef8d7fe9cd71ca965eceb28ba Mon Sep 17 00:00:00 2001
From: Anton Iakimov <yakimant@gmail.com>
Date: Thu, 20 Aug 2026 15:14:42 +0300
Subject: [PATCH] i

---
 flake.lock       | 8 ++++----
 flake.nix        | 3 +--
 nix/devshell.nix | 7 +++++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 60544dee70..50b17933a4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,16 +41,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1782847189,
-        "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
+        "lastModified": 1787101114,
+        "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
+        "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
         "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 04a7fcd05a..30b01d5743 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,7 @@
 
   inputs = {
     # qtwebengine is broken for darwin
-    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     nixgl = {
diff --git a/nix/devshell.nix b/nix/devshell.nix
index 908b1560c4..38cd69af65 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -1,7 +1,9 @@
 {pkgs}: let
   # NOTE: llvm19+ has an issue with zxing-cpp
   llvm18 = pkgs.llvmPackages_18;
-  mkShell18 = pkgs.mkShell.override {stdenv = llvm18.libcxxStdenv;};
+  mkShell18 = pkgs.mkShell.override {
+    inherit (llvm18) stdenv;
+  };
   mkShell =
     if pkgs.stdenv.isDarwin
     then mkShell18
@@ -33,7 +35,8 @@ in
         gcc           # for nim compilation
         git
         go-bindata
-        go_1_24       # 1.24.13
+        # go_1_24       # 1.24.13
+        go_1_26       # 1.2
         libglvnd
         mockgen       # v0.6.0
         nim           # 2.2.4