Skip to content

Commit c13c480

Browse files
committed
bump
1 parent b153ade commit c13c480

File tree

2 files changed

+85
-52
lines changed

2 files changed

+85
-52
lines changed

flake.lock

Lines changed: 81 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
description = "Minimal devshell flake for haskell";
33

44
inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
5-
inputs.nixpkgs.follows = "haskellNix/nixpkgs-2411";
5+
inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
66
inputs.flake-utils.url = "github:numtide/flake-utils";
77
inputs.iohk-nix.url = "github:input-output-hk/iohk-nix";
88
inputs.cabal.url = "github:stable-haskell/cabal";
99
inputs.cabal.flake = false;
10-
inputs.cabal-experimental.url = "github:stable-haskell/cabal?ref=angerman/cross";
10+
inputs.cabal-experimental.url = "github:stable-haskell/cabal?ref=stable-haskell/feature/cross-compile";
1111
inputs.cabal-experimental.flake = false;
1212

1313
outputs = { self, nixpkgs, flake-utils, haskellNix, iohk-nix, ... }:
@@ -61,8 +61,7 @@
6161
supportedSystems = [
6262
"x86_64-linux"
6363
"x86_64-darwin"
64-
# Currently no aarch64 linux builders
65-
# "aarch64-linux"
64+
"aarch64-linux"
6665
"aarch64-darwin"
6766
];
6867
in let flake-outputs = flake-utils.lib.eachSystem supportedSystems (system:
@@ -90,7 +89,7 @@
9089
# Map the compiler-nix-name to a final compiler-nix-name the way haskell.nix
9190
# projects do (that way we can use short names)
9291
let compilers = pkgs: pkgs.lib.genAttrs [
93-
"ghc810"
92+
# "ghc810"
9493
"ghc96"
9594
"ghc98"
9695
"ghc910"

0 commit comments

Comments
 (0)