commit 3630c6cb9cba6e835008145b82c507ad94615ec4 · pyrox.dev/nixpkgs

-31

pkgs/by-name/ov/ovn/0001-tests-Expect-musl-error-string-for-EIO-errno.patch

···

       1
       1
       -
       From d4ead86b2184d1fc2748ed2b6fae8c0dceaf76c8 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>

     

       3
       3
       -
       Date: Thu, 11 Sep 2025 23:37:28 -0400

     

       4
       4
       -
       Subject: [PATCH ovn 1/2] tests: Expect musl error string for EIO errno.

     

       5
       5
       -
       

     

       6
       6
       -
       Musl uses a slightly different string representation for the error,

     

       7
       7
       -
       which makes the test fail on cleanup because an unexpected warning is

     

       8
       8
       -
       observed in the service log.

     

       9
       9
       -
       

     

       10
       10
       -
       This patch will ignore both glibc and musl error messages.

     

       11
       11
       -
       

     

       12
       12
       -
       Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>

     

       13
       13
       -
       ---

     

       14
       14
       -
        tests/ovn-controller.at | 1 +

     

       15
       15
       -
        1 file changed, 1 insertion(+)

     

       16
       16
       -
       

     

       17
       17
       -
       diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at

     

       18
       18
       -
       index 0b00906ae..bec06e527 100644

     

       19
       19
       -
       --- a/tests/ovn-controller.at

     

       20
       20
       -
       +++ b/tests/ovn-controller.at

     

       21
       21
       -
       @@ -846,6 +846,7 @@ OVN_CLEANUP([hv1

     

       22
       22
       -
        /Certificate must be configured to use SSL/d

     

       23
       23
       -
        /SSL_read: error/d

     

       24
       24
       -
        /receive error: Input/d

     

       25
       25
       -
       +/receive error: I\/O error/d

     

       26
       26
       -
        /connection dropped/d

     

       27
       27
       -
        ])

     

       28
       28
       -
        AT_CLEANUP

     

       29
       29
       -
       -- 

     

       30
       30
       -
       2.50.1

     

       31
       31
       -

-37

pkgs/by-name/ov/ovn/0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch

···

       1
       1
       -
       From 44d9d58461e15314edf507d0379bff991d7e9964 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>

     

       3
       3
       -
       Date: Thu, 11 Sep 2025 23:40:51 -0400

     

       4
       4
       -
       Subject: [PATCH ovn 2/2] tests: Use localhost when setting "wrong" ovn-remote.

     

       5
       5
       -
       

     

       6
       6
       -
       In some isolated environments (e.g. in nixpkgs build sandbox), the

     

       7
       7
       -
       network namespace doesn't have any routes or interfaces but `lo`. In

     

       8
       8
       -
       this case, an attempt to connect to 192.168.0.10 results in ENETUNREACH,

     

       9
       9
       -
       producing an unexpected "Network unreachable" warning message in service

     

       10
       10
       -
       log file - breaking the test cleanup checks.

     

       11
       11
       -
       

     

       12
       12
       -
       Since the test case doesn't seem to care if the address is available, as

     

       13
       13
       -
       long as there is no SB database actually running at the configured

     

       14
       14
       -
       ovn-remote port, use the localhost address instead (which is always

     

       15
       15
       -
       present, even in the most isolated environments).

     

       16
       16
       -
       

     

       17
       17
       -
       Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>

     

       18
       18
       -
       ---

     

       19
       19
       -
        tests/ovn-controller.at | 2 +-

     

       20
       20
       -
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       21
       21
       -
       

     

       22
       22
       -
       diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at

     

       23
       23
       -
       index bec06e527..a8a9a2da2 100644

     

       24
       24
       -
       --- a/tests/ovn-controller.at

     

       25
       25
       -
       +++ b/tests/ovn-controller.at

     

       26
       26
       -
       @@ -404,7 +404,7 @@ check_sbdb_connection () {

     

       27
       27
       -
        

     

       28
       28
       -
        OVS_WAIT_UNTIL([check_sbdb_connection connected])

     

       29
       29
       -
        

     

       30
       30
       -
       -ovs-vsctl set open . external_ids:ovn-remote=tcp:192.168.0.10:6642

     

       31
       31
       -
       +ovs-vsctl set open . external_ids:ovn-remote=tcp:127.0.0.1:12345

     

       32
       32
       -
        OVS_WAIT_UNTIL([check_sbdb_connection 'not connected'])

     

       33
       33
       -
        

     

       34
       34
       -
        # reset the remote for clean-up

     

       35
       35
       -
       -- 

     

       36
       36
       -
       2.50.1

     

       37
       37
       -

+35 -20

pkgs/by-name/ov/ovn/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         autoreconfHook,

     

       6
       7
        
         libbpf,

     

       7
       8
        
         libcap_ng,

     
···

       13
       14
        
         python3,

     

       14
       15
        
         unbound,

     

       15
       16
        
         xdp-tools,

     

       17
       17
       +
         openvswitch,

     

       18
       18
       +
         makeWrapper,

     

       16
       19
        
       }:

     

       17
       20
        
       let

     

       18
       21
        
         withOpensslConfigureFlag = "--with-openssl=${lib.getLib openssl.dev}";

     
