Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-05-22 06:00:59 +00:00
committed by GitHub
24 changed files with 667 additions and 714 deletions

View File

@@ -11154,6 +11154,12 @@
githubId = 15742918;
name = "Sergey Kuznetsov";
};
kvendingoldo = {
email = "kvendingoldo@gmail.com";
github = "kvendingoldo";
githubId = 11614750;
name = "Alexander Sharov";
};
kwohlfahrt = {
email = "kai.wohlfahrt@gmail.com";
github = "kwohlfahrt";
@@ -14750,6 +14756,12 @@
githubId = 6930756;
name = "Nicolas Mattia";
};
nmishin = {
email = "sanduku.default@gmail.com";
github = "Nmishin";
githubId = 4242897;
name = "Nikolai Mishin";
};
noaccos = {
name = "Francesco Noacco";
email = "francesco.noacco2000@gmail.com";

File diff suppressed because it is too large Load Diff

View File

@@ -1,22 +1,20 @@
{ lib, stdenv, fetchFromGitHub
, cmake, pkg-config
, boost179, miniupnpc, openssl, unbound
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, boost, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
, randomx, rapidjson
, easyloggingpp
, randomx, rapidjson, easyloggingpp
, CoreData, IOKit, PCSC
, trezorSupport ? true, libusb1, protobuf, python3
}:
stdenv.mkDerivation rec {
pname = "haven-cli";
version = "3.0.7";
version = "3.3.4";
src = fetchFromGitHub {
owner = "haven-protocol-org";
repo = "haven-main";
rev = "v${version}";
sha256 = "sha256-HLZ9j75MtF7FkHA4uefkrYp07pVZe1Ac1wny7T0CMpA=";
sha256 = "sha256-jKeLFWJDwS8WWRynkDgBjvjq2EDpTEJadwkNsANQXws=";
fetchSubmodules = true;
};
@@ -26,39 +24,38 @@ stdenv.mkDerivation rec {
postPatch = ''
# remove vendored libraries
rm -r external/{miniupnp,randomx,rapidjson,unbound}
rm -r external/{miniupnp,randomx,rapidjson}
# export patched source for haven-gui
cp -r . $source
# fix build on aarch64-darwin
substituteInPlace CMakeLists.txt --replace "-march=x86-64" ""
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
boost179 miniupnpc openssl unbound
boost miniupnpc openssl unbound
zeromq pcsclite readline
libsodium hidapi randomx rapidjson
protobuf
readline easyloggingpp
]
protobuf readline easyloggingpp
] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]
++ lib.optionals trezorSupport [ libusb1 protobuf python3 ];
cmakeFlags = [
"-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";
] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"
++ lib.optional (!trezorSupport) "-DUSE_DEVICE_TREZOR=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 ];
description = "Haven Protocol is the world's only network of private stable asset";
homepage = "https://havenprotocol.org/";
license = licenses.bsd3;
platforms = platforms.all;
badPlatforms = [ "x86_64-darwin" ];
maintainers = with maintainers; [ kim0 ];
mainProgram = "haven-wallet-cli";
};
}

View File

@@ -2,19 +2,18 @@ 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)
@@ -364,10 +364,10 @@ 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)
check_submodule(external/supercop)
endif()
endif()
@@ -45,13 +44,15 @@ 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 @@
@@ -37,21 +37,9 @@
find_package(Miniupnpc REQUIRED)
-message(STATUS "Using in-tree miniupnpc")
-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
-add_subdirectory(miniupnp/miniupnpc)
-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
-if(MSVC)
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
-elseif(NOT MSVC)
@@ -68,10 +69,11 @@ index 71b165f..10189ce 100644
find_package(Unbound)
@@ -80,4 +70,3 @@ endif()
@@ -69,5 +69,4 @@ endif()
add_subdirectory(db_drivers)
add_subdirectory(easylogging++)
add_subdirectory(qrcodegen)
-add_subdirectory(randomx EXCLUDE_FROM_ALL)
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index c626e22..be570ed 100644

View File

