unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH 0/2]: Add qtox.
@ 2016-09-14 19:30 Andy Patterson
  2016-09-14 19:30 ` [PATCH 1/2] gnu: Add sqlcipher Andy Patterson
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Andy Patterson @ 2016-09-14 19:30 UTC (permalink / raw)
  To: guix-devel


In the spirit of other Tox-related packages added recently, here's qTox.

--
Andy

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 1/2] gnu: Add sqlcipher.
  2016-09-14 19:30 [PATCH 0/2]: Add qtox Andy Patterson
@ 2016-09-14 19:30 ` Andy Patterson
  2016-09-20  8:42   ` Efraim Flashner
  2016-09-14 19:30 ` [PATCH 2/2] gnu: Add qtox Andy Patterson
  2016-09-22  3:58 ` [PATCH v2 0/2] " Andy Patterson
  2 siblings, 1 reply; 12+ messages in thread
From: Andy Patterson @ 2016-09-14 19:30 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/database.scm (sqlcipher): New variable.
---
 gnu/packages/databases.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index fc31653..d424848 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
+;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,11 +34,13 @@
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages language)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages tcl)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages ncurses)
@@ -1094,3 +1097,37 @@ trees (LSM), for sustained throughput under random insert workloads.")
     (synopsis "Lightning memory-mapped database library")
     (description "Lightning memory-mapped database library.")
     (license license:openldap2.8)))
+
+(define-public sqlcipher
+  (package
+    (name "sqlcipher")
+    (version "3.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/sqlcipher/" name
+                           "/archive/v" version ".tar.gz"))
+       (sha256
+        (base32 "1l23lbp9pmf20xkshrs45gbg0igixr6dwdbvgfzh5plnyzn05dwr"))
+       (file-name (string-append name "-" version ".tar.gz"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libcrypto" ,openssl)))
+    (native-inputs
+     `(("tcl" ,tcl)))
+    (arguments
+     '(#:configure-flags
+       '("--enable-tempstore=yes"
+         "CFLAGS=-DSQLITE_HAS_CODEC"
+         "LDFLAGS=-lcrypto"
+         "--disable-tcl")
+       ;; tests are un-maintained in this fork
+       #:tests? #f))
+    (home-page "https://www.zetetic.net/sqlcipher/")
+    (synopsis
+     "Library providing transparent encryption of SQLite database files")
+    (description "SQLCipher is an SQLite extension that provides transparent
+256-bit AES encryption of database files.  Pages are encrypted before being
+written to disk and are decrypted when read back.  It’s well suited for
+protecting embedded application databases and for mobile development.")
+    (license license:bsd-3)))
-- 
2.10.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH 2/2] gnu: Add qtox.
  2016-09-14 19:30 [PATCH 0/2]: Add qtox Andy Patterson
  2016-09-14 19:30 ` [PATCH 1/2] gnu: Add sqlcipher Andy Patterson
@ 2016-09-14 19:30 ` Andy Patterson
  2016-09-21  7:47   ` Brendan Tildesley
  2016-09-22  3:58 ` [PATCH v2 0/2] " Andy Patterson
  2 siblings, 1 reply; 12+ messages in thread
From: Andy Patterson @ 2016-09-14 19:30 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/messaging.scm (qtox): New variable.
---
 gnu/packages/messaging.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3627fec..f628404 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,6 +33,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
+  #:use-module (gnu packages aidc)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages check)
@@ -658,6 +660,58 @@ instant messenger with audio and video chat capabilities.")
    (home-page "http://utox.org/")
    (license license:gpl3)))
 
