Skip to content

Commit

Permalink
Switch to buildFromSdist (#221)
Browse files Browse the repository at this point in the history
  • Loading branch information
srid authored Feb 5, 2024
1 parent c301f31 commit dd0d3b9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
- #210: Add `extraLibraries` to `settings` module.
- #215: Improved debug logging.
- #216: Remove `debug` option (pass `--trace-verbose` to nix instead)
- Breaking changes
- #221: Switch to `buildFromSdist`, to allow using non-standard package sets (wherein `cabal-install` is otherwise built without using user's overrides)

## 0.4.0 (Aug 22, 2023)

Expand Down
6 changes: 4 additions & 2 deletions nix/build-haskell-package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
}:

let
fromSdist = self.buildFromCabalSdist or
(log.traceWarning "Your nixpkgs does not have hs.buildFromCabalSdist" (pkg: pkg));
# NOTE: We do not use the optimized version, `buildFromCabalSdist`, because it
# breaks in some cases. See https://github.com/srid/haskell-flake/pull/220
fromSdist = pkgs.haskell.lib.buildFromSdist or
(log.traceWarning "Your nixpkgs does not have hs.buildFromSdist" (pkg: pkg));

mkNewStorePath = name: src:
# Since 'src' may be a subdirectory of a store path
Expand Down

0 comments on commit dd0d3b9

Please sign in to comment.