commit 8d25f9f0286f514b4856e227f95f506bc7934ee7 · pyrox.dev/nixpkgs

maintainers/maintainer-list.nix

···

       21571
       21571
        
           github = "i-am-logger";

     

       21572
       21572
        
           githubId = 1440852;

     

       21573
       21573
        
         };

     

       21574
       21574
       +
         rebmit = {

     

       21575
       21575
       +
           name = "Lu Wang";

     

       21576
       21576
       +
           email = "rebmit@rebmit.moe";

     

       21577
       21577
       +
           github = "rebmit";

     

       21578
       21578
       +
           githubId = 188659765;

     

       21579
       21579
       +
         };

     

       21574
       21580
        
         reckenrode = {

     

       21575
       21581
        
           name = "Randy Eckenrode";

     

       21576
       21582
        
           email = "randy@largeandhighquality.com";

+14 -14

pkgs/by-name/mt/mtxclient/package.nix

···

       12
       12
        
         openssl,

     

       13
       13
        
         re2,

     

       14
       14
        
         spdlog,

     

       15
       15
       +
         gtest,

     

       15
       16
        
       }:

     

       16
       17
        
       

     

       17
       17
       -
       stdenv.mkDerivation rec {

     

       18
       18
       +
       stdenv.mkDerivation (finalAttrs: {

     

       18
       19
        
         pname = "mtxclient";

     

       19
       20
        
         version = "0.10.1";

     

       20
       21
        
       

     

       21
       22
        
         src = fetchFromGitHub {

     

       22
       23
        
           owner = "Nheko-Reborn";

     

       23
       24
        
           repo = "mtxclient";

     

       24
       24
       -
           rev = "v${version}";

     

       25
       25
       +
           rev = "v${finalAttrs.version}";

     

       25
       26
        
           hash = "sha256-Y0FMCq4crSbm0tJtYq04ZFwWw+vlfxXKXBo0XUgf7hw=";

     

       26
       27
        
         };

     

       27
       28
        
       

     

       28
       28
       -
         postPatch = ''

     

       29
       29
       -
           # See https://github.com/gabime/spdlog/issues/1897

     

       30
       30
       -
           sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt

     

       31
       31
       -
         '';

     

       29
       29
       +
         patches = [

     

       30
       30
       +
           ./remove-network-tests.patch

     

       31
       31
       +
         ];

     

       32
       32
        
       

     

       33
       33
        
         cmakeFlags = [

     

       34
       34
       -
           # Network requiring tests can't be disabled individually:

     

       35
       35
       -
           # https://github.com/Nheko-Reborn/mtxclient/issues/22

     

       36
       36
       -
           "-DBUILD_LIB_TESTS=OFF"

     

       37
       37
       -
           "-DBUILD_LIB_EXAMPLES=OFF"

     

       34
       34
       +
           (lib.cmakeBool "BUILD_LIB_TESTS" finalAttrs.finalPackage.doCheck)

     

       35
       35
       +
           (lib.cmakeBool "BUILD_LIB_EXAMPLES" false)

     

       38
       36
        
         ];

     

       39
       37
        
       

     

       40
       38
        
         nativeBuildInputs = [

     
···

       53
       51
        
           spdlog

     

       54
       52
        
         ];

     

       55
       53
        
       

     

       54
       54
       +
         checkInputs = [ gtest ];

     

       55
       55
       +
       

     

       56
       56
       +
         doCheck = true;

     

       57
       57
       +
       

     

       56
       58
        
         meta = with lib; {

     

       57
       59
        
           description = "Client API library for the Matrix protocol";

     

       58
       60
        
           homepage = "https://github.com/Nheko-Reborn/mtxclient";

     
···

       60
       62
        
           maintainers = with maintainers; [

     

       61
       63
        
             fpletz

     

       62
       64
        
             pstn

     

       65
       65
       +
             rebmit

     

       63
       66
        
             rnhmjoj

     

       64
       67
        
           ];

     

       65
       68
        
           platforms = platforms.all;

     

       66
       66
       -
           # Should be fixable if a higher clang version is used, see:

     

       67
       67
       -
           # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177

     

       68
       68
       -
           broken = stdenv.hostPlatform.isDarwin;

     

       69
       69
        
         };

     

       70
       70
       -
       }

     

       70
       70
       +
       })

