Skip to content

Commit 908d11a

Browse files
authored
Use extra-packages in modules/hackage-project.nix (#2310)
This is a step towards removing the dependency on `hackage.nix`. Instead of looking up the source for a tool using `hackage.nix` it lets `make-install-plan` to it using the cabal planner (based on an `extra-packages:` entry in a `cabal.project` file).
1 parent cc140d1 commit 908d11a

File tree

141 files changed

+1107
-7031
lines changed

Some content is hidden

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

141 files changed

+1107
-7031
lines changed

.github/workflows/upload-artifacts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Wait for nix-tools meta job
4040
uses: input-output-hk/actions/wait-for-hydra@angerman/support-prs
4141
with:
42-
status: 'ci/hydra-build:nix-tools'
42+
check: 'nix-tools'
4343

4444
- name: "Pull nix-tools"
4545
run: |

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/ghc902/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)