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: 3d98c52b23a0
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: 820226eb93d1
Choose a head ref
  • 7 commits
  • 7 files changed
  • 1 contributor

Commits on Apr 17, 2019

  1. linux: 4.14.111 -> 4.14.112 

    (cherry picked from commit dd3964e)
    @NeQuissimus
    NeQuissimus committed Apr 17, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    349c05c View commit details

  2. linux: 4.19.34 -> 4.19.35 

    (cherry picked from commit f9c3869)
    @NeQuissimus
    NeQuissimus committed Apr 17, 2019
    Copy the full SHA
    d40b384 View commit details

  3. linux: 4.9.168 -> 4.9.169 

    (cherry picked from commit 4133606)
    @NeQuissimus
    NeQuissimus committed Apr 17, 2019
    Copy the full SHA
    92ed0ca View commit details

  4. linux: 5.0.7 -> 5.0.8 

    (cherry picked from commit e9621b2)
    @NeQuissimus
    NeQuissimus committed Apr 17, 2019
    Copy the full SHA
    8169e97 View commit details

  5. dotty: 0.10.0-RC1 -> 0.14.0-RC1 

    (cherry picked from commit 9429f15)
    @NeQuissimus
    NeQuissimus committed Apr 17, 2019
    Copy the full SHA
    354f1fe View commit details

  6. openjdk: 8u202 -> 8u212 

    (cherry picked from commit 0540650)
    @NeQuissimus
    NeQuissimus committed Apr 17, 2019
    Copy the full SHA
    dd64c5d View commit details

  7. openjdk: 11.0.2-b9 -> 11.0.3-ga 

    (cherry picked from commit eb970c5)
    @NeQuissimus
    NeQuissimus committed Apr 17, 2019
    Copy the full SHA
    820226e View commit details
10 changes: 5 additions & 5 deletions pkgs/development/compilers/openjdk/11.nix
View file
Original file line number Diff line number Diff line change
@@ -18,16 +18,16 @@ let
else "amd64";

major = "11";
update = ".0.2";
build = "9";
repover = "jdk-${major}${update}+${build}";
update = ".0.3";
build = "ga";
repover = "jdk-${major}${update}-${build}";

openjdk = stdenv.mkDerivation {
name = "openjdk-${major}${update}-b${build}";
name = "openjdk-${major}${update}-${build}";

src = fetchurl {
url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
sha256 = "0xc7nksvj72cgw8zrmvlcwaasinpij1j1959398a4nqvzpvpxg30";
sha256 = "1v6pam38iidlhz46046h17hf5kki6n3kl302awjcyxzk7bmkvb8x";
};

nativeBuildInputs = [ pkgconfig ];
20 changes: 10 additions & 10 deletions pkgs/development/compilers/openjdk/8.nix
View file
Original file line number Diff line number Diff line change
@@ -21,44 +21,44 @@ let
else
throw "openjdk requires i686-linux or x86_64 linux";

update = "202";
update = "212";
build = "ga";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
repover = "jdk8u${update}-${build}";
jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = "0asx7qkhmrlfmhrljck5gb3yp4v0aa8k35y4xfcph41x0m0mvrdb";
sha256 = "00rl33h4cl4b4p3hcid765h38x2jdkb14ylh8k1zhnd0ka76crgg";
};
langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
sha256 = "07q6l3slmi5fgwjnsk6bd8miv8glmw15w5f6yyvp8nlp2d54l33n";
sha256 = "0va6g2dccf1ph6mpwxswbks5axp7zz258cl89qq9r8jn4ni04agw";
};
hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
sha256 = "01k4pwhn3nmkzdhdj1v58dgir4iwsj9mm2ml1541z31s53g037cq";
sha256 = "0sgr9df10hs49pjld6c6kr374v4zwd9s52pc3drz68zrlk71ja4s";
};
corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz";
sha256 = "0v39kl2iiyh74p3cp6bjhshkwxpgbffza9abzjgp7cpdfhcc73p0";
sha256 = "1hq0sr4k4k4iv815kg72i9lvd7n7mn5pmw96ckk9p1rnyagn9z03";
};
jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
sha256 = "0z1cy6aq09j25jyryj47rms15h5175p2h23fg5pv035zapf8nb1b";
sha256 = "1fc59jrbfq8l067mggzy5dnrvni7lwaqd7hahs4nqv87kyrfg545";
};
jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
sha256 = "0y0mk4sra9d29kgx842m5y4bz9gczc9ypkajv6m5igjv7sizzsv7";
sha256 = "1ka2fvyxdmpfhk814s314gx53yvdr19vpsqygx283v9nbq90l1yg";
};
jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
sha256 = "07ssrjhffkdncxxhsbid21hlg51y7js3x7sb4g474vmmi3qj6vmb";
sha256 = "15vlgs5v2ax8sqwh7bg50fnlrwlpnkp0myzrvpqs1mcza8pyasp8";
};
nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = "0r0b8ra0ibzbdpxz6nv6i2zrzh2j5sxgprpnl6gf4d9h0i29ickj";
sha256 = "1jzn0yi0v6lda5y8ib07g1p6zymnbcx9yy6iz8niggpm7205y93h";
};
openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}";
name = "openjdk-8u${update}-${build}";

srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ];
sourceRoot = ".";
4 changes: 2 additions & 2 deletions pkgs/development/compilers/scala/dotty-bare.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, ncurses }:

stdenv.mkDerivation rec {
version = "0.10.0-RC1";
version = "0.14.0-RC1";
name = "dotty-bare-${version}";

src = fetchurl {
url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
sha256 = "0s9vh0d6xx99gl0ji0dgmbq36f79c0iwfbrfqwmaclqm9yq5m54k";
sha256 = "0nrgsyhqjlpvnjqgb18pryr8q7knq3dq25jhp98s4wh76nssm1zr";
};

propagatedBuildInputs = [ jre ncurses.dev ] ;
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.111";
version = "4.14.112";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed

@@ -12,6 +12,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1s56819kkr7h48njk708f9gapy2hr97vxawp5qflv1izamb7s6gq";
sha256 = "0wp40cr3gpj8g2hghcvhz669qshd7zkfjkq78gkdg840rki02q9j";
};
} // (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.34";
version = "4.19.35";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed

@@ -12,6 +12,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1k5qhyh7nwfs5pkbrjpxyj6w17424qcmmd9v7jqfbgnx3wm5wyfx";
sha256 = "1q2742sbi9vgk791xr1rbi5mr3ra4k1bdzq9dr610870y1hfb9rg";
};
} // (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.168";
version = "4.9.169";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "07h9xwxpdxb6gm1fy0d8s6p1zalmw3mbzjgd4gipvmzsxwhiqiad";
sha256 = "1c6nz27q0m6nbb7v7kba6zrhzav5bqqllvwzzqf9cmd5cdn66xmp";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.0.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.0.7";
version = "5.0.8";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed

@@ -12,6 +12,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1v2lxwamnfm879a9qi9fwp5zyvlzjw9qa0aizidjbiwz5dk7gq8n";
sha256 = "0dalr3vym2ixmblnlrw10dfx0icdf2aab38z2j9y1qfcx128140i";
};
} // (args.argsOverride or {}))