Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d7491cea3d19
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e43e173ae129
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 10, 2020

  1. monero: 0.17.1.1 -> 0.17.1.3

    @prusnak
    prusnak committed Nov 10, 2020
    Copy the full SHA
    51c2129 View commit details

  2. monero-gui: 0.17.1.1 -> 0.17.1.4

    @prusnak
    prusnak committed Nov 10, 2020
    Copy the full SHA
    52ee36a View commit details

Commits on Nov 14, 2020

  1. Merge pull request #103208 from prusnak/monero 

    monero: 0.17.1.1 -> 0.17.1.3
    @mmahut
    mmahut authored Nov 14, 2020
    Copy the full SHA
    e43e173 View commit details
Showing with 13 additions and 5 deletions.
  1. +11 −3 pkgs/applications/blockchains/monero-gui/default.nix
  2. +2 −2 pkgs/applications/blockchains/monero/default.nix
14 changes: 11 additions & 3 deletions pkgs/applications/blockchains/monero-gui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, wrapQtAppsHook, makeDesktopItem
, fetchFromGitHub
, fetchpatch
, cmake, qttools, pkgconfig
, qtbase, qtdeclarative, qtgraphicaleffects
, qtmultimedia, qtxmlpatterns
@@ -27,13 +28,13 @@ in

stdenv.mkDerivation rec {
pname = "monero-gui";
version = "0.17.1.1";
version = "0.17.1.4";

src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
sha256 = "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx";
sha256 = "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng";
};

nativeBuildInputs = [
@@ -58,7 +59,14 @@ stdenv.mkDerivation rec {
chmod -R +w source/monero
'';

patches = [ ./move-log-file.patch ];
patches = [
./move-log-file.patch
# fix build failure due to invalid use of CMAKE_PREFIX_PATH
(fetchpatch {
url = "https://github.com/monero-project/monero-gui/commit/ef2be82c21b0934522ad8e110805b66f5948da1f.patch";
sha256 = "1rhazk2xwa5dv1cmkrkq8yr08qxslg4k929cvlliabrx20kbr5z5";
})
];

postPatch = ''
# set monero-gui version
4 changes: 2 additions & 2 deletions pkgs/applications/blockchains/monero/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];

stdenv.mkDerivation rec {
pname = "monero";
version = "0.17.1.1";
version = "0.17.1.3";

src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
sha256 = "18x27dm24k04vx0yz57zi02rk0wrmbn4wr8alqf48dq6z9wr0fhp";
sha256 = "1ddkdfd8i5q509qziwcx1f6nm8axs4a1ppzv2y5lgsqpq375if6j";
fetchSubmodules = true;
};