File tree Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change 455
455
inherit checkMaterialization ;
456
456
} ) ( evalPackages . runCommand ( nameAndSuffix "plan-to-nix-pkgs" ) {
457
457
nativeBuildInputs = [
458
- nix-tools . project . hsPkgs . nix-tools . components . exes . plan-to-nix
458
+ nix-tools . exes . plan-to-nix
459
459
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 ;
461
461
# Needed or stack-to-nix will die on unicode inputs
462
462
LOCALE_ARCHIVE = pkgs . lib . optionalString ( evalPackages . stdenv . buildPlatform . libc == "glibc" ) "${ evalPackages . glibcLocales } /lib/locale/locale-archive" ;
463
463
LANG = "en_US.UTF-8" ;
Original file line number Diff line number Diff line change @@ -992,7 +992,12 @@ in {
992
992
wrapProgram "$out/bin/$prog" --prefix PATH : "${ final . lib . makeBinPath tools } "
993
993
done
994
994
'' ;
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
+ } ;
996
1001
997
1002
# Memoize the cabal-install and nix-tools derivations by adding:
998
1003
# haskell-nix.cabal-install.ghcXXX
Original file line number Diff line number Diff line change @@ -193,7 +193,7 @@ final: prev: {
193
193
name = "01-index.tar.gz-at-${ at } " ;
194
194
url = "https://hackage.haskell.org/01-index.tar.gz" ;
195
195
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 } " ;
197
197
198
198
outputHashAlgo = "sha256" ;
199
199
outputHash = sha256 ;
You can’t perform that action at this time.
0 commit comments