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: d2f46002829c
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: a0756f9e8841
Choose a head ref
  • 13 commits
  • 6 files changed
  • 5 contributors

Commits on Sep 1, 2020

  1. solr: 8.4.1 -> 8.5.0 

    (cherry picked from commit 7613ae0)
    @r-ryantm @aanderse
    r-ryantm authored and aanderse committed Sep 1, 2020
    Copy the full SHA
    fd70277 View commit details

  2. solr: 8.5.0 -> 8.5.1 

    (cherry picked from commit f82006b)
    @r-ryantm @aanderse
    r-ryantm authored and aanderse committed Sep 1, 2020
    Copy the full SHA
    dc6333c View commit details

  3. solr: 8.5.1 -> 8.5.2 

    (cherry picked from commit 41a81c4)
    @r-ryantm @aanderse
    r-ryantm authored and aanderse committed Sep 1, 2020
    Copy the full SHA
    7a4bae9 View commit details

  4. solr: 8.5.2 -> 8.6.1 

    (cherry picked from commit 563b73d)
    @r-ryantm @aanderse
    r-ryantm authored and aanderse committed Sep 1, 2020
    Copy the full SHA
    977ee46 View commit details

Commits on Nov 5, 2020

  1. axel: 2.17.7 -> 2.17.8 

    (cherry picked from commit 6eee522)
    @r-ryantm @redvers
    r-ryantm authored and redvers committed Nov 5, 2020
    Copy the full SHA
    1fbed80 View commit details

  2. axel: 2.17.8 -> 2.17.9 

    (cherry picked from commit b467a11)
    @r-ryantm @redvers
    r-ryantm authored and redvers committed Nov 5, 2020
    Copy the full SHA
    5619d39 View commit details

  3. Merge pull request #96881 from aanderse/solr-backport 

    solr: 8.4.1 -> 8.6.1 [20.03 backport]
    @mweinelt
    mweinelt authored Nov 5, 2020
    Copy the full SHA
    9ec0d8c View commit details

  4. linux: 4.14.203 -> 4.14.204

    @NeQuissimus
    NeQuissimus committed Nov 5, 2020
    Copy the full SHA
    75bde93 View commit details

  5. linux: 4.19.154 -> 4.19.155

    @NeQuissimus
    NeQuissimus committed Nov 5, 2020
    Copy the full SHA
    3f3186c View commit details

  6. linux: 5.4.74 -> 5.4.75

    @NeQuissimus
    NeQuissimus committed Nov 5, 2020
    Copy the full SHA
    688286e View commit details

  7. tmux: apply patch for CVE-2020-27347 

    Fixes a buffer overflow in the escape sequence parser.

Fixes: CVE-2020-27347
    @mweinelt
    mweinelt committed Nov 5, 2020
    Copy the full SHA
    e138b42 View commit details

  8. Merge pull request #102863 from redvers/update_axel_2.17.7_to_2.17.9 

    axel: 2.17.7 -> 2.17.9 [20.03]
    @mweinelt
    mweinelt authored Nov 5, 2020
    Copy the full SHA
    d81f5d9 View commit details

  9. Merge pull request #102941 from mweinelt/20.03/tmux 

    [20.03] tmux: apply patch for CVE-2020-27347
    @andir
    andir authored Nov 5, 2020
    Copy the full SHA
    a0756f9 View commit details
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.203";
version = "4.14.204";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0c9r1s83mrn9lzgrr4wzvk4d72q70sbgf7lql6z9ivkf12v3p5mc";
sha256 = "1ncacsy2g80zigfx8nmr1f7v50s1y9ys1xy9jgizrnvmxjcji0wy";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.154";
version = "4.19.155";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0ik6anz6ly0dl0lp8m5mighlvzkifnk2kljwajxa56vbhj691339";
sha256 = "1lj81aadyskmxs3j4s923nhnk69dfj2kiwm0nxabbcjw83sliinb";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.74";
version = "5.4.75";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1drs2pngr5w3rmpydljirmibp30qb4hdrhqsi92knshlw6nz817c";
sha256 = "0w0lpiy56zqdm2vpx9ckxakna334n88pnqbv52zyfcslxgb6yinj";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/servers/search/solr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "solr";
version = "8.4.1";
version = "8.6.1";

src = fetchurl {
url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc";
sha256 = "0ds6zjsnwgpcmivzi7d6yqdmyn2mhf3k8g7xp26yfpm7f12gpq4g";
};

nativeBuildInputs = [ makeWrapper ];
9 changes: 9 additions & 0 deletions pkgs/tools/misc/tmux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, pkgconfig
, makeWrapper
@@ -32,6 +33,14 @@ stdenv.mkDerivation rec {
sha256 = "0y9lv1yr0x50v3k70vzkc8hfr7yijlsi30p7dr7i8akp3lwmmc7h";
};

patches = [
(fetchpatch {
name = "CVE-2020-27347.patch";
url = "https://github.com/tmux/tmux/commit/a868bacb46e3c900530bed47a1c6f85b0fbe701c.patch";
sha256 = "1mxvrs2vm52as128riddvxgzqbx1zrjs38n3gvjyl2p9h6xp5k4k";
})
];

nativeBuildInputs = [
pkgconfig
autoreconfHook
4 changes: 2 additions & 2 deletions pkgs/tools/networking/axel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "axel";
version = "2.17.7";
version = "2.17.9";

src = fetchFromGitHub {
owner = "axel-download-accelerator";
repo = pname;
rev = "v${version}";
sha256 = "0z20d2fkf69v35d4pkba95vnk7yq7393kwikmb64y7cjyz4m2ngk";
sha256 = "1bhzgvvqcwa5bd487400hg1nycvw8qqxzbzvq5ywyz5d9j12hdrd";
};

nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ];