fix: don't rely on string context for package source

CHANGELOG.md

@@ -9,6 +9,7 @@
   - `flake.haskellFlakeProjectModules`: Dropped all defaults, except the `output` module, which now exports `packages` and `settings`. Added a `defaults.projectModules.output` option that allows the user to override this module, or directly access the generated module.
   - Add `project.config.defaults.settings.default` defining sensible defaults for local packages.
   - Add `project.config.defaults.enable` to turn off all default settings en masse.
+  - Regressions in this PR: #169
 
 ## 0.3.0 (May 22, 2023)
 

nix/modules/project/packages/default.nix

@@ -55,12 +55,11 @@ in
       default = self: _super:
         let
           inherit (project.config) log;
-          isPathUnderNixStore = path: builtins.hasContext (builtins.toString path);
           build-haskell-package = import ../../../build-haskell-package.nix {
             inherit pkgs lib self log;
           };
           getOrMkPackage = name: cfg:
-            if isPathUnderNixStore cfg.source
+            if lib.types.path.check cfg.source
             then
               log.traceDebug "${name}.callCabal2nix ${cfg.source}"
                 (build-haskell-package name cfg.source)

nix/modules/project/packages/package.nix

@@ -4,19 +4,17 @@ let
   inherit (lib)
     mkOption
     types;
-  # TODO: DRY
-  isPathUnderNixStore = path: builtins.hasContext (builtins.toString path);
 
   # Whether the 'path' is local to `project.config.projectRoot`
   localToProject = path:
     path != null &&
-    isPathUnderNixStore path &&
+    lib.types.path.check path &&
     lib.strings.hasPrefix "${project.config.projectRoot}" "${path}";
 in
 { name, config, ... }: {
   options = {
     source = mkOption {
-      type = import ../../../types/haskell-source-type.nix { inherit lib; };
+      type = with types; either path str;
       description = ''
         Source refers to a Haskell package defined by one of the following:
 
@@ -43,7 +41,7 @@ in
             '';
           };
         in
-        if isPathUnderNixStore config.source
+        if lib.types.path.check config.source
         then haskell-parsers.getCabalExecutables config.source
         else null; # cfg.source is Hackage version; nothing to do.
     };