github-actions[bot]
2 years ago
committed by
GitHub
commit
629adb097a
@ -0,0 +1,34 @@ |
||||
--- |
||||
name: Build failure |
||||
about: Create a report to help us improve |
||||
title: '' |
||||
labels: '0.kind: build failure' |
||||
assignees: '' |
||||
|
||||
--- |
||||
|
||||
### Steps To Reproduce |
||||
Steps to reproduce the behavior: |
||||
1. build *X* |
||||
|
||||
### Build log |
||||
``` |
||||
log here if short otherwise a link to a gist |
||||
``` |
||||
|
||||
### Additional context |
||||
Add any other context about the problem here. |
||||
|
||||
### Notify maintainers |
||||
<!-- |
||||
Please @ people who are in the `meta.maintainers` list of the offending package or module. |
||||
If in doubt, check `git blame` for whoever last touched something. |
||||
--> |
||||
|
||||
### Metadata |
||||
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. |
||||
|
||||
```console |
||||
[user@system:~]$ nix-shell -p nix-info --run "nix-info -m" |
||||
output here |
||||
``` |
||||
@ -0,0 +1,14 @@ |
||||
diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt
|
||||
index f42748aa..ae339946 100644
|
||||
--- a/src/musikcube/CMakeLists.txt
|
||||
+++ b/src/musikcube/CMakeLists.txt
|
||||
@@ -98,9 +98,6 @@ else()
|
||||
endif()
|
||||
|
||||
if (APPLE)
|
||||
- message(STATUS "[ncurses] detected Darwin, linking statically")
|
||||
- set(CURSES_LIBRARY_NAME "lib${CURSES_LIBRARY_NAME}.a")
|
||||
- set(PANEL_LIBRARY_NAME "lib${PANEL_LIBRARY_NAME}.a")
|
||||
else()
|
||||
message(STATUS "[ncurses] not Darwin! will attempt to link against libtinfo")
|
||||
find_library(LIBTINFO NAMES tinfo)
|
||||
@ -0,0 +1,63 @@ |
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch |
||||
, cmake, pkg-config |
||||
, boost, miniupnpc, openssl, unbound |
||||
, zeromq, pcsclite, readline, libsodium, hidapi |
||||
, randomx, rapidjson |
||||
, easyloggingpp |
||||
, CoreData, IOKit, PCSC |
||||
, trezorSupport ? true, libusb1, protobuf, python3 |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "haven-cli"; |
||||
version = "2.2.3"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "haven-protocol-org"; |
||||
repo = "haven-main"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-nBVLNT0jWIewr6MPDGwDqXoVtyFLyls1IEQraVoWDQ4="; |
||||
fetchSubmodules = true; |
||||
}; |
||||
|
||||
patches = [ |
||||
./use-system-libraries.patch |
||||
]; |
||||
|
||||
postPatch = '' |
||||
# remove vendored libraries |
||||
rm -r external/{miniupnp,randomx,rapidjson,unbound} |
||||
# export patched source for haven-gui |
||||
cp -r . $source |
||||
''; |
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ]; |
||||
|
||||
buildInputs = [ |
||||
boost miniupnpc openssl unbound |
||||
zeromq pcsclite readline |
||||
libsodium hidapi randomx rapidjson |
||||
protobuf |
||||
readline easyloggingpp |
||||
] |
||||
++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; |
||||
|
||||
cmakeFlags = [ |
||||
"-DCMAKE_BUILD_TYPE=Release" |
||||
"-DUSE_DEVICE_TREZOR=ON" |
||||
"-DBUILD_GUI_DEPS=ON" |
||||
"-DReadline_ROOT_DIR=${readline.dev}" |
||||
"-DReadline_INCLUDE_DIR=${readline.dev}/include/readline" |
||||
"-DRandomX_ROOT_DIR=${randomx}" |
||||
] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; |
||||
|
||||
outputs = [ "out" "source" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "Haven Protocol is the world's only network of private stable asset"; |
||||
homepage = "https://havenprotocol.org/"; |
||||
license = licenses.bsd3; |
||||
platforms = platforms.all; |
||||
maintainers = with maintainers; [ kim0 ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,92 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index fb71d2d..3a710a4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -200,11 +200,11 @@ if(NOT MANUAL_SUBMODULES)
|
||||
endfunction ()
|
||||
|
||||
message(STATUS "Checking submodules")
|
||||
- check_submodule(external/miniupnp)
|
||||
- check_submodule(external/unbound)
|
||||
- check_submodule(external/rapidjson)
|
||||
+ # check_submodule(external/miniupnp)
|
||||
+ # check_submodule(external/unbound)
|
||||
+ # check_submodule(external/rapidjson)
|
||||
check_submodule(external/trezor-common)
|
||||
- check_submodule(external/randomx)
|
||||
+ # check_submodule(external/randomx)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -300,7 +300,8 @@ endif()
|
||||
# elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
|
||||
# set(BSDI TRUE)
|
||||
|
||||
-include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external)
|
||||
+include_directories(external/easylogging++ src contrib/epee/include external)
|
||||
+#include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external)
|
||||
|
||||
if(APPLE)
|
||||
include_directories(SYSTEM /usr/include/malloc)
|
||||
diff --git a/cmake/FindMiniupnpc.cmake b/cmake/FindMiniupnpc.cmake
|
||||
index ad2004a..7f4bb68 100644
|
||||
--- a/cmake/FindMiniupnpc.cmake
|
||||
+++ b/cmake/FindMiniupnpc.cmake
|
||||
@@ -37,7 +37,7 @@ set(MINIUPNP_STATIC_LIBRARIES ${MINIUPNP_STATIC_LIBRARY})
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(
|
||||
- MiniUPnPc DEFAULT_MSG
|
||||
+ Miniupnpc DEFAULT_MSG
|
||||
MINIUPNP_INCLUDE_DIR
|
||||
MINIUPNP_LIBRARY
|
||||
)
|
||||
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
||||
index 71b165f..10189ce 100644
|
||||
--- a/external/CMakeLists.txt
|
||||
+++ b/external/CMakeLists.txt
|
||||
@@ -37,19 +37,9 @@
|
||||
|
||||
find_package(Miniupnpc REQUIRED)
|
||||
|
||||
-message(STATUS "Using in-tree miniupnpc")
|
||||
-add_subdirectory(miniupnp/miniupnpc)
|
||||
-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
|
||||
-if(MSVC)
|
||||
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
|
||||
-elseif(NOT MSVC)
|
||||
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
|
||||
-endif()
|
||||
-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
|
||||
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
|
||||
-endif()
|
||||
-
|
||||
-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
|
||||
+set(UPNP_STATIC false PARENT_SCOPE)
|
||||
+set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE)
|
||||
+set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE)
|
||||
|
||||
find_package(Unbound)
|
||||
|
||||
@@ -80,4 +70,3 @@ endif()
|
||||
|
||||
add_subdirectory(db_drivers)
|
||||
add_subdirectory(easylogging++)
|
||||
-add_subdirectory(randomx EXCLUDE_FROM_ALL)
|
||||
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
|
||||
index c626e22..be570ed 100644
|
||||
--- a/src/p2p/net_node.inl
|
||||
+++ b/src/p2p/net_node.inl
|
||||
@@ -60,9 +60,9 @@
|
||||
#include "cryptonote_core/cryptonote_core.h"
|
||||
#include "net/parse.h"
|
||||
|
||||
-#include <miniupnp/miniupnpc/miniupnpc.h>
|
||||
-#include <miniupnp/miniupnpc/upnpcommands.h>
|
||||
-#include <miniupnp/miniupnpc/upnperrors.h>
|
||||
+#include <miniupnpc/miniupnpc.h>
|
||||
+#include <miniupnpc/upnpcommands.h>
|
||||
+#include <miniupnpc/upnperrors.h>
|
||||
|
||||
#undef MONERO_DEFAULT_LOG_CATEGORY
|
||||
#define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
|
||||
@ -0,0 +1,44 @@ |
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, roxctl }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "roxctl"; |
||||
version = "3.69.1"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "stackrox"; |
||||
repo = "stackrox"; |
||||
rev = version; |
||||
sha256 = "sha256-fB43C+gMtUOg/Ah1fOTnOWOUmS0TjXkNCzw/TKfMzj4="; |
||||
}; |
||||
|
||||
vendorSha256 = "sha256-M+ZueycJEaDVzC2bFwQc5EulCrdz6lvzyD8YCoGyW1g="; |
||||
|
||||
nativeBuildInputs = [ installShellFiles ]; |
||||
|
||||
subPackages = [ "roxctl" ]; |
||||
|
||||
ldflags = [ |
||||
"-s" |
||||
"-w" |
||||
"-X github.com/stackrox/rox/pkg/version/internal.MainVersion=${version}" |
||||
]; |
||||
|
||||
postInstall = '' |
||||
installShellCompletion --cmd roxctl \ |
||||
--bash <($out/bin/roxctl completion bash) \ |
||||
--fish <($out/bin/roxctl completion fish) \ |
||||
--zsh <($out/bin/roxctl completion zsh) |
||||
''; |
||||
|
||||
passthru.tests.version = testVersion { |
||||
package = roxctl; |
||||
command = "roxctl version"; |
||||
}; |
||||
|
||||
meta = with lib; { |
||||
description = "Command-line client of the StackRox Kubernetes Security Platform"; |
||||
license = licenses.asl20; |
||||
homepage = "https://www.stackrox.io"; |
||||
maintainers = with maintainers; [ stehessel ]; |
||||
}; |
||||
} |
||||
@ -1,48 +0,0 @@ |
||||
{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 |
||||
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts |
||||
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas |
||||
, curl, glib, gnome, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "feedreader"; |
||||
version = "2.11.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "jangernert"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "1agy1nkpkdsy2kbrrc8nrwphj5n86rikjjvwkr8klbf88mzl6civ"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
meson ninja pkg-config vala gettext appstream-glib desktop-file-utils |
||||
libxml2 python3 wrapGAppsHook |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
curl glib json-glib libnotify libsecret sqlite gumbo gtk3 |
||||
libgee libpeas gnome.libsoup librest webkitgtk gsettings-desktop-schemas |
||||
gnome-online-accounts |
||||
] ++ (with gst_all_1; [ |
||||
gstreamer gst-plugins-base gst-plugins-good |
||||
]); |
||||
|
||||
postPatch = '' |
||||
patchShebangs build-aux/meson_post_install.py |
||||
''; |
||||
|
||||
passthru = { |
||||
updateScript = nix-update-script { |
||||
attrPath = pname; |
||||
}; |
||||
}; |
||||
|
||||
meta = with lib; { |
||||
description = "A modern desktop application designed to complement existing web-based RSS accounts"; |
||||
homepage = "https://jangernert.github.io/FeedReader/"; |
||||
license = licenses.gpl3Plus; |
||||
maintainers = with maintainers; [ edwtjo ]; |
||||
platforms = platforms.linux; |
||||
}; |
||||
} |
||||
@ -0,0 +1,8 @@ |
||||
# Tests _for the testers_ |
||||
|
||||
cd nixpkgs |
||||
nix-build -A tests.testers |
||||
|
||||
Tests generally derive their own correctness from simplicity, which in the |
||||
case of testers (themselves functions) does not always work out. |
||||
Hence the need for tests that test the testers. |
||||
@ -0,0 +1,27 @@ |
||||
{ testers, lib, pkgs, ... }: |
||||
let |
||||
pkgs-with-overlay = pkgs.extend(final: prev: { |
||||
proof-of-overlay-hello = prev.hello; |
||||
}); |
||||
|
||||
dummyVersioning = { |
||||
revision = "test"; |
||||
versionSuffix = "test"; |
||||
label = "test"; |
||||
}; |
||||
|
||||
in |
||||
lib.recurseIntoAttrs { |
||||
# Check that the wiring of nixosTest is correct. |
||||
# Correct operation of the NixOS test driver should be asserted elsewhere. |
||||
nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, pkgs, figlet, ... }: { |
||||
name = "nixosTest-test"; |
||||
nodes.machine = { pkgs, ... }: { |
||||
system.nixos = dummyVersioning; |
||||
environment.systemPackages = [ pkgs.proof-of-overlay-hello figlet ]; |
||||
}; |
||||
testScript = '' |
||||
machine.succeed("hello | figlet >/dev/console") |
||||
''; |
||||
}); |
||||
} |
||||
@ -0,0 +1,39 @@ |
||||
{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "libgtkflow"; |
||||
version = "0.8.0"; |
||||
|
||||
src = fetchFromGitea { |
||||
domain = "notabug.org"; |
||||
owner = "grindhold"; |
||||
repo = pname; |
||||
rev = version; |
||||
hash = "sha256:1m30rvj5hx3b4cj8lbzrxv4j8lp3hx4jlb8vpf4rh46vc1rdkxpz"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
vala |
||||
meson |
||||
ninja |
||||
pkg-config |
||||
gobject-introspection |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
gtk3 |
||||
glib |
||||
]; |
||||
|
||||
mesonFlags = [ |
||||
"-Denable_valadoc=true" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Flow graph widget for GTK 3"; |
||||
homepage = "https://notabug.org/grindhold/libgtkflow"; |
||||
maintainers = with maintainers; [ grindhold ]; |
||||
license = licenses.lgpl3Plus; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
@ -0,0 +1,28 @@ |
||||
{ lib, stdenv, fetchFromGitea, cmake, pkg-config, ncurses, the-foundation }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "sealcurses"; |
||||
version = "unstable-2022-04-28"; # No release yet |
||||
|
||||
src = fetchFromGitea { |
||||
domain = "git.skyjake.fi"; |
||||
owner = "skyjake"; |
||||
repo = pname; |
||||
rev = "abf27cfd2567a0765aaa115cabab0abb7f862253"; |
||||
hash = "sha256-c4zi/orHyr1hkuEisqZ9V8SaiH1IoxIbeGMrLBEkZ0A="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ]; |
||||
|
||||
buildInputs = [ ncurses the-foundation ]; |
||||
|
||||
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "SDL Emulation and Adaptation Layer for Curses (ncursesw)"; |
||||
homepage = "https://git.skyjake.fi/skyjake/sealcurses"; |
||||
license = licenses.bsd2; |
||||
maintainers = with maintainers; [ sikmir ]; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
@ -0,0 +1,36 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitea |
||||
, cmake |
||||
, pkg-config |
||||
, curl |
||||
, libunistring |
||||
, openssl |
||||
, pcre |
||||
, zlib |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "the-foundation"; |
||||
version = "1.4.0"; |
||||
|
||||
src = fetchFromGitea { |
||||
domain = "git.skyjake.fi"; |
||||
owner = "skyjake"; |
||||
repo = "the_Foundation"; |
||||
rev = "v${version}"; |
||||
hash = "sha256-IHwWJryG4HcrW9Bf8KJrisCrbF86RBQj6Xl1HTmcr6k="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ]; |
||||
|
||||
buildInputs = [ curl libunistring openssl pcre zlib ]; |
||||
|
||||
meta = with lib; { |
||||
description = "Opinionated C11 library for low-level functionality"; |
||||
homepage = "https://git.skyjake.fi/skyjake/the_Foundation"; |
||||
license = licenses.bsd2; |
||||
maintainers = with maintainers; [ sikmir ]; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
@ -0,0 +1,42 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, pythonOlder |
||||
, pycryptodome |
||||
, python |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "sjcl"; |
||||
version = "0.2.1"; |
||||
|
||||
format = "setuptools"; |
||||
|
||||
# PyPi release is missing tests |
||||
src = fetchFromGitHub { |
||||
owner = "berlincode"; |
||||
repo = pname; |
||||
# commit from: 2018-08-16, because there aren't any tags on git |
||||
rev = "e8bdad312fa99c89c74f8651a1240afba8a9f3bd"; |
||||
sha256 = "1v8rc55v28v8cl7nxcavj34am005wi63zcvwnbc6pyfbv4ss30ab"; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ pycryptodome ]; |
||||
|
||||
checkPhase = '' |
||||
runHook preCheck |
||||
${python.interpreter} -m unittest discover |
||||
runHook postCheck |
||||
''; |
||||
|
||||
pythonImportsCheck = [ |
||||
"sjcl" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Decrypt and encrypt messages compatible to the \"Stanford Javascript Crypto Library (SJCL)\" message format. This is a wrapper around pycrypto."; |
||||
homepage = "https://github.com/berlincode/sjcl"; |
||||
license = licenses.bsd3; |
||||
maintainers = with maintainers; [ binsky ]; |
||||
}; |
||||
} |
||||
@ -1 +1 @@ |
||||
"0qqp05258s2ybzbxfklhya8zw9ha9crkxzwls2kfdhndlrdpgznl" |
||||
"1c8f7y580sq9495l2cxb2jkhgqs2wf0j3x073l1xnr9lv6crfvhn" |
||||
|
||||
@ -1 +1 @@ |
||||
"2.1.0" |
||||
"2.1.4" |
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue