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.

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

Jump to bottom

haskell generic-builder: fix Darwin regression for lmdb #80337

Merged
merged 1 commit into from Feb 17, 2020
Merged

haskell generic-builder: fix Darwin regression for lmdb #80337

merged 1 commit into from Feb 17, 2020

Conversation

infinisil
Copy link
Member

Motivation for this change

Staging version of #80191

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.

@simonchatts @infinisil
haskell generic-builder: fix Darwin regression for lmdb
019e86f 
Recent updates to the generic builder have caused haskellPackages.lmdb-simple to
fail to build on Darwin, since it cannot see the lmdb C dynamic library included
by its dependent haskellPackages.lmdb.

The C dynamic library has suffix `.so` not `.dylib`, so this fix allows for
that.

Closes NixOS#80190, but that issue may identify a preferable solution.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Feb 17, 2020
@infinisil infinisil mentioned this pull request Feb 17, 2020
Merged
10 tasks
@cdepillabout
Copy link
Member

@infinisil Thanks for rebasing this on staging.

Looks like checks pass, so if you're happy with it, can we merge this in?

@infinisil infinisil merged commit 2de0724 into NixOS:staging Feb 17, 2020
@infinisil infinisil deleted the lmdb branch February 17, 2020 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@basvandijk basvandijk Awaiting requested review from basvandijk

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: haskell 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@infinisil @cdepillabout @simonchatts