+(define-public qtox
+  (package
+    (name "qtox")
+    (version "1.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/qTox/qTox/archive/v"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "0y15mc39x54k1kz36cw9412kl1p1p6nzlx97gagv4gg3vybfhbjv"))
+       (file-name (string-append name "-" version ".tar.gz"))))
+    (inputs
+     `(("ffmpeg" ,ffmpeg)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+-2)
+       ("libsodium" ,libsodium)
+       ("libtoxcore" ,libtoxcore)
+       ("libvpx" ,libvpx)
+       ("libxscrnsaver" ,libxscrnsaver)
+       ("libx11" ,libx11)
+       ("openal" ,openal)
+       ("qrencode" ,qrencode)
+       ("qt" ,qt)
+       ("sqlcipher" ,sqlcipher)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("qmake" ,qt)))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (zero?
+              (system* "qmake"
+                       (string-append "PREFIX="
+                                      (assoc-ref outputs "out"))))))
+         (add-after 'unpack 'fix-reproducibility-issues
+           (lambda _
+             (substitute* "src/main.cpp"
+               (("__DATE__") "\"\"")
+               (("__TIME__") "\"\"")
+               (("TIMESTAMP") "\"\""))
+             #t)))))
+    (home-page "https://qtox.github.io/")
+    (synopsis "Tox chat client using Qt")
+    (description "qTox is a Tox client that follows the Tox design
+guidelines.  It provides an easy to use application that allows you to
+connect with friends and family without anyone else listening in.")
+    (license license:gpl3+)))
+
 (define-public pybitmessage
   (package
     (name "pybitmessage")
-- 
2.10.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH 1/2] gnu: Add sqlcipher.
  2016-09-14 19:30 ` [PATCH 1/2] gnu: Add sqlcipher Andy Patterson
@ 2016-09-20  8:42   ` Efraim Flashner
  2016-09-20 21:49     ` Leo Famulari
  2016-09-20 23:38     ` Andy Patterson
  0 siblings, 2 replies; 12+ messages in thread
From: Efraim Flashner @ 2016-09-20  8:42 UTC (permalink / raw)
  To: Andy Patterson; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 3417 bytes --]

On Wed, Sep 14, 2016 at 03:30:13PM -0400, Andy Patterson wrote:
> * gnu/packages/database.scm (sqlcipher): New variable.
> ---
>  gnu/packages/databases.scm | 37 +++++++++++++++++++++++++++++++++++++
>  1 file changed, 37 insertions(+)
> 
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index fc31653..d424848 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -11,6 +11,7 @@
>  ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>  ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
>  ;;; Copyright © 2016 David Craven <david@craven.ch>
> +;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -33,11 +34,13 @@
>    #:use-module (gnu packages avahi)
>    #:use-module (gnu packages bash)
>    #:use-module (gnu packages boost)
> +  #:use-module (gnu packages crypto)
>    #:use-module (gnu packages gettext)
>    #:use-module (gnu packages glib)
>    #:use-module (gnu packages perl)
>    #:use-module (gnu packages language)
>    #:use-module (gnu packages linux)
> +  #:use-module (gnu packages tcl)
>    #:use-module (gnu packages tls)
>    #:use-module (gnu packages compression)
>    #:use-module (gnu packages ncurses)
> @@ -1094,3 +1097,37 @@ trees (LSM), for sustained throughput under random insert workloads.")
>      (synopsis "Lightning memory-mapped database library")
>      (description "Lightning memory-mapped database library.")
>      (license license:openldap2.8)))
> +
> +(define-public sqlcipher
> +  (package
> +    (name "sqlcipher")
> +    (version "3.4.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/sqlcipher/" name
> +                           "/archive/v" version ".tar.gz"))
> +       (sha256
> +        (base32 "1l23lbp9pmf20xkshrs45gbg0igixr6dwdbvgfzh5plnyzn05dwr"))
> +       (file-name (string-append name "-" version ".tar.gz"))))
> +    (build-system gnu-build-system)
> +    (inputs
> +     `(("libcrypto" ,openssl)))
> +    (native-inputs
> +     `(("tcl" ,tcl)))
> +    (arguments
> +     '(#:configure-flags
> +       '("--enable-tempstore=yes"
> +         "CFLAGS=-DSQLITE_HAS_CODEC"
> +         "LDFLAGS=-lcrypto"
> +         "--disable-tcl")
> +       ;; tests are un-maintained in this fork
> +       #:tests? #f))
> +    (home-page "https://www.zetetic.net/sqlcipher/")
> +    (synopsis
> +     "Library providing transparent encryption of SQLite database files")
> +    (description "SQLCipher is an SQLite extension that provides transparent
> +256-bit AES encryption of database files.  Pages are encrypted before being
> +written to disk and are decrypted when read back.  It’s well suited for
> +protecting embedded application databases and for mobile development.")
> +    (license license:bsd-3)))
> -- 
> 2.10.0
> 

I'm a little confused how much of this is actually upstream sqlite and
how much is their own code. The commit messages look like they're
continually merging in sqlite. Also, many of the files in the src folder
I checked are public-domain and not bsd-3 licensed.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 1/2] gnu: Add sqlcipher.
  2016-09-20  8:42   ` Efraim Flashner
@ 2016-09-20 21:49     ` Leo Famulari
  2016-09-20 23:09       ` Andy Patterson
  2016-09-20 23:38     ` Andy Patterson
  1 sibling, 1 reply; 12+ messages in thread
From: Leo Famulari @ 2016-09-20 21:49 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

On Tue, Sep 20, 2016 at 11:42:44AM +0300, Efraim Flashner wrote:
> On Wed, Sep 14, 2016 at 03:30:13PM -0400, Andy Patterson wrote:
> > +       ;; tests are un-maintained in this fork
> > +       #:tests? #f))
> > +    (home-page "https://www.zetetic.net/sqlcipher/")
> > +    (synopsis
> > +     "Library providing transparent encryption of SQLite database files")
> > +    (description "SQLCipher is an SQLite extension that provides transparent
> > +256-bit AES encryption of database files.  Pages are encrypted before being
> > +written to disk and are decrypted when read back.  It’s well suited for
> > +protecting embedded application databases and for mobile development.")
> > +    (license license:bsd-3)))
> > -- 
> > 2.10.0
> > 
> 
> I'm a little confused how much of this is actually upstream sqlite and
> how much is their own code. The commit messages look like they're
> continually merging in sqlite. Also, many of the files in the src folder
> I checked are public-domain and not bsd-3 licensed.

I'm also wondering what the relationship is between this project and
SQLite. The comment about disabling tests describes SQLCipher as a fork,
but the SQLCipher home page describe it as an extension.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 1/2] gnu: Add sqlcipher.
  2016-09-20 21:49     ` Leo Famulari
@ 2016-09-20 23:09       ` Andy Patterson
  0 siblings, 0 replies; 12+ messages in thread
From: Andy Patterson @ 2016-09-20 23:09 UTC (permalink / raw)
  To: Leo Famulari; +Cc: guix-devel

On Tue, 20 Sep 2016 17:49:50 -0400
Leo Famulari <leo@famulari.name> wrote:

> On Tue, Sep 20, 2016 at 11:42:44AM +0300, Efraim Flashner wrote:
> > On Wed, Sep 14, 2016 at 03:30:13PM -0400, Andy Patterson wrote:  
> > > +       ;; tests are un-maintained in this fork
> > > +       #:tests? #f))
> > > +    (home-page "https://www.zetetic.net/sqlcipher/")
> > > +    (synopsis
> > > +     "Library providing transparent encryption of SQLite
> > > database files")
> > > +    (description "SQLCipher is an SQLite extension that provides
> > > transparent +256-bit AES encryption of database files.  Pages are
> > > encrypted before being +written to disk and are decrypted when
> > > read back.  It’s well suited for +protecting embedded application
> > > databases and for mobile development.")
> > > +    (license license:bsd-3)))
> > > -- 
> > > 2.10.0
> > >   
> > 
> > I'm a little confused how much of this is actually upstream sqlite
> > and how much is their own code. The commit messages look like
> > they're continually merging in sqlite. Also, many of the files in
> > the src folder I checked are public-domain and not bsd-3 licensed.  
> 
> I'm also wondering what the relationship is between this project and
> SQLite. The comment about disabling tests describes SQLCipher as a
> fork, but the SQLCipher home page describe it as an extension.

I'd say it's a fork based on the source structure and commit history as
Efraim mentioned. I think the upstream describes it as an extension
because it adds extra behaviour on top of SQLite while maintaining API
compatibility, rather than changing its fundamental behaviour. I could
alter the description (I've currently just used the upstream's wording)
in order to reflect the fact that this isn't an SQLite "loadable
extension". Do you have any reccomendations along those lines?

Thanks,

--
Andy

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 1/2] gnu: Add sqlcipher.
  2016-09-20  8:42   ` Efraim Flashner
  2016-09-20 21:49     ` Leo Famulari
@ 2016-09-20 23:38     ` Andy Patterson
  1 sibling, 0 replies; 12+ messages in thread
From: Andy Patterson @ 2016-09-20 23:38 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: guix-devel

On Tue, 20 Sep 2016 11:42:44 +0300
Efraim Flashner <efraim@flashner.co.il> wrote:

> I'm a little confused how much of this is actually upstream sqlite and
> how much is their own code. The commit messages look like they're
> continually merging in sqlite. Also, many of the files in the src
> folder I checked are public-domain and not bsd-3 licensed.
> 

You're right; it seems to be the new files which the project has added
which fall under the bsd-3 license. I'll do some investigation in order
to make the license field more descriptive, and send an updated patch.

Thanks,

--
Andy

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 2/2] gnu: Add qtox.
  2016-09-14 19:30 ` [PATCH 2/2] gnu: Add qtox Andy Patterson
@ 2016-09-21  7:47   ` Brendan Tildesley
  2016-09-21  8:28     ` Ricardo Wurmus
  0 siblings, 1 reply; 12+ messages in thread
From: Brendan Tildesley @ 2016-09-21  7:47 UTC (permalink / raw)
  To: guix-devel

Andy Patterson 於 2016-09-15 05:30 寫道:
[...]
> +    (arguments
> +     '(#:phases
> +       (modify-phases %standard-phases
> +         (replace 'configure
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (zero?
> +              (system* "qmake"
> +                       (string-append "PREFIX="
> +                                      (assoc-ref outputs "out"))))))
> +         (add-after 'unpack 'fix-reproducibility-issues
> +           (lambda _
> +             (substitute* "src/main.cpp"
> +               (("__DATE__") "\"\"")
> +               (("__TIME__") "\"\"")
> +               (("TIMESTAMP") "\"\""))
> +             #t)))))
'unpack is before 'configure, so I think this should be put above
(replace 'configure. Also I noticed qmake outputs Makefile that contains
DTIMESTAMP=.... It doesn't look like it actually does anything though.
> +    (home-page "https://qtox.github.io/")
> +    (synopsis "Tox chat client using Qt")
> +    (description "qTox is a Tox client that follows the Tox design
> +guidelines.  It provides an easy to use application that allows you to
> +connect with friends and family without anyone else listening in.")
> +    (license license:gpl3+)))
> +
>  (define-public pybitmessage
>    (package
>      (name "pybitmessage")

I was able to compile and run, but the package technically failed with

builder for `/gnu/store/3qh6k8lixrkdxvd3zfvapc1fdwl079lv-qtox-1.5.1.drv'
failed to produce output path
`/gnu/store/j4yg5hd5giss2fpivzdkrdlzp62x4qbq-qtox-1.5.1'

I don't understand what produces this message. Can anyone explain. If I
use guix build qtox -K I can find the "failed" build in /tmp/ and run it.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 2/2] gnu: Add qtox.
  2016-09-21  7:47   ` Brendan Tildesley