+77

pkgs/by-name/mt/mtxclient/remove-network-tests.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index 9d9f92932246ebec8ab5d1cc462366a17818d014..ce27390bd754a33986188dd2bf29cd0c818c2d58 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -398,36 +398,6 @@ if(BUILD_LIB_TESTS)

     

       6
       6
       +
        

     

       7
       7
       +
        	file(COPY tests/fixtures DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

     

       8
       8
       +
        

     

       9
       9
       +
       -	add_executable(client_api tests/client_api.cpp)

     

       10
       10
       +
       -	target_link_libraries(client_api

     

       11
       11
       +
       -		MatrixClient::MatrixClient

     

       12
       12
       +
       -		GTest::GTest

     

       13
       13
       +
       -		GTest::Main)

     

       14
       14
       +
       -	target_include_directories(client_api PRIVATE

     

       15
       15
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/tests)

     

       16
       16
       +
       -

     

       17
       17
       +
       -	add_executable(media_api tests/media_api.cpp)

     

       18
       18
       +
       -	target_link_libraries(media_api

     

       19
       19
       +
       -		MatrixClient::MatrixClient

     

       20
       20
       +
       -		GTest::GTest

     

       21
       21
       +
       -		GTest::Main)

     

       22
       22
       +
       -	target_include_directories(media_api PRIVATE

     

       23
       23
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/tests)

     

       24
       24
       +
       -

     

       25
       25
       +
       -	add_executable(e2ee tests/e2ee.cpp)

     

       26
       26
       +
       -	target_link_libraries(e2ee

     

       27
       27
       +
       -		MatrixClient::MatrixClient

     

       28
       28
       +
       -		GTest::GTest

     

       29
       29
       +
       -		GTest::Main)

     

       30
       30
       +
       -	target_include_directories(e2ee PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)

     

       31
       31
       +
       -

     

       32
       32
       +
       -	add_executable(device tests/device.cpp)

     

       33
       33
       +
       -	target_link_libraries(device

     

       34
       34
       +
       -		MatrixClient::MatrixClient

     

       35
       35
       +
       -		GTest::GTest

     

       36
       36
       +
       -		GTest::Main)

     

       37
       37
       +
       -	target_include_directories(device PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)

     

       38
       38
       +
       -

     

       39
       39
       +
        	add_executable(utils tests/utils.cpp)

     

       40
       40
       +
        	target_link_libraries(utils

     

       41
       41
       +
        		MatrixClient::MatrixClient

     

       42
       42
       +
       @@ -435,21 +405,6 @@ if(BUILD_LIB_TESTS)

     

       43
       43
       +
        		GTest::Main)

     

       44
       44
       +
        	target_include_directories(utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)

     

       45
       45
       +
        

     

       46
       46
       +
       -	add_executable(pushrules tests/pushrules.cpp)

     

       47
       47
       +
       -	target_link_libraries(pushrules

     

       48
       48
       +
       -		MatrixClient::MatrixClient

     

       49
       49
       +
       -		GTest::GTest

     

       50
       50
       +
       -		GTest::Main)

     

       51
       51
       +
       -	target_include_directories(pushrules PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)

     

       52
       52
       +
       -

     

       53
       53
       +
       -	add_executable(connection tests/connection.cpp)

     

       54
       54
       +
       -	target_link_libraries(connection

     

       55
       55
       +
       -		MatrixClient::MatrixClient

     

       56
       56
       +
       -		GTest::GTest

     

       57
       57
       +
       -		GTest::Main)

     

       58
       58
       +
       -	target_include_directories(connection PRIVATE

     

       59
       59
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/tests)

     

       60
       60
       +
       -

     

       61
       61
       +
        	add_executable(identifiers tests/identifiers.cpp)

     

       62
       62
       +
        	target_link_libraries(identifiers

     

       63
       63
       +
        		MatrixClient::MatrixClient

     

       64
       64
       +
       @@ -498,13 +453,7 @@ if(BUILD_LIB_TESTS)

     

       65
       65
       +
        		GTest::GTest

     

       66
       66
       +
        		GTest::Main)

     

       67
       67
       +
        

     

       68
       68
       +
       -	add_test(BasicConnectivity connection)

     

       69
       69
       +
       -	add_test(ClientAPI client_api)

     

       70
       70
       +
       -	add_test(MediaAPI media_api)

     

       71
       71
       +
       -	add_test(Encryption e2ee)

     

       72
       72
       +
       -	add_test(Devices device)

     

       73
       73
       +
        	add_test(Utilities utils)

     

       74
       74
       +
       -	add_test(Pushrules pushrules)

     

       75
       75
       +
        	add_test(Identifiers identifiers)

     

       76
       76
       +
        	add_test(Errors errors)

     

       77
       77
       +
        	add_test(CryptoStructs crypto)

+22

pkgs/by-name/nh/nheko/fix-darwin-build.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index 4ff134c53877d5aa2e00e3c344eb5c6783cccb2f..164553d34152639c6a2c5319c2a03d7a25c33ba3 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -974,16 +974,11 @@ endif()

     

       6
       6
       +
        

     

       7
       7
       +
        # potential workaround for macdeployqt issues

     

       8
       8
       +
        if(APPLE)

     

       9
       9
       +
       +    set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")

     

       10
       10
       +
            install(TARGETS nheko

     

       11
       11
       +
                BUNDLE  DESTINATION .

     

       12
       12
       +
                RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

     

       13
       13
       +
            )

     

       14
       14
       +
       -    qt_generate_deploy_qml_app_script(

     

       15
       15
       +
       -        TARGET nheko

     

       16
       16
       +
       -        OUTPUT_SCRIPT deploy_script

     

       17
       17
       +
       -        NO_UNSUPPORTED_PLATFORM_ERROR

     

       18
       18
       +
       -    )

     

       19
       19
       +
       -    install(SCRIPT ${deploy_script})

     

       20
       20
       +
        endif()

     

       21
       21
       +
        

     

       22
       22
       +
        if(UNIX AND NOT APPLE)

+23 -21

pkgs/by-name/nh/nheko/package.nix

···

       5
       5
        
         cmake,

     

       6
       6
        
         asciidoc,

     

       7
       7
        
         pkg-config,

     

       8
       8
       -
         boost,

     

       9
       8
        
         cmark,

     

       10
       9
        
         coeurl,

     

       11
       10
        
         curl,

     
···

       23
       22
        
         libnice,

     

       24
       23
        
         qt6Packages,

     

       25
       24
        
         fetchpatch,

     

       25
       25
       +
         withVoipSupport ? stdenv.hostPlatform.isLinux,

     

       26
       26
        
       }:

     

       27
       27
        
       

     

       28
       28
       -
       stdenv.mkDerivation rec {

     

       28
       28
       +
       stdenv.mkDerivation (finalAttrs: {

     

       29
       29
        
         pname = "nheko";

     

       30
       30
        
         version = "0.12.1";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchFromGitHub {

     

       33
       33
        
           owner = "Nheko-Reborn";

     

       34
       34
        
           repo = "nheko";

     

       35
       35
       -
           rev = "v${version}";

     

       35
       35
       +
           rev = "v${finalAttrs.version}";

     

       36
       36
        
           hash = "sha256-WlWxe4utRSc9Tt2FsnhBwxzQsoDML2hvm3g5zRnDEiU=";

     

       37
       37
        
         };

     

       38
       38
        
       

     
···

       42
       42
        
             url = "https://github.com/Nheko-Reborn/nheko/commit/2769642d3c7bd3c0d830b2f18ef6b3bf6a710bf4.patch";

     

       43
       43
        
             hash = "sha256-y8aiS6h5CSJYBdsAH4jYhAyrFug7aH2H8L6rBfULnQQ=";

     

       44
       44
        
           })

     

       45
       45
       +
           ./fix-darwin-build.patch

     

       45
       46
        
         ];

     

       46
       47
        
       

     

       47
       48
        
         nativeBuildInputs = [

     
···

       53
       54
        
         ];

     

       54
       55
        
       

     

       55
       56
        
         buildInputs = [

     

       56
       56
       -
           boost

     

       57
       57
        
           cmark

     

       58
       58
        
           coeurl

     

       59
       59
        
           curl

     
···

       65
       65
        
           nlohmann_json

     

       66
       66
        
           olm

     

       67
       67
        
           qt6Packages.qtbase

     

       68
       68
       +
           qt6Packages.qtdeclarative

     

       68
       69
        
           qt6Packages.qtimageformats

     

       69
       70
        
           qt6Packages.qtkeychain

     

       70
       71
        
           qt6Packages.qtmultimedia

     

       72
       72
       +
           qt6Packages.qtsvg

     

       71
       73
        
           qt6Packages.qttools

     

       72
       72
       -
           qt6Packages.qtwayland

     

       73
       74
        
           qt6Packages.qt-jdenticon

     

       74
       75
        
           re2

     

       75
       76
        
           spdlog

     

       76
       77
        
         ]

     

       77
       77
       -
         ++ (with gst_all_1; [

     

       78
       78
       -
           gstreamer

     

       79
       79
       -
           gst-plugins-base

     

       80
       80
       -
           (gst-plugins-good.override { qt6Support = true; })

     

       81
       81
       -
           gst-plugins-bad

     

       78
       78
       +
         ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       79
       79
       +
           qt6Packages.qtwayland

     

       80
       80
       +
         ]

     

       81
       81
       +
         ++ lib.optionals withVoipSupport [

     

       82
       82
       +
           gst_all_1.gstreamer

     

       83
       83
       +
           gst_all_1.gst-plugins-base

     

       84
       84
       +
           (gst_all_1.gst-plugins-good.override { qt6Support = true; })

     

       85
       85
       +
           gst_all_1.gst-plugins-bad

     

       82
       86
        
           libnice

     

       83
       83
       -
         ]);

     

       87
       87
       +
         ];

     

       84
       88
        
       

     

       85
       89
        
         cmakeFlags = [

     

       86
       86
       -
           "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389

     

       90
       90
       +
           (lib.cmakeBool "VOIP" withVoipSupport)

     

       87
       91
        
         ];

     

       88
       92
        
       

     

       89
       93
        
         preFixup = ''

     

       90
       90
       -
           # add gstreamer plugins path to the wrapper

     

       91
       94
        
           # unset QT_STYLE_OVERRIDE to avoid showing a blank window when started

     

       92
       95
        
           # https://github.com/NixOS/nixpkgs/issues/333009

     

       93
       93
       -
           qtWrapperArgs+=(

     

       94
       94
       -
             --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"

     

       95
       95
       -
             --unset QT_STYLE_OVERRIDE

     

       96
       96
       -
           )

     

       96
       96
       +
           qtWrapperArgs+=(--unset QT_STYLE_OVERRIDE)

     

       97
       97
       +
         ''

     

       98
       98
       +
         + lib.optionalString withVoipSupport ''

     

       99
       99
       +
           # add gstreamer plugins path to the wrapper

     

       100
       100
       +
           qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

     

       97
       101
        
         '';

     

       98
       102
        
       

     

       99
       103
        
         meta = with lib; {

     
···

       104
       108
        
           maintainers = with maintainers; [

     

       105
       109
        
             ekleog

     

       106
       110
        
             fpletz

     

       111
       111
       +
             rebmit

     

       107
       112
        
             rnhmjoj

     

       108
       113
        
           ];

     

       109
       114
        
           platforms = platforms.all;

     

       110
       110
       -
           # Should be fixable if a higher clang version is used, see:

     

       111
       111
       -
           # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177

     

       112
       112
       -
           broken = stdenv.hostPlatform.isDarwin;

     

       113
       115
        
         };

     

       114
       114
       -
       }

     

       116
       116
       +
       })