Skip to content

Commit

Permalink
Update Nixpkgs to 24.11 and Rust to 1.83.0 (#109)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThetaSinner authored Dec 20, 2024
1 parent 59dbc3c commit 17cdfd8
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 20 deletions.
34 changes: 17 additions & 17 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# specify all input dependencies needed to create the outputs of the flake
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=24.05";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11";

# utility to iterate over multiple target platforms
flake-parts.url = "github:hercules-ci/flake-parts";
Expand Down Expand Up @@ -61,7 +61,7 @@
inherit system overlays;
};

rustVersion = "1.81.0";
rustVersion = "1.83.0";

# define Rust toolchain version and targets to be used in this flake
rust = (pkgs.rust-bin.stable.${rustVersion}.minimal.override
Expand All @@ -87,6 +87,10 @@

# Crane doesn't know which version to select from a workspace, so we tell it where to look
crateInfo = craneLib.crateNameFromCargoToml { cargoToml = inputs.holochain + "/crates/holochain/Cargo.toml"; };

# On intel macs, the default SDK is still 10.12 and Holochain won't build against that because we're
# using a newer Go version. So override with the newest SDK available for x86_64-darwin.
apple_sdk = if system == "x86_64-darwin" then [ pkgs.apple-sdk_10_15 ] else [ ];
in
craneLib.buildPackage {
pname = "holochain";
Expand All @@ -101,7 +105,8 @@
buildInputs = [
pkgs.go
pkgs.perl
];
] ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin apple_sdk);

# Build Holochain, CLI and local services (bootstrap + signal server) binaries.
# Pass extra arguments like feature flags to build command.
cargoExtraArgs = "--bin holochain --bin hc --bin hc-sandbox --bin hcterm --bin hc-run-local-services " + cargoExtraArgs;
Expand Down

0 comments on commit 17cdfd8

Please sign in to comment.