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: 4e7831170907
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3d4548bc8055
Choose a head ref
  • 19 commits
  • 15 files changed
  • 14 contributors

Commits on May 8, 2020

  1. clipman: 1.5.0 -> 1.5.1 

    https://github.com/yory8/clipman/releases/tag/v1.5.1
(cherry picked from commit b2d7c0d)
    @Ma27
    Ma27 committed May 8, 2020
    Copy the full SHA
    5c416f7 View commit details
    Browse the repository at this point in the history

  2. nixos/zfs: populate PATH with needed programs for zed 

    (cherry picked from commit 92bede3)
    @Mic92
    Mic92 committed May 8, 2020
    Copy the full SHA
    7d3621c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #87252 from Mic92/fix-zed

    @Mic92
    Mic92 committed May 8, 2020
    Copy the full SHA
    02faf44 View commit details
    Browse the repository at this point in the history

  4. cabal2nix: update from version 2.15.0 to 2.15.3 

    The new version supports older versions of Cabal again and therefore doesn't
need any overrides or a newer compiler to build. The default ghc-8.6.x in the
release-20.03 release branch can compile it just fine.

Fixes #87184.
    @peti
    peti committed May 8, 2020
    1
    Copy the full SHA
    6b2dc0e View commit details
    Browse the repository at this point in the history

  5. youtube-dl: 2020.05.03 -> 2020.05.08 

    https://github.com/ytdl-org/youtube-dl/releases/tag/2020.05.08
(cherry picked from commit 906497a)
    @Luflosi @Ma27
    Luflosi authored and Ma27 committed May 8, 2020
    Copy the full SHA
    7aa47b4 View commit details
    Browse the repository at this point in the history

  6. elan: 0.9.0 -> 0.10.0 

    (cherry picked from commit 115fa1c)
    @gebner
    gebner committed May 8, 2020
    Copy the full SHA
    9daa5fb View commit details
    Browse the repository at this point in the history

  7. blockbook: fix go version

    1000101 committed May 8, 2020
    Copy the full SHA
    85bb2d2 View commit details
    Browse the repository at this point in the history

  8. blockbook: 0.3.1 -> 0.3.2

    1000101 committed May 8, 2020
    Copy the full SHA
    a3a12c0 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #87284 from 1000101/blockbook-20.03 

    blockbook: fix go version
    @mmahut
    mmahut committed May 8, 2020
    Copy the full SHA
    6958957 View commit details
    Browse the repository at this point in the history

  10. squid: apply patch for CVE-2020-11945 

    http://www.squid-cache.org/Advisories/SQUID-2020_4.txt

Fixes: CVE-2020-11945
    @mweinelt
    mweinelt committed May 8, 2020
    Copy the full SHA
    1cc1584 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #87297 from mweinelt/20.03/pr/squid 

    [20.03] squid: apply patch for CVE-2020-11945
    @7c6f434c
    7c6f434c committed May 8, 2020
    Copy the full SHA
    0fdd3e8 View commit details
    Browse the repository at this point in the history

  12. microcodeIntel: 20191115 → 20200508 

    (cherry picked from commit d2ad98b)
    @mweinelt
    mweinelt committed May 8, 2020
    Copy the full SHA
    6b17e35 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #87304 from mweinelt/20.03/pr/microcode/intel 

    [20.03] microcodeIntel: 20191115 → 20200508
    @andir
    andir committed May 8, 2020
    Copy the full SHA
    d6c1b56 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2020

  1. wire-desktop: linux 3.16.2923 -> 3.17.2924 

    (cherry picked from commit 84b5107)
    @toonn @FRidh
    toonn authored and FRidh committed May 9, 2020
    Copy the full SHA
    b04336d View commit details
    Browse the repository at this point in the history

  2. wire-desktop: mac 3.16.3630 -> 3.17.3666 

    (cherry picked from commit b408b8c)
    @toonn @FRidh
    toonn authored and FRidh committed May 9, 2020
    Copy the full SHA
    655649e View commit details
    Browse the repository at this point in the history

  3. graphicsmagick: apply patch for CVE-2020-10938 

    Adapted from http://hg.graphicsmagick.org/hg/GraphicsMagick/raw-rev/95abc2b694ce
    @mweinelt @FRidh
    mweinelt authored and FRidh committed May 9, 2020
    Copy the full SHA
    afb0b51 View commit details
    Browse the repository at this point in the history

  4. cups: 2.3.1 -> 2.3.3 

    https://github.com/apple/cups/releases/tag/v2.3.3

Fixes:

https://nvd.nist.gov/vuln/detail/CVE-2019-8842
https://nvd.nist.gov/vuln/detail/CVE-2020-3898
(cherry picked from commit fe90f58)
    @mmilata @FRidh
    mmilata authored and FRidh committed May 9, 2020
    Copy the full SHA
    f354d93 View commit details
    Browse the repository at this point in the history

  5. libssh: 0.8.8 -> 0.8.9 

    Fixes CVE-2020-1730.
Release notes: https://www.libssh.org/2020/04/09/libssh-0-9-4-and-libssh-0-8-9-security-release/

(cherry picked from commit 812ede7)
    @mmilata @FRidh
    mmilata authored and FRidh committed May 9, 2020
    Copy the full SHA
    f860b7b View commit details
    Browse the repository at this point in the history

  6. Merge release-20.03 into staging-20.03

    @FRidh
    FRidh committed May 9, 2020
    Copy the full SHA
    3d4548b View commit details
    Browse the repository at this point in the history