(address . guix-patches@gnu.org)
8737apqrlj.fsf@openmailbox.org
Hi Guix! :)
Here follows a series of patches, it's part of the attempt to package
GNU Ring. However, these contributions don't need custom patches from
Savir Faire Linux. The only doubt is in regards to the need to have a
variant of msgpack that uses C++ 11 instead, and have a variant of
opendht that makes use of such msgpack variant instead.
Respectfully, Adonay.
--
- Palestrante e consultor sobre /software/ livre (não confundir com
gratis).
- "WhatsApp"? Ele não é livre, por isso não uso. Iguais a ele prefiro
GNU Ring, ou Tox. Quer outras formas de contato? Adicione o vCard
que está no endereço acima aos teus contatos.
- Pretende me enviar arquivos .doc, .ppt, .cdr, ou .mp3? OK, eu
aceito, mas não repasso. Entrego apenas em formatos favoráveis ao
/software/ livre. Favor entrar em contato em caso de dúvida.
From 4622ca4c1ba0ef42c1b0db1070727c072365fbf6 Mon Sep 17 00:00:00 2001
From: Adonay Felipe Nogueira <adfeno@openmailbox.org>
Date: Sat, 24 Jun 2017 11:53:49 -0300
Subject: [PATCH] gnu: Add kashmir.
* gnu/packages/cpp.scm (kashmir): New variable.
---
gnu/packages/cpp.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 51 insertions(+), 1 deletion(-)
Toggle diff (73 lines)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index da19255..228be99 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
+;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,9 +21,58 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix build utils)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system trivial)
#:use-module (gnu packages)
- #:use-module (gnu packages autotools))
+ #:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages compression))
+
+(define-public kashmir
+ (let ((release "0")
+ (commit "2f3913f49c4ac7f9bff9224db5178f6f8f0ff3ee")
+ (revision 1))
+ (package
+ (name "kashmir")
+ (version (if (zero? revision)
+ release
+ (string-append release "-"
+ (number->string revision)
+ "." (string-take commit 7))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/Corvusoft/" name
+ "-dependency/archive/" commit ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "11hbh3d7w74gng9qgz3hdrzvxjgil1pymk2bzxv1ajh9vp60xxs9"))))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let ((gzip (assoc-ref %build-inputs "gzip"))
+ (source (assoc-ref %build-inputs "source"))
+ (tar (assoc-ref %build-inputs "tar")))
+ (setenv "PATH" (string-append gzip "/bin:"
+ tar "/bin"))
+ (mkdir-p %output)
+ (system* "tar" "-xvf" source "-C" %output)
+ (chdir %output)
+ (for-each (lambda (file)
+ (rename-file file "kashmir-dependency"))
+ (find-files "." "kashmir-dependency-" #:directories? #t))))))
+ (native-inputs
+ `(("source" ,source)
+ ("tar" ,tar)
+ ("gzip" ,gzip)))
+ (synopsis "C++ library providing I/O, MD5, SHA-1, random number string, and UUID operations")
+ (description "The Kashmir Library provides features allowing usage of I/O formatting and state saving; MD5 and SHA-1 hashing; random number streams, and UUID generation.")
+ (home-page "https://github.com/corvusoft/kashmir-dependency")
+ (license license:boost1.0))))
(define-public libzen
(package
--
1.9.1
From b61ac13661a9188394285ac83991d5eb3853d1d6 Mon Sep 17 00:00:00 2001
From: Adonay Felipe Nogueira <adfeno@openmailbox.org>
Date: Sat, 24 Jun 2017 12:02:01 -0300
Subject: [PATCH] gnu: argon2: Update to 20161029-4.9e3ae0f.
* gnu/packages/password-utils.scm (argon2): Update to 20161029-4.9e3ae0f.
---
gnu/packages/password-utils.scm | 94 +++++++++++++++++++++++++++--------------
1 file changed, 62 insertions(+), 32 deletions(-)
Toggle diff (122 lines)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 9cfacdb..0c56acc 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,6 +29,7 @@
(define-module (gnu packages password-utils)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix build utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix download)
@@ -346,39 +348,67 @@ through the pass command.")
(license license:gpl2+)))
(define-public argon2
- (package
- (name "argon2")
- (version "20161029")
- (source
- (origin
- (method url-fetch)
- (uri
- (string-append "https://github.com/P-H-C/phc-winner-argon2/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1rymikbysasdadm325jx69i0q19d9srqkny69jwmhswlidr4j07y"))))
- (build-system gnu-build-system)
- (arguments
- `(#:test-target "test"
- #:make-flags '("CC=gcc")
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (replace 'install
- (lambda _
- (let ((out (assoc-ref %outputs "out")))
- (install-file "argon2" (string-append out "/bin"))
- (install-file "libargon2.a" (string-append out "/lib"))
- (install-file "libargon2.so" (string-append out "/lib"))
- (copy-recursively "include"
- (string-append out "/include"))))))))
- (home-page "https://www.argon2.com/")
- (synopsis "Password hashing library")
- (description "Argon2 provides a key derivation function that was declared
+ (let ((release "20161029")
+ (commit "9e3ae0f5e91eced6de3c28a9b61f2d91200119e3")
+ (revision 4))
+ (package
+ (name "argon2")
+ (version (if (zero? revision)
+ release
+ (string-append release "-"
+ (number->string revision)
+ "." (string-take commit 7))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/P-H-C/phc-winner-argon2/archive/"
+ commit ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "Makefile"
+ (("ifneq \\(\\$\\(OPTTEST\\), 0\\)")
+ "ifneq (1, 0)"))))
+ (sha256
+ (base32
+ "122rpbrl2lbhgwj7sanbgyn81dnp3azr8ydxr5sc0rwqlyg3iqdp"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:test-target "test"
+ #:make-flags '("CC=gcc")
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'fix-pkg-config-and-makefile
+ (lambda _
+ (substitute* "libargon2.pc"
+ (("/usr")
+ (assoc-ref %outputs "out"))
+ (("@HOST_MULTIARCH@")
+ ,(or (%current-target-system)
+ (%current-system)))
+ (("@UPSTREAM_VER@")
+ ,release))))
+ (replace 'install
+ (lambda _
+ (let ((out (assoc-ref %outputs "out")))
+ (install-file "argon2"
+ (string-append out "/bin"))
+ (install-file "libargon2.a"
+ (string-append out "/lib"))
+ (install-file "libargon2.so.0"
+ (string-append out "/lib"))
+ (install-file "libargon2.pc"
+ (string-append out "/lib/pkgconfig"))
+ (copy-recursively "include"
+ (string-append out "/include"))
+ (symlink (string-append out "/lib/libargon2.so.0")
+ (string-append out "/lib/libargon2.so"))))))))
+ (home-page "https://www.argon2.com/")
+ (synopsis "Password hashing library")
+ (description "Argon2 provides a key derivation function that was declared
winner of the 2015 Password Hashing Competition.")
- (license license:cc0)))
+ (license license:cc0))))
(define-public python-bcrypt
(package
--
1.9.1