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: da7f4c484252
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 76dbea4cb5ee
Choose a head ref
  • 6 commits
  • 5 files changed
  • 3 contributors

Commits on Mar 28, 2021

  1. pythonPackages.lxml: 4.6.2 -> 4.6.3 

    addressing CVE-2021-28957

(cherry picked from commit c1360ac)
    @risicle @jonringer
    risicle authored and jonringer committed Mar 28, 2021
    Copy the full SHA
    caa06e9 View commit details
    Browse the repository at this point in the history

  2. python3Packages.pygments: add patch for CVE-2021-27291

    @risicle @jonringer
    risicle authored and jonringer committed Mar 28, 2021
    Copy the full SHA
    4d12ddf View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2021

  1. Merge #117408: pidgin: add dbus-python 

    (cherry picked from commit a411f18)
    @vcunat
    vcunat committed Apr 1, 2021
    Copy the full SHA
    0267cf5 View commit details
    Browse the repository at this point in the history

  2. nixos/kresd: Fix unsupported regex 

    Regex supported by `builtins.match` differ on Linux and Darwin
(see NixOS/nix#1537) and the empty match group errors on Darwin.
But simply removing it does not change the logic in the module in any
way.

(cherry picked from commit ab94ea6, PR #100592)
    @griff @vcunat
    griff authored and vcunat committed Apr 1, 2021
    Copy the full SHA
    c923a25 View commit details
    Browse the repository at this point in the history

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

    https://hydra.nixos.org/eval/1659180
Darwin can catch up later.
    @vcunat
    vcunat committed Apr 1, 2021
    Copy the full SHA
    319a7fb View commit details
    Browse the repository at this point in the history

  4. knot-dns: 2.9.8 -> 2.9.9 

    https://gitlab.nic.cz/knot/knot-dns/-/tags/v2.9.9
NixPkgs master has 3.0 already.  I ran nixosTests.knot, etc.
    @vcunat
    vcunat committed Apr 1, 2021
    Copy the full SHA
    76dbea4 View commit details
    Browse the repository at this point in the history