···

       29
       32
        
           fetchSubmodules = true;

     

       30
       33
        
         };

     

       31
       34
        
       

     

       35
       35
       +
         outputs = [

     

       36
       36
       +
           "out"

     

       37
       37
       +
           "lib"

     

       38
       38
       +
           "man"

     

       39
       39
       +
           "dev"

     

       40
       40
       +
           "tools"

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       32
       43
        
         patches = [

     

       33
       44
        
           # Fix test failure with musl libc.

     

       34
       34
       -
           # https://patchwork.ozlabs.org/project/ovn/patch/20250912035054.50593-1-ihar.hrachyshka@gmail.com/

     

       35
       35
       -
           ./0001-tests-Expect-musl-error-string-for-EIO-errno.patch

     

       45
       45
       +
           (fetchpatch {

     

       46
       46
       +
             url = "https://github.com/ovn-org/ovn/commit/d0b187905c45ce039163d18cc82869918946a41c.patch";

     

       47
       47
       +
             hash = "sha256-mTpNpH1ZSSMLtpZmy6jKjGDu84jL0ECr+HVh1PQzaVA=";

     

       48
       48
       +
           })

     

       36
       49
        
           # Fix sandbox test failure.

     

       37
       37
       -
           # https://patchwork.ozlabs.org/project/ovn/patch/20250912035054.50593-2-ihar.hrachyshka@gmail.com/

     

       38
       38
       -
           ./0002-tests-Use-localhost-when-setting-wrong-ovn-remote.patch

     

       50
       50
       +
           (fetchpatch {

     

       51
       51
       +
             url = "https://github.com/ovn-org/ovn/commit/b396babaa54ea0c8d943bbfef751dbdbf288c7af.patch";

     

       52
       52
       +
             hash = "sha256-RjWxT3EYKjGhtvCq3bAhKN9PrPTkSR72xPkQQ4SPWWU=";

     

       53
       53
       +
           })

     

       39
       54
        
         ];

     

       40
       55
        
       

     

       41
       56
        
         nativeBuildInputs = [

     

       42
       57
        
           autoreconfHook

     

       43
       58
        
           pkg-config

     

       44
       59
        
           python3

     

       60
       60
       +
           makeWrapper

     

       45
       61
        
         ];

     

       46
       62
        
       

     

       47
       63
        
         buildInputs = [

     
···

       83
       99
        
         ];

     

       84
       100
        
       

     

       85
       101
        
         postInstall = ''

     

       102
       102
       +
           moveToOutput 'share/ovn/bugtool-plugins' "$tools"

     

       103
       103
       +
           moveToOutput 'share/ovn/scripts/ovn-bugtool-*' "$tools"

     

       104
       104
       +
       

     

       105
       105
       +
           moveToOutput 'bin/ovn-detrace' "$tools"

     

       106
       106
       +
           moveToOutput 'bin/ovn_detrace*' "$tools"

     

       107
       107
       +
           moveToOutput 'bin/ovn-trace' "$tools"

     

       108
       108
       +
           moveToOutput 'bin/ovn-debug' "$tools"

     

       109
       109
       +
           moveToOutput 'bin/ovn-docker*' "$tools"

     

       110
       110
       +
       

     

       111
       111
       +
           sed -i '/chown -R $INSTALL_USER:$INSTALL_GROUP $ovn_etcdir/d' $out/share/ovn/scripts/ovn-ctl

     

       112
       112
       +
       

     

       86
       113
        
           mkdir -vp $out/share/openvswitch/scripts

     

       87
       87
       -
           mkdir -vp $out/etc/ovn

     

       88
       88
       -
           cp ovs/ovsdb/ovsdb-client $out/bin

     

       89
       89
       -
           cp ovs/ovsdb/ovsdb-server $out/bin

     

       90
       90
       -
           cp ovs/ovsdb/ovsdb-tool $out/bin

     

       91
       91
       -
           cp ovs/vswitchd/ovs-vswitchd $out/bin

     

       92
       92
       -
           cp ovs/utilities/ovs-appctl $out/bin

     

       93
       93
       -
           cp ovs/utilities/ovs-vsctl $out/bin

     

       94
       94
       -
           cp ovs/utilities/ovs-ctl $out/share/openvswitch/scripts

     

       95
       95
       -
           cp ovs/utilities/ovs-lib $out/share/openvswitch/scripts

     

       96
       96
       -
           cp ovs/utilities/ovs-kmod-ctl $out/share/openvswitch/scripts

     

       97
       97
       -
           cp ovs/vswitchd/vswitch.ovsschema $out/share/openvswitch

     

       98
       98
       -
           sed -i "s#/usr/local/etc#/var/lib#g" $out/share/openvswitch/scripts/ovs-lib

     

       99
       99
       -
           sed -i "s#/usr/local/bin#$out/bin#g" $out/share/openvswitch/scripts/ovs-lib

     

       100
       100
       -
           sed -i "s#/usr/local/sbin#$out/bin#g" $out/share/openvswitch/scripts/ovs-lib

     

       101
       101
       -
           sed -i "s#/usr/local/share#$out/share#g" $out/share/openvswitch/scripts/ovs-lib

     

       102
       102
       -
           sed -i '/chown -R $INSTALL_USER:$INSTALL_GROUP $ovn_etcdir/d' $out/share/ovn/scripts/ovn-ctl

     

       114
       114
       +
           ln -s ${openvswitch}/share/openvswitch/scripts/ovs-lib $out/share/openvswitch/scripts/ovs-lib

     

       115
       115
       +
       

     

       116
       116
       +
           wrapProgram $out/share/ovn/scripts/ovn-ctl \

     

       117
       117
       +
             --prefix PATH : ${lib.makeBinPath [ openvswitch ]}

     

       103
       118
        
         '';

     

       104
       119
        
       

     

       105
       120
        
         env = {