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: 9bd45dddf817
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: 19a0543c6284
Choose a head ref
  • 8 commits
  • 8 files changed
  • 6 contributors

Commits on Feb 15, 2019

  1. firefox: 60.5.0 -> 60.5.1

    (cherry picked from commit 0f2226a)
    andir committed Feb 15, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    Copy the full SHA
    657d92e View commit details
  2. thunderbird-bin: 60.5.0 -> 60.5.1

    (cherry picked from commit 3c35745)
    andir committed Feb 15, 2019
    Copy the full SHA
    cd88dcb View commit details
  3. Merge #55852: elfutils: 0.175 -> 0.176

    Fixes six security CVE issues.
    
    (cherry picked from commit 1ca67d2)
    vcunat committed Feb 15, 2019
    Copy the full SHA
    72aaa06 View commit details
  4. kernel: Remove 4.18.x

    4.18 series is EOL
    
    (cherry picked from commit ff4bf60)
    NeQuissimus authored and vcunat committed Feb 15, 2019
    Copy the full SHA
    14ce178 View commit details

Commits on Feb 16, 2019

  1. linux_hardkernel_4_14: don't apply interpreter-trunc patch

    The only 4.14.y versions that need the patch are 4.14.99 and 4.14.100.
    
    (cherry picked from commit 60b5347)
    lopsided98 authored and samueldr committed Feb 16, 2019
    Copy the full SHA
    e181504 View commit details
  2. linux: Drop the interpreter truncation patch

    All usage has been removed from the stable branche; upstream having
    updated with a revert.
    samueldr committed Feb 16, 2019
    Copy the full SHA
    526b34a View commit details
  3. Merge #55832: thunderbird*: 60.5.0 -> 60.5.1

    ... into release-18.09
    vcunat committed Feb 16, 2019
    Copy the full SHA
    7892372 View commit details
  4. unifi: 5.9.29 -> 5.10.17

    (cherry picked from commit 04a1f84)
    0x4A6F authored and flokli committed Feb 16, 2019
    Copy the full SHA
    19a0543 View commit details

Large diffs are not rendered by default.

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.5.0";
version = "60.5.1";

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

# from firefox, but without sound libraries
4 changes: 2 additions & 2 deletions pkgs/development/tools/misc/elfutils/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
name = "elfutils-${version}";
version = "0.175";
version = "0.176";

src = fetchurl {
url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
sha256 = "0nx6nzbk0rw3pxbzxsfvrjjh37hibzd2gjz5bb8wccpf85ar5vzp";
sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb";
};

patches = [ ./debug-info-from-env.patch ];
44 changes: 0 additions & 44 deletions pkgs/os-specific/linux/kernel/interpreter-trunc.patch

This file was deleted.

18 changes: 0 additions & 18 deletions pkgs/os-specific/linux/kernel/linux-4.18.nix

This file was deleted.

7 changes: 0 additions & 7 deletions pkgs/os-specific/linux/kernel/patches.nix
Original file line number Diff line number Diff line change
@@ -57,11 +57,4 @@ rec {
sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv";
};
};

# https://github.com/NixOS/nixpkgs/issues/53672
# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cb5b020a8d38f77209d0472a0fea755299a8ec78
interpreter-trunc = {
name = "interpreter-trunc";
patch = ./interpreter-trunc.patch;
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/unifi/default.nix
Original file line number Diff line number Diff line change
@@ -49,8 +49,8 @@ in rec {
};

unifiStable = generic {
version = "5.9.29";
sha256 = "0djdjh7lwaa5nvhvz2yh6dn07iad5nq4jpab7rc909sljl6wvwvx";
version = "5.10.17";
sha256 = "0mkbyz14c0i435afj4wyhnp45hbhvmhvcg02yxd2xs3zmcr8sjgz";
};

unifiTesting = unifiStable;
12 changes: 0 additions & 12 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -14107,16 +14107,6 @@ with pkgs;
];
};

linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
# kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
];
};

linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
@@ -14163,7 +14153,6 @@ with pkgs;
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.interpreter-trunc
];
};

@@ -14330,7 +14319,6 @@ with pkgs;
linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
# Don't forget to update linuxPackages_latest!