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: 5720c0533998
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 941054a39b89
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 9, 2018

  1. monero: fix daemon crash

    @rnhmjoj
    rnhmjoj committed May 9, 2018

    Unverified

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

  2. Merge pull request #40212 from rnhmjoj/monero-fix 

    monero: fix daemon crash
    @xeji
    xeji authored May 9, 2018

    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
    941054a View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/applications/altcoins/monero/default.nix
11 changes: 10 additions & 1 deletion pkgs/applications/altcoins/monero/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, git
{ stdenv, fetchFromGitHub, fetchpatch
, cmake, pkgconfig, git
, boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline
, CoreData, IOKit, PCSC
@@ -21,6 +22,14 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake pkgconfig git ];

patches = [
# fix daemon crash, remove with 0.12.1.0 update
(fetchpatch {
url = "https://github.com/monero-project/monero/commit/08343ab.diff";
sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83";
})
];

buildInputs = [
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline