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: 10e61bf5be57
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 736019f325af
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 9, 2019

  1. pythonPackages.lmdb: fix build 

    This fixes:

pythonCatchConflictsPhase
Found duplicated packages in closure for dependency 'lmdb':
  lmdb 0.97 (/build/lmdb-0.97)
  lmdb 0.97 (/nix/store/js0iimri6y9yqgfc111jzp3mrv5ic9cj-python3.7-lmdb-0.97/lib/python3.7/site-packages)

Package duplicates found in closure, see above. Usually this happens if two packages depend on different version of the same dependency.
builder for '/nix/store/9bcn2m3r5v8slmpj31hxw05j906qgl5l-python3.7-lmdb-0.97.drv' failed with exit code 1

This was probably broken by f7e28bf

(cherry picked from commit 39d0c96)
    @ivan
    ivan committed Sep 9, 2019
    Copy the full SHA
    fe40168 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #68359 from ivan/fix-python-lmdb-backport 

    [19.09] pythonPackages.lmdb: fix build
    @worldofpeace
    worldofpeace committed Sep 9, 2019
    Copy the full SHA
    736019f View commit details
    Browse the repository at this point in the history