From 026acf572fd7497105e78ac9fbd59f7ca3db3a33 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> Date: Thu, 9 Feb 2023 20:05:44 -0500 Subject: [PATCH] Rename `haskellPackages` -> `basePackages` (#77) * Rename haskellPackages -> basePackages * Typo --- CHANGELOG.md | 2 +- flake-module.nix | 4 ++-- haskell-project.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d22310d..2610cbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - API changes - #37: Group `buildTools` (renamed to `tools`), `hlsCheck` and `hlintCheck` under the `devShell` submodule option; and allow disabling them all using `devShell.enable = false;` (useful if you want haskell-flake to produce just the package outputs). - #64: Remove hlintCheck (use [treefmt-nix](https://github.com/numtide/treefmt-nix#flake-parts) instead) - - #52: Expose the final package set (API provisional) + - #52: Expose the final package set as `finalPackages`. Rename `haskellPackages`, accordingly, to `basePackages`. Overlays are applied on top of `basePackage` -- using `source-overrides`, `overrides`, `packages` in that order -- to produce `finalPackages`. ## 0.1.0 diff --git a/flake-module.nix b/flake-module.nix index d29c100..08b49db 100644 --- a/flake-module.nix +++ b/flake-module.nix @@ -77,7 +77,7 @@ in ./haskell-project.nix { options = { - haskellPackages = mkOption { + basePackages = mkOption { type = types.attrsOf raw; description = '' Which Haskell package set / compiler to use. @@ -144,7 +144,7 @@ in type = types.attrsOf raw; readOnly = true; description = '' - The final package set, based `haskellPackages` plus + The final package set, based on `basePackages` plus the additions and overrides specified in the other options. ''; }; diff --git a/haskell-project.nix b/haskell-project.nix index 0492888..fe67068 100644 --- a/haskell-project.nix +++ b/haskell-project.nix @@ -68,7 +68,7 @@ in }; in { - finalPackages = config.haskellPackages.extend config.finalOverlay; + finalPackages = config.basePackages.extend config.finalOverlay; finalOverlay = lib.composeManyExtensions [ # The order here matters.