From 164217b7fb46796f8aba13ced2e6e118ecb5232c Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 3 Mar 2023 12:31:29 +0800 Subject: [PATCH] Dance around compiler versions --- cabal.project | 2 +- flake.nix | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cabal.project b/cabal.project index 77fbcdb..dd43461 100644 --- a/cabal.project +++ b/cabal.project @@ -1,5 +1,5 @@ packages: . -index-state: 2022-08-29T00:00:00Z +index-state: 2023-01-08T00:00:00Z with-compiler: ghc-9.2.5 allow-newer: , tomland:base diff --git a/flake.nix b/flake.nix index d2ad6a1..0a3dabd 100644 --- a/flake.nix +++ b/flake.nix @@ -18,17 +18,18 @@ overlays = [ haskell-nix.overlay ]; }; - pkgs-static-where-possible = if pkgs.stdenv.hostPlatform.isLinux then - if pkgs.stdenv.hostPlatform.isAarch64 then - pkgs.pkgsCross.aarch64-multiplatform-musl + pkgs-static-where-possible = + if pkgs.stdenv.hostPlatform.isLinux then + if pkgs.stdenv.hostPlatform.isAarch64 then + pkgs.pkgsCross.aarch64-multiplatform-musl + else + pkgs.pkgsCross.musl64 else - pkgs.pkgsCross.musl64 - else - pkgs; + pkgs; project = pkgs-static-where-possible.haskell-nix.cabalProject' { src = ./.; - compiler-nix-name = "ghc8107"; + compiler-nix-name = "ghc925"; shell.tools = { cabal = { }; hlint = { }; @@ -38,7 +39,8 @@ flake = project.flake { }; - in flake // { packages.default = flake.packages."foliage:exe:foliage"; }); + in + flake // { packages.default = flake.packages."foliage:exe:foliage"; }); nixConfig = { extra-substituters = [