diff --git a/Cargo.toml b/Cargo.toml index 01225930..e9b0e964 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ keywords = [ license = "Apache-2.0" readme = "README.md" repository = "https://github.com/matrix-construct/tuwunel" -rust-version = "1.89.0" +rust-version = "1.91.1" version = "1.4.9" [workspace.metadata.crane] diff --git a/flake.nix b/flake.nix index aa2978c9..4ad43398 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ file = ./rust-toolchain.toml; # See also `rust-toolchain.toml` - sha256 = "sha256-+9FmLhAOezBZCOziO0Qct1NOrfpjNsXxc/8I0c7BdKE="; + sha256 = "sha256-SDu4snEWjuZU475PERvu+iO50Mi39KVjqCeJeNvpguU="; }; mkScope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: { diff --git a/nix/pkgs/main/default.nix b/nix/pkgs/main/default.nix index edaabf65..964ca354 100644 --- a/nix/pkgs/main/default.nix +++ b/nix/pkgs/main/default.nix @@ -9,7 +9,7 @@ , rocksdb , removeReferencesTo , rust -, rust-jemalloc-sys +, rust-jemalloc-sys-unprefixed , stdenv # Options (keep sorted) @@ -62,7 +62,7 @@ enableLiburing = featureEnabled "io_uring" && !stdenv.hostPlatform.isDarwin; # own. In order for this to work, we need to set flags on the build that match # whatever flags tikv-jemalloc-sys was going to use. These are dependent on # which features we enable in tikv-jemalloc-sys. -rust-jemalloc-sys' = (rust-jemalloc-sys.override { +rust-jemalloc-sys' = (rust-jemalloc-sys-unprefixed.override { # tikv-jemalloc-sys/unprefixed_malloc_on_supported_platforms feature unprefixed = true; }).overrideAttrs (old: { @@ -171,15 +171,12 @@ commonAttrs = { dontStrip = profile == "dev" || profile == "test"; dontPatchELF = profile == "dev" || profile == "test"; - buildInputs = lib.optional (featureEnabled "jemalloc") rust-jemalloc-sys' + buildInputs = lib.optional (featureEnabled "jemalloc") rust-jemalloc-sys-unprefixed # needed to build Rust applications on macOS ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/206242 # ld: library not found for -liconv libiconv - # https://stackoverflow.com/questions/69869574/properly-adding-darwin-apple-sdk-to-a-nix-shell - # https://discourse.nixos.org/t/compile-a-rust-binary-on-macos-dbcrossbar/8612 - pkgsBuildHost.darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 28ba8200..ddce5f30 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -9,7 +9,7 @@ # If you're having trouble making the relevant changes, bug a maintainer. [toolchain] -channel = "1.89.0" +channel = "1.91.1" profile = "minimal" components = [ # For rust-analyzer