Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-07-05 06:01:40 +00:00 committed by GitHub
commit 86a9eb5293
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 16 deletions

View file

@ -8198,6 +8198,12 @@
githubId = 1179566;
name = "Nicolas B. Pierron";
};
pimeys = {
email = "julius@nauk.io";
github = "pimeys";
githubId = 34967;
name = "Julius de Bruijn";
};
pingiun = {
email = "nixos@pingiun.com";
github = "pingiun";

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "free42";
version = "3.0.4";
version = "3.0.5";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZoW5gBAUp/5U8Is3Nhx+SHY4d0F3PGOS1/WOokKRnCU=";
sha256 = "sha256-ytRPIBE8KcuM+pyfdKt/b+Vi03x8nowdgZjSt8EddSc=";
};
nativeBuildInputs = [ copyDesktopItems pkg-config ];

View file

@ -0,0 +1,23 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "pscale";
version = "0.51.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-ykHwDVwL30uXeCEP4EcM8TPYqZmCDDAUUpfinpYipHE=";
};
vendorSha256 = "sha256-3VP2fluQLZs4nWT3O6NmCFxrqKw0/j3ASNxtbXHlZEA=";
meta = with lib; {
homepage = "https://www.planetscale.com/";
changelog = "https://github.com/planetscale/cli/releases/tag/v${version}";
description = "The CLI for PlanetScale Database";
license = licenses.asl20;
maintainers = with maintainers; [ pimeys ];
};
}

View file

@ -1,6 +1,4 @@
{ lib, stdenv, fetchurl }:
with lib;
{ lib, stdenv, fetchurl, fetchFromGitHub }:
let
# The x86-64-modern may need to be refined further in the future
@ -12,28 +10,29 @@ let
if stdenv.isi686 then "x86-32" else
if stdenv.isAarch64 then "armv8" else
"unknown";
version = "13";
nnueFile = "nn-62ef826d1a6d.nnue";
nnueFile = "nn-3475407dc199.nnue";
nnue = fetchurl {
name = nnueFile;
url = "https://tests.stockfishchess.org/api/nn/${nnueFile}";
sha256 = "0qsy9rr4zgxrpgwhwbi96z01a2560am2b00q2klbj4bd39nq5vv2";
sha256 = "sha256-NHVAfcGZc+pERnZ4Y0zOAj1iDkGXcMERzIk3/maJ7Ic=";
};
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "stockfish";
inherit version;
version = "14";
src = fetchurl {
url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
sha256 = "0qhxp2w543psanzhzn8jhfafx8aip57v9nsvafbwa5xynchlgl8m";
src = fetchFromGitHub {
owner = "official-stockfish";
repo = "Stockfish";
rev = "sf_${version}";
sha256 = "sha256-fX0Tr1yqjmNRSxmisFRKUY1E5//qF3zAfJ8innAeyxA=";
};
# This addresses a linker issue with Darwin
# https://github.com/NixOS/nixpkgs/issues/19098
preBuild = optionalString stdenv.isDarwin ''
preBuild = lib.optionalString stdenv.isDarwin ''
sed -i.orig '/^\#\#\# 3.*Link Time Optimization/,/^\#\#\# 3/d' Makefile
'';
@ -48,14 +47,14 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
meta = {
meta = with lib; {
homepage = "https://stockfishchess.org/";
description = "Strong open source chess engine";
longDescription = ''
Stockfish is one of the strongest chess engines in the world. It is also
much stronger than the best human chess grandmasters.
'';
maintainers = with maintainers; [ luispedro peti ];
maintainers = with maintainers; [ luispedro peti siraben ];
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"];
license = licenses.gpl2;
};

View file

@ -3148,6 +3148,8 @@ in
ps_mem = callPackage ../tools/system/ps_mem { };
pscale = callPackage ../development/tools/pscale { };
psstop = callPackage ../tools/system/psstop { };
precice = callPackage ../development/libraries/precice { };