@ 2016-09-21  8:28     ` Ricardo Wurmus
  0 siblings, 0 replies; 12+ messages in thread
From: Ricardo Wurmus @ 2016-09-21  8:28 UTC (permalink / raw)
  To: Brendan Tildesley; +Cc: guix-devel


Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:

> I was able to compile and run, but the package technically failed with
>
> builder for `/gnu/store/3qh6k8lixrkdxvd3zfvapc1fdwl079lv-qtox-1.5.1.drv'
> failed to produce output path
> `/gnu/store/j4yg5hd5giss2fpivzdkrdlzp62x4qbq-qtox-1.5.1'
>
> I don't understand what produces this message. Can anyone explain. If I
> use guix build qtox -K I can find the "failed" build in /tmp/ and run it.

This means that nothing was installed to the given target directory.
Often this means that the “install” target is defective in some way.

~~ Ricardo

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v2 0/2] Add qtox.
  2016-09-14 19:30 [PATCH 0/2]: Add qtox Andy Patterson
  2016-09-14 19:30 ` [PATCH 1/2] gnu: Add sqlcipher Andy Patterson
  2016-09-14 19:30 ` [PATCH 2/2] gnu: Add qtox Andy Patterson
@ 2016-09-22  3:58 ` Andy Patterson
  2016-09-22  3:58   ` [PATCH v2 1/2] gnu: Add sqlcipher Andy Patterson
  2016-09-22  3:58   ` [PATCH v2 2/2] gnu: Add qtox Andy Patterson
  2 siblings, 2 replies; 12+ messages in thread
