Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 48723f48ab92
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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

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 a9373cdb0aeca1bef291d74be1cecdca8e0c3c27)
    @roberth
    roberth committed May 17, 2020
    Copy the full SHA
    233cec3 View commit details

  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 authored May 17, 2020
    Copy the full SHA
    710c339 View commit details

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

    @roberth
    roberth committed May 17, 2020
    Copy the full SHA
    190080c View commit details

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

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

    @vcunat
    vcunat committed May 21, 2020
    Copy the full SHA
    6681b0c View commit details

Commits on May 22, 2020

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

    Staging 20.03
    @roberth
    roberth authored May 22, 2020
    Copy the full SHA
    6a5e279 View commit details
Showing with 7 additions and 5 deletions.
  1. +2 −1 pkgs/development/haskell-modules/generic-builder.nix
  2. +3 −2 pkgs/development/libraries/ffmpeg/generic.nix
  3. +2 −2 pkgs/tools/networking/unbound/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/haskell-modules/generic-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -385,7 +385,8 @@ stdenv.mkDerivation ({
for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do
for lib in "$d/"*.dylib; do
ln -s "$lib" "$dynamicLinksDir"
# Allow overwriting because C libs can be pulled in multiple times.
ln -sf "$lib" "$dynamicLinksDir"
done
done
# Edit the local package DB to reference the links directory.
5 changes: 3 additions & 2 deletions pkgs/development/libraries/ffmpeg/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -199,9 +199,10 @@ stdenv.mkDerivation rec {
--replace "includedir=$out" "includedir=''${!outputInclude}"
done
'' + optionalString stdenv.isLinux ''
# Set RUNPATH so that libnvcuvid in /run/opengl-driver(-32)/lib can be found.
# Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found.
# See the explanation in addOpenGLRunpath.
addOpenGLRunpath $out/lib/libavcodec.so*
addOpenGLRunpath $out/lib/libavcodec.so
addOpenGLRunpath $out/lib/libavutil.so
'';

installFlags = [ "install-man" ];
4 changes: 2 additions & 2 deletions pkgs/tools/networking/unbound/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "unbound";
version = "1.9.5";
version = "1.10.1";

src = fetchurl {
url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
sha256 = "0myv8l886gmlh9nh4j3q5549idxnl51hf9cw20yxfqbwd47l13ca";
sha256 = "0dnmh9jjh2v274f0hl31bgv40pl77mmfgky8bkqr5kvi3b17fdmp";
};

# https://github.com/NLnetLabs/unbound/pull/90