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: d592f291ed29
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: 5d19e3e78fb8
Choose a head ref
  • 8 commits
  • 5 files changed
  • 5 contributors

Commits on Oct 13, 2018

  1. jenkins: 2.89.4 -> 2.107.3 (#41618) 

    (cherry picked from commit 500f1a9)
    @fuzzy-id @fpletz
    fuzzy-id authored and fpletz committed Oct 13, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eps1lon Sebastian "Sebbie" Silbermann
    GPG key ID: 5827136E9D397532
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2424c81 View commit details

  2. jenkins: 2.107.3 -> 2.121.2 (#43936) 

    (cherry picked from commit 1bb4fd7)
    @pinktrink @fpletz
    pinktrink authored and fpletz committed Oct 13, 2018
    Copy the full SHA
    c314203 View commit details

  3. jenkins: 2.121.2 -> 2.138.1 

    (cherry picked from commit 16ce28e)
    @bchallenor @fpletz
    bchallenor authored and fpletz committed Oct 13, 2018
    Copy the full SHA
    af21727 View commit details

  4. jenkins: 2.138.1 -> 2.138.2 

    (cherry picked from commit 88e7d7b)
    @bchallenor @fpletz
    bchallenor authored and fpletz committed Oct 13, 2018
    Copy the full SHA
    d457ecd View commit details

  5. wireguard: 0.0.20180904 -> 0.0.20181007 

    backport of 97d2779
    @fpletz
    fpletz committed Oct 13, 2018
    Copy the full SHA
    e85e0c2 View commit details

  6. linux: 4.4.160 -> 4.4.161 

    (cherry picked from commit 3ad8afb)
    @NeQuissimus
    NeQuissimus committed Oct 13, 2018
    Copy the full SHA
    06e98e0 View commit details

  7. linux: 4.9.132 -> 4.9.133 

    (cherry picked from commit b4d4aff)
    @NeQuissimus
    NeQuissimus committed Oct 13, 2018
    Copy the full SHA
    cb6fbe8 View commit details

  8. linux: 4.14.75 -> 4.14.76 

    (cherry picked from commit 43d8a40)
    @NeQuissimus
    NeQuissimus committed Oct 13, 2018
    Copy the full SHA
    5d19e3e 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 {
name = "jenkins-${version}";
version = "2.89.4";
version = "2.138.2";

src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "0lwv3y12r36amkr70fap5g1zfd7vv92809lh9w7178s91sikm28x";
sha256 = "10qyr8izngnhlr1b03a9vdnbmwprbqsjnd55hjdalmxy6dq5mvfq";
};

buildCommand = ''
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.75";
version = "4.14.76";

# 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 = "084176rl51ls0dhy39vpj9fhasm4436iqv6aa0s5a74g1cixg4sh";
sha256 = "1gl2wkq4sazvpr0xnn4vrajj3j7w6hfiwdiy34y7jhlazyj1jgzf";
};
} // (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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

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

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1i0wqccab2xxjsx58pgzgbmm5cclfd3hh3yjasnfrqsdaarxvgkd";
sha256 = "11rz66qvbcb6y3fz9k04jzn547sqdahqknd43imsr9sjgkaq60xy";
};
} // (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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.132";
version = "4.9.133";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1lz53r6p293y5fwx7pz9ymj9sss3wmip8hcc48zwkcwm8phnmrk7";
sha256 = "0qv5n8vipkqcd0hpf5l41h023n46rgja39h895phlcxs4p00ywsk";
};
} // (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
@@ -5,11 +5,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";

let
name = "wireguard-${version}";
version = "0.0.20180904";
version = "0.0.20181007";

src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "1w9qzvrsivc3k18hl1fv513in4gi1m0my26hlb6vfzaak5rav3m3";
sha256 = "12dg2jrwp26mv8zzmp4cnqs9n3m55x6dcxkyjjsp2j2r2q90svnj";
};

meta = with stdenv.lib; {