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: 5f59ab7d4e07
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: 01f5e794913a
Choose a head ref
  • 7 commits
  • 7 files changed
  • 4 contributors

Commits on Sep 14, 2018

  1. Merge pull request #46643 from taku0/flashplayer-31.0.0.108 

    flashplayer: 30.0.0.154 -> 31.0.0.108 [Important security fix]
(cherry picked from commit a9e50ec)
    @7c6f434c
    7c6f434c committed Sep 14, 2018
    Copy the full SHA
    0bb2960 View commit details

Commits on Sep 15, 2018

  1. php56: 5.6.37 -> 5.6.38 

    Changelog: http://php.net/ChangeLog-5.php#5.6.38
    @etu
    etu committed Sep 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    df98b89 View commit details

  2. linux: 4.4.155 -> 4.4.156 

    (cherry picked from commit b9ca4ac)
    @NeQuissimus
    NeQuissimus committed Sep 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    963704f View commit details

  3. linux: 4.9.126 -> 4.9.127 

    (cherry picked from commit c1d7826)
    @NeQuissimus
    NeQuissimus committed Sep 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ce005f0 View commit details

  4. linux: 4.14.69 -> 4.14.70 

    (cherry picked from commit 1a13067)
    @NeQuissimus
    NeQuissimus committed Sep 15, 2018
    Copy the full SHA
    67782bc View commit details

  5. php70: 7.0.31 -> 7.0.32 

    Changelog: http://php.net/ChangeLog-7.php#7.0.32
    @etu
    etu committed Sep 15, 2018
    Copy the full SHA
    bcd2eda View commit details

  6. Merge pull request #46717 from etu/upgrade-1803-php 

    [18.03] php: 5.6.37 -> 5.6.38, 7.0.31 -> 7.0.32
    @xeji
    xeji authored Sep 15, 2018
    Copy the full SHA
    01f5e79 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/chromium/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -98,11 +98,11 @@ let

flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "30.0.0.154";
version = "31.0.0.108";

src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "0bi9b6syx7x2avixgjwanrvynzanf89xm2g3nxazw9qgxxc1cp48";
sha256 = "0dcwyx0fp7wbsx0cyi7xpwq0nnvcvkzfgi6zyy75487820ssc4h1";
stripRoot = false;
};

12 changes: 6 additions & 6 deletions pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -73,25 +73,25 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "30.0.0.154";
version = "31.0.0.108";

src = fetchurl {
url =
if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_npapi_linux_debug.${arch}.tar.gz"
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_npapi_linux_debug.${arch}.tar.gz"
else
"https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
sha256 =
if debug then
if arch == "x86_64" then
"04hfh0vn1n70gdpfydq0sj94d6rkbk80h4pmy3rsfvhg0x540wx8"
"1mn29ahxjf6pdy2zp2na14cz46jrl88f54kp3bs3cz75syyizyb6"
else
"073327sszbvkglh5b18axmwv40sy2vyacdhcd1fx82qskv44sfda"
"0inpj6bcsn5lh8gdv1wxpgipzrmpc553nhr68a55b2wff9fkv1ci"
else
if arch == "x86_64" then
"03ypgzy88ck5rn1q971v0km9yw3p10ly1zkxh239v6nx0hs35w84"
"1dfgsl5jf8ja9f7wwkzj5bfz1v5rdsyf4qhg1shqqldadmyyha7p"
else
"0rld7i659ccp4gvcvdkqkc1lajvlss5d4qndzf9aqiksvdknv62x";
"0yiqwwqs3z9zzkfgqzjwqqdr2vaj1ia5xychs9fgxix3y4j934da";
};

nativeBuildInputs = [ unzip ];
10 changes: 5 additions & 5 deletions pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View file
Original file line number Diff line number Diff line change
@@ -55,19 +55,19 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "30.0.0.154";
version = "31.0.0.108";

src = fetchurl {
url =
if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux_debug.x86_64.tar.gz"
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux_debug.x86_64.tar.gz"
else
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz";
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"133zhgc5fh6s0xr93lv70xcrgvaj7lhjxk5w7xz79h3mp185p3g4"
"0i047fvj3x9lx7x8bf7jl1ybf9xpmr6g77q0h7n2s8qvscsw0pmm"
else
"1xz1l5q0zahalh0l4mkrwhmfrmcli3sckg3rcfnllizq9rbfzcmr";
"19wfs452ix57yfi4cy2din6mi5jky9hjzbdjny1bl8w32fy8xmm3";
};

nativeBuildInputs = [ unzip ];
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -338,13 +338,13 @@ let

in {
php56 = generic {
version = "5.6.37";
sha256 = "08wbg1qbbr80wcpv0l24vfyd9w8cxanils928gjs6knr0lyxcsl8";
version = "5.6.38";
sha256 = "00xw7rcq36dlrzgx9nr96jc64gnnrxjxkkpmkr1y8fynpldj6nyn";
};

php70 = generic {
version = "7.0.31";
sha256 = "14bb230qip62cn7k6hvgr18kxj76zvl735fkg6hpkrnnrqzdg2vy";
version = "7.0.32";
sha256 = "1qcjch3293h3fwci767x9rih3nrvz02rhn33hvx8l5q8kk7xis2n";
};

php71 = generic {
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.69";
version = "4.14.70";

# 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 = "1w0r7g04q9ac14krm5dmvl8sv88avsmdirvnfk964cz3n3xxbgb1";
sha256 = "0b733s4m9r9606xmxv5jfr5x14c4ik665awln2smd23z8wrdipy5";
};
} // (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.155";
version = "4.4.156";
extraMeta.branch = "4.4";

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

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1davk0c760if20h3f9r18lcvb7lqzlx0chxlph7ld5nlaz3ncskd";
sha256 = "03yxdzmlikyvbkfaha871h9n7y58lyzyxgybsx09ln4pxnnswxwl";
};
} // (args.argsOverride or {}))