Skip to content
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
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ mod testgen_hs {
return;
}

let testgen_lib_version = "10.4.1.0";
let testgen_lib_version = "10.4.1.1";

let target_os = if cfg!(target_os = "macos") {
"darwin"
Expand Down
8 changes: 4 additions & 4 deletions flake.lock

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

10 changes: 3 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
flake-compat.flake = false;
cardano-node.url = "github:IntersectMBO/cardano-node/10.4.1";
cardano-node.flake = false; # otherwise, +2k dependencies we don’t really use
testgen-hs.url = "github:input-output-hk/testgen-hs/10.4.1.0"; # make sure it follows cardano-node
testgen-hs.url = "github:input-output-hk/testgen-hs/10.4.1.1"; # make sure it follows cardano-node
testgen-hs.flake = false; # otherwise, +2k dependencies we don’t really use
devshell.url = "github:numtide/devshell";
devshell.inputs.nixpkgs.follows = "nixpkgs";
Expand All @@ -36,7 +36,7 @@

systems = [
"x86_64-linux"
# "aarch64-linux"
"aarch64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
Expand All @@ -51,7 +51,6 @@
}
// (lib.optionalAttrs (system == "x86_64-linux") {
blockfrost-platform-x86_64-windows = inputs.self.internal.x86_64-windows.package;
blockfrost-platform-aarch64-linux = inputs.self.internal.aarch64-linux.package;
});

devshells.default = import ./nix/devshells.nix {inherit inputs;};
Expand Down Expand Up @@ -113,9 +112,6 @@
)
// lib.genAttrs ["x86_64-windows"] (
targetSystem: import ./nix/internal/windows.nix {inherit inputs targetSystem;}
)
// lib.genAttrs ["aarch64-linux"] (
targetSystem: import ./nix/internal/linux-cross-arm64.nix {inherit inputs targetSystem;}
);

nixosModule = {
Expand All @@ -128,7 +124,7 @@
};

hydraJobs = let
crossSystems = ["x86_64-windows" "aarch64-linux"];
crossSystems = ["x86_64-windows"];
allJobs = {
blockfrost-platform = lib.genAttrs (config.systems ++ crossSystems) (
targetSystem: inputs.self.internal.${targetSystem}.package
Expand Down
92 changes: 0 additions & 92 deletions nix/internal/linux-cross-arm64.nix

This file was deleted.

89 changes: 51 additions & 38 deletions nix/internal/unix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,17 @@ in
in
(import inputs.flake-compat {
src =
if targetSystem != "aarch64-darwin"
if targetSystem != "aarch64-darwin" && targetSystem != "aarch64-linux"
then unpatched
else {
outPath = toString (pkgs.runCommand "source" {} ''
cp -r ${unpatched} $out
chmod -R +w $out
cd $out
echo ${lib.escapeShellArg (builtins.toJSON [targetSystem])} $out/nix/supported-systems.nix
echo ${lib.escapeShellArg (builtins.toJSON [targetSystem])} >$out/nix/supported-systems.nix
${lib.optionalString (targetSystem == "aarch64-linux") ''
sed -r 's/"-fexternal-interpreter"//g' -i $out/nix/haskell.nix
''}
'');
inherit (unpatched) rev shortRev lastModified lastModifiedDate;
};
Expand All @@ -180,7 +183,7 @@ in
cardano-node-packages =
{
x86_64-linux = cardano-node-flake.hydraJobs.x86_64-linux.musl;
inherit (cardano-node-flake.packages) x86_64-darwin aarch64-darwin;
inherit (cardano-node-flake.packages) x86_64-darwin aarch64-darwin aarch64-linux;
}
.${
targetSystem
Expand Down Expand Up @@ -236,41 +239,51 @@ in
# For generating a signing key from a recovery phrase. It’s a little
# controversial to download a binary, but we only need it for the devshell. If
# needed, we can use the source instead.
cardano-address = let
release = "v2024-09-29";
baseUrl = "https://github.com/cardano-foundation/cardano-wallet/releases/download/${release}/cardano-wallet";
archive = pkgs.fetchzip {
name = "cardano-wallet-${release}";
url =
{
"x86_64-linux" = "${baseUrl}-${release}-linux64.tar.gz";
"x86_64-darwin" = "${baseUrl}-${release}-macos-intel.tar.gz";
"aarch64-darwin" = "${baseUrl}-${release}-macos-silicon.tar.gz";
}
.${
targetSystem
};
hash =
{
"x86_64-linux" = "sha256-EOe6ooqvSGylJMJnWbqDrUIVYzwTCw5Up/vU/gPK6tE=";
"x86_64-darwin" = "sha256-POUj3Loo8o7lBI4CniaA/Z9mTRAmWv9VWAdtcIMe27I=";
"aarch64-darwin" = "sha256-+6bzdUXnJ+nnYdZuhLueT0+bYmXzwDXTe9JqWrWnfe4=";
}
.${
targetSystem
};
};
in
pkgs.runCommandNoCC "cardano-address" {
meta.description = "Command-line for address and key manipulation in Cardano";
} ''
mkdir -p $out/bin $out/libexec
cp ${archive}/cardano-address $out/libexec/
${lib.optionalString pkgs.stdenv.isDarwin ''
cp ${archive}/{libz,libiconv.2,libgmp.10,libffi.8}.dylib $out/libexec
''}
ln -sf $out/libexec/cardano-address $out/bin/
'';
cardano-address =
if targetSystem == "aarch64-linux"
then
pkgs.writeShellApplication {
name = "cardano-address";
text = ''
echo >&2 "TODO: unimplemented: compile \`cardano-address\` for \`${targetSystem}\`!"
exit 1
'';
}
else let
release = "v2024-09-29";
baseUrl = "https://github.com/cardano-foundation/cardano-wallet/releases/download/${release}/cardano-wallet";
archive = pkgs.fetchzip {
name = "cardano-wallet-${release}";
url =
{
"x86_64-linux" = "${baseUrl}-${release}-linux64.tar.gz";
"x86_64-darwin" = "${baseUrl}-${release}-macos-intel.tar.gz";
"aarch64-darwin" = "${baseUrl}-${release}-macos-silicon.tar.gz";
}
.${
targetSystem
};
hash =
{
"x86_64-linux" = "sha256-EOe6ooqvSGylJMJnWbqDrUIVYzwTCw5Up/vU/gPK6tE=";
"x86_64-darwin" = "sha256-POUj3Loo8o7lBI4CniaA/Z9mTRAmWv9VWAdtcIMe27I=";
"aarch64-darwin" = "sha256-+6bzdUXnJ+nnYdZuhLueT0+bYmXzwDXTe9JqWrWnfe4=";
}
.${
targetSystem
};
};
in
pkgs.runCommandNoCC "cardano-address" {
meta.description = "Command-line for address and key manipulation in Cardano";
} ''
mkdir -p $out/bin $out/libexec
cp ${archive}/cardano-address $out/libexec/
${lib.optionalString pkgs.stdenv.isDarwin ''
cp ${archive}/{libz,libiconv.2,libgmp.10,libffi.8}.dylib $out/libexec
''}
ln -sf $out/libexec/cardano-address $out/bin/
'';

tx-build = pkgs.writeShellApplication {
name = "tx-build";
Expand Down