Skip to content

Commit

Permalink
revert haskell.nix update (#503)
Browse files Browse the repository at this point in the history
* revert haskell.nix update

* bitvec -simd

* Use ghc965

* Update flake.nix

* add hackageNix

* drop ghc 9.8

* bring back cabal-3.12.1

---------

Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
  • Loading branch information
angerman and hamishmack authored Oct 25, 2024
1 parent 8434541 commit da6b931
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 59 deletions.
4 changes: 4 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ benchmarks: true
program-options
ghc-options: -Werror

-- Windows cross with bitvec/simd is broken.
package bitvec
-- Workaround for windows cross-compilation
flags: -simd
120 changes: 64 additions & 56 deletions flake.lock

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

14 changes: 11 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,19 @@
description = "cardano-base";

inputs = {
haskellNix.url = "github:input-output-hk/haskell.nix";
# freeze haskell.nix prior to the nixpkgs update that broken 8.10 cross-windows
haskellNix.url = "github:input-output-hk/haskell.nix?ref=cb139fa956158397aa398186bb32dd26f7318784";
# allow us to independently update hackageNix
haskellNix.inputs.hackage.follows = "hackageNix";
nixpkgs.follows = "haskellNix/nixpkgs-unstable";
iohkNix.url = "github:input-output-hk/iohk-nix";
flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs";

hackageNix = {
url = "github:input-output-hk/hackage.nix";
flake = false;
};

CHaP = {
url = "github:intersectmbo/cardano-haskell-packages?ref=repo";
flake = false;
Expand Down Expand Up @@ -48,7 +56,7 @@
inherit (nixpkgs) lib;

# see flake `variants` below for alternative compilers
defaultCompiler = "ghc966";
defaultCompiler = "ghc964";
fourmoluVersion = "0.16.2.0";
# We use cabalProject' to ensure we don't build the plan for
# all systems.
Expand Down Expand Up @@ -144,7 +152,7 @@
cabalProject.flake (
lib.optionalAttrs (system == "x86_64-linux") {
# on linux, build/test other supported compilers
variants = lib.genAttrs ["ghc8107" "ghc982"] (compiler-nix-name: {
variants = lib.genAttrs ["ghc8107"] (compiler-nix-name: {
inherit compiler-nix-name;
});
# we also want cross compilation to windows.
Expand Down

0 comments on commit da6b931

Please sign in to comment.