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: 0d79decdb3ba
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: 5b0b58685d68
Choose a head ref
  • 16 commits
  • 11 files changed
  • 9 contributors

Commits on Sep 6, 2019

  1. exim: 4.92 -> 4.92.2

    security update: CVE-2019-13917, CVE-2019-15846
    pacien authored and alyssais committed Sep 6, 2019
    Copy the full SHA
    56c18e6 View commit details
  2. signal-desktop: 1.27.1 -> 1.27.2

    (cherry picked from commit 042b63d)
    Reason: Avoid an expired (unusable) release in the stable release
    (Signal-Desktop releases expire after a few months).
    primeos committed Sep 6, 2019
    Copy the full SHA
    06ba45c View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d0ad9ba View commit details
  4. Copy the full SHA
    327d935 View commit details
  5. Copy the full SHA
    c50741f View commit details
  6. Copy the full SHA
    1b984e5 View commit details
  7. linux: 5.2.11 -> 5.2.13

    NeQuissimus committed Sep 6, 2019
    Copy the full SHA
    d19cb75 View commit details

Commits on Sep 7, 2019

  1. Copy the full SHA
    759a408 View commit details
  2. php72: 7.2.21 -> 7.2.22

    Changelog: https://www.php.net/ChangeLog-7.php#7.2.22
    (cherry picked from commit 125d068)
    etu committed Sep 7, 2019
    Copy the full SHA
    03dcb3d View commit details
  3. Copy the full SHA
    b10acd3 View commit details
  4. Merge pull request #68232 from primeos/signal-desktop-backport

    [19.03] signal-desktop: 1.26.2 -> 1.27.1 (backport)
    primeos authored Sep 7, 2019
    Copy the full SHA
    92650cb View commit details
  5. Merge pull request #68262 from etu/1903-php-updates

    [19.03] php: 7.1.30 -> 7.1.32, 7.2.21 -> 7.2.22, 7.3.8 -> 7.3.9
    globin authored Sep 7, 2019
    Copy the full SHA
    7aa3117 View commit details
  6. gitea: 1.9.2 -> 1.9.3

    Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.9.3
    (cherry picked from commit 8b71bb0)
    etu committed Sep 7, 2019
    Copy the full SHA
    bced2b1 View commit details
  7. Copy the full SHA
    bb18e38 View commit details

Commits on Sep 8, 2019

  1. Merge pull request #68284 from etu/1903-gitea-1-9-3

    [19.03] gitea: 1.9.2 -> 1.9.3
    Ma27 authored Sep 8, 2019
    Copy the full SHA
    65a9b52 View commit details
  2. axis2: 1.7.8 -> 1.7.9

    (cherry picked from commit 0e679dd)
    mmahut authored and svanderburg committed Sep 8, 2019
    Copy the full SHA
    5b0b586 View commit details
Original file line number Diff line number Diff line change
@@ -58,11 +58,11 @@ let

in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
version = "1.27.1";
version = "1.27.2";

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "16fg60c5r7zcjs8ya6jk33l5kz8m21y9a1si3i0a2dvyaclz4a3q";
sha256 = "08qh7867bc6z6mdbdilqdacx67n0kaxl3m4m97k0jxhd093a8xfz";
};

phases = [ "unpackPhase" "installPhase" ];
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitea/default.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ with stdenv.lib;

buildGoPackage rec {
pname = "gitea";
version = "1.9.2";
version = "1.9.3";

src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
sha256 = "1i7h6scycwzil87fcx1a19w5pl0986g5ax7y030w0wgmrq3zj53a";
sha256 = "0g6ch85dq4vazxnr6g78wgqrnfa955395y1zws0a50h0wfxpdjis";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
@@ -56,7 +56,7 @@ buildGoPackage rec {

meta = {
description = "Git with a cup of tea";
homepage = https://gitea.io;
homepage = "https://gitea.io";
license = licenses.mit;
maintainers = with maintainers; [ disassembler kolaente ];
};
12 changes: 6 additions & 6 deletions pkgs/development/interpreters/php/default.nix
Original file line number Diff line number Diff line change
@@ -248,24 +248,24 @@ let

in {
php71 = generic {
version = "7.1.30";
sha256 = "1czcf5qwk727sdzx5n4wvsxvl50jx6d5x8ws1dqx46fa9xvm0j36";
version = "7.1.32";
sha256 = "0ymbkj8117pakcs40rkkrsrvcc2rn9nrd7ilcdzw2nn7vnns3iyp";

# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;
};

php72 = generic {
version = "7.2.21";
sha256 = "1vqldc2namfblwyv87fgpfffkjpzawfpcp48f40nfdl3pshq6c9l";
version = "7.2.22";
sha256 = "12phn0rrd5r1j6xlz83h7v6gszmj4lb5gwj927psbbc6nn1rh2n1";

# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};

php73 = generic {
version = "7.3.8";
sha256 = "1xbndimrfamf97m3vln842g9w1ikq071gjfkk15ai7sx2wqccrnm";
version = "7.3.9";
sha256 = "1i33v50rbqrfwjwch1d46mbpwbxrg1xfycs9mjl7xsy9m04rg753";

# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
2 changes: 1 addition & 1 deletion pkgs/development/libraries/mesa/default.nix
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
, galliumDrivers ? null
, driDrivers ? null
, vulkanDrivers ? null
, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "surfaceless" "wayland" "drm" ]
, OpenGL, Xplugin
}:

4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.141";
version = "4.14.142";

# 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 = "05rs411rw10hhnfzvaxmcik3pq20i1i05shvvra4bv164f0z1f8b";
sha256 = "1wwhnm1n1b6yzsd2zzzf9i3n4hlvgnph70p67cwahw0ik4ssayz6";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.69";
version = "4.19.71";

# 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 = "11yrw8ixd5ni9rlpndqsz2ihx6k8qaf35a1lf164lkhaa85pd4f0";
sha256 = "1bjwkb7k82l646ryyy0jbwsnygm2qsxgcwli8bdrj844skzynlqz";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
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.190";
version = "4.4.191";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y";
sha256 = "0x3lnq4xyj5v6r1cz4jizm4vdspws1nb806f5qczwi3yil5nm6bh";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
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.190";
version = "4.9.191";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py";
sha256 = "1g5p736p8zx5rmxaj56yw93jp768npl868jsn8973dny0rsbim6y";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.2.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.2.11";
version = "5.2.13";

# 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/v5.x/linux-${version}.tar.xz";
sha256 = "1y9kn1zny3xpmbi5an3g7hbzywnycys8chfaw6laij1xk4gq6ahc";
sha256 = "12hpph3iynr22mfwz7745lp01waf2kg579hr56d4pvhx4iahzdhp";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/servers/http/tomcat/axis2/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "axis2-${version}";
version = "1.6.4";
version = "1.7.9";

src = fetchurl {
url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip";
sha256 = "12ir706dn95567j6lkxdwrh28vnp6292h59qwjyqjm7ckglkmgyr";
sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
};

buildInputs = [ unzip apacheAnt jdk ];
4 changes: 2 additions & 2 deletions pkgs/servers/mail/exim/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@
}:

stdenv.mkDerivation rec {
name = "exim-4.92";
name = "exim-4.92.2";

src = fetchurl {
url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
sha256 = "0qhxxwl0nhzgp0w3pjkhx9z9lqfpk8id25q5ghf9ay2f90mydjba";
sha256 = "0m56jsh2fzvwj4rdpcc3pkd5vsi40cjrpzalis7l1zq33m4axmq1";
};

nativeBuildInputs = [ pkgconfig ];