[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/16: gnu: gnunet: Fix indentation and use gexps.
From: |
guix-commits |
Subject: |
01/16: gnu: gnunet: Fix indentation and use gexps. |
Date: |
Sat, 1 Apr 2023 20:09:59 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit 2d4b61d014ce6daba6bc6c39df77a0c46cffe55c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Mar 31 11:39:21 2023 -0400
gnu: gnunet: Fix indentation and use gexps.
* gnu/packages/gnunet.scm (gnunet): Fix indentation.
[arguments]: Use gexps and delete trailing #t.
---
gnu/packages/gnunet.scm | 140 ++++++++++++++++++++++++------------------------
1 file changed, 71 insertions(+), 69 deletions(-)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 4d662d75fb..2b494862ad 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023 Adam Faiz <adam.faiz@disroot.org>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,6 +32,7 @@
(define-module (gnu packages gnunet)
#:use-module (gnu packages)
+ #:use-module (gnu packages base)
#:use-module (gnu packages file)
#:use-module (gnu packages aidc)
#:use-module (gnu packages autotools)
@@ -259,82 +261,82 @@ supports HTTP, HTTPS and GnuTLS.")
(define-public gnunet
(package
- (name "gnunet")
- (version "0.19.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/gnunet/gnunet-" version
- ".tar.gz"))
- (sha256
- (base32
- "09bspbjl6cll8wcrl1vnb56jwp30pcrg1yyj6xy3i0fl2bzdbdw2"))
- (modules '((guix build utils)))
- (snippet
- #~(begin
- ;; This is fixed in the upstream repository but the fix
- ;; has not been released.
- (substitute* "src/gns/test_proxy.sh"
- (("test_gnunet_proxy.conf") "test_gns_proxy.conf"))))))
- (build-system gnu-build-system)
- (inputs
- (list bluez
- glpk
- curl
- gnutls/dane
- gstreamer
- jansson
- libextractor
- libidn2
- libgcrypt
- libjpeg-turbo
- libltdl
- libmicrohttpd
- libogg
- libsodium
- libunistring
- miniupnpc
- opus
- pulseaudio
- sqlite
- zbar
- zlib))
- (native-inputs
- (list curl
- openssl
- pkg-config
- python
- python-sphinx
- python-sphinx-rtd-theme
- xxd
- (@ (gnu packages base) which)))
- (arguments
- '(#:parallel-tests? #f ; Parallel tests aren't supported.
+ (name "gnunet")
+ (version "0.19.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gnunet/gnunet-" version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "09bspbjl6cll8wcrl1vnb56jwp30pcrg1yyj6xy3i0fl2bzdbdw2"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; This is fixed in the upstream repository but the fix
+ ;; has not been released.
+ (substitute* "src/gns/test_proxy.sh"
+ (("test_gnunet_proxy.conf") "test_gns_proxy.conf"))))))
+ (build-system gnu-build-system)
+ (inputs
+ (list bluez
+ glpk
+ curl
+ gnutls/dane
+ gstreamer
+ jansson
+ libextractor
+ libidn2
+ libgcrypt
+ libjpeg-turbo
+ libltdl
+ libmicrohttpd
+ libogg
+ libsodium
+ libunistring
+ miniupnpc
+ opus
+ pulseaudio
+ sqlite
+ zbar
+ zlib))
+ (native-inputs
+ (list curl
+ openssl
+ pkg-config
+ python
+ python-sphinx
+ python-sphinx-rtd-theme
+ xxd
+ which))
+ (arguments
+ (list
+ #:parallel-tests? #f ;parallel tests aren't supported
#:phases
- (modify-phases %standard-phases
- (add-before 'check 'set-env-var-for-tests
- (lambda _
- (setenv "LANG" "en_US.UTF-8")))
- ;; Swap 'check and 'install phases and add installed binaries to $PATH.
- (add-before 'check 'set-path-for-check
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (setenv "GNUNET_PREFIX" (string-append out "/lib"))
- (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")))
- #t))
- (delete 'check)
- (add-after 'install 'check
- (assoc-ref %standard-phases 'check)))))
- (synopsis "Secure, decentralized, peer-to-peer networking framework")
- (description
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-env-var-for-tests
+ (lambda _
+ (setenv "LANG" "en_US.UTF-8")))
+ ;; Swap 'check and 'install phases and add installed binaries to
$PATH.
+ (add-before 'check 'set-path-for-check
+ (lambda _
+ (setenv "GNUNET_PREFIX" (string-append #$output "/lib"))
+ (setenv "PATH" (string-append (getenv "PATH") ":"
+ #$output "/bin"))))
+ (delete 'check)
+ (add-after 'install 'check
+ (assoc-ref %standard-phases 'check)))))
+ (synopsis "Secure, decentralized, peer-to-peer networking framework")
+ (description
"GNUnet is a framework for secure peer-to-peer networking. The
high-level goal is to provide a strong foundation of free software for a
global, distributed network that provides security and privacy. GNUnet in
that sense aims to replace the current internet protocol stack. Along with
an application for secure publication of files, it has grown to include all
kinds of basic applications for the foundation of a GNU internet.")
- (license license:agpl3+)
- (home-page "https://gnunet.org/en/")))
+ (license license:agpl3+)
+ (home-page "https://gnunet.org/en/")))
(define-public guile-gnunet ;GSoC 2015!
(let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602")
- branch staging updated (99b25b1313 -> b8de3dee08), guix-commits, 2023/04/01
- 02/16: gnu: gnunet: Disable flaky tests., guix-commits, 2023/04/01
- 04/16: gnu: blender: Use ffmpeg 5., guix-commits, 2023/04/01
- 06/16: gnu: imgui: Use unsigned int vertex indexes., guix-commits, 2023/04/01
- 05/16: gnu: blender: Update to 3.3.5., guix-commits, 2023/04/01
- 01/16: gnu: gnunet: Fix indentation and use gexps.,
guix-commits <=
- 03/16: gnu: blender: Use gexps and remove labels., guix-commits, 2023/04/01
- 08/16: gnu: openboardview: Update to 9.95.0., guix-commits, 2023/04/01
- 13/16: gnu: Add imgui-1.87., guix-commits, 2023/04/01
- 14/16: gnu: openboardview: Use imgui-1.87., guix-commits, 2023/04/01
- 09/16: gnu: openboardview: Update home page., guix-commits, 2023/04/01
- 11/16: gnu: utf8-h: Install header under include/utf8 prefix., guix-commits, 2023/04/01
- 12/16: gnu: imgui: Use gexp output variables., guix-commits, 2023/04/01
- 16/16: gnu: gnunet: Update to 0.19.4., guix-commits, 2023/04/01
- 07/16: gnu: Add orangeduck-mpc., guix-commits, 2023/04/01
- 10/16: gnu: gnunet: Update home page., guix-commits, 2023/04/01