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: 35421cfdf7b9
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: 720af0f20fb0
Choose a head ref
  • 6 commits
  • 5 files changed
  • 3 contributors

Commits on Oct 20, 2018

  1. linux: 4.4.161 -> 4.4.162 

    (cherry picked from commit 218bf14)
    @NeQuissimus
    NeQuissimus committed Oct 20, 2018
    Copy the full SHA
    9dec819 View commit details

  2. linux: 4.9.134 -> 4.9.135 

    (cherry picked from commit 560e61a)
    @NeQuissimus
    NeQuissimus committed Oct 20, 2018
    Copy the full SHA
    76408dd View commit details

  3. linux: 4.14.77 -> 4.14.78 

    (cherry picked from commit 719087f)
    @NeQuissimus
    NeQuissimus committed Oct 20, 2018
    Copy the full SHA
    617448e View commit details

  4. linux: 4.18.15 -> 4.18.16 

    (cherry picked from commit 154f457)
    @NeQuissimus
    NeQuissimus committed Oct 20, 2018
    Copy the full SHA
    b62ae25 View commit details

  5. mattermost: 5.1.0 -> 5.3.0 

    (cherry picked from commit 06eeeed)
    @Mic92
    Jeff Slight authored and Mic92 committed Oct 20, 2018
    Copy the full SHA
    bbc3f42 View commit details

  6. mattermost: 5.3.0 -> 5.4.0 

    (cherry picked from commit 321b3a2)
    @jslight90 @Mic92
    jslight90 authored and Mic92 committed Oct 20, 2018
    Copy the full SHA
    720af0f 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.77";
version = "4.14.78";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1y567wkr4p7hywq3pdw06yc4hi16rp1vkx764wzy5nyajkhz95h4";
sha256 = "0v2cwykgd2hxlqja4yl4pq45nhd5x8917ixqq7hj1r3ry304vnpl";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.18.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.18.15";
version = "4.18.16";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "0cr9ash165yimwf8742c9cshfnjvmnzibyfrii9cnfig9m8m3hwg";
sha256 = "1rjjkhl8lz4y4sn7icy8mp6p1x7rvapybp51p92sanbjy3i19fmy";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.161";
version = "4.4.162";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "11rz66qvbcb6y3fz9k04jzn547sqdahqknd43imsr9sjgkaq60xy";
sha256 = "0l2agmxzmq89jbh7r00qg4msvmhny40m2jar96fibwpklwd44kki";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.134";
version = "4.9.135";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0xvsk5q4w4sa3vk0rhckxn7faj12rvmfpwn08m4qf7024b8yiyvd";
sha256 = "1kjly5ynsg2jy5nj41z21s8f18wfs4nk843jlmmcazzax6xv08z0";
};
} // (args.argsOverride or {}))
6 changes: 3 additions & 3 deletions pkgs/servers/mattermost/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:

let
version = "5.1.0";
version = "5.4.0";

mattermost-server = buildGoPackage rec {
name = "mattermost-server-${version}";
@@ -10,7 +10,7 @@ let
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
sha256 = "069ihmfr6np991mbgg001y0kyafghn57nsv3kpyyvfmhv07p0qbc";
sha256 = "0sal5ydm1cwnvf3acmiy0400ghhd6v0wj64mkxqwqf8ysnbxizwq";
};

goPackagePath = "github.com/mattermost/mattermost-server";
@@ -27,7 +27,7 @@ let

src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
sha256 = "1bm5nqnhk2w3sy8mvm81k7d65j6bgpvakgphgwqgnlm864i4253z";
sha256 = "06dg0f6nrh3a2v3lnyn2s39nj5jpsvfkx3ypq4zjpks0srv4mgfz";
};

installPhase = ''