Skip to content

Commit 872cb27

Browse files
committed
Shorten nix-tools attribute path
1 parent d17dcbf commit 872cb27

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

lib/call-cabal-project-to-nix.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,9 @@ let
455455
inherit checkMaterialization;
456456
}) (evalPackages.runCommand (nameAndSuffix "plan-to-nix-pkgs") {
457457
nativeBuildInputs = [
458-
nix-tools.project.hsPkgs.nix-tools.components.exes.plan-to-nix
458+
nix-tools.exes.plan-to-nix
459459
dummy-ghc dummy-ghc-pkg cabal-install evalPackages.rsync evalPackages.gitMinimal ]
460-
++ pkgs.lib.optional supportHpack nix-tools.project.hsPkgs.hpack.components.exes.hpack;
460+
++ pkgs.lib.optional supportHpack nix-tools.exes.hpack;
461461
# Needed or stack-to-nix will die on unicode inputs
462462
LOCALE_ARCHIVE = pkgs.lib.optionalString (evalPackages.stdenv.buildPlatform.libc == "glibc") "${evalPackages.glibcLocales}/lib/locale/locale-archive";
463463
LANG = "en_US.UTF-8";

overlays/bootstrap.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,12 @@ in {
992992
wrapProgram "$out/bin/$prog" --prefix PATH : "${final.lib.makeBinPath tools}"
993993
done
994994
'';
995-
}) // { inherit project; };
995+
}) // {
996+
inherit project;
997+
exes = project.hsPkgs.nix-tools.components.exes // {
998+
hpack = project.hsPkgs.hpack.component.exes.hpack;
999+
};
1000+
};
9961001

9971002
# Memoize the cabal-install and nix-tools derivations by adding:
9981003
# haskell-nix.cabal-install.ghcXXX

overlays/haskell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ final: prev: {
193193
name = "01-index.tar.gz-at-${at}";
194194
url = "https://hackage.haskell.org/01-index.tar.gz";
195195
downloadToTemp = true;
196-
postFetch = "${nix-tools.project.hsPkgs.nix-tools.components.exes.truncate-index}/bin/truncate-index -o $out -i $downloadedFile -s ${index-state}";
196+
postFetch = "${nix-tools.exes.truncate-index}/bin/truncate-index -o $out -i $downloadedFile -s ${index-state}";
197197

198198
outputHashAlgo = "sha256";
199199
outputHash = sha256;

0 commit comments

Comments
 (0)