-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Backport 0.3: Update nixpkgs 24.11 #112
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -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"; | ||||||||||||
|
@@ -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"; | ||||||||||||
|
@@ -101,7 +105,7 @@ | |||||||||||
buildInputs = [ | ||||||||||||
pkgs.go | ||||||||||||
pkgs.perl | ||||||||||||
]; | ||||||||||||
] ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin apple_sdk); | ||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nitpick: Do we need to check
Suggested change
This really is just a style thing though so I leave the decision up to you 🙂 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 It's a little more precise, though it makes no difference to the aarch64 systems. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't really no, but since this change is being backported, I'd rather not just fix this on 0.3. I'll put a PR to tidy this up on |
||||||||||||
# 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 hc-run-local-services " + cargoExtraArgs; | ||||||||||||
|
@@ -287,12 +291,6 @@ | |||||||||||
echo "Lair keystore : not installed" | ||||||||||||
fi | ||||||||||||
|
||||||||||||
if command -v "holo-dev-server" > /dev/null; then | ||||||||||||
echo "Holo dev server : $(holo-dev-server --version)" | ||||||||||||
else | ||||||||||||
echo "Holo dev server : not installed" | ||||||||||||
fi | ||||||||||||
|
||||||||||||
if command -v "holochain" > /dev/null; then | ||||||||||||
echo "Holochain : $(holochain --version) (${builtins.substring 0 7 inputs.holochain.rev})" | ||||||||||||
|
||||||||||||
|
@@ -354,10 +352,6 @@ | |||||||||||
path = ./templates/custom; | ||||||||||||
description = "Holonix template for custom Holochain build"; | ||||||||||||
}; | ||||||||||||
holo = { | ||||||||||||
path = ./templates/holo; | ||||||||||||
description = "Holonix template for Holo-enabled app development"; | ||||||||||||
}; | ||||||||||||
}; | ||||||||||||
}; | ||||||||||||
|
||||||||||||
|
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See the comment below.