3 files changed, 31 insertions, 92 deletions
diff --git a/contrib/guix-env.scm b/contrib/guix-env.scm
deleted file mode 100644
@@ -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:
-;; 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'.
- (gnu packages gnunet))
diff --git a/contrib/guix.packages b/contrib/guix.packages
deleted file mode 100644
@@ -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))
- (list "glpk"
- "texlive" ; FIXME: minimize
-(map specification->package gnunet-dev-packages)
diff --git a/contrib/guix/README b/contrib/guix/README
index 720cee28e..6f862283a 100644
@@ -1,4 +1,33 @@
-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
+ guix ... --load-path=<gnunet.git>/contrib/guix ...
+ export GUIX_PACKAGE_PATH=<gnunet.git>/contrib/guix
+To spawn a (development) environment with GNUnet's dependencies
+ guix environment --load-path=<gnunet.git>/contrib/guix guix
+To spawn a (test) environment with GNUnet available in this
+ 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.