Skip to content

haskellPackages.mkDerivation: small clean up #235263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maralorn merged 1 commit into from
Jun 1, 2023
Merged

haskellPackages.mkDerivation: small clean up #235263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkgs/development/haskell-modules/generic-builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let
isCross = stdenv.buildPlatform != stdenv.hostPlatform;
inherit (buildPackages)
fetchurl removeReferencesTo
pkg-config coreutils gnugrep gnused glibcLocales;
pkg-config coreutils gnugrep glibcLocales;
in

{ pname
Expand Down Expand Up @@ -246,11 +246,11 @@ let
"--ghc-options=-haddock"
];

postPhases = optional doInstallIntermediates [ "installIntermediatesPhase" ];
postPhases = optional doInstallIntermediates "installIntermediatesPhase";
Copy link
Member

@maralorn maralorn Jun 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this semantically a no-op?

Copy link
Member Author

@figsoda figsoda Jun 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it basically changes the value from [ [ "installIntermediatesPhase" ] ] to [ "installIntermediatesPhase" ], so it should be a no-op since it gets turned into a string


setupCompileFlags = [
(optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir")
(optionalString enableParallelBuilding (parallelBuildingFlags))
(optionalString enableParallelBuilding parallelBuildingFlags)
"-threaded" # https://github.com/haskell/cabal/issues/2398
"-rtsopts" # allow us to pass RTS flags to the generated Setup executable
];
Expand Down Expand Up @@ -698,7 +698,7 @@ stdenv.mkDerivation ({
lib.optionals (!isCross) setupHaskellDepends);

ghcCommandCaps = lib.toUpper ghcCommand';
in stdenv.mkDerivation ({
in stdenv.mkDerivation {
inherit name shellHook;

depsBuildBuild = lib.optional isCross ghcEnvForBuild;
Expand All @@ -718,7 +718,7 @@ stdenv.mkDerivation ({
"NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
then "${ghcEnv}/lib/HaLVM-${ghc.version}"
else "${ghcEnv}/${ghcLibdir}";
});
};

env = envFunc { };

Expand Down