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: 5039d6ed1f53
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1a1fdaa9d296
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 20, 2018

  1. libgcrypt: keep new lock behavior but only do so around collector access 

    Not around a function that itself will grab the rng lock.

Unfortunate that we obtain/release the lock twice
but this seems least invasive way to fix this.
    @dtzWill
    dtzWill committed Jun 20, 2018
    Copy the full SHA
    7cfdb89 View commit details
    Browse the repository at this point in the history

  2. libgcrypt: mention PR, upstream issue

    @dtzWill
    dtzWill committed Jun 20, 2018
    Copy the full SHA
    6c16f3d View commit details
    Browse the repository at this point in the history

  3. libgcrypt: don't disable checks on Darwin, let's see if patch fixes

    @dtzWill
    dtzWill committed Jun 20, 2018
    Copy the full SHA
    d6bffa6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #42150 from dtzWill/fix/libgcrypt-locking-badness 

    libgcrypt: fix bad locking behavior introduced in update
    @dtzWill
    dtzWill committed Jun 20, 2018
    Copy the full SHA
    1a1fdaa View commit details
    Browse the repository at this point in the history