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: de493bd74921
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: 8ada044ed469
Choose a head ref
  • 18 commits
  • 12 files changed
  • 11 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

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    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 20, 2020

  1. lxc: backport cpuset initialisation fix 

    Fixes #88430
    @Atemu
    Atemu committed May 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7a556b3 View commit details

Commits on May 21, 2020

  1. maintainers: add valodim 

    (cherry picked from commit 52ac65c)
    @Valodim @jokogr
    Valodim authored and jokogr committed May 21, 2020
    Copy the full SHA
    99be616 View commit details

  2. pythonPackages.fritzconnection: 0.8.4 -> 1.2.1

    @Valodim @jokogr
    Valodim authored and jokogr committed May 21, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0edf164 View commit details

  3. 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

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: FD36A5EAAC49035A
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f9cf6f3 View commit details

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

    @vcunat
    vcunat committed May 21, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6681b0c View commit details

Commits on May 22, 2020

  1. obs-studio: show the actual version instead of 0.0.1 

    (cherry picked from commit 23e4067)
    @peterhoeg
    peterhoeg committed May 22, 2020
    Copy the full SHA
    b60e37d View commit details

  2. Merge pull request #88563 from peterhoeg/f/obs_2003 

    obs-studio: show the actual version instead of 0.0.1
    @flokli
    flokli authored May 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b075410 View commit details

  3. Merge pull request #88437 from Atemu/anbox-lxc-fix 

    lxc: backport cpuset initialisation fix
    @Mic92
    Mic92 authored May 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    10a5f5a View commit details

  4. Merge pull request #88501 from jokogr/u/fritzconnection-1.2.1-20.03 

    [20.03] pythonPackages.fritzconnection: 0.8.4 -> 1.2.1
    @jokogr
    jokogr authored May 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48723f4 View commit details

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

    Staging 20.03
    @roberth
    roberth authored May 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6a5e279 View commit details

  6. documize-community: 3.7.0 -> 3.8.0 

    https://github.com/documize/community/releases/tag/v3.8.0
(cherry picked from commit 7857634)
    @Ma27
    Ma27 committed May 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    926c211 View commit details

  7. mautrix-whatsapp: 2020-04-21-1 -> 2020-05-21 

    (cherry picked from commit 5cdc8f4)
    @Ma27
    Ma27 committed May 22, 2020
    Copy the full SHA
    d91569a View commit details

  8. riot-web: 1.6.1 -> 1.6.2 

    https://github.com/vector-im/riot-web/releases/tag/v1.6.2
(cherry picked from commit 7dcff0d)
    @Ma27
    Ma27 committed May 22, 2020
    Copy the full SHA
    2816f9e View commit details

  9. riot-desktop: 1.6.1 -> 1.6.2 

    https://github.com/vector-im/riot-web/releases/tag/v1.6.2
(cherry picked from commit 84ede87)
    @Ma27
    Ma27 committed May 22, 2020
    Copy the full SHA
    8ada044 View commit details
Loading