diff --git a/default.nix b/default.nix index 399ee97c..78141093 100644 --- a/default.nix +++ b/default.nix @@ -8,7 +8,7 @@ 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; @@ -16,9 +16,9 @@ llvmPackages_11.stdenv.mkDerivation rec { 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 index ad78452f..21747524 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "type": "github" }, "original": { @@ -17,17 +17,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1617987980, - "narHash": "sha256-0D5vcBHvccMIpdZN9h4TqPGdiiRuGMpaO4jaj4iJu50=", + "lastModified": 1633254510, + "narHash": "sha256-6I4cnC6CUjBNXaLXHF+nbTfqTYPGlpAM7SsJasC2gF4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae09772927566314ad11e366ddb46a9c7ffb666a", + "rev": "22374e17050f0a4453a3256c6473177b553a72be", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae09772927566314ad11e366ddb46a9c7ffb666a", + "rev": "22374e17050f0a4453a3256c6473177b553a72be", "type": "github" } }, diff --git a/flake.nix b/flake.nix index f3617a28..a0670b6e 100644 --- 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 index 9026c25d..96c60218 100644 --- 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 index 1f5e67bc..05a6863c 100644 --- 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; }