Skip to content

Commit

Permalink
[ADP-3173] Clean up flake.nix (#4423)
Browse files Browse the repository at this point in the history
This pull request performs a small cleanup of our `flake.nix` after
merging support for `aarch64-darwin`.

### Issue number

ADP-3173
  • Loading branch information
HeinrichApfelmus authored Feb 2, 2024
2 parents 5d5872c + 5e7e39d commit 9bbf925
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
27 changes: 16 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,14 @@
collectChecks
check;

nodePkgs = cardano-node-runtime.legacyPackages.${system};
nodePackages = cardano-node-runtime.packages.${system};
nodeProject = cardano-node-runtime.project.${system};

walletProject = (import ./nix/haskell.nix
CHaP
pkgs.haskell-nix
nixpkgs-unstable.legacyPackages.${system}
nodePkgs
nodePackages
).appendModule [{
gitrev =
if config.gitrev != null
Expand Down Expand Up @@ -305,8 +304,8 @@
linuxPackages.cardano-wallet
linuxPackages.bech32
linuxPackages.cardano-address
nodePkgs.hydraJobs.musl.cardano-cli
nodePkgs.hydraJobs.musl.cardano-node
cardano-node-runtime.hydraJobs.x86_64-linux.musl.cardano-cli
cardano-node-runtime.hydraJobs.x86_64-linux.musl.cardano-node
];
# Which exes should be put in the release archives.
checkReleaseContents = jobs: map (exe: jobs.${exe}) [
Expand All @@ -328,7 +327,13 @@
win64 =
let
# windows is cross-compiled from linux
windowsPackages = mkPackages project.projectCross.mingwW64;
windowsPackages =
mkPackages project.projectCross.mingwW64 // {
cardano-cli =
cardano-node-runtime.hydraJobs.x86_64-linux.windows.cardano-cli;
cardano-node =
cardano-node-runtime.hydraJobs.x86_64-linux.windows.cardano-node;
};
in {
release = import ./nix/release-package.nix {
inherit pkgs;
Expand All @@ -337,8 +342,8 @@
windowsPackages.cardano-wallet
windowsPackages.bech32
windowsPackages.cardano-address
nodePkgs.hydraJobs.windows.cardano-cli
nodePkgs.hydraJobs.windows.cardano-node
windowsPackages.cardano-cli
windowsPackages.cardano-node
];
platform = "win64";
format = "zip";
Expand All @@ -347,8 +352,8 @@
tests = import ./nix/windows-testing-bundle.nix {
inherit pkgs;
cardano-wallet = windowsPackages.cardano-wallet;
cardano-node = nodePkgs.hydraJobs.windows.cardano-node;
cardano-cli = nodePkgs.hydraJobs.windows.cardano-cli;
cardano-cli = windowsPackages.cardano-cli;
cardano-node = windowsPackages.cardano-node;
tests = lib.collect lib.isDerivation windowsPackages.tests;
benchmarks = lib.collect lib.isDerivation windowsPackages.benchmarks;
};
Expand All @@ -364,8 +369,8 @@
macOsPkgs.cardano-wallet
macOsPkgs.bech32
macOsPkgs.cardano-address
nodePkgs.hydraJobs.native.cardano-cli
nodePkgs.hydraJobs.native.cardano-node
nodePackages.cardano-cli
nodePackages.cardano-node
];
platform = "macos-intel";
format = "tar.gz";
Expand Down
1 change: 0 additions & 1 deletion nix/supported-systems.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
"x86_64-linux"
"x86_64-darwin"
# TODO: Enable aarch64-darwin when there are Hydra builders for it
"aarch64-darwin"
]

0 comments on commit 9bbf925

Please sign in to comment.