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: 0000bf730b94
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a05357f9442c
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 28, 2019

  1. monero: 0.13.0.4 -> 0.14.0.2 

    (cherry picked from commit a0a1dc0)
    @thedavidmeister @rnhmjoj
    thedavidmeister authored and rnhmjoj committed Mar 28, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 91BE884FBA4B591A
    Learn about vigilant mode
    Copy the full SHA
    9c2efe9 View commit details

  2. monero-gui: 0.13.0.4 -> 0.14.0.0 

    (cherry picked from commit b1d040b)
    @thedavidmeister @rnhmjoj
    thedavidmeister authored and rnhmjoj committed Mar 28, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 91BE884FBA4B591A
    Learn about vigilant mode
    Copy the full SHA
    d568a72 View commit details

  3. monero-gui: fix missing qml imports 

    (cherry picked from commit bbefa95)
    @rnhmjoj
    rnhmjoj committed Mar 28, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 91BE884FBA4B591A
    Learn about vigilant mode
    Copy the full SHA
    ebe9fc2 View commit details

  4. Merge pull request #58463 from rnhmjoj/monero-19.03 

    [19.03] monero: 0.13 -> 0.14
    @pSub
    pSub authored Mar 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a05357f View commit details
28 changes: 23 additions & 5 deletions pkgs/applications/altcoins/monero-gui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,31 +2,44 @@
, makeWrapper, makeDesktopItem
, qtbase, qmake, qtmultimedia, qttools
, qtgraphicaleffects, qtdeclarative
, qtlocation, qtquickcontrols2, qtwebchannel
, qtwebengine, qtx11extras, qtxmlpatterns
, qtlocation, qtquickcontrols, qtquickcontrols2
, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns
, monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
, hidapi
}:

with stdenv.lib;

let
qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}";

qml2ImportPath = concatMapStringsSep ":" qmlPath [
qtbase.bin qtmultimedia.bin qtgraphicaleffects
qtdeclarative.bin qtlocation.bin
qtquickcontrols qtquickcontrols2.bin
qtwebchannel.bin qtwebengine.bin qtxmlpatterns
];

in

stdenv.mkDerivation rec {
name = "monero-gui-${version}";
version = "0.13.0.4";
version = "0.14.0.0";

src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
sha256 = "142yj5s15bhm300dislq3x5inw1f37shnrd5vyj78jjcvry3wymw";
sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8";
};

nativeBuildInputs = [ qmake pkgconfig ];

buildInputs = [
qtbase qtmultimedia qtgraphicaleffects
qtdeclarative qtlocation qtquickcontrols2
qtdeclarative qtlocation
qtquickcontrols qtquickcontrols2
qtwebchannel qtwebengine qtx11extras
qtxmlpatterns monero unbound readline
boost libunwind libsodium pcsclite zeromq
@@ -81,6 +94,11 @@ stdenv.mkDerivation rec {
cp $src/images/appicons/$size.png \
$out/share/icons/hicolor/$size/apps/monero.png
done;
# wrap runtime dependencies
wrapProgram $out/bin/monero-wallet-gui \
--set QML2_IMPORT_PATH "${qml2ImportPath}" \
--set QT_PLUGIN_PATH "${qtbase.bin}/${qtbase.qtPluginPrefix}"
'';

meta = {
12 changes: 7 additions & 5 deletions pkgs/applications/altcoins/monero-gui/move-log-file.patch
View file
Original file line number Diff line number Diff line change
@@ -13,15 +13,17 @@ index 79223c0..e80b317 100644
parser.addHelpOption();
parser.process(app);
diff --git a/Logger.cpp b/Logger.cpp
index 660bafc..dae24d4 100644
index 6b1daba..c357762 100644
--- a/Logger.cpp
+++ b/Logger.cpp
@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log";
#elif defined(Q_OS_MAC)
static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs";
@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log";
static const QString appFolder = "Library/Logs";
#else // linux + bsd
//HomeLocation = "~"
- static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
- static const QString appFolder = ".bitmonero";
+ static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0);
+ static const QString appFolder = "bitmonero";
#endif


4 changes: 2 additions & 2 deletions pkgs/applications/altcoins/monero/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "monero-${version}";
version = "0.13.0.4";
version = "0.14.0.2";

src = fetchgit {
url = "https://github.com/monero-project/monero.git";
rev = "v${version}";
sha256 = "1ambgakapijhsi1pd70vw8vvnlwa3nid944lqkbfq3wl25lmc70d";
sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k";
};

nativeBuildInputs = [ cmake pkgconfig git ];