Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-02-02 19:46:31 +01:00
51 changed files with 540 additions and 267 deletions
@@ -8,12 +8,12 @@ let
_kernel = kernel;
pythonEnv = python3.withPackages (ps: with ps; [ six ]);
in stdenv.mkDerivation rec {
version = "2.14.0";
version = "2.14.1";
pname = "openvswitch";
src = fetchurl {
url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz";
sha256 = "0q52k6mq1jfsv0ix55mjd5ljlalhklhqfrma3l61dzhgihmfawa1";
sha256 = "sha256-GAttQsCrSybyH1i4vzszdiA9dHWqeo7xUTZVFMNQiP4=";
};
kernel = optional (_kernel != null) _kernel.dev;