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: b3f42ae53c57
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5a3fdf27d3f1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 25, 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.

(cherry picked from commit 7cfdb89)
    @dtzWill
    dtzWill committed Jun 25, 2018
    Copy the full SHA
    94e261d View commit details
    Browse the repository at this point in the history

  2. libgcrypt: mention PR, upstream issue 

    (cherry picked from commit 6c16f3d)
    @dtzWill
    dtzWill committed Jun 25, 2018
    Copy the full SHA
    57c0968 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 

    (cherry picked from commit d6bffa6)
("yes the patch does fix tests on Darwin", by the way :))
    @dtzWill
    dtzWill committed Jun 25, 2018
    Copy the full SHA
    5a3fdf2 View commit details
    Browse the repository at this point in the history