public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-21 06:19:56 +00:00 committed by GitHub
commit f2b48e74be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/physfs/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, doxygen { stdenv, fetchurl, cmake, doxygen, darwin
, zlib }: , zlib }:
let let
@ -14,7 +14,8 @@ let
nativeBuildInputs = [ cmake doxygen ]; nativeBuildInputs = [ cmake doxygen ];
buildInputs = [ zlib ]; buildInputs = [ zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -32,7 +33,7 @@ let
homepage = "http://icculus.org/physfs/"; homepage = "http://icculus.org/physfs/";
description = "Library to provide abstract access to various archives"; description = "Library to provide abstract access to various archives";
license = licenses.free; license = licenses.free;
platforms = platforms.linux; platforms = platforms.unix;
}; };
}; };

4
pkgs/development/web/nodejs/v14.nix
View File

@ -8,7 +8,7 @@ let
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "14.15.1"; version = "14.15.3";
sha256 = "1g61vqsgq3jsipw2fckj68i4a4pi1iz1kbw7mlw8jmzp8rl46q81"; sha256 = "1zplrfhsrqblvq2wxf5386wc9hf11k42jaw4mzgwy5dxx6dv3krj";
patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
} }

11
pkgs/tools/misc/ethminer/default.nix
View File

@ -1,5 +1,5 @@
{ {
stdenv, clangStdenv,
fetchFromGitHub, fetchFromGitHub,
opencl-headers, opencl-headers,
cmake, cmake,
@ -16,7 +16,11 @@
cli11 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"; pname = "ethminer";
version = "0.18.0"; version = "0.18.0";
@ -71,8 +75,5 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ nand0p ]; maintainers = with maintainers; [ nand0p ];
license = licenses.gpl2; license = licenses.gpl2;
# Doesn't build with gcc9, and if overlayed to use gcc8 stdenv fails on CUDA issues.
broken = true;
}; };
} }