Update nix toolchain (#532)

Riey · Oct 3, 2021 · 3876675 · 3876675
1 parent a27fbc5
commit 3876675
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/default.nix b/default.nix
@@ -8,17 +8,17 @@ let
   testArgs = if debug then "" else "--release";
 in
 with pkgs;
-llvmPackages_11.stdenv.mkDerivation rec {
+llvmPackages_13.stdenv.mkDerivation rec {
   name = "kime";
   src = ./.;
   buildInputs = deps.kimeBuildInputs;
   nativeBuildInputs = deps.kimeNativeBuildInputs ++ [ rustPlatform.cargoSetupHook ];
   version = kimeVersion;
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    sha256 = "sha256-j3S457qDgHEcKC9FraiYsj/ykHB/cJVNLI2H/XcRDUk=";
+    sha256 = "sha256-GvBnNPY51RPt+I73oet5tB/EE2UsEPKbelJZkSY3xNw=";
   };
-  LIBCLANG_PATH = "${pkgs.llvmPackages_11.libclang}/lib";
+  LIBCLANG_PATH = "${pkgs.llvmPackages_13.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
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = github:NixOS/nixpkgs?rev=ae09772927566314ad11e366ddb46a9c7ffb666a;
+    nixpkgs.url = github:NixOS/nixpkgs?rev=22374e17050f0a4453a3256c6473177b553a72be;
     flake-utils.url = github:numtide/flake-utils;
   };
 

diff --git a/nix/deps.nix b/nix/deps.nix
@@ -22,9 +22,9 @@ with pkgs;
   kimeNativeBuildInputs = [
     bash
     pkg-config
-    clang_11
-    llvmPackages_11.libclang
-    llvmPackages_11.bintools
+    llvmPackages_13.clang
+    llvmPackages_13.libclang.lib
+    llvmPackages_13.bintools
     rustc cargo
     cmake
     extra-cmake-modules

diff --git a/shell.nix b/shell.nix
@@ -5,14 +5,14 @@ let
   deps = import ./nix/deps.nix { pkgs = pkgs; };
 in
 with pkgs;
-llvmPackages_11.stdenv.mkDerivation {
+llvmPackages_13.stdenv.mkDerivation {
   name = "kime-shell";
   dontUseCmakeConfigure = true;
   dontWrapQtApps = true;
   buildInputs = deps.kimeBuildInputs;
   nativeBuildInputs = deps.kimeNativeBuildInputs;
   CMAKE_EXPORT_COMPILE_COMMANDS = 1;
-  LIBCLANG_PATH = "${pkgs.llvmPackages_11.libclang}/lib";
+  LIBCLANG_PATH = "${pkgs.llvmPackages_13.libclang.lib}/lib";
   RUST_BACKTRACE = 1;
 }