Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 17b46e81da21
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2de07244ef0f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 17, 2020

  1. haskell generic-builder: fix Darwin regression for lmdb 

    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 #80190, but that issue may identify a preferable solution.
    @simonchatts @infinisil
    simonchatts authored and infinisil committed Feb 17, 2020
    Copy the full SHA
    019e86f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #80337 from Infinisil/lmdb 

    haskell generic-builder: fix Darwin regression for lmdb
    @infinisil
    infinisil committed Feb 17, 2020
    Copy the full SHA
    2de0724 View commit details
    Browse the repository at this point in the history