commit a8a3c4829071e20d191f318fbe520efe9b4d4d1d · pyrox.dev/nixpkgs

+12 -29
pkgs/by-name/ne/net-cpp/package.nix
···

       2
       2
        
         stdenv,

     

       3
       3
        
         lib,

     

       4
       4
        
         fetchFromGitLab,

     

       5
       5
       -
         fetchpatch,

     

       6
       5
        
         gitUpdater,

     

       6
       6
       +
         makeFontsConf,

     

       7
       7
        
         testers,

     

       8
       8
        
         # https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/issues/5

     

       9
       9
        
         boost186,

     
···

       19
       19
        
         properties-cpp,

     

       20
       20
        
         python3,

     

       21
       21
        
         validatePkgConfig,

     

       22
       22
       +
         writableTmpDirAsHomeHook,

     

       22
       23
        
       }:

     

       23
       24
        
       

     

       24
       25
        
       let

     
···

       30
       31
        
       in

     

       31
       32
        
       stdenv.mkDerivation (finalAttrs: {

     

       32
       33
        
         pname = "net-cpp";

     

       33
       33
       -
         version = "3.1.1";

     

       34
       34
       +
         version = "3.2.0";

     

       34
       35
        
       

     

       35
       36
        
         src = fetchFromGitLab {

     

       36
       37
        
           owner = "ubports";

     

       37
       38
        
           repo = "development/core/lib-cpp/net-cpp";

     

       38
       39
        
           rev = finalAttrs.version;

     

       39
       39
       -
           hash = "sha256-MSqdP3kGI9hDdxFv2a0yd5ZkFkf1lMurB+KDIZLR9jg=";

     

       40
       40
       +
           hash = "sha256-JfVSAwBWtHw7a0CtY5C1xuxThO3FbS4MgNuIO1CGuts=";

     

       40
       41
        
         };

     

       41
       42
        
       

     

       42
       43
        
         outputs = [

     
···

       45
       46
        
           "doc"

     

       46
       47
        
         ];

     

       47
       48
        
       

     

       48
       48
       -
         patches = [

     

       49
       49
       -
           # Be more lenient with how quickly HTTP test server must be up, for slower hardware / archs

     

       50
       50
       -
           (fetchpatch {

     

       51
       51
       -
             url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/941d9eceaa66a06eabb1eb79554548b47d4a60ab/debian/patches/1007_wait-for-flask.patch";

     

       52
       52
       -
             hash = "sha256-nsGkZBuqahsg70PLUxn5EluDjmfZ0/wSnOYimfAI4ag=";

     

       53
       53
       -
           })

     

       54
       54
       -
       

     

       55
       55
       -
           # Bump std version to 14 for gtest 1.13+

     

       56
       56
       -
           (fetchpatch {

     

       57
       57
       -
             url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f3a031eb7e4ce7df00781100f16de58a4709afcb/debian/patches/0001-Bump-std-version-to-14-needed-for-googletest-1.13.0.patch";

     

       58
       58
       -
             hash = "sha256-3ykqCfZjtTx7zWQ5rkMhVp7D5fkpoCjl0CVFwwEd4U4=";

     

       59
       59
       -
           })

     

       60
       60
       -
       

     

       61
       61
       -
           # Fix newer flask rejecting large chunks by default

     

       62
       62
       -
           (fetchpatch {

     

       63
       63
       -
             url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f2050b5318cba3860fa1042e9b81e1b792b972c4/debian/patches/1008_set-MAX-CONTENT-LENGTH-for-flask-server-to-let-it-accept-big-chunks-of-data.patch";

     

       64
       64
       -
             hash = "sha256-lfMRjpmysrhzdG6OOSpBGvYJCi1hrERI/SRf+rAakbA=";

     

       65
       65
       -
           })

     

       66
       66
       -
         ];

     

       67
       67
       -
       

     

       68
       49
        
         postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''

     

       69
       50
        
           # Use wrapped python. Removing just the /usr/bin doesn't seem to work?

     

       70
       51
        
           substituteInPlace tests/httpbin.h.in \

     
···

       78
       59
        
           doxygen

     

       79
       60
        
           graphviz

     

       80
       61
        
           validatePkgConfig

     

       62
       62
       +
           writableTmpDirAsHomeHook # makes doc generation quieter

     

       81
       63
        
         ];

     

       82
       64
        
       

     

       83
       65
        
         buildInputs = [

     
···

       99
       81
        
         ];

     

       100
       82
        
       

     

       101
       83
        
         cmakeFlags = [

     

       102
       102
       -
           # https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/issues/4

     

       103
       103
       -
           (lib.cmakeBool "ENABLE_WERROR" false)

     

       84
       84
       +
           (lib.cmakeBool "ENABLE_WERROR" true)

     

       104
       85
        
         ];

     

       105
       86
        
       

     

       87
       87
       +
         env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };

     

       88
       88
       +
       

     

       106
       89
        
         doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

     

       107
       90
        
       

     

       108
       91
        
         # Tests start HTTP server in separate process with fixed URL, parallelism breaks things

     
···

       113
       96
        
           updateScript = gitUpdater { };

     

       114
       97
        
         };

     

       115
       98
        
       

     

       116
       116
       -
         meta = with lib; {

     

       99
       99
       +
         meta = {

     

       117
       100
        
           description = "Simple yet beautiful networking API for C++11";

     

       118
       101
        
           homepage = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp";

     

       119
       102
        
           changelog = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/blob/${finalAttrs.version}/ChangeLog";

     

       120
       120
       -
           license = licenses.lgpl3Only;

     

       121
       121
       -
           teams = [ teams.lomiri ];

     

       122
       122
       -
           platforms = platforms.linux;

     

       103
       103
       +
           license = lib.licenses.lgpl3Only;

     

       104
       104
       +
           teams = [ lib.teams.lomiri ];

     

       105
       105
       +
           platforms = lib.platforms.linux;

     

       123
       106
        
           pkgConfigModules = [

     

       124
       107
        
             "net-cpp"

     

       125
       108
        
           ];