@@ -16,7 +16,7 @@
}:
let
rev = "87ecb45eebf345a2f60bdca47e9073ec833f7737";
rev = "14180dcfa42a50e5365175a1bf5dc9dd8db196eb";
python = python3.withPackages (ps: with ps; [
epc
orjson
@@ -28,13 +28,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
version = "20240516.145";
version = "20240520.1548";
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
inherit rev;
hash = "sha256-s0Tvvo4NO2GJrKSfE7XNuI1OBkf2bLRvaJilVWjyyE0=";
hash = "sha256-HIOIHvcazCeyAlMoVSPl8uVXh5zI+UuoNNJgIhFO6BY=";
};
commit = rev;

View File

@@ -16,13 +16,13 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.9.31";
version = "0.9.32";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "refs/tags/v${version}";
hash = "sha256-g3O+jWLwMBNfk0vAi/wq/YnGTAIscDJH2QV7bequyNU=";
hash = "sha256-7UROYXmDDWW/NFmKy3h1PfkQGB74DogcgTQXGXojY4U=";
};
# No tests

View File

@@ -5,11 +5,11 @@
let
pname = "codux";
version = "15.26.0";
version = "15.27.0";
src = fetchurl {
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
sha256 = "sha256-jja9WYfirltjBdJNCQONowVjMTg0aj265Sjq57qSjbc=";
sha256 = "sha256-FsTGBms98jZZP0QSJwjoGMyuK4Pgcpl1htrDSdp52lU=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };

View File

@@ -38,9 +38,9 @@ buildGoModule rec {
meta = {
changelog = "https://github.com/tofuutils/tenv/releases/tag/v${version}";
description = "A version manager for OpenTofu, Terraform and Terragrunt written in Go";
homepage = "https://github.com/tofuutils/tenv";
description = "OpenTofu, Terraform, Terragrunt and Atmos version manager written in Go";
homepage = "https://tofuutils.github.io/tenv";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ rmgpinto ];
maintainers = with lib.maintainers; [ rmgpinto nmishin kvendingoldo ];
};
}

View File

@@ -27,14 +27,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xemu";
version = "0.7.121";
version = "0.7.122";
src = fetchFromGitHub {
owner = "xemu-project";
repo = "xemu";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-VcztVzG/IN9N0SVKj6BipyqnhxXC2nTTuMjKMtFKzGw=";
hash = "sha256-TxtkLdUSIbDu9uqPq4s64HtXFyT3ntN8Su9bEGPS3f0=";
};
nativeBuildInputs =

View File

