1 files changed, 13 insertions, 16 deletions

diff --git a/guix-env.scm b/guix-env.scm
index b1a5f94c6..588f389c5 100644
--- 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)
@@ -75,8 +73,8 @@
                              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))
@@ -98,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")
@@ -134,14 +133,12 @@
          (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")))
@@ -154,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