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: aaa66d8d887c
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: b103b4bc6208
Choose a head ref
  • 10 commits
  • 6 files changed
  • 3 contributors

Commits on Jul 16, 2020

  1. nextcloud: 18.0.6 -> 18.0.7 

    (cherry picked from commit 34ec5c7)
    @tokudan
    tokudan committed Jul 16, 2020
    Copy the full SHA
    4f5fb2b View commit details

Commits on Jul 17, 2020

  1. linuxPackages.wireguard: 1.0.20200623 -> 1.0.20200712 

    https://lists.zx2c4.com/pipermail/wireguard/2020-July/005639.html
(cherry picked from commit 2c275f8)
    @Ma27
    Ma27 committed Jul 17, 2020
    Copy the full SHA
    890f7af View commit details

  2. linux: 4.19.132 -> 4.19.133

    @NeQuissimus
    NeQuissimus committed Jul 17, 2020
    Copy the full SHA
    8240196 View commit details

  3. linux: 5.4.51 -> 5.4.52

    @NeQuissimus
    NeQuissimus committed Jul 17, 2020
    Copy the full SHA
    c423cca View commit details

  4. jenkins: 2.222.1 -> 2.222.3 

    (cherry picked from commit f7b4174)
    @NeQuissimus
    NeQuissimus committed Jul 17, 2020
    Copy the full SHA
    47aa88c View commit details

  5. jenkins: 2.222.3 -> 2.222.4 

    (cherry picked from commit f75d629)
    @NeQuissimus
    NeQuissimus committed Jul 17, 2020
    Copy the full SHA
    2941c14 View commit details

  6. jenkins: 2.222.4 -> 2.235.1 

    (cherry picked from commit d1966f0)
    @NeQuissimus
    NeQuissimus committed Jul 17, 2020
    Copy the full SHA
    e8ef507 View commit details

  7. jenkins: 2.235.1 -> 2.235.2 

    (cherry picked from commit 223efd7)
    @NeQuissimus
    NeQuissimus committed Jul 17, 2020
    Copy the full SHA
    360177f View commit details

  8. Merge pull request #93279 from tokudan/20.03.nextcloud1807 

    nextcloud: 18.0.6 -> 18.0.7 [20.03]
    @Ma27
    Ma27 authored Jul 17, 2020
    Copy the full SHA
    dd78ac7 View commit details

  9. matrix-synapse: 1.16.1 -> 1.17.0 

    https://github.com/matrix-org/synapse/releases/tag/v1.17.0
(cherry picked from commit 91f1d32)
    @Ma27
    Ma27 committed Jul 17, 2020
    Copy the full SHA
    b103b4b View commit details
4 changes: 2 additions & 2 deletions pkgs/development/tools/continuous-integration/jenkins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.222.1";
version = "2.235.2";

src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "0glmx8xi99mbfr84hi4sn36qkxw00rfn8wlz5n674ygbdj1vnv2s";
sha256 = "16rn5fbafkiriwzk6mr37am1270d64w6ngijr81kf7hpmz7lq4lp";
};

buildCommand = ''
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.132";
version = "4.19.133";

# 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 = "0i3xka0n26iqslvc8xzxlcig3gjwfprzgdwd1q3wrr1cjsafxmyp";
sha256 = "1i6vfzg8xds4lvvzkxaak74727iq35hx4vxr14w65bq9gpzfacxr";
};
} // (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.51";
version = "5.4.52";

# 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 = "1786l83nwzjazr2rl5fwxpw9dzlggi33nnj9grmp4dnn9j5ym2wy";
sha256 = "0fjxx8xpp0v0wwfw6zd5nc21i2r82wzcsy2yyl7w5c90259zlzh3";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/wireguard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";

stdenv.mkDerivation rec {
pname = "wireguard";
version = "1.0.20200623";
version = "1.0.20200712";

src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
sha256 = "1siybpd14la9c5diigniwis1q9f5fhq2ris9bvgzhh8g8vr3xmqh";
sha256 = "04f8hh6rz6ibavvga5z2mjpccnkacj1h24y3vj2kpya132qpavfr";
};

hardeningDisable = [ "pic" ];
4 changes: 2 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.16.1";
version = "1.17.0";

src = fetchPypi {
inherit pname version;
sha256 = "0kkja67h5ky94q5zj3790zx0nw5r8qksndvdg6gk6h0s1xb74iqa";
sha256 = "16hc82qhzb5maxp6f4xqarcv93sa6pg7i585vg97khgy6ryp3m7p";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/servers/nextcloud/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ in {
};

nextcloud18 = generic {
version = "18.0.6";
sha256 = "1chmkg31jc1nr53y8r886mmd2jzb78094mrx7ggcfpjfkkv8b89s";
version = "18.0.7";
sha256 = "0pka87ccrds17n6n5w5a80mc1s5yrf8d4mf6wsfaypwjbm3wfb2b";
};

nextcloud19 = generic {