diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-01 00:13:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-01 00:13:01 +0000 |
| commit | 05ce1c8cd3a666f6efee99a0ff0a4a0cd663c55e (patch) | |
| tree | fea269f9ab5ad82e5d6ccc93d916cdff87062f59 /pkgs/development/haskell-modules | |
| parent | 5e9a1bf8728c35887fcb4fa2ebaf710b1051c0f6 (diff) | |
| parent | e4f711a40e2124d11f84c3e67443d02fa413a634 (diff) | |
| download | nixlib-05ce1c8cd3a666f6efee99a0ff0a4a0cd663c55e.tar nixlib-05ce1c8cd3a666f6efee99a0ff0a4a0cd663c55e.tar.gz nixlib-05ce1c8cd3a666f6efee99a0ff0a4a0cd663c55e.tar.bz2 nixlib-05ce1c8cd3a666f6efee99a0ff0a4a0cd663c55e.tar.lz nixlib-05ce1c8cd3a666f6efee99a0ff0a4a0cd663c55e.tar.xz nixlib-05ce1c8cd3a666f6efee99a0ff0a4a0cd663c55e.tar.zst nixlib-05ce1c8cd3a666f6efee99a0ff0a4a0cd663c55e.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-darwin.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index e306884cf4fd..e6400e2c46c8 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -345,7 +345,7 @@ self: super: ({ }) (disableCabalFlag "fixity-th" super.fourmolu); # https://github.com/NixOS/nixpkgs/issues/149692 - Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; + Agda = disableCabalFlag "optimise-heavily" super.Agda; } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d045da36579a..79b991da2897 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1134,10 +1134,16 @@ self: super: builtins.intersectAttrs super { preCheck = "export CI=true"; }) super.aeson-typescript; - # Enable extra optimisations which increase build time, but also - # later compiler performance, so we should do this for user's benefit. - # Flag added in Agda 2.6.2 - Agda = appendConfigureFlag "-foptimise-heavily" super.Agda; + Agda = lib.pipe super.Agda [ + # Enable extra optimisations which increase build time, but also + # later compiler performance, so we should do this for user's benefit. + # Flag added in Agda 2.6.2 + (enableCabalFlag "optimise-heavily") + # Enable debug printing, which worsens performance slightly but is + # very useful. + # Flag added in Agda 2.6.4.1, was always enabled before + (enableCabalFlag "debug") + ]; # ats-format uses cli-setup in Setup.hs which is quite happy to write # to arbitrary files in $HOME. This doesn't either not achieve anything |