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: 878531fbdbbe
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: 2d05858567ed
Choose a head ref
  • 12 commits
  • 4 files changed
  • 3 contributors

Commits on Aug 13, 2019

  1. signal-desktop: 1.25.3 -> 1.26.0 

    (cherry picked from commit cfe629e)
    @primeos
    primeos committed Aug 13, 2019
    Copy the full SHA
    fce4f8d View commit details

  2. linux_testing (5.2.0-rc1): fix build, include 'cpio' in nativeBuildIn… 

    …puts

81d4e65 automatically bumped
linux_testing to 5.2.0-rc1, but the 5.2 merge window included a new
feature adding compressed headers for compiled kernels into
/proc/kheaders.tar.xz

See torvalds/linux@43d8ce9

This feature requires 'cpio' to now be included in nativeBuildInputs
since it's used to construct that archive.

This wasn't caught by Hydra since we turn off build of linuxPackages,
but ideally we should at least build the kernel in the future
(linux_testing itself.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit c117aa3)
    @thoughtpolice @NeQuissimus
    thoughtpolice authored and NeQuissimus committed Aug 13, 2019
    Copy the full SHA
    b2f2830 View commit details

  3. linux: Add 5.2 

    Update linuxPackages_latest to 5.2

(cherry picked from commit 3df683c)
    @NeQuissimus
    NeQuissimus committed Aug 13, 2019
    Copy the full SHA
    6c8c2be View commit details

  4. linux: 5.2 -> 5.2.1 

    (cherry picked from commit a62fa2f)
    @NeQuissimus
    NeQuissimus committed Aug 13, 2019
    Copy the full SHA
    15e893e View commit details

  5. linux: 5.2.1 -> 5.2.2 

    (cherry picked from commit e1309f7)
    @NeQuissimus
    NeQuissimus committed Aug 13, 2019
    Copy the full SHA
    1721bea View commit details

  6. linux: 5.2.2 -> 5.2.3 

    (cherry picked from commit 2295a3c)
    @NeQuissimus
    NeQuissimus committed Aug 13, 2019
    Copy the full SHA
    762fddd View commit details

  7. linux: 5.2.3 -> 5.2.4 

    (cherry picked from commit d3433f7)
    @NeQuissimus
    NeQuissimus committed Aug 13, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f5d58b7 View commit details

  8. linux: 5.2.4 -> 5.2.5 

    (cherry picked from commit 9d8e811)
    @NeQuissimus
    NeQuissimus committed Aug 13, 2019
    Copy the full SHA
    1b68795 View commit details

  9. linux: 5.2.5 -> 5.2.6 

    (cherry picked from commit d95b118)
    @NeQuissimus
    NeQuissimus committed Aug 13, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4fdfa92 View commit details

  10. linux: 5.2.6 -> 5.2.7 

    (cherry picked from commit 2082dbd)
    @NeQuissimus
    NeQuissimus committed Aug 13, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    896f160 View commit details

  11. linux: 5.2.7 -> 5.2.8 

    (cherry picked from commit 2da00ae)
    @NeQuissimus
    NeQuissimus committed Aug 13, 2019
    Copy the full SHA
    e88e9e6 View commit details

  12. Merge pull request #66560 from primeos/signal-desktop-backport 

    [19.03] signal-desktop: 1.25.3 -> 1.26.0 (backport)
    @primeos
    primeos authored Aug 13, 2019
    Copy the full SHA
    2d05858 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -57,11 +57,11 @@ let

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

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0f7pip4d97xixwf667xpi50r0r65givvmry862zhp2cq24bs0693";
sha256 = "17g5yxr6ydc4rlbqc3r3876jis1x7mw496skc098n4q4f0m2ih24";
};

phases = [ "unpackPhase" "installPhase" ];
18 changes: 18 additions & 0 deletions pkgs/os-specific/linux/kernel/linux-5.2.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:

with stdenv.lib;

buildLinux (args // rec {
version = "5.2.8";

# 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;

# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0dv91zfjkil29lp2l35lswkrhrqbc4kjh965ciaqwih1rh3cs9x1";
};
} // (args.argsOverride or {}))
9 changes: 5 additions & 4 deletions pkgs/os-specific/linux/kernel/manual-config.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf
, libelf, cpio
, utillinux
, writeTextFile
}:
@@ -277,10 +277,11 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches

depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ]
++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
++ optional (stdenv.lib.versionAtLeast version "5.2") cpio
;

hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];
11 changes: 10 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -14753,6 +14753,14 @@ in
];
};

linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.export_kernel_fpu_functions
];
};

linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -14936,7 +14944,7 @@ in
linux = linuxPackages.kernel;

# Update this when adding the newest kernel major version!
linuxPackages_latest = linuxPackages_5_1;
linuxPackages_latest = linuxPackages_5_2;
linux_latest = linuxPackages_latest.kernel;

# Build the kernel modules for the some of the kernels.
@@ -14947,6 +14955,7 @@ in
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1);
linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2);

# When adding to this list:
# - Update linuxPackages_latest to the latest version