From 4bd7582cb2a7fab5846acd02eb99ec03773443ad Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 17 Dec 2020 04:20:00 +0000 Subject: [PATCH 1/3] nodejs-14_x: 14.15.1 -> 14.15.3 + https://github.com/nodejs/node/releases/tag/v14.15.2 + https://github.com/nodejs/node/releases/tag/v14.15.3 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index c3e4d7507806..14833bb042f4 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.15.1"; - sha256 = "1g61vqsgq3jsipw2fckj68i4a4pi1iz1kbw7mlw8jmzp8rl46q81"; + version = "14.15.3"; + sha256 = "1zplrfhsrqblvq2wxf5386wc9hf11k42jaw4mzgwy5dxx6dv3krj"; patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 182b0d051a0ed679d1690c3674f90340606928a1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 Dec 2020 04:20:00 +0000 Subject: [PATCH 2/3] physfs: enable build on darwin --- pkgs/development/libraries/physfs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 66f2d433ee3e..160f2f64cf40 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, doxygen +{ stdenv, fetchurl, cmake, doxygen, darwin , zlib }: let @@ -14,7 +14,8 @@ let nativeBuildInputs = [ cmake doxygen ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; enableParallelBuilding = true; @@ -32,7 +33,7 @@ let homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; license = licenses.free; - platforms = platforms.linux; + platforms = platforms.unix; }; }; From 0446b8af52a4c3af59386d3808b1f250c7ad6745 Mon Sep 17 00:00:00 2001 From: Break Yang Date: Sat, 19 Dec 2020 22:57:25 -0800 Subject: [PATCH 3/3] ethminer: fix broken package by switching to clang --- pkgs/tools/misc/ethminer/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index d593d677cc32..f84b0096d044 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,5 +1,5 @@ { - stdenv, + clangStdenv, fetchFromGitHub, opencl-headers, cmake, @@ -16,7 +16,11 @@ cli11 }: -stdenv.mkDerivation rec { +# Note that this requires clang < 9.0 to build, and currently +# clangStdenv provides clang 7.1 which satisfies the requirement. +let stdenv = clangStdenv; + +in stdenv.mkDerivation rec { pname = "ethminer"; version = "0.18.0"; @@ -71,8 +75,5 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; - # Doesn't build with gcc9, and if overlayed to use gcc8 stdenv fails on CUDA issues. - broken = true; }; - }