From ecf787f6922a0c1443d9e280ea3a930c64997a1a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 7 Jun 2022 16:01:28 -0400 Subject: [PATCH 1/7] apple_sdk_11_0: expose 11.0 sdk stdenv as an attribute (cherry picked from commit 4741402d547773cc7d7f53814e65a3b81f23666c) --- .../darwin/apple-sdk-11.0/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 44b119e1a23e..96ef3831c95d 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -1,4 +1,5 @@ { stdenvNoCC, fetchurl, newScope, pkgs +, stdenv, overrideCC , xar, cpio, python3, pbzx }: let @@ -54,5 +55,21 @@ let # questionable aliases configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration; IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit; + + stdenv = + let + clang = stdenv.cc.override { + bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; + libc = packages.Libsystem; + }; + in + if stdenv.isAarch64 then stdenv + else + (overrideCC stdenv clang).override { + targetPlatform = stdenv.targetPlatform // { + darwinMinVersion = "10.12"; + darwinSdkVersion = "11.0"; + }; + }; }; in packages From 67e4141c0686b5fdface6f4f32f8e9267721d8d8 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 6 Jul 2022 19:40:34 -0400 Subject: [PATCH 2/7] apple_sdk_11_0: provide SDK-specific `callPackage` (cherry picked from commit 9659c7abcebb9fd36d0a8184681574268d8b9296) --- .../darwin/apple-sdk-11.0/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 96ef3831c95d..b29a36177a82 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, newScope, pkgs +{ stdenvNoCC, fetchurl, newScope, lib, pkgs , stdenv, overrideCC , xar, cpio, python3, pbzx }: @@ -56,6 +56,20 @@ let configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration; IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit; + callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { + inherit (pkgs.darwin.apple_sdk_11_0) stdenv; + darwin = pkgs.darwin.overrideScope (_: prev: { + inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; + apple_sdk = prev.darwin.apple_sdk_11_0; + CF = prev.darwin.apple_sdk_11_0.CoreFoundation; + }); + xcodebuild = pkgs.xcbuild.override { + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO; + inherit stdenv; + }; + xcbuild = xcodebuild; + }); + stdenv = let clang = stdenv.cc.override { From 71a1890ff186dc6cd4cc04fbeef8f41e67ded51f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 6 Jun 2022 09:48:25 -0400 Subject: [PATCH 3/7] apple_sdk_11_0: fix build on x86_64-darwin and expose as attribute (cherry picked from commit d8f71776fffc7c98d82a58771b199a761d40cde1) --- pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix | 4 ++-- pkgs/top-level/darwin-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index 228a084d250f..05340642f8d0 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -168,8 +168,8 @@ in rec { bareFrameworks = ( lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs; - inherit (pkgs.darwin) libobjc Libsystem; - inherit (pkgs.darwin.apple_sdk) libnetwork; + inherit (pkgs.darwin.apple_sdk_11_0) libnetwork Libsystem; + libobjc = pkgs.darwin.apple_sdk_11_0.objc4; }) ) // ( lib.mapAttrs privateFramework (import ./private-frameworks.nix { diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index d6ee88bc4f5e..47dd47aedea6 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -70,7 +70,7 @@ in impure-cmds // appleSourcePackages // chooseLibs // { - inherit apple_sdk; + inherit apple_sdk apple_sdk_10_12 apple_sdk_11_0; stdenvNoCF = stdenv.override { extraBuildInputs = []; From 31543a74482a5c9476292c9ed3c2cfe3713bb145 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jun 2022 04:52:17 +0000 Subject: [PATCH 4/7] hidapi: 0.11.2 -> 0.12.0 (cherry picked from commit 20749fc886cf6ade0726d0ab51a6c08428e51c73) --- pkgs/development/libraries/hidapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index ffe534ede4af..b29b64c2a757 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko="; + sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM="; }; nativeBuildInputs = [ cmake pkg-config ]; From befc42d68a1fed0fe9e309319d2f7950e7d4231e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 13 Aug 2022 20:49:43 +0000 Subject: [PATCH 5/7] randomx: 1.1.9 -> 1.1.10 (cherry picked from commit bb202ec7218af0327d8b9b87758a96a35e1e6e7f) --- pkgs/development/libraries/randomx/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 68e81866e1e6..b5da1ad6e198 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.9"; + version = "1.1.10"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "188fh4l8wda1y9vxa9asbk8nw35gyapw7gyn4w2p2qspdjhi5mnq"; + sha256 = "sha256-ZPphhZFzQL72xcEp9kNfZITY4oqK930ve/bbljTYNBs="; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae51b848e102..41ca374ed17c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20450,7 +20450,7 @@ with pkgs; qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; - randomx = callPackage ../development/libraries/randomx { }; + randomx = darwin.apple_sdk_11_0.callPackage ../development/libraries/randomx { }; retro-gtk = callPackage ../development/libraries/retro-gtk { }; From b9548f04d2e0bb1dbbaceeb8917148b79647e028 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 11 Aug 2022 22:53:24 +0200 Subject: [PATCH 6/7] monero-gui: 0.17.3.2 -> 0.18.1.0 (cherry picked from commit 749e42f16d8fbaa1b5c814c4a7dc17b937d2f67d) --- pkgs/applications/blockchains/monero-gui/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 6b2cc4a7f928..6627c29d9951 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.3.2"; + version = "0.18.1.0"; src = fetchFromGitHub { - owner = "monero-project"; - repo = "monero-gui"; - rev = "v${version}"; - sha256 = "10gincmgc0qpsgm94m1fqfy9j8jn9g1gjk12lcqnf77kvcnz37hq"; + owner = "monero-project"; + repo = "monero-gui"; + rev = "v${version}"; + sha256 = "sha256-XL7DV4YD/U6RiqgdYJf6zFfvJWlOx//4YVmnc51riiE="; }; nativeBuildInputs = [ From c4f583a7698366af097716c3b8ff75f8e1e2f4c1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 11 Aug 2022 22:53:06 +0200 Subject: [PATCH 7/7] monero: 0.17.3.2 -> 0.18.1.0 (cherry picked from commit 0ec615c46b67a1c300fce032fce433dfd2bc3ec3) --- pkgs/applications/blockchains/monero-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 39e416e430a7..1709c8833cb8 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.17.3.2"; + version = "0.18.1.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "19sgcbli7fc1l6ms7ma6hcz1mmpbnd296lc8a19rl410acpv45zy"; + sha256 = "sha256-xniGiGqZpL1b6alnCxa2MNzuDQxPgMdNjqifOC8h0qM="; fetchSubmodules = true; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postPatch = '' # remove vendored libraries - rm -r external/{miniupnp,randomx,rapidjson,unbound} + rm -r external/{miniupnp,randomx,rapidjson} # export patched source for monero-gui cp -r . $source '';