Skip to content

Commit 05c2012

Browse files
committed
Rewire nix-tools
1 parent 5b7f7f2 commit 05c2012

File tree

3 files changed

+1
-29
lines changed

3 files changed

+1
-29
lines changed

flake.lock

Lines changed: 0 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
url = "github:sevanspowell/hpc-coveralls";
4747
flake = false;
4848
};
49-
nix-tools = {
50-
url = "github:input-output-hk/nix-tools";
51-
flake = false;
52-
};
5349
old-ghc-nix = {
5450
url = "github:angerman/old-ghc-nix/master";
5551
flake = false;

overlays/bootstrap.nix

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -918,14 +918,7 @@ in {
918918
final.haskell-nix.cabalProject ({pkgs, ...}: {
919919
evalPackages = pkgs.buildPackages;
920920
name = "nix-tools";
921-
src = {
922-
outPath = final.haskell-nix.sources.nix-tools;
923-
# TODO remove once nix >=2.4 is widely adopted (will trigger rebuilds of everything).
924-
# Disable filtering keeps pre ond post nix 2.4 behaviour the same. This means that
925-
# the same `alex`, `happy` and `hscolour` are used to build GHC. It also means that
926-
# that `tools` in the shell will be built the same.
927-
filterPath = { path, ... }: path;
928-
};
921+
src = ../nix-tools;
929922
# This is a handy way to use a local git clone of nix-tools when developing
930923
# src = final.haskell-nix.haskellLib.cleanGit { name = "nix-tools"; src = ../../nix-tools; };
931924
cabalProjectLocal = ''

0 commit comments

Comments
 (0)