From c2c1aaa22a04501a12effb8043e2e20f3e8899ef Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Sat, 24 Aug 2024 12:32:49 +0000
Subject: [PATCH] openvswitch: 3.3.0 -> 3.4.0

https://github.com/openvswitch/ovs/blob/v3.4.0/NEWS
---
 pkgs/by-name/op/openvswitch/package.nix              |  7 ++-----
 .../op/openvswitch/patches/fix-python313.patch       | 12 ------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/by-name/op/openvswitch/patches/fix-python313.patch

diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index 63b0e0eb232c..4502031120c0 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -31,7 +31,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
-  version = "3.3.0";
+  version = "3.4.0";
 
   kernel = lib.optional (_kernel != null) _kernel.dev;
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     owner = "openvswitch";
     repo = "ovs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZO5qECVpsJ4lqFbGqD4eokHzkBQ3mawDVUBNdva76lo=";
+    hash = "sha256-oe6RnSEaK/mFPzTLfsyyd7wijKbv2/tlNUlXZYrb+ko=";
   };
 
   outputs = [
@@ -50,9 +50,6 @@ stdenv.mkDerivation rec {
   patches = [
     # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664)
     ./patches/disable-bash-arg-completion-test.patch
-
-    # https://github.com/openvswitch/ovs/commit/9185793e75435d890f18d391eaaeab0ade6f1415
-    ./patches/fix-python313.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openvswitch/patches/fix-python313.patch b/pkgs/by-name/op/openvswitch/patches/fix-python313.patch
deleted file mode 100644
index 0b68c0560d51..000000000000
--- a/pkgs/by-name/op/openvswitch/patches/fix-python313.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/vlog.at b/tests/vlog.at
-index 785014956e7..efe91479a63 100644
---- a/tests/vlog.at
-+++ b/tests/vlog.at
-@@ -8,6 +8,7 @@ AT_CHECK([$PYTHON3 $srcdir/test-vlog.py --log-file log_file \
- 
- AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \
- -e 's/File ".*", line [[0-9]][[0-9]]*,/File <name>, line <number>,/' \
-+-e '/\^\+/d' \
- stderr_log], [0], [dnl
-   0  | module_0 | EMER | emergency
-   1  | module_0 | ERR | error