mirror of
https://github.com/ilyakooo0/haskell.nix.git
synced 2024-08-15 18:00:50 +03:00
Fix tool functions (#1570)
This commit is contained in:
parent
33ac5a137d
commit
ce047883ac
@ -152,7 +152,7 @@ in
|
|||||||
nativeBuildInputs = [ ghcEnv ]
|
nativeBuildInputs = [ ghcEnv ]
|
||||||
++ nativeBuildInputs
|
++ nativeBuildInputs
|
||||||
++ mkDrvArgs.nativeBuildInputs or []
|
++ mkDrvArgs.nativeBuildInputs or []
|
||||||
++ lib.attrValues (buildPackages.haskell-nix.tools evalPackages compiler.nix-name tools)
|
++ lib.attrValues (buildPackages.haskell-nix.tools' evalPackages compiler.nix-name tools)
|
||||||
# If this shell is a cross compilation shell include
|
# If this shell is a cross compilation shell include
|
||||||
# wrapper script for running cabal build with appropriate args.
|
# wrapper script for running cabal build with appropriate args.
|
||||||
# Includes `--with-compiler` in case the `cabal.project` file has `with-compiler:` in it.
|
# Includes `--with-compiler` in case the `cabal.project` file has `with-compiler:` in it.
|
||||||
|
@ -496,8 +496,8 @@ final: prev: {
|
|||||||
inherit pkg-set;
|
inherit pkg-set;
|
||||||
plan-nix = callProjectResults.projectNix;
|
plan-nix = callProjectResults.projectNix;
|
||||||
inherit (callProjectResults) index-state;
|
inherit (callProjectResults) index-state;
|
||||||
tool = final.buildPackages.haskell-nix.tool pkg-set.config.compiler.nix-name;
|
tool = final.buildPackages.haskell-nix.tool' evalPackages pkg-set.config.compiler.nix-name;
|
||||||
tools = final.buildPackages.haskell-nix.tools pkg-set.config.compiler.nix-name;
|
tools = final.buildPackages.haskell-nix.tools' evalPackages pkg-set.config.compiler.nix-name;
|
||||||
roots = final.haskell-nix.roots pkg-set.config.compiler.nix-name;
|
roots = final.haskell-nix.roots pkg-set.config.compiler.nix-name;
|
||||||
projectFunction = haskell-nix: haskell-nix.cabalProject';
|
projectFunction = haskell-nix: haskell-nix.cabalProject';
|
||||||
inherit projectModule buildProject args;
|
inherit projectModule buildProject args;
|
||||||
@ -788,8 +788,8 @@ final: prev: {
|
|||||||
inherit (pkg-set.config) hsPkgs;
|
inherit (pkg-set.config) hsPkgs;
|
||||||
inherit pkg-set;
|
inherit pkg-set;
|
||||||
stack-nix = callProjectResults.projectNix;
|
stack-nix = callProjectResults.projectNix;
|
||||||
tool = final.buildPackages.haskell-nix.tool pkg-set.config.compiler.nix-name;
|
tool = final.buildPackages.haskell-nix.tool' evalPackages pkg-set.config.compiler.nix-name;
|
||||||
tools = final.buildPackages.haskell-nix.tools pkg-set.config.compiler.nix-name;
|
tools = final.buildPackages.haskell-nix.tools' evalPackages pkg-set.config.compiler.nix-name;
|
||||||
roots = final.haskell-nix.roots pkg-set.config.compiler.nix-name;
|
roots = final.haskell-nix.roots pkg-set.config.compiler.nix-name;
|
||||||
projectFunction = haskell-nix: haskell-nix.stackProject';
|
projectFunction = haskell-nix: haskell-nix.stackProject';
|
||||||
inherit projectModule buildProject args;
|
inherit projectModule buildProject args;
|
||||||
|
@ -77,12 +77,16 @@ in { haskell-nix = prev.haskell-nix // {
|
|||||||
tool = compiler-nix-name: name: versionOrMod:
|
tool = compiler-nix-name: name: versionOrMod:
|
||||||
final.haskell-nix.hackage-tool (
|
final.haskell-nix.hackage-tool (
|
||||||
final.haskell-nix.haskellLib.versionOrModToMods versionOrMod
|
final.haskell-nix.haskellLib.versionOrModToMods versionOrMod
|
||||||
++ [{ inherit compiler-nix-name name; }]
|
++ [(lib.mapAttrs (_: lib.mkOverride 1100) { inherit compiler-nix-name name; })]
|
||||||
);
|
);
|
||||||
|
|
||||||
tools = evalPackages: compiler-nix-name:
|
# tool with a default evalPackages to use.
|
||||||
lib.mapAttrs (name: versionOrMod:
|
tool' = evalPackages: compiler-nix-name: name: versionOrMod:
|
||||||
final.haskell-nix.hackage-tool (
|
final.haskell-nix.hackage-tool (
|
||||||
final.haskell-nix.haskellLib.versionOrModToMods versionOrMod
|
final.haskell-nix.haskellLib.versionOrModToMods versionOrMod
|
||||||
++ [{ inherit evalPackages compiler-nix-name name; }]));
|
++ [(lib.mapAttrs (_: lib.mkOverride 1100) { inherit evalPackages compiler-nix-name name; })]
|
||||||
|
);
|
||||||
|
|
||||||
|
tools = compiler-nix-name: lib.mapAttrs (final.haskell-nix.tool compiler-nix-name);
|
||||||
|
tools' = evalPackages: compiler-nix-name: lib.mapAttrs (final.haskell-nix.tool' evalPackages compiler-nix-name);
|
||||||
}; }
|
}; }
|
||||||
|
Loading…
Reference in New Issue
Block a user