Skip to content
This repository has been 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
base: 8634c3b61990
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 53346d725ffd
Choose a head ref
  • 6 commits
  • 4 files changed
  • 3 contributors

Commits on Jun 22, 2019

  1. bzip2: patch CVE-2019-12900 

    The vulnerability seems quite serious.
It isn't practical to use fetchpatch here due to bootstrapping,
so I just committed the small patch file.

(cherry picked from commit 4fd6cb7)
    @vcunat
    vcunat committed Jun 22, 2019
    Configuration menu
    Copy the full SHA
    d7366bb View commit details
    Browse the repository at this point in the history

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

    @vcunat
    vcunat committed Jun 22, 2019
    Configuration menu
    Copy the full SHA
    b41ca72 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2019

  1. nixos: add hardware/network/intel-2200bg.nix to module-list 

    this is referenced by nixos-generate-config.pl. See
NixOS/nixpkgs#63091 for more discussion.

(cherry picked from commit 8768d1c)
    @matthewbauer
    matthewbauer committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    d5a3e5f View commit details
    Browse the repository at this point in the history

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

    @vcunat
    vcunat committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    47d7882 View commit details
    Browse the repository at this point in the history

  3. tomcat9: 9.0.13 -> 9.0.21

    @danbst
    Johan Thomsen authored and danbst committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    c3446ff View commit details
    Browse the repository at this point in the history

  4. tomcat85: 8.5.35 -> 8.5.42

    @danbst
    Johan Thomsen authored and danbst committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    53346d7 View commit details
    Browse the repository at this point in the history