diff options
author | ng0 <contact.ng0@cryptolab.net> | 2017-05-14 17:03:39 +0000 |
---|---|---|
committer | ng0 <contact.ng0@cryptolab.net> | 2017-05-14 17:03:41 +0000 |
commit | b612bb0dbc760cecdb64ad5cbd4ce65979971004 (patch) | |
tree | e43b3c4b4b8d354b82f9cb6ac6c7570164ac1d02 /guix-env.scm | |
parent | 696ca66c291f84d7bdbc7a043c6156d2b9de0607 (diff) | |
download | gnunet-b612bb0dbc760cecdb64ad5cbd4ce65979971004.tar.gz gnunet-b612bb0dbc760cecdb64ad5cbd4ce65979971004.zip |
guix-env.scm: Remove unused code. Point out location for further gnunet variations.
Diffstat (limited to 'guix-env.scm')
-rw-r--r-- | guix-env.scm | 52 |
1 files changed, 9 insertions, 43 deletions
diff --git a/guix-env.scm b/guix-env.scm index 958e07146..fc3d5a231 100644 --- a/guix-env.scm +++ b/guix-env.scm | |||
@@ -1,5 +1,5 @@ | |||
1 | ;;; This file is part of GNUnet. | 1 | ;;; This file is part of GNUnet. |
2 | ;;; Copyright (C) 2016 GNUnet e.V. | 2 | ;;; Copyright (C) 2016, 2017 GNUnet e.V. |
3 | ;;; | 3 | ;;; |
4 | ;;; GNUnet is free software; you can redistribute it and/or modify | 4 | ;;; GNUnet is free software; you can redistribute it and/or modify |
5 | ;;; it under the terms of the GNU General Public License as published | 5 | ;;; it under the terms of the GNU General Public License as published |
@@ -16,46 +16,30 @@ | |||
16 | ;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 | ;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
17 | ;;; Boston, MA 02110-1301, USA. | 17 | ;;; Boston, MA 02110-1301, USA. |
18 | ;;; | 18 | ;;; |
19 | ;;; | ||
20 | ;;; Author: N. Gillmann <ngillmann@runbox.com> | ||
21 | ;;; | ||
22 | ;;; Parts borrowed here from pubstrate: | ||
23 | ;;; Pubstrate is distributed in the hope that it will be useful, but | ||
24 | ;;; WITHOUT ANY WARRANTY; without even the implied warranty of | ||
25 | ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
26 | ;;; General Public License for more details. | ||
27 | ;;; | ||
28 | ;;; You should have received a copy of the GNU General Public License | ||
29 | ;;; along with Pubstrate. If not, see <http://www.gnu.org/licenses/>. | ||
30 | ;;; | ||
31 | ;;; Parts borrowed here from guile-sdl2: | ||
32 | ;;; Guile-sdl2 is distributed in the hope that it will be useful, but | ||
33 | ;;; WITHOUT ANY WARRANTY; without even the implied warranty of | ||
34 | ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
35 | ;;; General Public License for more details. | ||
36 | ;;; | ||
37 | ;;; You should have received a copy of the GNU Lesser General Public | ||
38 | ;;; License along with guile-sdl2. If not, see | ||
39 | ;;; <http://www.gnu.org/licenses/>. | ||
40 | |||
41 | ;; Guix package for GNUnet development | 19 | ;; Guix package for GNUnet development |
42 | ;; | 20 | ;; |
43 | ;; INSTALL | 21 | ;; INSTALL |
22 | ;; ------- | ||
44 | ;; | 23 | ;; |
45 | ;; To build and install the package in the user environment, use: | 24 | ;; To build and install the package in the user environment, use: |
46 | ;; | 25 | ;; |
47 | ;; .. to be documented | 26 | ;; guix package --install-from-file=guix-env.scm |
48 | ;; | 27 | ;; |
49 | ;; BUILD ONLY | 28 | ;; BUILD ONLY |
29 | ;; ---------- | ||
50 | ;; | 30 | ;; |
51 | ;; Precondition for using this file is that you run Guix and have a | 31 | ;; Precondition for using this file is that you run Guix and have a |
52 | ;; development setup for this setup, which involves a version of Guile in | 32 | ;; development setup for this setup, which involves a version of Guile in |
53 | ;; your PATH. | 33 | ;; your PATH. |
54 | ;; | 34 | ;; |
55 | ;; Simply run "guix build -f guix-env.scm" | 35 | ;; guix build -f guix-env.scm |
56 | ;; | 36 | ;; |
57 | ;; We'd like to provide advanced functions such as guix environment specific | 37 | ;; We'd like to provide advanced functions such as guix environment specific |
58 | ;; gnunet-svn package, but this is subject to tests right now. | 38 | ;; gnunet-svn package, but this is subject to tests right now. |
39 | ;; | ||
40 | ;; Further versions of GNUnet for Guix can currently be found in | ||
41 | ;; https://git.pragmatique.xyz/ng0-packages/log.html, mirrored at | ||
42 | ;; https://notabug.org/ng0/ng0-packages | ||
59 | 43 | ||
60 | (use-modules | 44 | (use-modules |
61 | (ice-9 popen) | 45 | (ice-9 popen) |
@@ -104,23 +88,6 @@ | |||
104 | 88 | ||
105 | (define %source-dir (dirname (current-filename))) | 89 | (define %source-dir (dirname (current-filename))) |
106 | 90 | ||
107 | (define git-file? | ||
108 | (let* ((pipe (with-directory-excursion %source-dir | ||
109 | (open-pipe* OPEN_READ "git" "ls-files"))) | ||
110 | (files (let loop ((lines '())) | ||
111 | (match (read-line pipe) | ||
112 | ((? eof-object?) | ||
113 | (reverse lines)) | ||
114 | (line | ||
115 | (loop (cons line lines)))))) | ||
116 | (status (close-pipe pipe))) | ||
117 | (lambda (file stat) | ||
118 | (match (stat:type stat) | ||
119 | ('directory #t) | ||
120 | ((or 'regular 'symlink) | ||
121 | (any (cut string-suffix? <> file) files)) | ||
122 | (_ #f))))) | ||
123 | |||
124 | (define gnunet-git | 91 | (define gnunet-git |
125 | (package | 92 | (package |
126 | (name "gnunet-git") | 93 | (name "gnunet-git") |
@@ -128,7 +95,6 @@ | |||
128 | (source | 95 | (source |
129 | (local-file %source-dir | 96 | (local-file %source-dir |
130 | #:recursive? #t)) | 97 | #:recursive? #t)) |
131 | ;;#:select? git-file?)) ; XXX: FIXME. | ||
132 | (build-system gnu-build-system) | 98 | (build-system gnu-build-system) |
133 | (inputs | 99 | (inputs |
134 | `(("glpk" ,glpk) | 100 | `(("glpk" ,glpk) |