make sure port is closed on shutdown

[oweals/gnunet.git] / guix-env.scm

diff --git a/guix-env.scm b/guix-env.scm
index d44b4d71fbc7c48b43da547e9c7f664e8ee04189..588f389c58b59574b41eff3ee802fabbda1d212a 100644 (file)
--- a/guix-env.scm
+++ b/guix-env.scm
@@ -1,20 +1,18 @@
 ;;; This file is part of GNUnet.
 ;;; Copyright (C) 2016, 2017, 2018 GNUnet e.V.
 ;;;
-;;; GNUnet is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published
-;;; by the Free Software Foundation; either version 3, or (at your
-;;; option) any later version.
+;;; GNUnet is free software: you can redistribute it and/or modify it
+;;; under the terms of the GNU Affero General Public License as published
+;;; by the Free Software Foundation, either version 3 of the License,
+;;; or (at your option) any later version.
 ;;;
 ;;; GNUnet is distributed in the hope that it will be useful, but
 ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; General Public License for more details.
+;;; Affero General Public License for more details.
 ;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNUnet; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;;; Boston, MA 02110-1301, USA.
+;;; You should have received a copy of the GNU Affero General Public License
+;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules
  (ice-9 popen)
@@ -66,19 +64,17 @@
  (gnu packages xiph)
  ((guix licenses) #:prefix license:))
 
-(define %source-dir (string-append (current-source-directory)
-                                   "/../../../"))
+(define %source-dir (current-source-directory))
 
 (define gnunet-dev-env
   (let* ((revision "1")
          (select? (delay (or (git-predicate
-                              (string-append (current-source-directory)
-                                             "/../../../"))
+                              (current-source-directory))
                              source-file?))))
     (package
       (inherit gnunet)
-      (name "gnunet-dev-env")
-      (version (string-append "0.11-" revision "." "dev-env"))
+      (name "gnunet")
+      (version (string-append "git" revision))
       (source
        (local-file
         (string-append (getcwd))
@@ -88,7 +84,7 @@
          ("gnurl" ,gnurl)
          ("gstreamer" ,gstreamer)
          ("gst-plugins-base" ,gst-plugins-base)
-         ("gnutls/dane" ,gnutls/dane) ;Change to gnutls/dane once it is merged.
+         ("gnutls/dane" ,gnutls/dane)
          ("libextractor" ,libextractor)
          ("libgcrypt" ,libgcrypt)
          ("libidn" ,libidn)
@@ -100,10 +96,11 @@
          ("pulseaudio" ,pulseaudio)
          ("sqlite" ,sqlite)
          ("postgresql" ,postgresql)
-         ("mysql" ,mysql)
+         ("mysql" ,mariadb)
          ("zlib" ,zlib)
          ("perl" ,perl)
          ("python-2" ,python-2) ; tests and gnunet-qr
+         ("python2-future" ,python2-future)
          ("jansson" ,jansson)
          ("nss" ,nss)
          ("glib" ,glib "bin")
@@ -124,25 +121,27 @@
          ("libtool" ,libtool)))
       (outputs '("out" "debug"))
       (arguments
-       `(#:configure-flags
-         (list (string-append "--with-nssdir=" %output "/lib")
+       `(;#:configure-flags
+         ;;(list (string-append "--with-nssdir=" %output "/lib")
                ;;"--enable-gcc-hardening"
                ;;"--enable-linker-hardening"
-               "--enable-logging=verbose"
-               "CFLAGS=-ggdb -O0")
+               ;;;;"--enable-documentation-only")
+               ;;;"--enable-logging=verbose"
+               ;;;"CFLAGS=-ggdb -O0")
          #:phases
          ;; swap check and install phases and set paths to installed bin
          (modify-phases %standard-phases
            (add-after 'unpack 'patch-bin-sh
              (lambda _
-               (substitute* "bootstrap"
-                 (("contrib/pogen.sh") "sh contrib/pogen.sh"))
                (for-each (lambda (f) (chmod f #o755))
                          (find-files "po" ""))
                #t))
            (add-after 'patch-bin-sh 'bootstrap
              (lambda _
-               (zero? (system* "sh" "bootstrap"))))
+               (invoke "sh" "bootstrap")))
+           ;;(add-before 'build 'chdir
+           ;; (lambda _
+           ;;  (chdir "doc/documentation")))
            (delete 'check)
            ;; XXX: https://gnunet.org/bugs/view.php?id=4619
            (add-after 'install 'set-path-for-check
@@ -152,6 +151,6 @@
                       (lib (string-append out "/lib")))
                  (setenv "GNUNET_PREFIX" lib)
                  (setenv "PATH" (string-append (getenv "PATH") ":" bin))
-                 (zero? (system* "make" "check")))))))))))
+                 (invoke "make" "check"))))))))))
 
 gnunet-dev-env