Update haskell.nix and fix windows cross #2655
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently the use of nonReinstallablePkgs to make the Win32
reinstallable breaks cross compilation of any package using a
custom-setup. This is because nonReinstallablePkgs is applied
unconditionally and therefor applies to the "build" packages
that are used for compiling the setup executables.
The work around has been to add `buildType - lib.mkForce "Simple"`
to any packages that use a custom setup executable. Maintaining this
list is annoying and difficult (in part because the error message
given when a package needs to be added a long way from clear).
It turns out the correct fix is to make the override for
nonReinstallablePkgs conditional and the correct way to do that
is to use `pkgs` from the module arguments to detect when the
`hostPlatform.isWindows`. We also need to use `mkIf` to avoid
infinite recursion. So the windows specific module is now wrapped
in:
```
({ pkgs, ... }: lib.mkIf pkgs.stdenv.hostPlatform.isWindows {...})
```
This change also updates to a more recent `haskell.nix` commit and
removes the references to the `.all` components (they have been
removed from haskell.nix).
|
Much appreciated! I'll try it out in #2540. |
|
Hmm, if I cherry-pick this commit in #2540, I get evaluation errors: https://hydra.iohk.io/jobset/Cardano/ouroboros-network-pr-2540#tabs-errors |
This kinda sounds like a corrupted nix derivation? |
|
I should have merged this in #2540 instead of cherry-picking. Closing. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently the use of nonReinstallablePkgs to make the Win32
reinstallable breaks cross compilation of any package using a
custom-setup. This is because nonReinstallablePkgs is applied
unconditionally and therefor applies to the "build" packages
that are used for compiling the setup executables.
The work around has been to add
buildType - lib.mkForce "Simple"to any packages that use a custom setup executable. Maintaining this
list is annoying and difficult (in part because the error message
given when a package needs to be added a long way from clear).
It turns out the correct fix is to make the override for
nonReinstallablePkgs conditional and the correct way to do that
is to use
pkgsfrom the module arguments to detect when thehostPlatform.isWindows. We also need to usemkIfto avoidinfinite recursion. So the windows specific module is now wrapped
in:
This change also updates to a more recent
haskell.nixcommit andremoves the references to the
.allcomponents (they have beenremoved from haskell.nix).