Merge pull request #306277 from adamcstephens/ovs/fix-python313 (0b868df4) · Commits · nix / nixpkgs

pkgs/os-specific/linux/openvswitch/generic.nix→pkgs/by-name/op/openvswitch/generic.nix

+43 −35

Original line number	Diff line number	Diff line
		{ version
		, hash
		, updateScriptArgs ? ""
		{
		version,
		hash,
		updateScriptArgs ? "",
		}:

		{ lib
		, stdenv
		, fetchurl
		, autoconf
		, automake
		, installShellFiles
		, iproute2
		, kernel ? null
		, libcap_ng
		, libtool
		, openssl
		, perl
		, pkg-config
		, procps
		, python3
		, sphinxHook
		, util-linux
		, which
		, writeScript
		{
		lib,
		stdenv,
		fetchurl,
		autoconf,
		automake,
		installShellFiles,
		iproute2,
		kernel ? null,
		libcap_ng,
		libtool,
		openssl,
		perl,
		pkg-config,
		procps,
		python3,
		sphinxHook,
		util-linux,
		which,
		writeScript,
		}:

		let
		_kernel = kernel;
		in stdenv.mkDerivation rec {
		in
		stdenv.mkDerivation rec {
		pname = "openvswitch";
		inherit version;

		@@ -45,6 +48,9 @@ in 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 = [
		@@ -56,9 +62,7 @@ in stdenv.mkDerivation rec {
		sphinxHook
		];

		sphinxBuilders = [
		"man"
		];
		sphinxBuilders = [ "man" ];

		sphinxRoot = "./Documentation";

		@@ -102,9 +106,9 @@ in stdenv.mkDerivation rec {
		patchShebangs tests/
		'';

		nativeCheckInputs = [
		iproute2
		] ++ (with python3.pkgs; [
		nativeCheckInputs =
		[ iproute2 ]
		++ (with python3.pkgs; [
		netaddr
		pyparsing
		pytest
		@@ -129,7 +133,11 @@ in stdenv.mkDerivation rec {
		'';
		homepage = "https://www.openvswitch.org/";
		license = licenses.asl20;
		maintainers = with maintainers; [ netixx kmcopper ];
		maintainers = with maintainers; [
		adamcstephens
		kmcopper
		netixx
		];
		platforms = platforms.linux;
		};
		}

pkgs/os-specific/linux/openvswitch/lts.nix→pkgs/by-name/op/openvswitch/lts.nix

+0 −0

File moved.

View file

pkgs/os-specific/linux/openvswitch/default.nix→pkgs/by-name/op/openvswitch/package.nix

+0 −0

File moved.

View file

pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch→pkgs/by-name/op/openvswitch/patches/disable-bash-arg-completion-test.patch

+0 −0

File moved.

View file

pkgs/by-name/op/openvswitch/patches/fix-python313.patch

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		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

Admin message