From 88751ab1f8af667c46ddd0d53532ae385318e9a4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 2 Jan 2025 17:49:55 +0100 Subject: [PATCH 1/3] xmrig: move to pkgs/by-name --- .../moneroocean.nix => by-name/xm/xmrig-mo/package.nix} | 0 .../xmrig/proxy.nix => by-name/xm/xmrig-proxy/package.nix} | 0 .../misc => by-name/xm}/xmrig/donate-level.patch | 0 .../misc/xmrig/default.nix => by-name/xm/xmrig/package.nix} | 0 pkgs/top-level/all-packages.nix | 6 ------ 5 files changed, 6 deletions(-) rename pkgs/{applications/misc/xmrig/moneroocean.nix => by-name/xm/xmrig-mo/package.nix} (100%) rename pkgs/{applications/misc/xmrig/proxy.nix => by-name/xm/xmrig-proxy/package.nix} (100%) rename pkgs/{applications/misc => by-name/xm}/xmrig/donate-level.patch (100%) rename pkgs/{applications/misc/xmrig/default.nix => by-name/xm/xmrig/package.nix} (100%) diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/by-name/xm/xmrig-mo/package.nix similarity index 100% rename from pkgs/applications/misc/xmrig/moneroocean.nix rename to pkgs/by-name/xm/xmrig-mo/package.nix diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/by-name/xm/xmrig-proxy/package.nix similarity index 100% rename from pkgs/applications/misc/xmrig/proxy.nix rename to pkgs/by-name/xm/xmrig-proxy/package.nix diff --git a/pkgs/applications/misc/xmrig/donate-level.patch b/pkgs/by-name/xm/xmrig/donate-level.patch similarity index 100% rename from pkgs/applications/misc/xmrig/donate-level.patch rename to pkgs/by-name/xm/xmrig/donate-level.patch diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/by-name/xm/xmrig/package.nix similarity index 100% rename from pkgs/applications/misc/xmrig/default.nix rename to pkgs/by-name/xm/xmrig/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed3cf54d85b..6a041b1e8d01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14600,12 +14600,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { }; - - xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { }; - - xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { }; - monotone = callPackage ../applications/version-management/monotone { lua = lua5; }; From 532220669af5b69c2ae742dd7171c9e5e6e8b29b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 2 Jan 2025 17:51:23 +0100 Subject: [PATCH 2/3] xmrig: use new apple sdk pattern --- pkgs/by-name/xm/xmrig/package.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/by-name/xm/xmrig/package.nix b/pkgs/by-name/xm/xmrig/package.nix index 9099e8e3dbfe..589b7ff35d35 100644 --- a/pkgs/by-name/xm/xmrig/package.nix +++ b/pkgs/by-name/xm/xmrig/package.nix @@ -7,12 +7,8 @@ , openssl , hwloc , donateLevel ? 0 -, darwin }: -let - inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; -in stdenv.mkDerivation rec { pname = "xmrig"; version = "6.22.2"; @@ -43,10 +39,6 @@ stdenv.mkDerivation rec { libmicrohttpd openssl hwloc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreServices - OpenCL ]; inherit donateLevel; From 6f2ff58e43b8c530b2e8b12ec73a0faef7a194aa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 2 Jan 2025 17:51:35 +0100 Subject: [PATCH 3/3] xmrig-proxy: use new apple sdk pattern --- pkgs/by-name/xm/xmrig-proxy/package.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/xm/xmrig-proxy/package.nix b/pkgs/by-name/xm/xmrig-proxy/package.nix index 7090f85483b4..3bbc7ee70883 100644 --- a/pkgs/by-name/xm/xmrig-proxy/package.nix +++ b/pkgs/by-name/xm/xmrig-proxy/package.nix @@ -6,12 +6,8 @@ libuv, libmicrohttpd, openssl, - darwin, }: -let - inherit (darwin.apple_sdk_11_0.frameworks) CoreServices IOKit; -in stdenv.mkDerivation rec { pname = "xmrig-proxy"; version = "6.22.0"; @@ -35,16 +31,11 @@ stdenv.mkDerivation rec { cmake ]; - buildInputs = - [ - libuv - libmicrohttpd - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - IOKit - ]; + buildInputs = [ + libuv + libmicrohttpd + openssl + ]; installPhase = '' runHook preInstall