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: 3a3353953f9b
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: 72718be0219c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on May 22, 2019

  1. graylog: 3.0.1 -> 3.0.2 

    (cherry picked from commit d537c4c)
Reason: The update fixes a bug with the handling of quoted PaloAlto
input values.
    Tristan Helmich (omniIT) committed May 22, 2019
    Copy the full SHA
    8cc317e View commit details

Commits on May 23, 2019

  1. openssl: fix CVE-2019-1543 

    Originally from NixOS/nixpkgs#61827.

(cherry picked from commit aae4c11)
Fixes NixOS/nixpkgs#58269.
    @tomberek @vcunat
    tomberek authored and vcunat committed May 23, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e4ee5b9 View commit details

  2. Merge pull request #61864 from fadenb/graylog_3.0.2_backport 

    [19.03] graylog: 3.0.1 -> 3.0.2
    @c0bw3b
    c0bw3b authored May 23, 2019
    Copy the full SHA
    72718be View commit details
Showing with 7 additions and 2 deletions.
  1. +5 −0 pkgs/development/libraries/openssl/default.nix
  2. +2 −2 pkgs/tools/misc/graylog/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/libraries/openssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -136,6 +136,11 @@ in {
sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw";
patches = [
./1.1/nix-ssl-cert-file.patch
(fetchurl {
name = "long-chacha-nonce.patch";
url = "https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f426625b6ae9a7831010750490a5f0ad689c5ba3";
sha256= "02ghqg3vzmzx3s1dwwwbm1p1l4asaiampyg4k9vfrjwficvgpdgp";
})

(if stdenv.hostPlatform.isDarwin
then ./1.1/use-etc-ssl-certs-darwin.patch
4 changes: 2 additions & 2 deletions pkgs/tools/misc/graylog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre_headless }:

stdenv.mkDerivation rec {
version = "3.0.1";
version = "3.0.2";
name = "graylog-${version}";

src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "07a003c2d9hj6aczlbai279z9bw50yk0a6qx1cw44f8p08y6dnqi";
sha256 = "1xw9fxdb3n9h595sw1imns6g5a5339ppn2plx8qw4ngnkzd9pvhj";
};

dontBuild = true;