From dc1e9ee48df9c1b5513760ed658b01a735c5d109 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Mon, 21 Oct 2019 11:36:56 +0200
Subject: [PATCH 1/4] caf: 0.17.1 -> 0.17.2
---
pkgs/development/libraries/caf/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 4a4cba31735c..f49c7ca01387 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "actor-framework";
- version = "0.17.1";
+ version = "0.17.2";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = version;
- sha256 = "1xbq591m3v6pkz4z3dg2lsxr6bxv1lpz4yhdci3vi55y6x9pwyfw";
+ sha256 = "0z9qh580pa1mx9h48npwji24bjyqxm1w93wdcc4inmjzdmrqwzim";
};
nativeBuildInputs = [ cmake ];
From 53bd4ebd1799fa81330db873075cc477de5902be Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Fri, 30 Aug 2019 12:41:58 +0200
Subject: [PATCH 2/4] caf: enable openssl support
---
pkgs/development/libraries/caf/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index f49c7ca01387..e048e21aac28 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, openssl }:
stdenv.mkDerivation rec {
pname = "actor-framework";
@@ -13,11 +13,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
+ buildInputs = [ openssl ];
+
meta = with stdenv.lib; {
description = "An open source implementation of the actor model in C++";
homepage = http://actor-framework.org/;
license = licenses.bsd3;
platforms = platforms.unix;
- maintainers = with maintainers; [ bobakker ];
+ maintainers = with maintainers; [ bobakker tobim ];
};
}
From afcf63bc740210a77ba009bcc1efd19201030f93 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Fri, 30 Aug 2019 15:47:22 +0200
Subject: [PATCH 3/4] caf: disable examples
---
pkgs/development/libraries/caf/default.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index e048e21aac28..b0ca85ce69a0 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ];
+ cmakeFlags = [
+ "-DCAF_NO_EXAMPLES:BOOL=TRUE"
+ ];
+
meta = with stdenv.lib; {
description = "An open source implementation of the actor model in C++";
homepage = http://actor-framework.org/;
From f5d99970d09ed60831a997719404b8a26cd5f070 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Fri, 30 Aug 2019 15:48:51 +0200
Subject: [PATCH 4/4] caf: enable checks
---
pkgs/development/libraries/caf/default.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index b0ca85ce69a0..ebe89985977e 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
"-DCAF_NO_EXAMPLES:BOOL=TRUE"
];
+ doCheck = true;
+ checkTarget = "test";
+ preCheck = ''
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+ '';
+
meta = with stdenv.lib; {
description = "An open source implementation of the actor model in C++";
homepage = http://actor-framework.org/;