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: a84b797b28eb
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: dce9ef51057e
Choose a head ref
  • 5 commits
  • 4 files changed
  • 5 contributors

Commits on Jun 16, 2020

  1. graylog: 3.3.0 -> 3.3.1 

    (cherry picked from commit cb05373)

Reason: 3.3.1 contains bugfix for potential dataloss when Elasticsearch
index is read-only due to disk space problems
    @r-ryantm
    r-ryantm authored and - committed Jun 16, 2020
    Copy the full SHA
    70ecf77 View commit details

  2. graylogPlugins: Update plugins 

    graylog-enterprise-integrations: 3.3.0 -> 3.3.1
graylog-integrations: 3.3.0 -> 3.3.1
(cherry picked from commit 0181c1b)

Reason: Companion commit to 70ecf77
to ensure that packaged plugin versions are compatible
    @fadenb
    fadenb authored and - committed Jun 16, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    60da5ed View commit details

  3. strace-graph: fix strace-graph shebang which points to perl 

    (cherry picked from commit 38b7aff)
    @hlolli @Ma27
    hlolli authored and Ma27 committed Jun 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    02b95cf View commit details

  4. Merge pull request #90611 from omniitgmbh/graylog_3.3.1_with_plugins_… 

    …backport

[20.03] graylog: 3.3.0 -> 3.3.1 (with plugins)
    @Ma27
    Ma27 authored Jun 16, 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
    33e9bc8 View commit details

  5. youtube-dl: 2020.06.06 -> 2020.06.16.1 

    https://github.com/ytdl-org/youtube-dl/releases/tag/2020.06.16.1
(cherry picked from commit 1ab1a02)
    @Luflosi @Ma27
    Luflosi authored and Ma27 committed Jun 16, 2020

    Partially verified

    This commit is signed with the committer’s verified signature. The key has expired.
    Ma27’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    dce9ef5 View commit details
Showing with 11 additions and 9 deletions.
  1. +2 −0 pkgs/development/tools/misc/strace/default.nix
  2. +2 −2 pkgs/tools/misc/graylog/default.nix
  3. +5 −5 pkgs/tools/misc/graylog/plugins.nix
  4. +2 −2 pkgs/tools/misc/youtube-dl/default.nix
2 changes: 2 additions & 0 deletions pkgs/development/tools/misc/strace/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {

buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k

postPatch = "patchShebangs strace-graph";

configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check";

# fails 1 out of 523 tests with
4 changes: 2 additions & 2 deletions pkgs/tools/misc/graylog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "graylog";
version = "3.3.0";
version = "3.3.1";

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

dontBuild = true;
10 changes: 5 additions & 5 deletions pkgs/tools/misc/graylog/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -64,18 +64,18 @@ in {
enterprise-integrations = glPlugin rec {
name = "graylog-enterprise-integrations-${version}";
pluginName = "graylog-plugin-enterprise-integrations";
version = "3.3.0";
version = "3.3.1";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz";
sha256 = "1480ccii3nzvm0jp1xm2iddgc789zcwbgd19201q7p3v0ph02yj8";
sha256 = "0la91f5hfakrp5d37q3r1z15zzya9vmwgp8gf5ifkh6fasa811ll";
};
installPhase = ''
mkdir -p $out/bin
tar --strip-components=2 -xf $src
cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar
'';
meta = {
homepage = "https://docs.graylog.org/en/3.2/pages/integrations.html#enterprise";
homepage = "https://docs.graylog.org/en/3.3/pages/integrations.html#enterprise";
description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)";
license = stdenv.lib.licenses.unfree;
};
@@ -96,10 +96,10 @@ in {
integrations = glPlugin rec {
name = "graylog-integrations-${version}";
pluginName = "graylog-plugin-integrations";
version = "3.3.0";
version = "3.3.1";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz";
sha256 = "08cpxviwk2p4zsgbr2h3symr88rf3fjfz1kkg4iglvdc5mqf71xx";
sha256 = "1k90q50p4ly9d8fj0riyb1xw0bd6f8wm2xmkr71908j2v0jaskpq";
};
installPhase = ''
mkdir -p $out/bin
4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2020.06.06";
version = "2020.06.16.1";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1qrrr14glv0jv377n61paq55b6k58jpnwbz2sp5xfl4wnxy5hqny";
sha256 = "1q0080cvxpfakgbzigbnl9adnga3jz1sqig2rsiq52rarqbc01px";
};

nativeBuildInputs = [ installShellFiles makeWrapper ];