From: Andy Patterson @ 2016-09-22  3:58 UTC (permalink / raw)
  To: guix-devel

Here's the updated patch set, which improves the license and description
fields for sqlcipher. While I was at it I discovered that there were tests
made specifically for that package, so I enabled them. They haven't been
updated for the current release however, so I downgraded to the previous one.

I also swapped the order of qtox's custom phases for legibility and rebased on
to master.

--
Andy

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v2 1/2] gnu: Add sqlcipher.
  2016-09-22  3:58 ` [PATCH v2 0/2] " Andy Patterson
@ 2016-09-22  3:58   ` Andy Patterson
  2016-09-22  3:58   ` [PATCH v2 2/2] gnu: Add qtox Andy Patterson
  1 sibling, 0 replies; 12+ messages in thread
From: Andy Patterson @ 2016-09-22  3:58 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/database.scm (sqlcipher): New variable.
---
 gnu/packages/databases.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 4f345e2..3e25d47 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,11 +35,13 @@
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages language)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages tcl)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages ncurses)
@@ -1150,3 +1153,53 @@ can autogenerate peewee models using @code{pwiz}, a model generator.")
 
 (define-public python2-peewee
   (package-with-python2 python-peewee))
+
+(define-public sqlcipher
+  (package
+    (name "sqlcipher")
+    (version "3.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/sqlcipher/" name
+                           "/archive/v" version ".tar.gz"))
+       (sha256
+        (base32 "1gv58dlbpzrmznly52yqbxgvii0ib88zr3aszla1bsypwjr6flff"))
+       (file-name (string-append name "-" version ".tar.gz"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libcrypto" ,openssl)
+       ("libtcl8.6" ,tcl))) ; required for running the tests
+    (native-inputs
+     `(("tcl" ,tcl)))
+    (arguments
+     '(#:configure-flags
+       '("--enable-tempstore=yes"
+         "CFLAGS=-DSQLITE_HAS_CODEC -DSQLITE_ENABLE_FTS3"
+         "LDFLAGS=-lcrypto -ltcl8.6"
+         "--disable-tcl")
+       ;; tests cannot be run from the Makefile
+       ;; see: <https://github.com/sqlcipher/sqlcipher/issues/172>
+       #:test-target "testfixture"
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'build-test-runner
+           (assoc-ref %standard-phases 'check))
+         (replace 'check
+           (lambda _
+             (zero?
+              (system* "./testfixture" "test/crypto.test")))))))
+    (home-page "https://www.zetetic.net/sqlcipher/")
+    (synopsis
+     "Library providing transparent encryption of SQLite database files")
+    (description "SQLCipher is an implementation of SQLite, extended to
+provide transparent 256-bit AES encryption of database files.  Pages are
+encrypted before being written to disk and are decrypted when read back.  It’s
+well suited for protecting embedded application databases and for mobile
+development.")
+    ;; The source files
+    ;; src/{crypto.c,crypto_impl.c,crypto.h,crypto_cc.c,crypto_libtomcrypt.c},
+    ;; src/{crypto_openssl.c,sqlcipher.h}, tool/crypto-speedtest.tcl,
+    ;; test/crypto.test are licensed under a 3-clause BSD license. All other
+    ;; source files are in the public domain.
+    (license (list license:public-domain license:bsd-3))))
-- 
2.10.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 2/2] gnu: Add qtox.
  2016-09-22  3:58 ` [PATCH v2 0/2] " Andy Patterson
  2016-09-22  3:58   ` [PATCH v2 1/2] gnu: Add sqlcipher Andy Patterson
