commit 9e0a40f27c0aab4d05584d4c0d45083b02895a8c · pyrox.dev/nixpkgs

+20

pkgs/development/libraries/argagg/0001-catch.diff

···

       1
       1
       +
       --- old/test/doctest.h	2019-03-05 18:04:06.143740733 +0300

     

       2
       2
       +
       +++ new/test/doctest.h	2019-03-05 18:04:43.577284916 +0300

     

       3
       3
       +
       @@ -1307,7 +1307,7 @@

     

       4
       4
       +
                                                               __FILE__, __LINE__, #expr, #as);            \

     

       5
       5
       +
                    try {                                                                                  \

     

       6
       6
       +
                        expr;                                                                              \

     

       7
       7
       +
       -            } catch(as) {                                                                          \

     

       8
       8
       +
       +            } catch(as e) {                                                                          \

     

       9
       9
       +
                        _DOCTEST_RB.m_threw    = true;                                                     \

     

       10
       10
       +
                        _DOCTEST_RB.m_threw_as = true;                                                     \

     

       11
       11
       +
                    } catch(...) { _DOCTEST_RB.m_threw = true; }                                           \

     

       12
       12
       +
       @@ -1332,7 +1332,7 @@

     

       13
       13
       +
        #define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS)

     

       14
       14
       +
        

     

       15
       15
       +
        #define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS)

     

       16
       16
       +
       -#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS)

     

       17
       17
       +
       +#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, const ex &, DT_CHECK_THROWS_AS)

     

       18
       18
       +
        #define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS)

     

       19
       19
       +
        

     

       20
       20
       +
        #define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW)

+46

pkgs/development/libraries/argagg/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       stdenv.mkDerivation rec {

     

       8
       8
       +
         pname = "argagg";

     

       9
       9
       +
         version = "0.4.6";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "vietjtnguyen";

     

       13
       13
       +
           repo = pname;

     

       14
       14
       +
           rev = version;

     

       15
       15
       +
           hash = "sha256-MCtlAPfwdJpgfS8IH+zlcgaaxZ5AsP4hJvbZAFtOa4o=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         patches = [

     

       19
       19
       +
           # Fix compilation of macro catch statement

     

       20
       20
       +
           ./0001-catch.diff

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           cmake

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         meta = with lib; {

     

       28
       28
       +
           homepage = "https://github.com/vietjtnguyen/argagg";

     

       29
       29
       +
           description = "Argument Aggregator";

     

       30
       30
       +
           longDescription = ''

     

       31
       31
       +
             argagg is yet another C++ command line argument/option parser. It was

     

       32
       32
       +
             written as a simple and idiomatic alternative to other frameworks like

     

       33
       33
       +
             getopt, Boost program options, TCLAP, and others. The goal is to achieve

     

       34
       34
       +
             the majority of argument parsing needs in a simple manner with an easy to

     

       35
       35
       +
             use API. It operates as a single pass over all arguments, recognizing

     

       36
       36
       +
             flags prefixed by - (short) or -- (long) and aggregating them into easy to

     

       37
       37
       +
             access structures with lots of convenience functions. It defers processing

     

       38
       38
       +
             types until you access them, so the result structures end up just being

     

       39
       39
       +
             pointers into the original command line argument C-strings.

     

       40
       40
       +
           '';

     

       41
       41
       +
           license = licenses.mit;

     

       42
       42
       +
           maintainers = with maintainers; [ AndersonTorres ];

     

       43
       43
       +
           platforms = with platforms; all;

     

       44
       44
       +
           badPlatforms = [ "aarch64-darwin" ];

     

       45
       45
       +
         };

     

       46
       46
       +
       }

pkgs/top-level/all-packages.nix

···

       1709
       1709
        
       

     

       1710
       1710
        
         apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {};

     

       1711
       1711
        
       

     

       1712
       1712
       +
         argagg = callPackage ../development/libraries/argagg { };

     

       1713
       1713
       +
       

     

       1712
       1714
        
         argtable = callPackage ../development/libraries/argtable { };

     

       1713
       1715
        
       

     

       1714
       1716
        
         arguments = callPackage ../development/libraries/arguments { };