Skip to content
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.4 nixpgks to 24.11 #111

Merged
merged 3 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ jobs:
templates:
- default
- custom
- holo
- rust-stable

fail-fast: false
Expand Down
20 changes: 10 additions & 10 deletions flake.lock

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

18 changes: 6 additions & 12 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 @@ -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,7 @@
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 Expand Up @@ -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})"

Expand Down Expand Up @@ -351,10 +349,6 @@
path = ./templates/default;
description = "Holonix default template";
};
holo = {
path = ./templates/holo;
description = "Holonix template for Holo-enabled app development";
};
custom-holochain = {
path = ./templates/custom-holochain;
description = "Holonix template for custom Holochain build";
Expand Down
39 changes: 0 additions & 39 deletions templates/holo/flake.nix

This file was deleted.

Loading