sternenseemann
2 years ago
commit
5d91721366
@ -0,0 +1,38 @@ |
||||
{ lib, fetchFromGitHub, fetchpatch, buildGoModule, testers, temporal-cli }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "temporal-cli"; |
||||
version = "1.16.1"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "temporalio"; |
||||
repo = "tctl"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-WNdu/62/VmxTmzAvzx3zIlcAAlEmpN0yKzQOSUtrL8s="; |
||||
}; |
||||
|
||||
patches = [ |
||||
# Fix tests |
||||
(fetchpatch { |
||||
name = "fix-tests.patch"; |
||||
url = "https://github.com/temporalio/tctl/pull/203/commits/2b113da137a3a925e8fbd7c18bdaaefc31397db4.patch"; |
||||
sha256 = "sha256-HFPwbmLZ2uPHzaHvYoB4MTZvMVyzvUKggA76/bh50DQ="; |
||||
}) |
||||
]; |
||||
|
||||
vendorSha256 = "sha256-WF3T+HNisfR0JoKkHCC77kmHmsGZ9NfQ7UCwOmpCG/o="; |
||||
|
||||
ldflags = [ "-s" "-w" ]; |
||||
|
||||
passthru.tests.version = testers.testVersion { |
||||
package = temporal-cli; |
||||
}; |
||||
|
||||
meta = with lib; { |
||||
description = "Temporal CLI"; |
||||
homepage = "https://temporal.io"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ aaronjheng ]; |
||||
mainProgram = "tctl"; |
||||
}; |
||||
} |
||||
@ -0,0 +1,11 @@ |
||||
--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
@@ -89,7 +89,7 @@
|
||||
#if PLATFORM(WAYLAND)
|
||||
if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) {
|
||||
#if USE(WPE_RENDERER)
|
||||
- wpe_loader_init("libWPEBackend-fdo-1.0.so.1");
|
||||
+ wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1");
|
||||
if (AcceleratedBackingStoreWayland::checkRequirements()) {
|
||||
parameters.hostClientFileDescriptor = IPC::Attachment(UnixFileDescriptor(wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt));
|
||||
parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name()));
|
||||
@ -1,24 +1,41 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchurl |
||||
, fetchFromGitHub |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
, six |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "mox"; |
||||
version = "0.5.3"; |
||||
version = "0.7.8"; |
||||
format = "setuptools"; |
||||
|
||||
src = fetchurl { |
||||
url = "http://pymox.googlecode.com/files/${pname}-${version}.tar.gz"; |
||||
sha256 = "4d18a4577d14da13d032be21cbdfceed302171c275b72adaa4c5997d589a5030"; |
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "ivancrneto"; |
||||
repo = "pymox"; |
||||
rev = "v${version}"; |
||||
hash = "sha256-gODE9IGDk3WtO8iPOlp98fGp6Ih2laA3YlOHmq62m8Y="; |
||||
}; |
||||
|
||||
# error: invalid command 'test' |
||||
doCheck = false; |
||||
propagatedBuildInputs = [ |
||||
six |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ |
||||
"mox" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://pymox.readthedocs.io/"; |
||||
description = "A mock object framework for Python"; |
||||
description = "Mock object framework"; |
||||
homepage = "https://github.com/ivancrneto/pymox"; |
||||
license = licenses.asl20; |
||||
maintainers = with maintainers; [ ]; |
||||
}; |
||||
|
||||
} |
||||
|
||||
@ -1,22 +1,22 @@ |
||||
diff --git a/shared/utils.c b/shared/utils.c
|
||||
index c978a1f..d2c36cd 100644
|
||||
index 453e277..28716a5 100644
|
||||
--- a/shared/utils.c
|
||||
+++ b/shared/utils.c
|
||||
@@ -52,7 +52,7 @@ nm_find_ipsec (void)
|
||||
@@ -39,7 +39,7 @@ check_ipsec_daemon(const char *path)
|
||||
const char *
|
||||
nm_find_ipsec(void)
|
||||
{
|
||||
static const char *ipsec_binary_paths[] =
|
||||
{
|
||||
- "/sbin/ipsec",
|
||||
+ "@strongswan@/bin/ipsec",
|
||||
"/usr/sbin/ipsec",
|
||||
"/usr/local/sbin/ipsec",
|
||||
"/sbin/strongswan",
|
||||
@@ -77,7 +77,7 @@ nm_find_l2tpd (void)
|
||||
{
|
||||
static const char *l2tp_binary_paths[] =
|
||||
{
|
||||
- "/sbin/xl2tpd",
|
||||
+ "@xl2tpd@/bin/xl2tpd",
|
||||
"/usr/sbin/xl2tpd",
|
||||
"/usr/local/sbin/xl2tpd",
|
||||
NULL
|
||||
- static const char *ipsec_binary_paths[] = {"/usr/bin/ipsec",
|
||||
+ static const char *ipsec_binary_paths[] = {"@strongswan@/bin/ipsec",
|
||||
"/sbin/ipsec",
|
||||
"/usr/sbin/ipsec",
|
||||
"/usr/local/sbin/ipsec",
|
||||
@@ -70,7 +70,7 @@ nm_find_l2tpd(NML2tpL2tpDaemon *l2tp_daemon)
|
||||
"/usr/local/sbin/kl2tpd",
|
||||
NULL};
|
||||
|
||||
- static const char *xl2tp_binary_paths[] = {"/usr/bin/xl2tpd",
|
||||
+ static const char *xl2tp_binary_paths[] = {"@xl2tpd@/bin/xl2tpd",
|
||||
"/sbin/xl2tpd",
|
||||
"/usr/sbin/xl2tpd",
|
||||
"/usr/local/sbin/xl2tpd",
|
||||
|
||||
Loading…
Reference in new issue