diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-18 17:55:04 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-18 17:55:04 +0200 |
commit | 4cf394ea3f173946363c40439b03ebcd92eb2bb4 (patch) | |
tree | 59d51185dc4aa583270396ce18fb2143a7e0fe1c /pkgs/os-specific/linux | |
parent | 9da079c6ff5e2870485ed014fe388a5c67997535 (diff) | |
parent | 0a84375ddb9c41fb5ffa9bf9785debcec84b0614 (diff) | |
download | nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.gz nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.bz2 nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.lz nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.xz nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.tar.zst nixpkgs-4cf394ea3f173946363c40439b03ebcd92eb2bb4.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/crda/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/gobi_loader/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 137e88cd6e8..979b7cf1deb 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3, wireless-regdb }: +{ stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }: stdenv.mkDerivation rec { pname = "crda"; @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libnl ]; nativeBuildInputs = [ pkgconfig - python3 - python3.pkgs.pycrypto + python3Packages.pycrypto ]; postPatch = '' diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/os-specific/linux/gobi_loader/default.nix index b79f8af6f8e..b8735354c2c 100644 --- a/pkgs/os-specific/linux/gobi_loader/default.nix +++ b/pkgs/os-specific/linux/gobi_loader/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Firmware loader for Qualcomm Gobi USB chipsets"; homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/"; license = with licenses; [ gpl2 ]; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index a2163ba323a..6cd63e0be6b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8-rc7"; - extraMeta.branch = "5.8"; + version = "5.9-rc1"; + extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1v6ch9lwbckmv66w6ysj24ap41pfxq55ssrfkg0qyz2pv0mc1rxc"; + sha256 = "08x6s4wydbrr4rqq3zfxq6qmnha4ikn7m9rmdqd42hmxl2ynqxla"; }; # Should the testing kernels ever be built on Hydra? |