@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zpaqfranz";
version = "59.4";
version = "59.6";
src = fetchFromGitHub {
owner = "fcorbelli";
repo = "zpaqfranz";
rev = finalAttrs.version;
hash = "sha256-tdkb/qyxpgORC8UcyDl3giGrU1VI0BAriBN7jDNBJzA=";
hash = "sha256-qDiFYVIaMEETYPDX+zIix+Si4RHsEveBhZXeAEALO2I=";
};
nativeBuildInputs = [

View File

@@ -1,48 +1,50 @@
{ lib
, pythonOlder
, pythonAtLeast
, asynctest
, buildPythonPackage
, docutils
, fetchFromGitHub
, imaplib2
, mock
, nose
, pyopenssl
, pytestCheckHook
, pytz
, tzlocal
{
lib,
asynctest,
buildPythonPackage,
docutils,
fetchFromGitHub,
imaplib2,
mock,
pyopenssl,
pytestCheckHook,
pythonAtLeast,
pythonOlder,
pytz,
setuptools,
tzlocal,
}:
buildPythonPackage rec {
pname = "aioimaplib";
version = "1.0.1";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bamthomas";
repo = pname;
rev = version;
repo = "aioimaplib";
rev = "refs/tags/${version}";
hash = "sha256-7Ta0BhtQSm228vvUa5z+pzM3UC7+BskgBNjxsbEb9P0=";
};
# https://github.com/bamthomas/aioimaplib/issues/54
doCheck = pythonOlder "3.11";
build-system = [ setuptools ];
nativeCheckInputs = [
asynctest
docutils
imaplib2
mock
nose
pyopenssl
pytestCheckHook
pytz
tzlocal
];
# https://github.com/bamthomas/aioimaplib/issues/54
doCheck = pythonOlder "3.11";
disabledTests = [
# https://github.com/bamthomas/aioimaplib/issues/77
"test_get_quotaroot"
@@ -50,9 +52,7 @@ buildPythonPackage rec {
"test_idle"
];
pythonImportsCheck = [
"aioimaplib"
];
pythonImportsCheck = [ "aioimaplib" ];
meta = with lib; {
description = "Python asyncio IMAP4rev1 client library";

View File

@@ -1,18 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, coverage }:
buildPythonPackage rec {
pname = "cov-core";
version = "1.15.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a";
};
propagatedBuildInputs = [ coverage ];
meta = with lib; {
description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov";
};
}

View File

@@ -54,5 +54,8 @@ buildPythonPackage rec {
homepage = "https://www.djangoproject.com/";
license = licenses.bsd3;
maintainers = with maintainers; [ georgewhewell ];
knownVulnerabilities = [
"Support for Django 3.2 ended on 2024-04-01, see https://www.djangoproject.com/download/#supported-versions."
];
};
}

View File

@@ -1,33 +1,35 @@
{ lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock
, pytest-xdist, cov-core, glibcLocales }:
{
lib,
buildPythonPackage,
fetchPypi,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "dyn";
version = "1.8.6";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-933etYrKRgSqJfOMIuIDL4Uv4/RdSEFMNWFtW5qiPpA=";
hash = "sha256-933etYrKRgSqJfOMIuIDL4Uv4/RdSEFMNWFtW5qiPpA=";
};
buildInputs = [ glibcLocales ];
build-system = [ setuptools ];
nativeCheckInputs = [
pytest
pytest-cov
mock
pytest-xdist
cov-core
];
# Disable checks because they are not stateless and require internet access.
# Module has no tests
doCheck = false;
LC_ALL="en_US.UTF-8";
pythonImportsCheck = [ "dyn" ];
meta = with lib; {
description = "Dynect dns lib";
homepage = "https://dyn.readthedocs.org/en/latest/intro.html";
homepage = "https://dyn.readthedocs.org";
changelog = "https://github.com/dyninc/dyn-python/blob/${version}/HISTORY.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}

View File

@@ -0,0 +1,33 @@
{
buildPythonPackage,
fetchFromGitHub,
flit-core,
lib,
pytestCheckHook
}:
buildPythonPackage rec {
pname = "esper";
version = "3.2";
pyproject = true;
src = fetchFromGitHub {
owner = "benmoran56";
repo = "esper";
rev = "refs/tags/v${version}";
hash = "sha256-oH3POxrQPge9BZHG5Y/n9/sWjiCA19mqpoCZfPM6BzA=";
};
build-system = [ flit-core ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "esper" ];
meta = {
description = "An ECS (Entity Component System) for Python";
homepage = "https://github.com/benmoran56/esper";
changelog = "https://github.com/benmoran56/esper/blob/${src.rev}/RELEASE_NOTES";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sigmanificient ];
};
}

View File

@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "limits";
version = "3.10.1";
version = "3.12.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/limits/_version.py"
'';
hash = "sha256-Ax0P9rYTPOrhtOw7FLElSNTGQ3WWCboM3FodTOGZWu8=";
hash = "sha256-EH2/75tcKuS11XKuo4lCQrFe4/XJZpcWhuGlSuhIk18=";
};
postPatch = ''
@@ -93,12 +93,14 @@ buildPythonPackage rec {
];
};
doCheck = pythonOlder "3.12"; # SystemError in protobuf
nativeCheckInputs = [
hiro
pytest-asyncio
pytest-lazy-fixture
pytestCheckHook
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
pythonImportsCheck = [
"limits"

View File

@@ -1,21 +0,0 @@
{ buildPythonPackage, fetchPypi, lib, nose, cov-core }:
buildPythonPackage rec {
pname = "nose-cov";
version = "1.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "04j4fw01bv648gimqqj4z88606lcczbm1k326agcc74gb4sh7v4b";
};
propagatedBuildInputs = [ nose cov-core ];
meta = with lib; {
homepage = "https://pypi.org/project/nose-cov/";
license = licenses.mit;
description = "This plugin produces coverage reports. It also supports coverage of subprocesses.";
maintainers = with maintainers; [ ];
};
}

View File

@@ -1,53 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, httplib2
, oauth
, oauth2
, semantic-version
, flask
, httpretty
, oauthlib
, pyflakes
, pytest
, pytestcache
, pytest-cov
, cov-core
, pytest-flakes
, sphinx
, mock
, chalice
, isPy27
}:
buildPythonPackage rec {
pname = "pylti";
version = "0.7.0";
format = "setuptools";
disabled = !isPy27;
# There is no need to fix mock. https://github.com/mitodl/pylti/pull/48
postPatch = ''
substituteInPlace setup.py --replace "mock==1.0.1" "mock"
'';
propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
nativeCheckInputs = [
flask httpretty oauthlib pyflakes pytest pytestcache pytest-cov cov-core
pytest-flakes sphinx mock chalice
];
src = fetchPypi {
pname = "PyLTI";
inherit version;
sha256 = "80938a235b1ab390f6889a95237d087ea7adde5cc50fcae9c80c49898e8ee78e";
};
meta = {
description = "Implementation of IMS LTI interface that works with edX";
homepage = "https://github.com/mitodl/pylti";
license = lib.licenses.bsdOriginal;
maintainers = with lib.maintainers; [ layus ];
};
}

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, SDL2, IOKit, Foundation, cmake, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, SDL2, IOKit, Foundation, OpenGL, cmake, makeWrapper }:
stdenv.mkDerivation rec {
pname = "bugdom";
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
IOKit
Foundation
OpenGL
];
nativeBuildInputs = [

View File

@@ -36,13 +36,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "prl-tools";
version = "19.3.0-54924";
version = "19.3.1-54941";
# We download the full distribution to extract prl-tools-lin.iso from
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
src = fetchurl {
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
hash = "sha256-Hj1manQSZHiht6mmWes44RVk2Bdqp6QdNCdK322bzWc=";
hash = "sha256-2M87+dbQaDerajzc6bCXmrpIyUNXfMxFiX1SbLJ0fss=";
};
hardeningDisable = [ "pic" "format" ];

View File

@@ -2,6 +2,7 @@
, buildGoModule
, fetchFromGitHub
, nixosTests
, stdenv
, testers
, telegraf
}:
@@ -30,10 +31,11 @@ buildGoModule rec {
];
passthru.tests = {
inherit (nixosTests) telegraf;
version = testers.testVersion {
package = telegraf;
};
} // lib.optionalAttrs stdenv.isLinux {
inherit (nixosTests) telegraf;
};
meta = with lib; {

View File

@@ -36554,7 +36554,8 @@ with pkgs;
btanks = callPackage ../games/btanks { };
bugdom = callPackage ../games/bugdom {
inherit (darwin.apple_sdk.frameworks) IOKit Foundation;
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL;
};
bzflag = callPackage ../games/bzflag {

View File

@@ -93,7 +93,8 @@ mapAliases ({
CommonMark = commonmark; # added 2023-02-1
ConfigArgParse = configargparse; # added 2021-03-18
coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04
covCore = cov-core; # added 2024-01-03
covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20
cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21
cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13
cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
@@ -303,6 +304,7 @@ mapAliases ({
nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08
ninja-python = ninja; # add 2022-08-03
nosejs = throw "nosejs has been removed since it has not been maintained for 15 years and there are no dependent packages"; # added 2024-05-21
nose-cov = throw "nose-cov has been removed, it was archived and unmaintained since 2012"; # added 2024-05-21
nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16
nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21
nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21
@@ -362,6 +364,7 @@ mapAliases ({
pyhs100 = throw "pyhs100 has been removed in favor of python-kasa."; # added 2024-01-05
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
PyLD = pyld; # added 2022-06-22
pylti = throw "pylti has been removed because it is unmaintained since 2019"; # added 2024-05-21
pymaging = throw "pymaging has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04
pymaging_png = throw "pymaging_png has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04
pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20

View File

@@ -2494,8 +2494,6 @@ self: super: with self; {
courlan = callPackage ../development/python-modules/courlan { };
cov-core = callPackage ../development/python-modules/cov-core { };
coverage = callPackage ../development/python-modules/coverage { };
coveralls = callPackage ../development/python-modules/coveralls { };
@@ -3885,6 +3883,8 @@ self: super: with self; {
espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { };
esper = callPackage ../development/python-modules/esper { };
esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { };
esprima = callPackage ../development/python-modules/esprima { };
@@ -8861,8 +8861,6 @@ self: super: with self; {
nose3 = callPackage ../development/python-modules/nose3 { };
nose-cov = callPackage ../development/python-modules/nose-cov { };
nose-exclude = callPackage ../development/python-modules/nose-exclude { };
nose-timer = callPackage ../development/python-modules/nose-timer { };
@@ -11293,8 +11291,6 @@ self: super: with self; {
pylpsd = callPackage ../development/python-modules/pylpsd { };
pylti = callPackage ../development/python-modules/pylti { };
pylutron = callPackage ../development/python-modules/pylutron { };
pylutron-caseta = callPackage ../development/python-modules/pylutron-caseta { };