Merge branch 'abe' into identity_abe

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

diff --git a/guix-env.scm b/guix-env.scm
index 958e0714661c1c06d1aa0fc53363c816ecb58fe6..ec3a8e1f8f2bbc6751b23c47968810d1218359f6 100644 (file)
--- a/guix-env.scm
+++ b/guix-env.scm
@@ -1,5 +1,5 @@
 ;;; This file is part of GNUnet.
-;;; Copyright (C) 2016 GNUnet e.V.
+;;; Copyright (C) 2016, 2017 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
@@ -16,46 +16,31 @@
 ;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;;; Boston, MA 02110-1301, USA.
 ;;;
-;;;
-;;; Author: N. Gillmann <ngillmann@runbox.com>
-;;;
-;;; Parts borrowed here from pubstrate:
-;;; Pubstrate 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.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with Pubstrate.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-;;; Parts borrowed here from guile-sdl2:
-;;; Guile-sdl2 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.
-;;;
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with guile-sdl2.  If not, see
-;;; <http://www.gnu.org/licenses/>.
-
 ;; Guix package for GNUnet development
 ;;
 ;; INSTALL
+;; -------
 ;;
 ;; To build and install the package in the user environment, use:
 ;;
-;; .. to be documented
+;; guix package --install-from-file=guix-env.scm
 ;;
 ;; BUILD ONLY
+;; ----------
 ;;
 ;; Precondition for using this file is that you run Guix and have a
 ;; development setup for this setup, which involves a version of Guile in
 ;; your PATH.
 ;;
-;; Simply run "guix build -f guix-env.scm"
+;; guix build -f guix-env.scm
 ;;
 ;; We'd like to provide advanced functions such as guix environment specific
-;; gnunet-svn package, but this is subject to tests right now.
+;; gnunet-git package and usage of gnunet-gtk-git, but this is subject
+;; to tests right now.
+;;
+;; Further versions of GNUnet for Guix can currently be found in
+;; https://git.pragmatique.xyz/ng0-packages/log.html, mirrored at
+;; https://notabug.org/ng0/ng0-packages
 
 (use-modules
  (ice-9 popen)
@@ -65,6 +50,7 @@
  (guix build-system gnu)
  (guix gexp)
  ((guix build utils) #:select (with-directory-excursion))
+ (guix git-download)
  (gnu packages)
  (gnu packages aidc)
  (gnu packages autotools)
@@ -104,31 +90,14 @@
 
 (define %source-dir (dirname (current-filename)))
 
-(define git-file?
-  (let* ((pipe (with-directory-excursion %source-dir
-                 (open-pipe* OPEN_READ "git" "ls-files")))
-         (files (let loop ((lines '()))
-                  (match (read-line pipe)
-                    ((? eof-object?)
-                     (reverse lines))
-                    (line
-                     (loop (cons line lines))))))
-         (status (close-pipe pipe)))
-    (lambda (file stat)
-      (match (stat:type stat)
-        ('directory #t)
-        ((or 'regular 'symlink)
-         (any (cut string-suffix? <> file) files))
-        (_ #f)))))
-
 (define gnunet-git
   (package
     (name "gnunet-git")
     (version (string-append "0.10.1-" "dev"))
     (source
      (local-file %source-dir
-                 #:recursive? #t))
-                 ;;#:select? git-file?)) ; XXX: FIXME.
+                 #:recursive? #t
+                 #:select? (git-predicate %source-dir)))
     (build-system gnu-build-system)
     (inputs
      `(("glpk" ,glpk)
@@ -172,7 +141,6 @@
     (arguments
      `(#:configure-flags
        (list (string-append "--with-nssdir=" %output "/lib")
-             ;; These appear to be "broken" on Guix, needs debugging.
              "--enable-gcc-hardening"
              "--enable-linker-hardening"