diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-07 20:06:22 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-07 20:06:22 +0100 |
| commit | a823616723c44700a1c976fee77aafb470388e19 (patch) | |
| tree | 08c996bb7f020cda3aa27ef881b61b0d3807b383 /pkgs/os-specific | |
| parent | 7f8111955082b4aa7dce2718b9ef4d8ad0f4584b (diff) | |
| parent | c425a7e694ef48513e35b60a124587ef382b2fa6 (diff) | |
| download | nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.gz nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.bz2 nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.lz nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.xz nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.zst nixpkgs-a823616723c44700a1c976fee77aafb470388e19.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/ddcci/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index 6c3bc558fa8..a399ad7029f 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; + NIX_CFLAGS_COMPILE = [ "-Wno-error=incompatible-pointer-types" ]; + prePatch = '' substituteInPlace ./ddcci/Makefile \ --replace 'SUBDIRS="$(src)"' 'M=$(PWD)' \ diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index cb6768a348b..31771251fb3 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17165"; + rev = "17169"; sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789"; } , ... diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index eefa03d91cd..56ab1751a91 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "0.0.20191226"; + version = "0.0.20200105"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1q618h385kqnzxa8xswnw9i1yqrlnl3fglkhbzc8w1181qr4fhra"; + sha256 = "1b0amq4xjnl0bfxy6g0awbgnfymx3knd4ldai25z53j8f7d9xri7"; }; preConfigure = '' |