README.md

@@ -35,9 +35,8 @@ section in [Guix's manual](http://guix.gnu.org/manual/).
 - [bic@1.0.0](https://github.com/hexagonal-sun/bic) - C interpreter and API explorer
 - [birch@0.0.1-2.27691aa](https://github.com/dylanaraps/birch.git) - Internet Relay Chat client
 - [cdrdao@1.2.4](http://cdrdao.sourceforge.net/) - Write audio/data CD-Rs in disk-at-once mode
-- [edbrowse@3.7.7](https://www.edbrowse.org) - Command line editor browser
+- [edbrowse@3.8.0](https://www.edbrowse.org) - Command line editor browser
 - [emma_02@1.36](https://www.emma02.hobby-site.com) - RCA CDP1802 Multi-system Emulator
-- [gappa@1.3.5](http://gappa.gforge.inria.fr/) - Proof generator for arithmetic properties
 - [gneuralnetwork@0.9.1](https://www.gnu.org/software/gneuralnetwork/) - Programmable neural network
 - [gpsim@0.31.0](http://gpsim.sourceforge.net/) - Software emulator for PIC microcontrollers
 - [gputils@1.5.0](https://gputils.sourceforge.io/) - Utilities for PIC microcontrollers
@@ -46,7 +45,6 @@ section in [Guix's manual](http://guix.gnu.org/manual/).
 - [openspades@0.1.3-0.cb89824](http://openspades.yvt.jp/) - Voxel first-person shooter game
 - [properties-cpp@0.0.1](https://launchpad.net/properties-cpp) - Properties and signals library for C++
 - [sdcc@3.9.0](http://sdcc.sourceforge.net/) - Small Device C Compiler
-- [sollya@7.0](http://sollya.gforge.inria.fr/) - Development environment for safe floating-point code
 - [systemd@246](https://systemd.io) - System and Service Manager
 - [treedec@0.9.0-0.aceed46](https://github.com/freetdi/tdlib) - Library of tree decomposition algorithms
 - [xorgxrdp@0.2.13](http://xrdp.org) - Xorg drivers for xrdp

bavier/packages/algebra.scm

@@ -1,99 +0,0 @@
-;;; This file is part of guix-bavier.git
-;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
-;;; License: GPLv3+
-
-(define-module (bavier packages algebra)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix download)
-  #:use-module (guix licenses)
-  #:use-module (guix packages)
-  #:use-module (gnu packages algebra)
-  #:use-module (gnu packages boost)
-  #:use-module (gnu packages maths)
-  #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages xml))
-
-(define-public sollya
-  (package
-   (name "sollya")
-   (version "7.0")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "https://www.sollya.org/releases/"
-                                "sollya-" version "/sollya-" version ".tar.bz2"))
-            (sha256
-             (base32
-              "11290ivi9h665cxi8f1shlavhy10vzb8s28m57hrcgnxyxqmhx0m"))))
-   (build-system gnu-build-system)
-   (inputs
-    `(("fplll" ,fplll)
-      ("gmp" ,gmp)
-      ("gnuplot" ,gnuplot)
-      ("libxml2" ,libxml2)
-      ("mpfi" ,mpfi)
-      ("mpfr" ,mpfr)))
-   (arguments
-    `(#:configure-flags (list (string-append "--docdir=${datadir}/doc/sollya-" ,version))
-      #:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'patch-test-shebang
-          (lambda _
-            (substitute* (list "tests-tool/Makefile.in"
-                               "tests-lib/Makefile.in")
-             (("#!/bin/sh") (string-append "#!" (which "sh"))))
-            #t))
-        (add-before 'build 'patch-gnuplot-reference
-          (lambda _
-            (substitute* "general.c"
-             (("\"gnuplot\"") (string-append "\"" (which "gnuplot") "\"")))
-            #t)))))
-   (home-page "https://www.sollya.org")
-   (synopsis "Development environment for safe floating-point code")
-   (description "Sollya is a computer program whose purpose is to
-provide an environment for safe floating-point code development.  It
-is particularly targeted to the automated implementation of
-mathematical floating-point libraries (libm).  Amongst other features,
-it offers a certified infinity norm, an automatic polynomial
-implementer, and a fast Remez algorithm.")
-   (license cecill-c)))
-
-(define-public gappa
-  (package
-   (name "gappa")
-   (version "1.3.5")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "https://gforge.inria.fr/frs/download.php/latestfile/"
-                                "2699/gappa-" version ".tar.gz"))
-            (sha256
-             (base32
-              "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w"))))
-   (build-system gnu-build-system)
-   (inputs
-    `(("boost" ,boost)
-      ("gmp" ,gmp)
-      ("mpfr" ,mpfr)))
-   (arguments
-    `(#:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'patch-remake-shell
-          (lambda _
-            (substitute* "remake.cpp"
-             (("/bin/sh") (which "sh")))
-            #t))
-        (replace 'build
-          (lambda _ (invoke "./remake" "-s" "-d")))
-        (replace 'install
-          (lambda _ (invoke "./remake" "-s" "-d" "install")))
-        (replace 'check
-          (lambda _ (invoke "./remake" "check"))))))
-   (home-page "http://gappa.gforge.inria.fr/")
-   (synopsis "Proof generator for arithmetic properties")
-   (description "Gappa is a tool intended to help verifying and formally
-proving properties on numerical programs dealing with floating-point or
-fixed-point arithmetic.  It has been used to write robust floating-point
-filters for CGAL and it is used to certify elementary functions in CRlibm.
-While Gappa is intended to be used directly, it can also act as a backend
-prover for the Why3 software verification platform or as an automatic tactic
-for the Coq proof assistant.")
-   (license (list gpl3+ cecill-c))))    ; either/or

bavier/packages/ed.scm

@@ -11,6 +11,7 @@
   #:use-module (gnu packages javascript)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages web)
   #:use-module ((guix licenses) #:prefix license:))
@@ -18,7 +19,7 @@
 (define-public edbrowse
   (package
     (name "edbrowse")
-    (version "3.7.7")
+    (version "3.8.0")
     (source
      (origin
        (method git-fetch)
@@ -28,26 +29,40 @@
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf"))))
+         "15a12la56z3m552m9c5wqfwws59cqgx87sn8vq6bkfr621076z35"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("perl" ,perl)))
+     `(("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
     (inputs
      `(("curl" ,curl)
-       ("duktape" ,duktape)
        ("pcre" ,pcre)
+       ("quickjs" ,quickjs)
        ("readline" ,readline)
        ("tidy" ,tidy-html)))
     (arguments
      `(#:make-flags
-       (list (string-append "prefix=" %output)
+       (list "-C" "src"
+             (string-append "PREFIX=" %output)
              "CC=gcc")
        #:modules ((ice-9 popen)
                   (guix build gnu-build-system)
                   (guix build utils))
        #:phases
        (modify-phases %standard-phases
-         (delete 'configure)
+         (replace 'configure
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "src/makefile"
+               (("^QUICKJS_LDFLAGS = -L/usr/local/lib")
+                (string-append "QUICKJS_LDFLAGS = -L"
+                               (assoc-ref inputs "quickjs")
+                               "/lib"))
+               (("^PERL !=.*")
+                (string-append "PERL = " (which "perl") "\n"))
+               (("!=[[:blank:]]*([^\n]*)" _ cmd)
+                ;; This transformation is easier than getting the build-system
+                ;; to use BSD's make.
+                (string-append ":= $(shell " cmd ")")))))
          (replace 'check
            (lambda _
              (with-directory-excursion "src"
@@ -63,8 +78,17 @@
                      (error "test failed"))
                    #t)))))
          (replace 'install
-           (lambda* (#:key make-flags #:allow-other-keys)
-             (apply invoke "make" "-C" "src" "install" make-flags))))))
+           (lambda* (#:key make-flags outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (mandir (string-append out "/share/man/man1"))
+                    (docdir (string-append out "/share/doc/edbrowse-" ,version)))
+               (mkdir-p mandir)
+               (mkdir-p docdir)
+               (copy-file "doc/man-edbrowse-debian.1"
+                          (string-append mandir "/edbrowse.1"))
+               (for-each (lambda (f) (install-file f docdir))
+                         (find-files "doc" ".*\\.(ebrc|html)"))
+               (apply invoke "make" "install" make-flags)))))))
     (home-page "https://www.edbrowse.org")
     (synopsis "Command line editor browser")
     (description "Edbrowse is a combination editor, browser, and mail client