ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: encfs: Update to 1.9.5.

Browse source 
* gnu/packages/crypto.scm (encfs): Update to 1.9.5.
[source](snippet): Adjust paths.  Remove two bundled libraries.
[native-inputs]: Add googletest-source.
[arguments]: Add 'unpack-googletest' and 'make-unittests' phases.

Signed-off-by: Kei Kebreau <kkebreau@posteo.net>
This commit is contained in:
Pierre Neidhardt 2018-06-06 11:47:30 +02:00 committed by Kei Kebreau
parent b4eae997fe
commit 47de00af16
No known key found for this signature in database
GPG key ID: E6A5EE3C19467A0D
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/crypto.scm
View file

@ -32,6 +32,7 @@ (define-module (gnu packages crypto)
#:use-module (gnu packages attr) #:use-module (gnu packages attr)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cryptsetup) #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
@ -217,7 +218,7 @@ (define-public opendht
(define-public encfs (define-public encfs
(package (package
(name "encfs") (name "encfs")
(version "1.9.1") (version "1.9.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -226,13 +227,13 @@ (define-public encfs
version "/encfs-" version ".tar.gz")) version "/encfs-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1906254dg5hwljh0h4gyrw09ms3b57dlhjfzhfzffv50yzpkl837")) "0qzxavvv20577bxvly8s7d3y7bqasqclc2mllp0ddfncjm9z02a7"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove bundled dependencies in favour of proper inputs. ;; Remove bundled dependencies in favour of proper inputs.
(snippet '(begin (snippet '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
(find-files "internal" "^tinyxml2-[0-9]" '("vendor/github.com/leethomason/tinyxml2"
#:directories? #t)) "vendor/github.com/google/googletest"))
#t)))) #t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
@ -240,6 +241,7 @@ (define-public encfs
;; Test dependencies. ;; Test dependencies.
("expect" ,expect) ("expect" ,expect)
("googletest-source" ,(package-source googletest))
("perl" ,perl))) ("perl" ,perl)))
(inputs (inputs
`(("attr" ,attr) `(("attr" ,attr)
@ -247,7 +249,18 @@ (define-public encfs
("openssl" ,openssl) ("openssl" ,openssl)
("tinyxml2" ,tinyxml2))) ("tinyxml2" ,tinyxml2)))
(arguments (arguments
`(#:configure-flags (list "-DUSE_INTERNAL_TINYXML=OFF"))) `(#:configure-flags (list "-DUSE_INTERNAL_TINYXML=OFF")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-googletest
(lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "vendor/github.com/google/googletest")
(invoke "tar" "xvf" (assoc-ref inputs "googletest-source")
"-C" "vendor/github.com/google/googletest"
"--strip-components=1")))
(add-before 'check 'make-unittests
(lambda _
(invoke "make" "unittests"))))))
(home-page "https://vgough.github.io/encfs") (home-page "https://vgough.github.io/encfs")
(synopsis "Encrypted virtual file system") (synopsis "Encrypted virtual file system")
(description (description