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: 56b84277cc8c
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: bb18e3823309
Choose a head ref

Commits on Aug 26, 2019

  1. mesa: add surfaceless egl platform

    (cherry picked from commit a316d71)
    matthewbauer authored and Ericson2314 committed Aug 26, 2019
    Copy the full SHA
    af7c460 View commit details

Commits on Aug 29, 2019

  1. Merge pull request #67511 from obsidiansystems/mesa-add-surfaceless-1…

    …9.03
    
    mesa: add surfaceless egl platform -- for 19.03
    Ericson2314 authored Aug 29, 2019
    Copy the full SHA
    1d8d75f View commit details

Commits on Sep 3, 2019

  1. Copy the full SHA
    d0216bd View commit details
  2. Copy the full SHA
    0de9229 View commit details
  3. Copy the full SHA
    7c9e643 View commit details

Commits on Sep 4, 2019

  1. firefox/wrapper: Set new style override for legacy profiles & allow d…

    …owngrades
    
    While Firefox 68 started messing with our profiles and required new
    profiles on binary location changes Firefox 69 now verifies that we
    aren't downgrading to an older Firefox even of the same version. If you
    switch between two channel versions and/or between nixpkgs releases
    Firefox will refuse to start and demand a fresh profile. Disabling the
    downgrade protection works around that issue.
    andir committed Sep 4, 2019
    Copy the full SHA
    a13344b View commit details
  2. Merge pull request #68050 from andir/19.03/firefox-allow-downgrade

    [19.03] firefox/wrapper: Set new style override for legacy profiles & allow downgrades
    andir authored Sep 4, 2019
    Copy the full SHA
    d4e9ae3 View commit details
  3. Copy the full SHA
    bd689a6 View commit details
  4. Copy the full SHA
    c6c0967 View commit details
  5. Copy the full SHA
    f51e276 View commit details
  6. firefox-esr: 68.0.2esr -> 68.1.0esr

    (cherry picked from commit 6dce809)
    andir committed Sep 4, 2019
    Copy the full SHA
    d8d6107 View commit details

Commits on Sep 5, 2019

  1. Merge branch 'staging-19.03' into release-19.03

    systemd-resolved security patch
    vcunat committed Sep 5, 2019
    Copy the full SHA
    3d7608e View commit details
  2. Copy the full SHA
    609fe21 View commit details
  3. signal-desktop: 1.26.2 -> 1.27.1

    at-spi2-core is required for the new dependency on libatspi.so.0.
    
    (cherry picked from commit 539d66a)
    primeos committed Sep 5, 2019
    Copy the full SHA
    bfbd6ce View commit details

Commits on Sep 6, 2019

  1. Merge pull request #68177 from primeos/signal-desktop-backport

    [19.03] signal-desktop: 1.26.2 -> 1.27.1 (backport)
    primeos authored Sep 6, 2019
    Copy the full SHA
    ff05bc4 View commit details
  2. thunderbird: 60.8.0 -> 60.9.0

    I know there's 68.0 already #67754, but let's be conservative on 19.03
    and remain on the older Thunderbird branch for a bit longer.
    vcunat committed Sep 6, 2019
    Copy the full SHA
    0d79dec View commit details
  3. 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
  4. 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
  5. Copy the full SHA
    d0ad9ba View commit details
  6. Copy the full SHA
    327d935 View commit details
  7. Copy the full SHA
    c50741f View commit details
  8. Copy the full SHA
    1b984e5 View commit details
  9. 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. Copy the full SHA
    bb18e38 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/packages.nix
Original file line number Diff line number Diff line change
@@ -92,10 +92,10 @@ rec {

firefox-esr-68 = common rec {
pname = "firefox-esr";
ffversion = "68.0.2esr";
ffversion = "68.1.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0dyjayrbcq6dg8vmzbf7303aixnhpd6r777chxpdvqq892rgvw5q4f8yfb6pr8j978hahn4dz968vzmi6sp40y3hf62hnzdqpzd2bx1";
sha512 = "0n8iy9xwf8wldkknq3y3nlm0cmb48baamvz4wmmbpfb2kfrxbsj3wnnd9ayk9zxhrsdq0na9gvkc374mv06nyqijrahd67wljv08fx5";
};

patches = [
2 changes: 2 additions & 0 deletions pkgs/applications/networking/browsers/firefox/wrapper.nix
Original file line number Diff line number Diff line change
@@ -129,6 +129,8 @@ let
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
--set SNAP_NAME "firefox" \
--set MOZ_LEGACY_PROFILES 1 \
--set MOZ_ALLOW_DOWNGRADE 1 \
${lib.optionalString gdkWayland ''
--set GDK_BACKEND "wayland" \
''}${lib.optionalString (browser ? gtk3)
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
, cups, expat, udev, libnotify, libuuid
, cups, expat, udev, libnotify, libuuid, at-spi2-core
# Unfortunately this also overwrites the UI language (not just the spell
# checking language!):
, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
@@ -25,6 +25,7 @@ let
alsaLib
atk
at-spi2-atk
at-spi2-core
cairo
cups
dbus
@@ -57,11 +58,11 @@ let

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

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

phases = [ "unpackPhase" "installPhase" ];
Original file line number Diff line number Diff line change
@@ -24,11 +24,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
version = "60.8.0";
version = "60.9.0";

src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "1cd1ps4r70bnxn9kydljsp776dazfzfsghc5zwp1xz6p3cwb9g0gybj677sac7y3ma2wsq1xbqk20q35n7gjz3k1zzhmpxyii558rdl";
sha512 = "f59d48fba7fb8a4bf7cb160e6ca2508312a7fce950c12f133206935bcdb4c9844a9cb063aa3aae67c82562d2a51e123cc1f5bbad0238a1e5ce386c514295bdd1";
};

# from firefox, but without sound libraries
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" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "surfaceless" "wayland" "drm" ]
, OpenGL, Xplugin
}:

8 changes: 4 additions & 4 deletions pkgs/development/libraries/webkitgtk/default.nix
Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;

with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
version = "2.24.1";
pname = "webkitgtk";
version = "2.24.4";

meta = {
description = "Web content rendering engine, GTK+ port";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
};

src = fetchurl {
url = "https://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk";
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46";
};

patches = optionals stdenv.isDarwin [
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 {}))
8 changes: 8 additions & 0 deletions pkgs/os-specific/linux/systemd/default.nix
Original file line number Diff line number Diff line change
@@ -30,6 +30,14 @@ in stdenv.mkDerivation rec {
sha256 = "0aczg25ih2gfjq810x8rw6rnpr6sw1lz6z0lvlyw2qphyih68b4x";
};

patches = [
(fetchpatch {
name = "CVE-2019-15718.patch";
url = https://github.com/systemd/systemd/pull/13457/commits/35e528018f315798d3bffcb592b32a0d8f5162bd.patch;
sha256 = "0m0ypnnllx4r6a2qy1586as15i2qrzxwi1sqdp14rzdwajz1rvnv";
})
];

prePatch = let
# Upstream's maintenance branches are still too intrusive:
# https://github.com/systemd/systemd-stable/tree/v239-stable
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 ];