Subject: bug#60211: closed (Re: [bug#60211] [PATCH] gnu: stockfish: Update to 15.1.)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 22 Dec 2022 16:19:02 +0000

Your bug report

#60211: [PATCH] gnu: stockfish: Update to 15.1.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
60211: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60211
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#60211] [PATCH] gnu: stockfish: Update to 15.1.
From: Guillaume Le Vaillant <[email-masked]>
To: Michael Rohleder <[email-masked]>
Cc: [email-masked]
Date: Thu, 22 Dec 2022 16:17:37 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

Patch pushed as d2cd3290ea4fed6417e6192676a55ee158256df0.
Thanks.

Subject: [PATCH] gnu: stockfish: Update to 15.1.
From: Michael Rohleder <[email-masked]>
To: [email-masked]
Cc: Michael Rohleder <[email-masked]>
Date: Tue, 20 Dec 2022 01:07:46 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/games.scm (stockfish): Update to 15.1.
[arguments]: Renamed phase remove-m-flag to remove-m-flag-and-net-target.
Add removing of the net target in the Makefile, because it wants networking.
---
 gnu/packages/games.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 6064dabbaa..e178536087 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -52,7 +52,7 @@
 ;;; Copyright © 2020 Vitaliy Shatrov <[email-masked]>
 ;;; Copyright © 2020 Jack Hill <[email-masked]>
 ;;; Copyright © 2020 Vincent Legoll <[email-masked]>
-;;; Copyright © 2020, 2021 Michael Rohleder <[email-masked]>
+;;; Copyright © 2020, 2021, 2022 Michael Rohleder <[email-masked]>
 ;;; Copyright © 2020 Trevor Hass <[email-masked]>
 ;;; Copyright © 2020, 2021 Liliana Marie Prikler <[email-masked]>
 ;;; Copyright © 2020 Lu hux <[email-masked]>
@@ -10336,10 +10336,10 @@ (define-public chessx
     (license license:gpl2+)))
 
 (define-public stockfish
-  (let ((neural-network-revision "6877cd24400e")) ; also update hash below
+  (let ((neural-network-revision "ad9b42354671")) ; also update hash below
     (package
       (name "stockfish")
-      (version "15")
+      (version "15.1")
       (source
        (origin
          (method git-fetch)
@@ -10348,7 +10348,7 @@ (define-public stockfish
                (commit (string-append "sf_" version))))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1v19v6qhwbf31wpc3qcih4dvqxwqkh0p426skgjin6ags31hkbmh"))))
+          (base32 "0zmnv8vbhhid73pjyxg56r4ckm887znv4d55br370plm3p5b56xa"))))
       (build-system gnu-build-system)
       (inputs
        `(("neural-network"
@@ -10358,7 +10358,7 @@ (define-public stockfish
                                  neural-network-revision ".nnue"))
              (sha256
               (base32
-               "1qyna598c0v7gdpycc6kpl12h5a2wa50dqray6gv208f80jcsxv8"))))))
+               "11mpdhnsfggldgvmzwmya64pp3fndyppi2fkdf8kfhbi8qsl56xd"))))))
       (arguments
        `(#:tests? #f
          #:make-flags (list "-C" "src"
@@ -10388,11 +10388,13 @@ (define-public stockfish
                         (copy-file (assoc-ref inputs "neural-network")
                                    (format #f "src/nn-~a.nnue"
                                            ,neural-network-revision))))
-                    ;; Guix doesn't use a multiarch gcc.
-                    (add-after 'unpack 'remove-m-flag
+                    (add-after 'unpack 'remove-m-flag-and-net-target
                       (lambda _
                         (substitute* "src/Makefile"
-                          (("-m\\$\\(bits\\)") "")))))))
+                          ;; Guix doesn't use a multiarch gcc.
+                          (("-m\\$\\(bits\\)") "")
+                          ;; Dont depend on net target.
+                          ((": net") ": ")))))))
       (synopsis "Strong chess engine")
       (description
        "Stockfish is a very strong chess engine.  It is much stronger than the
-- 
2.38.1