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: 2dfae8e22fde
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: 51bc28fd29d6
Choose a head ref
  • 12 commits
  • 8 files changed
  • 5 contributors

Commits on Sep 16, 2019

  1. cross: use newer gnu-config on iOS 

    (cherry picked from commit 5a69a4e)
    @matthewbauer
    matthewbauer committed Sep 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    benjamn Ben Newman
    GPG key ID: 15D2E57778C1A4BF
    Verified
    Learn about vigilant mode
    Copy the full SHA
    db69c2d View commit details

  2. linux: 4.14.143 -> 4.14.144

    @NeQuissimus
    NeQuissimus committed Sep 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    benjamn Ben Newman
    GPG key ID: 15D2E57778C1A4BF
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b7905d7 View commit details

  3. linux: 4.19.72 -> 4.19.73

    @NeQuissimus
    NeQuissimus committed Sep 16, 2019

    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
    4106901 View commit details

  4. linux: 4.4.192 -> 4.4.193

    @NeQuissimus
    NeQuissimus committed Sep 16, 2019
    Copy the full SHA
    827adf3 View commit details

  5. linux: 4.9.192 -> 4.9.193

    @NeQuissimus
    NeQuissimus committed Sep 16, 2019
    Copy the full SHA
    b5632e3 View commit details

  6. linux: 5.2.14 -> 5.2.15

    @NeQuissimus
    NeQuissimus committed Sep 16, 2019
    Copy the full SHA
    5e61b9b View commit details

Commits on Sep 17, 2019

  1. firmwareLinuxNonfree: 20190312 -> 20190416 

    restore outputHash attributes, since I already have them...

(cherry picked from commit e50c71b)
    @dtzWill @fpletz
    dtzWill authored and fpletz committed Sep 17, 2019
    Copy the full SHA
    d456b70 View commit details

  2. firmwareLinuxNonfree: 2019-04-16 -> 2019-07-17 

    (cherry picked from commit 0557007)

Fixes #68770.
    @eadwu @fpletz
    eadwu authored and fpletz committed Sep 17, 2019
    Copy the full SHA
    73dc838 View commit details

Commits on Sep 18, 2019

  1. mdadm: fix path to sendmail 

    Without this, mdadm won't be able to send email notifications:

  $ sudo mdadm --monitor --scan --test
  sh: /nix/store/2v8jn0lxza72grcm6hciak9fpgm7xb3a-system-sendmail-1.0: Is a directory

Fixes: b074a40 ("mdadm: use shared system-sendmail")
(cherry picked from commit 6b3832a)
    @bjornfor
    bjornfor committed Sep 18, 2019
    Copy the full SHA
    c2d01c0 View commit details

Commits on Sep 19, 2019

  1. linux: 4.14.144 -> 4.14.145

    @NeQuissimus
    NeQuissimus committed Sep 19, 2019
    Copy the full SHA
    02602f8 View commit details

  2. linux: 4.19.73 -> 4.19.74

    @NeQuissimus
    NeQuissimus committed Sep 19, 2019
    Copy the full SHA
    ef50783 View commit details

  3. linux: 5.2.15 -> 5.2.16

    @NeQuissimus
    NeQuissimus committed Sep 19, 2019
    Copy the full SHA
    51bc28f View commit details
10 changes: 7 additions & 3 deletions pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,19 +2,23 @@

stdenv.mkDerivation rec {
name = "firmware-linux-nonfree-${version}";
version = "2019-03-12";
version = "2019-07-17";

src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = "20190312";
sha256 = "1wk8l75rg7idvsyli29a1fii4xwz3vnm8d65fjw8d3azihdrhbyy";
rev = "20190717";
sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj";
};

installFlags = [ "DESTDIR=$(out)" ];

# Firmware blobs do not need fixing and should not be modified
dontFixup = true;

outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "1q3zqa3xxg4679p893xzwpa43afvdnnkg5xb0qs6mac75sizngid";

meta = with stdenv.lib; {
description = "Binary firmware collection packaged by kernel.org";
homepage = http://packages.debian.org/sid/firmware-linux-nonfree;
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.143";
version = "4.14.145";

# 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 = "14rxck0dd0rirj09aj4xsbylcvvfrgqxr1fx0c570dxr7kqg4d15";
sha256 = "0aa9b7ni6wadm43260vidqy4ngvws25027psbdnkl9hkcy0ba1gb";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.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.19.72";
version = "4.19.74";

# 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 = "0v8zypwyc9bcmm16hbvk092h9qnwqc0f6m61bz2ml499pnrvdz7r";
sha256 = "10pfg5sijw9sx66ybrb06nlmlvj0sxxa1yjhg6qwdhi9sgm2yp29";
};
} // (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, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.192";
version = "4.4.193";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0fwak1hrahcky1hdk4h8693rjpx65c2sqzfm1x71nhhysa6r3fig";
sha256 = "13iy0xyrqqagnrk7msp1qfw6xsc0dlc74dpdzki9rfsxcildxz3a";
};
} // (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, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.192";
version = "4.9.193";
extraMeta.branch = "4.9";

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

buildLinux (args // rec {
version = "5.2.14";
version = "5.2.16";

# 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 = "136fs0pn5acg40rlq51zl5001rk8fx01gi2ffd58cspfgx3kckf6";
sha256 = "0xg5jnkmc7b552jrhi200ck7q4hql3az2fpjfwxj3ay8xp4n280c";
};
} // (args.argsOverride or {}))
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/mdadm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -e 's@/lib/udev@''${out}/lib/udev@' \
-e 's@ -Werror @ @' \
-e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile
-e 's@/usr/sbin/sendmail@${system-sendmail}/bin/sendmail@' -i Makefile
'';

meta = with stdenv.lib; {
2 changes: 1 addition & 1 deletion pkgs/stdenv/cross/default.nix
View file
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ in lib.init bootStages ++ [
(hostPlatform.isLinux && !buildPlatform.isLinux)
[ buildPackages.patchelf ]
++ lib.optional
(let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
(let f = p: !p.isx86 || p.libc == "musl" || p.isiOS; in f hostPlatform && !(f buildPlatform))
buildPackages.updateAutotoolsGnuConfigScriptsHook
# without proper `file` command, libtool sometimes fails
# to recognize 64-bit DLLs