Skip to content
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.

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

Jump to bottom

haskell: Inline static overlay #108450

Merged
merged 1 commit into from Jan 11, 2021
Merged

haskell: Inline static overlay #108450

merged 1 commit into from Jan 11, 2021

Conversation

Ericson2314
Copy link
Member

Motivation for this change

We don't force enableStaticLibraries for Windows or WASM because it
will just fail an assertion.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cdepillabout
cdepillabout requested changes Jan 5, 2021
View reviewed changes
Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

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

@Ericson2314 Could you explain what this PR does? I don't really understand what is going on here.

Also, how would I go about testing that this PR is working as intended?

cc @nh2 as well.

pkgs/development/haskell-modules/generic-builder.nix Show resolved Hide resolved
pkgs/development/haskell-modules/generic-builder.nix
@@ -33,9 +33,9 @@ in
, profilingDetail ? "exported-functions"
# TODO enable shared libs for cross-compiling
, enableSharedExecutables ? false
, enableSharedLibraries ? (ghc.enableShared or false)
, enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false)
Copy link
Member

Choose a reason for hiding this comment

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

It might be nice to have a quick note here explaining that hostPlatform.isStatic means that we don't want any shared libraries built (or maybe they are not available to link against?).

(Actually I don't know this, I'm just guessing from the names... which is why it would be nice to have a comment about it.)

Copy link
Member Author

Choose a reason for hiding this comment

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

@cdepillabout I thought a bit about out; since this is always what isStatic is for I think it would be better to add more documention where it is defined instead, rather than at every use site.

@Ericson2314
haskell: Inline static overlay
a52f9a1 
We don't force `enableStaticLibraries` for Windows or WASM because it
will just fail an assertion.
@Ericson2314 Ericson2314 merged commit 5ac7aa5 into NixOS:master Jan 11, 2021
@Ericson2314 Ericson2314 deleted the no-static-overlay branch January 11, 2021 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout cdepillabout requested changes

Assignees
No one assigned
Labels
6.topic: haskell 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ericson2314 @cdepillabout