From 2a989bfbcebbd7184bd92bccc5a8eeec415dde91 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Fri, 2 Jul 2021 22:33:40 +0200 Subject: [PATCH 1/5] maintainers: add pimeys --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5cff742efe9d..6a706c9af410 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8192,6 +8192,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"; From dcd1a5d673ddadb0eb26bc83285572e3ef0fef8c Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Sat, 3 Jul 2021 10:32:03 +0200 Subject: [PATCH 2/5] pscale: Init at 0.51.0 --- pkgs/development/tools/pscale/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/pscale/default.nix diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix new file mode 100644 index 000000000000..701c22471ee4 --- /dev/null +++ b/pkgs/development/tools/pscale/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6961be94b87..5d3457a4b317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3149,6 +3149,8 @@ in ps_mem = callPackage ../tools/system/ps_mem { }; + pscale = callPackage ../development/tools/pscale { }; + psstop = callPackage ../tools/system/psstop { }; precice = callPackage ../development/libraries/precice { }; From 4feb20b7b185cd25e64f51eeb43c080320687ade Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 4 Jul 2021 11:25:25 +0700 Subject: [PATCH 3/5] stockfish: 13 -> 14 --- pkgs/games/stockfish/default.nix | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index b09dc523d1ac..ae2db89b564a 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -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,7 +47,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = "https://stockfishchess.org/"; description = "Strong open source chess engine"; longDescription = '' From 8a275690bc7f327f7d5327deba1f174d0ffd7230 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 4 Jul 2021 11:25:37 +0700 Subject: [PATCH 4/5] stockfish: add siraben to maintainers --- pkgs/games/stockfish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index ae2db89b564a..5aa2408afd12 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { 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; }; From 8f2113f0c7a8df759c6fe5aca04eb58c60c1e213 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 16:00:27 +0000 Subject: [PATCH 5/5] free42: 3.0.4 -> 3.0.5 --- pkgs/applications/misc/free42/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index feadf1590921..2dd70acb9a73 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -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 ];