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: 48723f48ab92
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6a5e279ab7d7
Choose a head ref
  • 7 commits
  • 3 files changed
  • 4 contributors

Commits on May 16, 2020

  1. ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries 

    (cherry picked from commit 78987e2)
    @elohmeier @flokli
    elohmeier authored and flokli committed May 16, 2020
    Copy the full SHA
    fc12091 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2020

  1. haskell/generic-builder.nix: Fix C lib multiple inclusions 

    Allow the darwin links code to overwrite libs that were already
copied, because C dependencies can occur multiple times.

Solves errors like

    ln: failed to create symbolic link '/nix/store/higpc9xavwcjjzdipz7m9ly03bh7iy2z-hercules-ci-agent-source-0.7.0/lib/links/libboost_context.dylib': File exists

(cherry picked from commit a9373cd)
    @roberth
    roberth committed May 17, 2020
    Copy the full SHA
    233cec3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #88017 from hercules-ci/backport-20.03-fix-haskell… 

    …-darwin-c-lib-links

[20.03] backport haskell/generic-builder.nix: Fix C lib multiple inclusions
    @roberth
    roberth committed May 17, 2020
    Copy the full SHA
    710c339 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-20.03' into staging-20.03

    @roberth
    roberth committed May 17, 2020
    Copy the full SHA
    190080c View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. unbound: 1.9.5 -> 1.10.1 (security) 

    https://www.nlnetlabs.nl/news/2020/May/19/unbound-1.10.1-released/
It fixes DoS CVEs; details e.g. on http://www.nxnsattack.com/

On each Linux platform this should be around 8k rebuilds,
so as a compromise I'm pushing to staging-next.

(cherry picked from commit 73390e3)
The change from 1.9.5 to 1.10.0 also seems basically without backwards
incompatibilities; so I took it whole.  Perhaps just this minor thing:
- Renamed statistic `num.zero_ttl` to `num.expired` as expired replies
  come with a configurable TTL value (`serve-expired-reply-ttl`).
https://lists.nlnetlabs.nl/pipermail/unbound-users/2020-February/006711.html
    @vcunat
    vcunat committed May 21, 2020
    Copy the full SHA
    f9cf6f3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-20.03' into staging-20.03

    @vcunat
    vcunat committed May 21, 2020
    Copy the full SHA
    6681b0c View commit details
    Browse the repository at this point in the history

Commits on May 22, 2020

  1. Merge pull request #88077 from NixOS/staging-20.03 

    Staging 20.03
    @roberth
    roberth committed May 22, 2020
    Copy the full SHA
    6a5e279 View commit details
    Browse the repository at this point in the history