Merge staging-next into staging

2021-03-10 00:39:15 +00:00
parent 7db55b3aa5 149a81c88d
commit ae64aaa5c0
65 changed files with 1235 additions and 376 deletions
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils
-, pandoc, ethtool, iproute, libnl, udev, python, perl
+, pandoc, ethtool, iproute, libnl, udev, python3, perl
 , makeWrapper
 } :

@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
  };

  nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];
-  buildInputs = [ libnl ethtool iproute udev python perl ];
+  buildInputs = [ libnl ethtool iproute udev python3 perl ];

  cmakeFlags = [
    "-DCMAKE_INSTALL_RUNDIR=/run"