Commit 95964369 authored by Anderson Torres's avatar Anderson Torres
Browse files

argagg: 0.4.6 -> 0.4.7

parent dc69ed5a

pkgs/by-name/ar/argagg/0001-catch.diff

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
--- old/test/doctest.h	2019-03-05 18:04:06.143740733 +0300

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

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

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

             try {                                                                                  \

                 expr;                                                                              \

-            } catch(as) {                                                                          \

+            } catch(as e) {                                                                          \

                 _DOCTEST_RB.m_threw    = true;                                                     \

                 _DOCTEST_RB.m_threw_as = true;                                                     \

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

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

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

 

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

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

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

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

 

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

pkgs/by-name/ar/argagg/package.nix

+10 −15
Original line number Diff line number Diff line
@@ -4,27 +4,22 @@ 
, cmake

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "argagg";

  version = "0.4.6";

  version = "0.4.7";



  src = fetchFromGitHub {

    owner = "vietjtnguyen";

    repo = pname;

    rev = version;

    hash = "sha256-MCtlAPfwdJpgfS8IH+zlcgaaxZ5AsP4hJvbZAFtOa4o=";

    repo = "argagg";

    rev = finalAttrs.version;

    hash = "sha256-G0PzoKpUyb1MaziLvHgasq98jPODUu4EgPzywRjuIN8=";

  };



  patches = [

    # Fix compilation of macro catch statement

    ./0001-catch.diff

  ];



  nativeBuildInputs = [

    cmake

  ];



  meta = with lib; {

  meta = {

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

    description = "Argument Aggregator";

    longDescription = ''
@@ -38,9 +33,9 @@ stdenv.mkDerivation rec { 
      types until you access them, so the result structures end up just being

      pointers into the original command line argument C-strings.

    '';

    license = licenses.mit;

    maintainers = with maintainers; [ AndersonTorres ];

    platforms = with platforms; all;

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ AndersonTorres ];

    platforms = lib.platforms.all;

    badPlatforms = [ "aarch64-darwin" ];

  };

}
 
})