public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-10-17 08:04:22 +02:00
parent 71f67f178d 1ba50fe163
commit 18fcc337af
351 changed files with 8830 additions and 5150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/cryptodev/default.nix
View File

@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
"http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz"
"http://download.gna.org/cryptodev-linux/${pname}.tar.gz"
];
sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z";
};
@@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Device that allows access to Linux kernel cryptographic drivers";
homepage = http://home.gna.org/cryptodev-linux/;
homepage = http://cryptodev-linux.org/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
broken = !stdenv.lib.versionOlder kernel.version "4.13";

4
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@@ -7,7 +7,7 @@
}:
let
# Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
version = "1.1.1";
version = "1.1.2";
python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
name = "fwupd-${version}";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "0szakfnp6pl8vv3ivb40p5j8pxapfp724a55s2dr1qzzdlbjd08s";
sha256 = "1qhg8h1dv9k3i0429j0wl37rpxfbahggfd1j8s7a4cw83k42cgfs";
};
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];

4
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "raspberrypi-firmware-${version}";
version = "1.20180817";
version = "1.20180919";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "0cjlgs7y0x7wjvbz6046017yb9r9wkjrxksvlnc6i9mgdjcryqqm";
sha256 = "0aw5fzz7kr18cc4phdn81g45swkpaf4022sgi72pq2q6zzqnrdg4";
};
installPhase = ''

6
pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "raspberrypi-tools-${version}";
version = "2018-02-05";
version = "2018-10-03";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "userland";
rev = "a343dcad1dae4e93f4bfb99496697e207f91027e";
sha256 = "1z4qrwjb7x3a45mx978q8vyhnx068sgzhymm4z0ayhckji4ngal1";
rev = "de4a7f2e3c391e2d3bc76af31864270e7802d9ac";
sha256 = "0w96xa98ngdk9m6wv185w8waa7wm2hkn2bhxz52zd477hchzrxlg";
};
patches = [ ./tools-dont-install-sysv-init-scripts.patch ];

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.75";
version = "4.14.76";
# 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 = "084176rl51ls0dhy39vpj9fhasm4436iqv6aa0s5a74g1cixg4sh";
sha256 = "1gl2wkq4sazvpr0xnn4vrajj3j7w6hfiwdiy34y7jhlazyj1jgzf";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.18.nix
View File

@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.18.13";
version = "4.18.14";
# 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 = "0l4n72gajgw2vqghl6ps0yjy1safnypyzkcp841zkkwinp3a31yw";
sha256 = "1lv2hpxzlk1yzr5dcjb0q0ylvlwx4ln2jvfvf01b9smr1lvd3iin";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.160";
version = "4.4.161";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1i0wqccab2xxjsx58pgzgbmm5cclfd3hh3yjasnfrqsdaarxvgkd";
sha256 = "11rz66qvbcb6y3fz9k04jzn547sqdahqknd43imsr9sjgkaq60xy";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.132";
version = "4.9.133";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1lz53r6p293y5fwx7pz9ymj9sss3wmip8hcc48zwkcwm8phnmrk7";
sha256 = "0qv5n8vipkqcd0hpf5l41h023n46rgja39h895phlcxs4p00ywsk";
};
} // (args.argsOverride or {}))

6
pkgs/os-specific/linux/kernel/linux-mptcp.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
buildLinux (rec {
mptcpVersion = "0.94";
modDirVersion = "4.14.24";
mptcpVersion = "0.94.1";
modDirVersion = "4.14.70";
version = "${modDirVersion}-mptcp_v${mptcpVersion}";
# autoModules= true;
@@ -15,7 +15,7 @@ buildLinux (rec {
owner = "multipath-tcp";
repo = "mptcp";
rev = "v${mptcpVersion}";
sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv";
sha256 = "13mi672jr1x463kzig1hi9cpdi8x6nqdfd4bqlrjn8zca48f4ln4";
};
extraConfig = ''

6
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
let
modDirVersion = "4.14.62";
tag = "1.20180817";
modDirVersion = "4.14.70";
tag = "1.20180919";
in
lib.overrideDerivation (buildLinux (args // rec {
version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ lib.overrideDerivation (buildLinux (args // rec {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}-1";
sha256 = "17k7c9hcp834qmlpllag8jc6xhym9wkr5lck1vr0y2wlcxccwnaz";
sha256 = "1zjvzk6rhrn3ngc012gjq3v7lxn8hy89ljb7fqwld5g7py9lkf0b";
};
defconfig = {

6
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec {
version = "4.19-rc7";
modDirVersion = "4.19.0-rc7";
version = "4.19-rc8";
modDirVersion = "4.19.0-rc8";
extraMeta.branch = "4.19";
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "0wjh62vfhvi2prz9sx9c0s0f9sa9z1775qn4jf8zz5y5isixzdml";
sha256 = "1xw8grzn4i4b2vprfwi4p4003n7rr9725dbiqyrl8w1pm11jwpin";
};
# Should the testing kernels ever be built on Hydra?