diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-06 08:21:14 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-06 08:21:14 +0100 |
| commit | b04848e5fe506a8ed8beeaec6075f867ee7443ac (patch) | |
| tree | a68758a3c5e8085acafc2bff54cd6c5cab32aaf7 /pkgs/applications/blockchains | |
| parent | 38e74f86e5365eadf7de99e13273bbce8dd733a8 (diff) | |
| parent | 21eda9bc80bef824a037582b1e5a43ba74e92daa (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/blockchains')
| -rw-r--r-- | pkgs/applications/blockchains/monero-cli/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/applications/blockchains/monero-gui/default.nix | 4 |
2 files changed, 25 insertions, 7 deletions
diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index caac322020eb5..0464c2610b7f5 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -6,16 +6,32 @@ , trezorSupport ? true, libusb1, protobuf, python3 }: +let + # submodules + supercop = fetchFromGitHub { + owner = "monero-project"; + repo = "supercop"; + rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9"; + sha256 = "26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE="; + }; + trezor-common = fetchFromGitHub { + owner = "trezor"; + repo = "trezor-common"; + rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0"; + sha256 = "VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI="; + }; + +in + stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.18.1.2"; + version = "0.18.2.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "sha256-yV1ysoesEcjL+JX6hkmcrBDmazOWBvYK6EjshxJzcAw="; - fetchSubmodules = true; + sha256 = "n2e5U3p0eG2atPYV86H2UAURwsIkeSOBm8iwYsDVAoc="; }; patches = [ @@ -23,8 +39,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # remove vendored libraries - rm -r external/{miniupnp,randomx,rapidjson} + # manually install submodules + rmdir external/{supercop,trezor-common} + ln -sf ${supercop} external/supercop + ln -sf ${trezor-common} external/trezor-common # export patched source for monero-gui cp -r . $source ''; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 1a39e68d8f67b..4ddb746c30a5c 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.18.1.2"; + version = "0.18.2.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "sha256-GBILqNkYQUkil1qvYnJTkHwgK3dzKR9I9GVbbLy/0UU="; + sha256 = "Bm6OpK1jjdWVqdp6HpirqP6+3GcMSZfZ/e70wcu+rQc="; }; nativeBuildInputs = [ |