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

Commits on Aug 18, 2019

  1. xmrig: 2.14.4 -> 3.0.0

    @kim0
    kim0 committed Aug 18, 2019
    Copy the full SHA
    61077c0 View commit details

  2. maintainers: add kim0

    @kim0
    kim0 committed Aug 18, 2019
    Copy the full SHA
    bbfd2e5 View commit details

  3. Merge pull request #66757 from kim0/xmrig300 

    xmrig: 2.14.4 -> 3.0.0
    @mmahut
    mmahut authored Aug 18, 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
    bcc14b2 View commit details
Showing with 10 additions and 5 deletions.
  1. +5 −0 maintainers/maintainer-list.nix
  2. +5 −5 pkgs/applications/misc/xmrig/default.nix
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -3218,6 +3218,11 @@
githubId = 6282557;
name = "Kiloreux Emperex";
};
kim0 = {
email = "email.ahmedkamal@googlemail.com";
github = "kim0";
name = "Ahmed Kamal";
};
kimburgess = {
email = "kim@acaprojects.com";
github = "kimburgess";
10 changes: 5 additions & 5 deletions pkgs/applications/misc/xmrig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl
{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl, hwloc
, donateLevel ? 0
}:

stdenv.mkDerivation rec {
name = "xmrig-${version}";
version = "2.14.4";
version = "3.0.0";

src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
sha256 = "0hmla9ys9gmmcrmkidw05ygiz734rs7skb9w86jnwxi5nlpxqrhj";
sha256 = "1m0rsjb7y1j77mzg5cqb3fdvzgvjkrwgmkjn9nv1xl2757z8hcl4";
};

nativeBuildInputs = [ cmake ];
buildInputs = [ libuv libmicrohttpd openssl ];
buildInputs = [ libuv libmicrohttpd openssl hwloc ];

postPatch = ''
substituteInPlace src/donate.h \
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/xmrig/xmrig";
license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ fpletz ];
maintainers = with maintainers; [ fpletz kim0 ];
};
}