Skip to content

Commit 254a9cb

Browse files
authored
Use flake-utils that haskell.nix uses (input-output-hk#1988)
* Use flake-utils that haskell.nix uses * Disable aarch64-linux in ci for now
1 parent 9acf2a9 commit 254a9cb

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

flake.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,12 @@
139139
# supported by haskell.nix, e.g. with remote builders, in order to check this flake.
140140
# If you want to run the tests for just your platform, run `./test/tests.sh` or
141141
# `nix-build -A checks.$PLATFORM`
142-
} // flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] (system: rec {
142+
} // flake-utils.lib.eachSystem [
143+
"x86_64-linux"
144+
"x86_64-darwin"
145+
# TODO switch back on when ci.iog.io has builders for aarch64-linux
146+
# "aarch64-linux"
147+
"aarch64-darwin" ] (system: rec {
143148
legacyPackages = (self.internal.compat { inherit system; }).pkgs;
144149
legacyPackagesUnstable = (self.internal.compat { inherit system; }).pkgs-unstable;
145150

hix/init/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This is a template created by `hix init`
33
inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
44
inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
5-
inputs.flake-utils.url = "github:numtide/flake-utils";
5+
inputs.flake-utils.follows = "haskellNix/flake-utils";
66
outputs = { self, nixpkgs, flake-utils, haskellNix }:
77
let
88
supportedSystems = [

hix/project/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
description = "Default hix flake";
55
inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
66
inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
7-
inputs.flake-utils.url = "github:numtide/flake-utils";
7+
inputs.flake-utils.follows = "haskellNix/flake-utils";
88
inputs.src.flake = false;
99
outputs = { self, src, nixpkgs, flake-utils, haskellNix }:
1010
flake-utils.lib.eachSystem [ "EVAL_SYSTEM" ] (system:

0 commit comments

Comments
 (0)