Skip to content

Commit fdfae24

Browse files
committed
Use extra-packages in modules/hackage-project.nix
1 parent c38c36f commit fdfae24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+723
-1721
lines changed

compiler/ghc/default.nix

+1
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ let
290290
cd hadrian
291291
'';
292292
}];
293+
cabalProject = builtins.readFile (src + "/hadrian/cabal.project");
293294
cabalProjectLocal = null;
294295
cabalProjectFreeze = null;
295296
src = haskell-nix.haskellLib.cleanSourceWith {

lib/load-cabal-plan.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ in {
100100
then import (nixFilesDir + "/cabal-files/${p.pkg-name}.nix")
101101
else if builtins.pathExists (nixFilesDir + "/.plan.nix/${p.pkg-name}.nix")
102102
then import (nixFilesDir + "/.plan.nix/${p.pkg-name}.nix")
103-
else (((hackage.${p.pkg-name}).${p.pkg-version}).revisions).default) (args // { hsPkgs = {}; });
103+
else
104+
# TODO make this an error?
105+
__trace "WARNING no `.nix` file for ${p.pkg-name} in ${nixFilesDir}." {}) (args // { hsPkgs = {}; });
104106
in pkgs.lib.optionalAttrs (p ? pkg-src-sha256) {
105107
sha256 = p.pkg-src-sha256;
106108
} // pkgs.lib.optionalAttrs (p.pkg-src.type or "" == "source-repo") {

materialized/alex-3.2.7.1/.plan.nix/alex.nix

-141
This file was deleted.

materialized/alex-3.2.7.1/cabal-files/alex.nix

+57
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/alex-3.2.7.1/default.nix

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)