srid/haskell-flake
1
1
Fork 0
mirror of https://github.com/srid/haskell-flake.git synced 2024-08-15 17:00:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify .cabal files detection (#91)

Browse Source 
* Simplify .cabal files detection

This, incidentally, allows a mix of top-level and sub-cabal files, but
that is okay.

* Re-format error message
This commit is contained in:
Sridhar Ratnakumar 2023-02-23 12:16:27 -05:00 committed by GitHub
parent e0c8f32d30
commit a28156e5d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,7 +4,7 @@
- New features
- #63: Add `config.haskellProjects.${name}.outputs` containing all flake outputs for that project.
- #49: The `packages` option now autodiscovers the top-level `.cabal` file as its default value.
- #49 & #91: The `packages` option now autodiscovers the top-level `.cabal` file (in addition to looking inside sub-directories) as its default value.
- #69: The default flake template creates `flake.nix` only, while the `#example` one creates the full Haskell project template.
- 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).

54
flake-module.nix
View File

@ -162,44 +162,38 @@ in
#
# In future, we could just read `cabal.project`. See #76.
let
toplevel-cabal-paths =
lib.concatMapAttrs
(f: _:
if lib.strings.hasSuffix ".cabal" f
then { "${lib.strings.removeSuffix ''.cabal'' f}" = self; }
else { }
# Like pkgs.haskell.lib.haskellPathsInDir' but with a few differences
# - Allows top-level .cabal files
haskellPathsInDir' = path:
lib.filterAttrs (k: v: v != null) (lib.mapAttrs'
(k: v:
if v == "regular" && lib.strings.hasSuffix ".cabal" k
then lib.nameValuePair (lib.strings.removeSuffix ".cabal" k) path
else
if v == "directory" && builtins.pathExists (path + "/${k}/${k}.cabal")
then lib.nameValuePair k (path + "/${k}")
else lib.nameValuePair k null
)
(builtins.readDir self);
subdir-cabal-paths = lib.filesystem.haskellPathsInDir self;
(builtins.readDir path));
errorNoDefault = msg:
lib.asserts.assertMsg false ''
A default value for `packages` cannot be auto-detected:
builtins.throw ''
haskell-flake: A default value for `packages` cannot be auto-detected:
${msg}
You must manually specify the `packages` option.
'';
cabal-paths =
if toplevel-cabal-paths != { }
cabalPaths =
let
cabalPaths = haskellPathsInDir' self;
in
if cabalPaths == { }
then
let cabalNames = lib.attrNames toplevel-cabal-paths;
in if builtins.length cabalNames > 1
then
errorNoDefault ''
More than one .cabal file found in project root:
- ${lib.concatStringsSep ".cabal\n - " cabalNames}.cabal
''
else
toplevel-cabal-paths
else if subdir-cabal-paths != { }
then
subdir-cabal-paths
else
errorNoDefault "No .cabal file found.";
errorNoDefault ''
No .cabal file found in project root or its sub-directories.
''
else cabalPaths;
in
lib.mapAttrs
(_: value: { root = value; })
cabal-paths;
lib.mapAttrs (_: value: { root = value; }) cabalPaths;
defaultText = lib.literalMD "autodiscovered by reading `self` files.";
};
devShell = mkOption {