From a741110b39bb6df46ff1114f88c0795c5a789161 Mon Sep 17 00:00:00 2001
From: Riey <creeper844@gmail.com>
Date: Tue, 30 Jul 2024 19:47:57 +0900
Subject: [PATCH] Update nix

---
 default.nix  |  6 +++---
 flake.lock   | 30 ++++++++++++++++++++++++------
 flake.nix    |  2 +-
 nix/deps.nix |  6 +++---
 shell.nix    |  6 +++---
 5 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/default.nix b/default.nix
index cac0835a..f901d9d0 100644
--- a/default.nix
+++ b/default.nix
@@ -8,7 +8,7 @@ let
   testArgs = if debug then "" else "--release";
 in
 with pkgs;
-llvmPackages_14.stdenv.mkDerivation rec {
+llvmPackages_18.stdenv.mkDerivation rec {
   name = "kime";
   src = ./.;
   buildInputs = deps.kimeBuildInputs;
@@ -17,9 +17,9 @@ llvmPackages_14.stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     #sha256 = "0000000000000000000000000000000000000000000000000000";
-    sha256 = "sha256-/o9b7YvrpV+IujkllFWAz6Mg4CbS9BInF8antfZ0Vsw=";
+    sha256 = "sha256-hlTxyaE/300CBGIJtFzIh6CT5PcmmqWt8CN428sr2U8=";
   };
-  LIBCLANG_PATH = "${pkgs.llvmPackages_14.libclang.lib}/lib";
+  LIBCLANG_PATH = "${pkgs.llvmPackages_18.libclang.lib}/lib";
   dontUseCmakeConfigure = true;
   dontWrapQtApps = true;
   buildPhase = if debug then "bash scripts/build.sh -ad" else "bash scripts/build.sh -ar";
diff --git a/flake.lock b/flake.lock
index 76be6d3f..7d837c01 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,15 @@
 {
   "nodes": {
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -17,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1673852661,
-        "narHash": "sha256-2FuRg7gI5dKfTXHh4U97OSSobXgUNnwNyy9akDliZyg=",
+        "lastModified": 1722335482,
+        "narHash": "sha256-ogz81JDwIyuX67JC2dZUr3tIPqJABgSKJF9tynZLksQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "05cbcd86534c8faebfb2ad4149d0139e49804cbd",
+        "rev": "3563397b2f10ffa1891e1a6ce99d13d960d73acd",
         "type": "github"
       },
       "original": {
@@ -35,6 +38,21 @@
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index cdd0ba93..ea6056bc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "A very basic flake";
+  description = "Korean IME";
 
   inputs = {
     nixpkgs.url = github:NixOS/nixpkgs;
diff --git a/nix/deps.nix b/nix/deps.nix
index 27fd99cf..4e908238 100644
--- a/nix/deps.nix
+++ b/nix/deps.nix
@@ -20,9 +20,9 @@ with pkgs;
   kimeNativeBuildInputs = [
     python3 # xcb 0.9.0
     pkg-config
-    llvmPackages_14.clang
-    llvmPackages_14.libclang.lib
-    llvmPackages_14.bintools
+    llvmPackages_18.clang
+    llvmPackages_18.libclang.lib
+    llvmPackages_18.bintools
     rustc cargo
     cmake
     extra-cmake-modules
diff --git a/shell.nix b/shell.nix
index c5d8e958..2844195f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -3,7 +3,7 @@
 }:
 let
   deps = import ./nix/deps.nix { pkgs = pkgs; };
-  stdenv = pkgs.llvmPackages_14.stdenv;
+  stdenv = pkgs.llvmPackages_18.stdenv;
   mkShell = (pkgs.mkShell.override { stdenv = stdenv; });
 in
 mkShell {
@@ -14,10 +14,10 @@ mkShell {
   nativeBuildInputs = deps.kimeNativeBuildInputs ++ (with pkgs; [
     rustfmt
     gnome.gedit
-    llvmPackages_14.lldb
+    llvmPackages_18.lldb
   ]);
   CMAKE_EXPORT_COMPILE_COMMANDS = 1;
-  LIBCLANG_PATH = "${pkgs.llvmPackages_14.libclang.lib}/lib";
+  LIBCLANG_PATH = "${pkgs.llvmPackages_18.libclang.lib}/lib";
   LD_LIBRARY_PATH = "./target/debug:${pkgs.wayland}/lib:${pkgs.libGL}/lib:${pkgs.libxkbcommon}/lib";
   G_MESSAGES_DEBUG = "kime";
   GTK_IM_MODULE = "kime";