gnu: nextpnr: Update to 0.8-0.d796cc7.

* gnu/packages/fpga.scm (nextpnr): Update to 0.8-0.d796cc7.

Change-Id: I6d0082eb22e2a51e3db648dd6c3228b635fb8d7c
Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
Modified-by: Maxim Cournoyer <maxim@guixotic.coop>

gnu/packages/fpga.scm

@@ -419,15 +419,19 @@ files.")
                      license:bsd-2))))) ;for lz4-derived sources
 
 (define-public nextpnr
+  ;; Necessary for compatibility with latest apycula.
+  ;; TODO: Remove with release 0.9.
+  (let ((commit "d796cc720b60ccc18580c686d93c8751fe461532")
+        (revision "0"))
     (package
       (name "nextpnr")
-    (version "0.8")
+      (version (git-version "0.8" revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                 (url "https://github.com/YosysHQ/nextpnr/")
-             (commit (string-append "nextpnr-" version))
+                (commit commit)
                 ;; XXX: Fetch some bundled libraries such as QtPropertyBrowser,
                 ;; json11 and python-console, which have custom modifications or
                 ;; no longer have their original upstream.
@@ -440,18 +444,11 @@ files.")
           '(begin
              ;; XXX: 'delete-all-but' is copied from the turbovnc package.
              (define (delete-all-but directory . preserve)
-             (define (directory? x)
-               (and=> (stat x #f)
-                      (compose (cut eq? 'directory <>) stat:type)))
                 (with-directory-excursion directory
-               (let* ((pred
-                       (negate (cut member <> (append '("." "..") preserve))))
+                  (let* ((pred (negate (cut member <>
+                                            (cons* "." ".." preserve))))
                          (items (scandir "." pred)))
-                 (for-each (lambda (item)
-                             (if (directory? item)
-                                 (delete-file-recursively item)
-                                 (delete-file item)))
-                           items))))
+                    (for-each (cut delete-file-recursively <>) items))))
              (delete-all-but "3rdparty"
                              ;; The following sources have all been patched, so
                              ;; cannot easily be unbundled.
@@ -462,7 +459,7 @@ files.")
          (patches (search-patches "nextpnr-gtest.patch"
                                   "nextpnr-imgui.patch"))
          (sha256
-        (base32 "0p53a2gl89hf3hfwdxs6pykxyrk82j4lqpwd1fqia2y0c9r2gjlm"))))
+          (base32 "1arj25vad76wg6b5yaaky4cby5zp9v92pdd4y3l0kxi7wvxhmmya"))))
       (build-system qt-build-system)
       (arguments
        (list
@@ -527,7 +524,7 @@ files.")
       (synopsis "Place-and-Route tool for FPGAs")
       (description "Nextpnr is a portable FPGA place and route tool.")
       (home-page "https://github.com/YosysHQ/nextpnr/")
-    (license license:isc)))
+      (license license:isc))))
 
 (define-public nextpnr-ice40
   (deprecated-package "nextpnr-ice40" nextpnr))