diff options
author | ng0 <ng0@infotropique.org> | 2017-08-17 11:37:28 +0000 |
---|---|---|
committer | ng0 <ng0@infotropique.org> | 2017-08-17 11:47:40 +0000 |
commit | 8065fcca1c748acae911fc9819d2f9c31d37d43e (patch) | |
tree | 1315230ec67226767dc18856c80d54a897e12a5e /guix-env.scm | |
parent | d587ba0915db6854959c4dfc2730b34d9577a395 (diff) | |
download | gnunet-8065fcca1c748acae911fc9819d2f9c31d37d43e.tar.gz gnunet-8065fcca1c748acae911fc9819d2f9c31d37d43e.zip |
guix-env.scm: Small adjustments.
Signed-off-by: ng0 <ng0@infotropique.org>
Diffstat (limited to 'guix-env.scm')
-rw-r--r-- | guix-env.scm | 177 |
1 files changed, 88 insertions, 89 deletions
diff --git a/guix-env.scm b/guix-env.scm index ec3a8e1f8..9d4430097 100644 --- a/guix-env.scm +++ b/guix-env.scm | |||
@@ -39,8 +39,7 @@ | |||
39 | ;; to tests right now. | 39 | ;; to tests right now. |
40 | ;; | 40 | ;; |
41 | ;; Further versions of GNUnet for Guix can currently be found in | 41 | ;; Further versions of GNUnet for Guix can currently be found in |
42 | ;; https://git.pragmatique.xyz/ng0-packages/log.html, mirrored at | 42 | ;; https://gitweb.krosos.org/ng0_guix/packages.git/ |
43 | ;; https://notabug.org/ng0/ng0-packages | ||
44 | 43 | ||
45 | (use-modules | 44 | (use-modules |
46 | (ice-9 popen) | 45 | (ice-9 popen) |
@@ -91,98 +90,98 @@ | |||
91 | (define %source-dir (dirname (current-filename))) | 90 | (define %source-dir (dirname (current-filename))) |
92 | 91 | ||
93 | (define gnunet-git | 92 | (define gnunet-git |
94 | (package | 93 | (let* ((revision "1")) |
95 | (name "gnunet-git") | 94 | (package |
96 | (version (string-append "0.10.1-" "dev")) | 95 | (name "gnunet-git") |
97 | (source | 96 | (version (string-append "0.10.1-" revision "." "dev")) |
98 | (local-file %source-dir | 97 | (source |
99 | #:recursive? #t | 98 | (local-file %source-dir |
100 | #:select? (git-predicate %source-dir))) | 99 | #:recursive? #t)) |
101 | (build-system gnu-build-system) | 100 | (build-system gnu-build-system) |
102 | (inputs | 101 | (inputs |
103 | `(("glpk" ,glpk) | 102 | `(("glpk" ,glpk) |
104 | ("gnurl" ,gnurl) | 103 | ("gnurl" ,gnurl) |
105 | ("gstreamer" ,gstreamer) | 104 | ("gstreamer" ,gstreamer) |
106 | ("gst-plugins-base" ,gst-plugins-base) | 105 | ("gst-plugins-base" ,gst-plugins-base) |
107 | ("gnutls" ,gnutls) | 106 | ("gnutls" ,gnutls) |
108 | ("libextractor" ,libextractor) | 107 | ("libextractor" ,libextractor) |
109 | ("libgcrypt" ,libgcrypt) | 108 | ("libgcrypt" ,libgcrypt) |
110 | ("libidn" ,libidn) | 109 | ("libidn" ,libidn) |
111 | ("libmicrohttpd" ,libmicrohttpd) | 110 | ("libmicrohttpd" ,libmicrohttpd) |
112 | ("libltdl" ,libltdl) | 111 | ("libltdl" ,libltdl) |
113 | ("libunistring" ,libunistring) | 112 | ("libunistring" ,libunistring) |
114 | ("openssl" ,openssl) | 113 | ("openssl" ,openssl) |
115 | ("opus" ,opus) | 114 | ("opus" ,opus) |
116 | ("pulseaudio" ,pulseaudio) | 115 | ("pulseaudio" ,pulseaudio) |
117 | ("sqlite" ,sqlite) | 116 | ("sqlite" ,sqlite) |
118 | ("postgresql" ,postgresql) | 117 | ("postgresql" ,postgresql) |
119 | ("mysql" ,mysql) | 118 | ("mysql" ,mysql) |
120 | ("zlib" ,zlib) | 119 | ("zlib" ,zlib) |
121 | ("perl" ,perl) | 120 | ("perl" ,perl) |
122 | ("python" ,python) ; tests and gnunet-qr | 121 | ("python" ,python) ; tests and gnunet-qr |
123 | ("jansson" ,jansson) | 122 | ("jansson" ,jansson) |
124 | ("nss" ,nss) | 123 | ("nss" ,nss) |
125 | ("gmp" ,gmp) | 124 | ("gmp" ,gmp) |
126 | ("bluez" ,bluez) ; for optional bluetooth feature | 125 | ("bluez" ,bluez) ; for optional bluetooth feature |
127 | ("glib" ,glib) | 126 | ("glib" ,glib) |
128 | ;; There are currently no binary substitutes for texlive on | 127 | ;; There are currently no binary substitutes for texlive on |
129 | ;; hydra.gnu.org or its mirrors due to its size. Uncomment if you need it. | 128 | ;; hydra.gnu.org or its mirrors due to its size. Uncomment if you need it. |
130 | ;;("texlive-minimal" ,texlive-minimal) ; optional. | 129 | ;;("texlive-minimal" ,texlive-minimal) ; optional. |
131 | ("libogg" ,libogg))) | 130 | ("libogg" ,libogg))) |
132 | (native-inputs | 131 | (native-inputs |
133 | `(("pkg-config" ,pkg-config) | 132 | `(("pkg-config" ,pkg-config) |
134 | ("autoconf" ,autoconf) | 133 | ("autoconf" ,autoconf) |
135 | ("automake" ,automake) | 134 | ("automake" ,automake) |
136 | ("gnu-gettext" ,gnu-gettext) | 135 | ("gnu-gettext" ,gnu-gettext) |
137 | ("libtool" ,libtool))) | 136 | ("libtool" ,libtool))) |
138 | ;; TODO: To make use of out:debug, which carries the symbols, | 137 | ;; TODO: To make use of out:debug, which carries the symbols, |
139 | ;; this file needs to fixed. | 138 | ;; this file needs to fixed. |
140 | (outputs '("out" "debug")) | 139 | (outputs '("out" "debug")) |
141 | (arguments | 140 | (arguments |
142 | `(#:configure-flags | 141 | `(#:configure-flags |
143 | (list (string-append "--with-nssdir=" %output "/lib") | 142 | (list (string-append "--with-nssdir=" %output "/lib") |
144 | "--enable-gcc-hardening" | 143 | "--enable-gcc-hardening" |
145 | "--enable-linker-hardening" | 144 | "--enable-linker-hardening" |
146 | 145 | ||
147 | "--enable-poisoning" | 146 | "--enable-poisoning" |
148 | "--enable-sanitizer" | 147 | "--enable-sanitizer" |
149 | "--enable-experimental" | 148 | "--enable-experimental" |
150 | "--enable-logging=verbose" | 149 | "--enable-logging=verbose" |
151 | "CFLAGS=-ggdb -O0") | 150 | "CFLAGS=-ggdb -O0") |
152 | ;;#:parallel-tests? #f ; parallel building seems to fail | 151 | ;;#:parallel-tests? #f ; parallel building seems to fail |
153 | ;;#:tests? #f ; fail: test_gnunet_statistics.py | 152 | ;;#:tests? #f ; fail: test_gnunet_statistics.py |
154 | #:phases | 153 | #:phases |
155 | ;; swap check and install phases and set paths to installed bin | 154 | ;; swap check and install phases and set paths to installed bin |
156 | (modify-phases %standard-phases | 155 | (modify-phases %standard-phases |
157 | (add-after 'unpack 'patch-bin-sh | 156 | (add-after 'unpack 'patch-bin-sh |
158 | (lambda _ | 157 | (lambda _ |
159 | (substitute* "bootstrap" | 158 | (substitute* "bootstrap" |
160 | (("contrib/pogen.sh") "sh contrib/pogen.sh")) | 159 | (("contrib/pogen.sh") "sh contrib/pogen.sh")) |
161 | (for-each (lambda (f) (chmod f #o755)) | 160 | (for-each (lambda (f) (chmod f #o755)) |
162 | (find-files "po" "")) | 161 | (find-files "po" "")) |
163 | #t)) | 162 | #t)) |
164 | (add-after 'patch-bin-sh 'bootstrap | 163 | (add-after 'patch-bin-sh 'bootstrap |
165 | (lambda _ | 164 | (lambda _ |
166 | (zero? (system* "sh" "bootstrap")))) | 165 | (zero? (system* "sh" "bootstrap")))) |
167 | (delete 'check)))) | 166 | (delete 'check)))) |
168 | ;; XXX: https://gnunet.org/bugs/view.php?id=4619 | 167 | ;; XXX: https://gnunet.org/bugs/view.php?id=4619 |
169 | ;; (add-after 'install 'set-path-for-check | 168 | ;; (add-after 'install 'set-path-for-check |
170 | ;; (lambda* (#:key outputs #:allow-other-keys) | 169 | ;; (lambda* (#:key outputs #:allow-other-keys) |
171 | ;; (let* ((out (assoc-ref outputs "out")) | 170 | ;; (let* ((out (assoc-ref outputs "out")) |
172 | ;; (bin (string-append out "/bin")) | 171 | ;; (bin (string-append out "/bin")) |
173 | ;; (lib (string-append out "/lib"))) | 172 | ;; (lib (string-append out "/lib"))) |
174 | ;; (setenv "GNUNET_PREFIX" lib) | 173 | ;; (setenv "GNUNET_PREFIX" lib) |
175 | ;; (setenv "PATH" (string-append (getenv "PATH") ":" bin)) | 174 | ;; (setenv "PATH" (string-append (getenv "PATH") ":" bin)) |
176 | ;; (zero? (system* "make" "check")))))))) | 175 | ;; (zero? (system* "make" "check")))))))) |
177 | (synopsis "Secure, decentralized, peer-to-peer networking framework") | 176 | (synopsis "Secure, decentralized, peer-to-peer networking framework") |
178 | (description | 177 | (description |
179 | "GNUnet is a framework for secure peer-to-peer networking. The | 178 | "GNUnet is a framework for secure peer-to-peer networking. The |
180 | high-level goal is to provide a strong foundation of free software for a | 179 | high-level goal is to provide a strong foundation of free software for a |
181 | global, distributed network that provides security and privacy. GNUnet in | 180 | global, distributed network that provides security and privacy. GNUnet in |
182 | that sense aims to replace the current internet protocol stack. Along with | 181 | that sense aims to replace the current internet protocol stack. Along with |
183 | an application for secure publication of files, it has grown to include all | 182 | an application for secure publication of files, it has grown to include all |
184 | kinds of basic applications for the foundation of a GNU internet.") | 183 | kinds of basic applications for the foundation of a GNU internet.") |
185 | (license license:gpl3+) | 184 | (license license:gpl3+) |
186 | (home-page "https://gnunet.org/"))) | 185 | (home-page "https://gnunet.org/")))) |
187 | 186 | ||
188 | gnunet-git | 187 | gnunet-git |