;;; 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
;;; 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)
(guix build-system gnu)
(guix gexp)
((guix build utils) #:select (with-directory-excursion))
+ (guix git-download)
(gnu packages)
- (gnu packages base)
- (gnu packages gnunet)
- (gnu packages file)
(gnu packages aidc)
(gnu packages autotools)
+ (gnu packages backup)
+ (gnu packages base)
(gnu packages compression)
(gnu packages curl)
- (gnu packages geeqie)
+ (gnu packages databases)
+ (gnu packages file)
(gnu packages gettext)
(gnu packages glib)
(gnu packages gnome)
+ (gnu packages gnunet)
(gnu packages gnupg)
+ (gnu packages gnuzilla)
(gnu packages groff)
+ (gnu packages gstreamer)
(gnu packages gtk)
(gnu packages guile)
- (gnu packages gstreamer)
- (gnu packages gnuzilla)
- (gnu packages libidn)
- (gnu packages linux)
(gnu packages image)
+ (gnu packages image-viewers)
+ (gnu packages libidn)
(gnu packages libunistring)
+ (gnu packages linux)
(gnu packages maths)
(gnu packages multiprecision)
- (gnu packages pkg-config)
(gnu packages perl)
+ (gnu packages pkg-config)
(gnu packages pulseaudio)
(gnu packages python)
- (gnu packages databases)
- (gnu packages tls)
(gnu packages tex)
+ (gnu packages tls)
(gnu packages video)
(gnu packages web)
(gnu packages xiph)
- (gnu packages backup)
((guix licenses) #:prefix license:))
(define %source-dir (dirname (current-filename)))
-;; This will be needed when gnunet source moves to git.
-;; Taken from https://gitlab.com/dustyweb/pubstrate/blob/master/guix.scm
-(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-svn
+(define gnunet-git
(package
- (name "gnunet-svn")
+ (name "gnunet-git")
(version (string-append "0.10.1-" "dev"))
(source
(local-file %source-dir
- #:recursive? #t))
- ;;#:select? git-file?))
+ #:recursive? #t
+ #:select? (git-predicate %source-dir)))
(build-system gnu-build-system)
(inputs
`(("glpk" ,glpk)
(arguments
`(#:configure-flags
(list (string-append "--with-nssdir=" %output "/lib")
- "--enable-experimental"
- ;; These appear to be "broken" on Guix, needs debugging.
- ;;"--enable-gcc-hardening"
+ "--enable-gcc-hardening"
"--enable-linker-hardening"
- "--enable-logging=verbose"
+
"--enable-poisoning"
+ "--enable-sanitizer"
+ "--enable-experimental"
+ "--enable-logging=verbose"
"CFLAGS=-ggdb -O0")
;;#:parallel-tests? #f ; parallel building seems to fail
;;#:tests? #f ; fail: test_gnunet_statistics.py
(license license:gpl3+)
(home-page "https://gnunet.org/")))
-gnunet-svn
+gnunet-git