aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2019-02-27 20:25:54 +0100
committerHartmut Goebel <h.goebel@crazy-compilers.com>2019-02-28 12:59:45 +0100
commit577b5107ff3d2240764374956f2bf0d19d84974a (patch)
treede16627d5cd7d3e1e92f42303898c560ef713605 /contrib
parent7016c019798fdd467fba67cc131ae564b472eacc (diff)
downloadgnunet-577b5107ff3d2240764374956f2bf0d19d84974a.tar.gz
gnunet-577b5107ff3d2240764374956f2bf0d19d84974a.zip
contrib/guix: Cleanup guix environment files and README.
- move the docs contained in guix-env.scm to guix/README, - change these docs to only use "--load-path=<gnunet.git>/contrib/guix" and GUIX_PACKAGE_PATH, - delete guix-env.scm and guix.packages.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/guix-env.scm46
-rw-r--r--contrib/guix.packages44
-rw-r--r--contrib/guix/README33
3 files changed, 31 insertions, 92 deletions
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 @@
1;;; This file is part of GNUnet.
2;;; Copyright (C) 2016, 2017, 2018 GNUnet e.V.
3;;;
4;;; GNUnet is free software: you can redistribute it and/or modify it
5;;; under the terms of the GNU Affero General Public License as published
6;;; by the Free Software Foundation, either version 3 of the License,
7;;; or (at your option) any later version.
8;;;
9;;; GNUnet is distributed in the hope that it will be useful, but
10;;; WITHOUT ANY WARRANTY; without even the implied warranty of
11;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12;;; Affero General Public License for more details.
13;;;
14;;; You should have received a copy of the GNU Affero General Public License
15;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
16
17
18;;; GNUnet development environment for Guix
19;;
20;; Depending on whether the search path <gnunet.git>/guix is included or not,
21;; the environment has GNUnet from git or uses the GNU distribution's
22;; (most likely older) GNUnet package.
23;;
24;; You can use the development version of GNUnet by passing an extra parameter
25;; or setting an environment variable:
26;;
27;; --load-path=<gnunet.git>/guix
28;; export GUIX_PACKAGE_PATH=<gnunet.git>/guix
29;;
30;; To spawn an environment with GNUnet's dependencies installed, run:
31;;
32;; guix environment -l guix-env.scm
33;;
34;; To also make GNUnet available in this environment, run:
35;;
36;; guix environment -l guix-env.scm --ad-hoc -l guix-env.scm
37;;
38;; It is recommented to also pass the '--pure' option to guix, to make sure the
39;; environment is not polluted with existing packages.
40;;
41;; The version of the resulting package is the output of 'git describe --tags'.
42
43(use-modules
44 (gnu packages gnunet))
45
46gnunet
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 @@
1;;; -*- mode: scheme -*-
2;;; Packages required to develop GNUnet with Guix.
3;;; (See guix package --manifest option for more details on this file).
4
5(use-modules (guix profiles)
6 (gnu packages))
7
8
9(define gnunet-dev-packages
10 (list "glpk"
11 "gnurl"
12 "gstreamer"
13 "gst-plugins-base"
14 "gnutls/dane"
15 "libextractor"
16 "libgcrypt"
17 "libidn"
18 "libunistring"
19 "openssl"
20 "opus"
21 "pulseaudio"
22 "sqlite"
23 "mysql"
24 "postgresql"
25 "zlib"
26 "perl"
27 "jansson"
28 "nss"
29 "glib"
30 "gmp"
31 "glib"
32 "glibc-locales"
33 "bluez"
34 "texlive" ; FIXME: minimize
35 "pkg-config"
36 "autoconf"
37 "automake"
38 "gnu-gettext"
39 "which"
40 "texinfo-5"
41 "libtool"))
42
43
44(map specification->package gnunet-dev-packages)
diff --git a/contrib/guix/README b/contrib/guix/README
index 720cee28e..6f862283a 100644
--- a/contrib/guix/README
+++ b/contrib/guix/README
@@ -1,4 +1,33 @@
1This directory contains Guix package definitions that can be used to override 1This directory contains Guix package definitions that can be used to
2the ones found in Guix's GNU distribution. 2override the ones found in Guix's GNU distribution.
3 3
4Guix packagers are encouraged to adopt and adjust these definitions. 4Guix packagers are encouraged to adopt and adjust these definitions.
5
6GNUnet developers can use this for easily setting up a development or
7test environment using Guix.
8
9When using the package definition for building a package this will
10pick up the current development code. The version of the resulting
11package is the output of 'git describe --tags'.
12
13
14To make guix pick up the package definition contained here you need to
15either pass an extra parameter to guix or or set an environment
16variable:
17
18 guix ... --load-path=<gnunet.git>/contrib/guix ...
19 export GUIX_PACKAGE_PATH=<gnunet.git>/contrib/guix
20
21To spawn a (development) environment with GNUnet's dependencies
22installed, run:
23
24 guix environment --load-path=<gnunet.git>/contrib/guix guix
25
26To spawn a (test) environment with GNUnet available in this
27environment, run:
28
29 guix environment --load-path=<gnunet.git>/contrib/guix --ad-hoc guix
30
31
32It is recommented to also pass the '--pure' option to guix, to make
33sure the environment is not polluted with existing packages.