[GNUnet-SVN] [gnunet] branch master updated (7016c0197 -> fe64845d5)

[gnunet]

This is an automated email from the git hooks/post-receive script.

htgoebel pushed a change to branch master
in repository gnunet.

    from 7016c0197 add missing documentation files
     new 577b5107f contrib/guix: Cleanup guix environment files and README.
     new fe64845d5 contrib/guix: Add guix-bug-notice to readme.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/guix-env.scm  | 46 ----------------------------------------------
 contrib/guix.packages | 44 --------------------------------------------
 contrib/guix/README   | 38 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 92 deletions(-)
 delete mode 100644 contrib/guix-env.scm
 delete mode 100644 contrib/guix.packages

diff --git a/contrib/guix-env.scm b/contrib/guix-env.scm
deleted file mode 100644
index e4db64547..000000000
--- a/contrib/guix-env.scm
+++ /dev/null
@@ -1,46 +0,0 @@
-;;; 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 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
-;;; Affero General Public License for more details.
-;;;
-;;; 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/>.
-
-
-;;; GNUnet development environment for Guix
-;;
-;; Depending on whether the search path <gnunet.git>/guix is included or not,
-;; the environment has GNUnet from git or uses the GNU distribution's
-;; (most likely older) GNUnet package.
-;;
-;; You can use the development version of GNUnet by passing an extra parameter
-;; or setting an environment variable:
-;;
-;;   --load-path=<gnunet.git>/guix
-;;   export GUIX_PACKAGE_PATH=<gnunet.git>/guix
-;;
-;; To spawn an environment with GNUnet's dependencies installed, run:
-;;
-;;   guix environment -l guix-env.scm
-;;
-;; To also make GNUnet available in this environment, run:
-;;
-;;   guix environment -l guix-env.scm --ad-hoc -l guix-env.scm
-;;
-;; It is recommented to also pass the '--pure' option to guix, to make sure the
-;; environment is not polluted with existing packages.
-;;
-;; The version of the resulting package is the output of 'git describe --tags'.
-
-(use-modules
- (gnu packages gnunet))
-
-gnunet
diff --git a/contrib/guix.packages b/contrib/guix.packages
deleted file mode 100644
index 3b2f6cfcd..000000000
--- a/contrib/guix.packages
+++ /dev/null
@@ -1,44 +0,0 @@
-;;; -*- mode: scheme -*-
-;;; Packages required to develop GNUnet with Guix.
-;;; (See guix package --manifest option for more details on this file).
-
-(use-modules (guix profiles)
-            (gnu packages))
-
-
-(define gnunet-dev-packages
-  (list "glpk"
-        "gnurl"
-        "gstreamer"
-        "gst-plugins-base"
-        "gnutls/dane"
-        "libextractor"
-        "libgcrypt"
-        "libidn"
-        "libunistring"
-        "openssl"
-        "opus"
-        "pulseaudio"
-        "sqlite"
-        "mysql"
-        "postgresql"
-        "zlib"
-        "perl"
-        "jansson"
-        "nss"
-        "glib"
-        "gmp"
-        "glib"
-        "glibc-locales"
-        "bluez"
-        "texlive" ; FIXME: minimize
-        "pkg-config"
-        "autoconf"
-        "automake"
-        "gnu-gettext"
-        "which"
-        "texinfo-5"
-        "libtool"))
-
-
-(map specification->package gnunet-dev-packages)
diff --git a/contrib/guix/README b/contrib/guix/README
index 720cee28e..bb128aaf2 100644
--- a/contrib/guix/README
+++ b/contrib/guix/README
@@ -1,4 +1,38 @@
-This directory contains Guix package definitions that can be used to override
-the ones found in Guix's GNU distribution.
+This directory contains Guix package definitions that can be used to
+override the ones found in Guix's GNU distribution.
 
 Guix packagers are encouraged to adopt and adjust these definitions.
+
+GNUnet developers can use this for easily setting up a development or
+test environment using Guix.
+
+When using the package definition for building a package this will
+pick up the current development code. The version of the resulting
+package is the output of 'git describe --tags'.
+
+
+To make guix pick up the package definition contained here you need to
+either pass an extra parameter to guix or or set an environment
+variable:
+
+  guix ... --load-path=<gnunet.git>/contrib/guix ...
+  export GUIX_PACKAGE_PATH=<gnunet.git>/contrib/guix
+
+NOTE: Due to a bug in guix 0.16, using --load-path currently does not
+      work as expected. Please set the environment variable. See
+      <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34679> for
+      details.
+
+To spawn a (development) environment with GNUnet's dependencies
+installed, run:
+
+  guix environment --load-path=<gnunet.git>/contrib/guix guix
+
+To spawn a (test) environment with GNUnet available in this
+environment, run:
+
+  guix environment --load-path=<gnunet.git>/contrib/guix --ad-hoc guix
+
+
+It is recommented to also pass the '--pure' option to guix, to make
+sure the environment is not polluted with existing packages.

-- 
To stop receiving notification emails like this one, please contact
address@hidden