@ 2016-09-22  3:58   ` Andy Patterson
  1 sibling, 0 replies; 12+ messages in thread
From: Andy Patterson @ 2016-09-22  3:58 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/messaging.scm (qtox): New variable.
---
 gnu/packages/messaging.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 2b0ffee..9bdcfef 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,6 +33,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
+  #:use-module (gnu packages aidc)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages check)
@@ -662,6 +664,58 @@ instant messenger with audio and video chat capabilities.")
    (home-page "http://utox.org/")
    (license license:gpl3)))
 
+(define-public qtox
+  (package
+    (name "qtox")
+    (version "1.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/qTox/qTox/archive/v"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "0y15mc39x54k1kz36cw9412kl1p1p6nzlx97gagv4gg3vybfhbjv"))
+       (file-name (string-append name "-" version ".tar.gz"))))
+    (inputs
+     `(("ffmpeg" ,ffmpeg)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+-2)
+       ("libsodium" ,libsodium)
+       ("libtoxcore" ,libtoxcore)
+       ("libvpx" ,libvpx)
+       ("libxscrnsaver" ,libxscrnsaver)
+       ("libx11" ,libx11)
+       ("openal" ,openal)
+       ("qrencode" ,qrencode)
+       ("qt" ,qt)
+       ("sqlcipher" ,sqlcipher)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("qmake" ,qt)))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-reproducibility-issues
+           (lambda _
+             (substitute* "src/main.cpp"
+               (("__DATE__") "\"\"")
+               (("__TIME__") "\"\"")
+               (("TIMESTAMP") "\"\""))
+             #t))
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (zero?
+              (system* "qmake"
+                       (string-append "PREFIX="
+                                      (assoc-ref outputs "out")))))))))
+    (home-page "https://qtox.github.io/")
+    (synopsis "Tox chat client using Qt")
+    (description "qTox is a Tox client that follows the Tox design
+guidelines.  It provides an easy to use application that allows you to
+connect with friends and family without anyone else listening in.")
+    (license license:gpl3+)))
+
 (define-public pybitmessage
   (package
     (name "pybitmessage")
-- 
2.10.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2016-09-22  3:58 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-14 19:30 [PATCH 0/2]: Add qtox Andy Patterson
2016-09-14 19:30 ` [PATCH 1/2] gnu: Add sqlcipher Andy Patterson
2016-09-20  8:42   ` Efraim Flashner
2016-09-20 21:49     ` Leo Famulari
2016-09-20 23:09       ` Andy Patterson
2016-09-20 23:38     ` Andy Patterson
2016-09-14 19:30 ` [PATCH 2/2] gnu: Add qtox Andy Patterson
2016-09-21  7:47   ` Brendan Tildesley
2016-09-21  8:28     ` Ricardo Wurmus
2016-09-22  3:58 ` [PATCH v2 0/2] " Andy Patterson
2016-09-22  3:58   ` [PATCH v2 1/2] gnu: Add sqlcipher Andy Patterson
2016-09-22  3:58   ` [PATCH v2 2/2] gnu: Add qtox Andy Patterson

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).