git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #100815 from rnhmjoj/monero

monero: 0.17.0.1 -> 0.17.1.0

commit54de950deec5eb0ea809b778f382132e0833a282 authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com> dateSat 17 Oct 2020, 15:14 (6 years ago) parentbce139d101bb78
2 files changed+9−18
compare with master
unifiedsplit
pkgs/applications/blockchains/monero-gui/default.nix+7−9 pkgs/applications/blockchains/monero/default.nix+2−9
pkgs/applications/blockchains/monero-gui/default.nix+7−9
@@ -27,13 +27,13 @@ in
2727
2828stdenv.mkDerivation rec {
2929 pname = "monero-gui";
30− version = "0.17.0.1";
30+ version = "0.17.1.0";
3131
3232 src = fetchFromGitHub {
3333 owner = "monero-project";
3434 repo = "monero-gui";
3535 rev = "v${version}";
36− sha256 = "1i9a3ampppyzsl4sllbqlr3w43sjpb3fdfxhb1j4n49p8g0jzmf3";
36+ sha256 = "07r78ipv4g3i6z822kq380vi3qwlb958rccsy6lyybkhj9y0rx84";
3737 };
3838
3939 nativeBuildInputs = [
@@ -65,9 +65,6 @@ stdenv.mkDerivation rec {
6565 substituteInPlace src/version.js.in \
6666 --replace '@VERSION_TAG_GUI@' '${version}'
6767
68− # remove this line on the next release
69− rm cmake/Version.cmake
70−
7168 # use monerod from the monero package
7269 substituteInPlace src/daemon/DaemonManager.cpp \
7370 --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin'
@@ -78,10 +75,11 @@ stdenv.mkDerivation rec {
7875 'add_subdirectory(monero EXCLUDE_FROM_ALL)'
7976 '';
8077
81− cmakeFlags = [
82− "-DCMAKE_INSTALL_PREFIX=$out/bin"
83− "-DARCH=${arch}"
84− ];
78+ preConfigure = ''
79+ # because $out needs to be expanded
80+ cmakeFlagsArray+=("-DCMAKE_INSTALL_PREFIX=$out/bin")
81+ cmakeFlagsArray+=("-DARCH=${arch}")
82+ '';
8583
8684 desktopItem = makeDesktopItem {
8785 name = "monero-wallet-gui";
pkgs/applications/blockchains/monero/default.nix+2−9
@@ -17,25 +17,18 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
1717
1818stdenv.mkDerivation rec {
1919 pname = "monero";
20− version = "0.17.0.1";
20+ version = "0.17.1.0";
2121
2222 src = fetchFromGitHub {
2323 owner = "monero-project";
2424 repo = "monero";
2525 rev = "v${version}";
26− sha256 = "1v0phvg5ralli4dr09a60nq032xqlci5d6v4zfq8304vgrn1ffgp";
26+ sha256 = "1cngniv7sndy8r0fcfgk737640k53q3kwd36g891p5igcb985qdw";
2727 fetchSubmodules = true;
2828 };
2929
3030 patches = [
3131 ./use-system-libraries.patch
32−
33− # This fixes a bug in the monero-gui build system,
34− # remove it once the PR has been merged
35− (fetchpatch {
36− url = "https://github.com/monero-project/monero/pull/6867.patch";
37− sha256 = "0nxa6861df1fadrm9bmhqf2g6mljgr4jndsbxqp7g501hv9z51j3";
38− })
3932 ];
4033
4134 postPatch = ''