01/01: gnu: Add emacs-scribble-mode.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 51f4e36cb9cc45493397bc799f7a87e5de92560d
Author: Christopher Lemmer Webber 
Date:   Mon Oct 22 09:59:42 2018 -0400

gnu: Add emacs-scribble-mode.

* gnu/packages/emacs.scm (emacs-scribble-mode): New variable.
---
 gnu/packages/emacs.scm | 29 -
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 47e984e..ce98dba 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015 Federico Beffa 
 ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus 
 ;;; Copyright © 2016, 2017, 2018 Chris Marusich 
-;;; Copyright © 2015, 2016 Christopher Allan Webber 
+;;; Copyright © 2015, 2016, 2018 Christopher Lemmer Webber 

 ;;; Copyright © 2016 Adriano Peluso 
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner 
 ;;; Copyright © 2016 David Thompson 
@@ -654,6 +654,33 @@ Gitlab APIs from Emacs packages.  It abstracts access to 
API resources using
 only a handful of functions that are not resource-specific.")
 (license license:gpl3+)))
 
+(define-public emacs-scribble-mode
+  (let ((commit "34e9e5edb921813b6483e0fefa848efb6ee4b314")
+(version "0.0")
+(revision 0))
+(package
+  (name "emacs-scribble-mode")
+  (version (if (zero? revision)
+   version
+   (string-append version "-"
+  (number->string revision)
+  "." (string-take commit 7
+  (source (origin
+(method git-fetch)
+(uri (git-reference
+  (url "https://github.com/emacs-pe/scribble-mode.git;)
+  (commit commit)))
+(sha256
+ (base32
+  "0598byqpz2q6yi2q4dwd77jj9z3n99z34d3an51s9m2za0nh1qvp"
+  (build-system emacs-build-system)
+  (home-page "https://github.com/emacs-pe/scribble-mode;)
+  (synopsis "Emacs mode for editing the Scribble documentation syntax.")
+  (description
+   "This package provides basic syntax highlighting and editing support
+for editing Racket's Scribble documentation syntax in Emacs.")
+  (license license:gpl3+
+
 (define-public emacs-haskell-mode
   (package
 (name "emacs-haskell-mode")

branch master updated (3a352a4 -> 51f4e36)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  3a352a4   gnu: snap: Update to 4.2.2.2.
   new  51f4e36   gnu: Add emacs-scribble-mode.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/emacs.scm | 29 -
 1 file changed, 28 insertions(+), 1 deletion(-)

branch master updated (d1022d6 -> 477dde6)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  d1022d6   gnu: guile-chickadee: Update to 0.3.0.
   new  477dde6   gnu: emacs-racket-mode: Update to commit b977873.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/emacs.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

01/01: gnu: emacs-racket-mode: Update to commit b977873.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 477dde6192bc795732be8643d66c98f89458fd68
Author: Christopher Lemmer Webber 
Date:   Tue Sep 25 21:09:32 2018 -0400

gnu: emacs-racket-mode: Update to commit b977873.

* gnu/packages/emacs.scm (emacs-racket-mode): Update to commit b977873.
---
 gnu/packages/emacs.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 8da5add..c10a802 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10410,8 +10410,8 @@ perform regression test for packages that provide 
font-lock rules.")
   (license license:gpl3+
 
 (define-public emacs-racket-mode
-  (let ((commit "92c33487f6c707880ac3f6169e7ea65ddffd1463")
-(revision "1"))
+  (let ((commit "b977873e6128f8399432dcd60cc39f6a6f803d9c")
+(revision "2"))
 (package
   (name "emacs-racket-mode")
   (version (string-append "0.0.2" "-" revision "."
@@ -10425,7 +10425,7 @@ perform regression test for packages that provide 
font-lock rules.")
  (file-name (string-append name "-" version "-checkout"))
  (sha256
   (base32
-   "19q6ym10gj2xdzzcgh3wdbq1xv8cv7nlrhv2b0bjvvdjzhiki472"
+   "0vp4bbbplqvmnhjpl6ajrlydmrhqzil56cfbs18m5c5fddx0zlh7"
   (build-system emacs-build-system)
   (arguments
`(#:include '("\\.el$" "\\.rkt$")))

branch master updated (b4c698c -> caf8a00)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  b4c698c   gnu: python-trezor: Update to 0.10.2.
   new  caf8a00   gnu: emacs-racket-mode: Update to commit 92c3348.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

01/01: gnu: emacs-racket-mode: Update to commit 92c3348.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit caf8a003b33f9ed59c8f9bf6fc2ca9929b96b63b
Author: Christopher Lemmer Webber 
Date:   Wed Aug 29 15:52:05 2018 -0400

gnu: emacs-racket-mode: Update to commit 92c3348.

* gnu/packages/emacs.scm (emacs-racket-mode): Update to commit 92c3348.
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 6d34f62..a1ce64f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10053,7 +10053,7 @@ perform regression test for packages that provide 
font-lock rules.")
   (license license:gpl3+
 
 (define-public emacs-racket-mode
-  (let ((commit "add0190d3c9bdad25fee57f8efd0460c9a45c2ec")
+  (let ((commit "92c33487f6c707880ac3f6169e7ea65ddffd1463")
 (revision "1"))
 (package
   (name "emacs-racket-mode")
@@ -10068,7 +10068,7 @@ perform regression test for packages that provide 
font-lock rules.")
  (file-name (string-append name "-" version "-checkout"))
  (sha256
   (base32
-   "0bf6s4nqjfacij20x9vppdnq8fq1bf53cch6p4g8xqcqri3ms4jw"
+   "19q6ym10gj2xdzzcgh3wdbq1xv8cv7nlrhv2b0bjvvdjzhiki472"
   (build-system emacs-build-system)
   (arguments
`(#:include '("\\.el$" "\\.rkt$")))

branch master updated (1d8d69c -> 6948fa0)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  1d8d69c   nls: Update 'fr' translation.
   new  6948fa0   gnu: emacs-racket-mode: Update to commit add0190.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/emacs.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

01/01: gnu: emacs-racket-mode: Update to commit add0190.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 6948fa087522928b277288aa84e1b3270ca7474b
Author: Christopher Lemmer Webber 
Date:   Sun Aug 26 07:02:04 2018 -0400

gnu: emacs-racket-mode: Update to commit add0190.

* gnu/packages/emacs.scm (emacs-racket-mode): Update to commit add0190.
---
 gnu/packages/emacs.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 18aac36..92d02df 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10025,8 +10025,8 @@ perform regression test for packages that provide 
font-lock rules.")
   (license license:gpl3+
 
 (define-public emacs-racket-mode
-  (let ((commit "1b78827d310b6d655782b7bba0f2360c9ef34ff6")
-(revision "2"))
+  (let ((commit "add0190d3c9bdad25fee57f8efd0460c9a45c2ec")
+(revision "1"))
 (package
   (name "emacs-racket-mode")
   (version (string-append "0.0.2" "-" revision "."
@@ -10040,7 +10040,7 @@ perform regression test for packages that provide 
font-lock rules.")
  (file-name (string-append name "-" version "-checkout"))
  (sha256
   (base32
-   "04mzxcg32av8p6v0pqb0si6qk5qxbrbllx6m3j16fp32bdz71sps"
+   "0bf6s4nqjfacij20x9vppdnq8fq1bf53cch6p4g8xqcqri3ms4jw"
   (build-system emacs-build-system)
   (arguments
`(#:include '("\\.el$" "\\.rkt$")))

01/01: gnu: racket: Ignore bytecode checksums in the store.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit e3fc9bcce2cfc26a60747c58f5c8c59cc8400785
Author: Timothy Sample 
Date:   Sun Aug 12 11:12:38 2018 -0400

gnu: racket: Ignore bytecode checksums in the store.

Fixes .

* gnu/packages/patches/racket-store-checksum-override.patch: New file.
* gnu/packages/scheme.scm (racket)[sources]: Add it.
---
 .../patches/racket-store-checksum-override.patch   | 42 ++
 gnu/packages/scheme.scm|  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/patches/racket-store-checksum-override.patch 
b/gnu/packages/patches/racket-store-checksum-override.patch
new file mode 100644
index 000..b22facc
--- /dev/null
+++ b/gnu/packages/patches/racket-store-checksum-override.patch
@@ -0,0 +1,42 @@
+Racket uses checksums to test if it needs to recompile its source
+files to bytecode.  If Racket is updated by grafting, the source and
+bytecode files get updated, but the checksum stays the same.  Since
+the checksum no longer matches the source file, Racket tries to
+regenerate the bytecode and write it to the store, causing errors
+because the store is immutable.  This patch makes Racket ignore
+checksums for files in the store.
+
+See  for details.
+
+diff -ruN racket-6.12/collects/compiler/cm.rkt 
racket-6.12-patched/collects/compiler/cm.rkt
+--- racket-6.12/collects/compiler/cm.rkt   1969-12-31 19:00:00.0 
-0500
 racket-6.12-patched/collects/compiler/cm.rkt   2018-08-12 
06:36:46.061142149 -0400
+@@ -7,6 +7,7 @@
+  racket/list
+  racket/path
+  racket/promise
++ racket/string
+  openssl/sha1
+  racket/place
+  setup/collects
+@@ -627,6 +628,10 @@
+   #f
+   (list src-hash recorded-hash)))
+ 
++(define (store-reference? path)
++  (let ([store-prefix (or (getenv "NIX_STORE") "/gnu/store")])
++(string-prefix? (path->string path) store-prefix)))
++
+ (define (rkt->ss p)
+   (if (path-has-extension? p #".rkt")
+   (path-replace-extension p #".ss")
+@@ -679,7 +684,8 @@
+   (trace-printf "newer src... ~a > ~a" path-time path-zo-time)
+   ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or 
thunk:
+   (maybe-compile-zo sha1-only? deps path->mode roots path 
orig-path read-src-syntax up-to-date collection-cache new-seen)]
+- [(different-source-sha1-and-dep-recorded path deps)
++ [(and (not (store-reference? path))
++   (different-source-sha1-and-dep-recorded path deps))
+   => (lambda (difference)
+(trace-printf "different src hash... ~a" difference)
+;; If `sha1-only?', then `maybe-compile-zo' returns a #f 
or thunk:
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 4178a45..b30245c 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -421,7 +421,8 @@ implementation techniques and as an expository tool.")
  (patches (search-patches
;; See: https://github.com/racket/racket/issues/1962
;; This can be removed in whatever Racket release comes 
after 6.12
-   "racket-fix-xform-issue.patch"
+   "racket-fix-xform-issue.patch"
+   "racket-store-checksum-override.patch"
 (build-system gnu-build-system)
 (arguments
  '(#:phases

branch master updated (5a0696b -> e3fc9bc)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  5a0696b   gnu: borg: Update to 1.1.7.
   new  e3fc9bc   gnu: racket: Ignore bytecode checksums in the store.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../patches/racket-store-checksum-override.patch   | 42 ++
 gnu/packages/scheme.scm|  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/racket-store-checksum-override.patch

branch master updated (b43a9eb -> ae9877f)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  b43a9eb   gnu: bedops: Update to 2.4.33.
   new  ae9877f   gnu: paperkey: Update to 1.5.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/gnupg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

01/01: gnu: paperkey: Update to 1.5.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit ae9877fed35a3add9ce38eab524daca597c00b52
Author: Christopher Lemmer Webber 
Date:   Thu Apr 26 19:10:36 2018 -0500

gnu: paperkey: Update to 1.5.

* gnu/packages/gnupg.scm (paperkey): Update to 1.5.
---
 gnu/packages/gnupg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 2942144..f397482 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -795,7 +795,7 @@ passphrase when @code{gpg} is run and needs it.")))
 (define-public paperkey
   (package
 (name "paperkey")
-(version "1.3")
+(version "1.5")
 (source (origin
   (method url-fetch)
   (uri (string-append "http://www.jabberwocky.com/;
@@ -803,7 +803,7 @@ passphrase when @code{gpg} is run and needs it.")))
   version ".tar.gz"))
   (sha256
(base32
-"1yybj8bj68v4lxwpn596b6ismh2fyixw5vlqqg26byrn4d9dfmsv"
+"1prd2jaf4zjad3xhv160hmi5n408ssljfg7iz90jxs9w111pjwy4"
 (build-system gnu-build-system)
 (arguments
  `(#:phases

02/02: gnu: racket: Patch xform compilation errors.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 75afbd247876d62f27cb2c90098bd59040f7e614
Author: Christopher Lemmer Webber 
Date:   Sun Mar 18 14:41:04 2018 -0500

gnu: racket: Patch xform compilation errors.

* gnu/packages/patches/gnu/packages/patches/racket-fix-xform-issue.patch:
Renamed from gnu/packages/patches/racket-minus_zero_p-disable-xform.patch.
Switch to upstream patch in Racket.
* gnu/packages/scheme.scm (racket): Update to renamed patch.
---
 gnu/packages/patches/racket-fix-xform-issue.patch  | 63 ++
 .../racket-minus_zero_p-disable-xform.patch| 10 
 gnu/packages/scheme.scm|  3 +-
 3 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/patches/racket-fix-xform-issue.patch 
b/gnu/packages/patches/racket-fix-xform-issue.patch
new file mode 100644
index 000..0a1640e
--- /dev/null
+++ b/gnu/packages/patches/racket-fix-xform-issue.patch
@@ -0,0 +1,63 @@
+050cdb59839896b41431791f8ee0ef2564231b8f
+Author: Matthew Flatt 
+AuthorDate: Tue Mar 6 09:05:08 2018 -0700
+Commit: Matthew Flatt 
+CommitDate: Tue Mar 6 09:05:08 2018 -0700
+
+Parent: efb9a919fc ffi docs: clarification on `unsafe-socket->port`
+Containing: master
+Follows:v5.0.1 (21612)
+
+xform: avoid problems with `__signbitf128`
+
+Closes #1962 and uses the suggested patch there, among other changes.
+
+2 files changed, 6 insertions(+), 3 deletions(-)
+racket/collects/compiler/private/xform.rkt | 2 +-
+racket/src/racket/src/number.c | 7 +--
+
+diff --git a/racket/collects/compiler/private/xform.rkt 
b/racket/collects/compiler/private/xform.rkt
+index 28a425c057..89ae848f9c 100644
+--- a/collects/compiler/private/xform.rkt
 b/collects/compiler/private/xform.rkt
+@@ -904,7 +904,7 @@
+ 
+strlen cos cosl sin sinl exp expl pow powl log logl sqrt sqrtl 
atan2 atan2l frexp
+isnan isinf fpclass signbit _signbit _fpclass __fpclassify 
__fpclassifyf __fpclassifyl
+- _isnan __isfinited __isnanl __isnan __signbit __signbitf 
__signbitd __signbitl
++ _isnan __isfinited __isnanl __isnan __signbit __signbitf 
__signbitd __signbitl __signbitf128
+__isinff __isinfl isnanf isinff __isinfd __isnanf __isnand 
__isinf __isinff128
+__inline_isnanl __inline_isnan __inline_signbit 
__inline_signbitf __inline_signbitd __inline_signbitl
+__builtin_popcount __builtin_clz __builtin_isnan 
__builtin_isinf __builtin_signbit
+diff --git a/racket/src/racket/src/number.c b/racket/src/racket/src/number.c
+index 71f42aaf3c..3bbad3ba83 100644
+--- a/src/racket/src/number.c
 b/src/racket/src/number.c
+@@ -1796,6 +1796,7 @@ double scheme_real_to_double(Scheme_Object *r)
+ }
+ 
+ XFORM_NONGCING static MZ_INLINE int minus_zero_p(double d)
++  XFORM_SKIP_PROC
+ {
+ #ifdef MZ_IS_NEG_ZERO
+   return MZ_IS_NEG_ZERO(d);
+@@ -1809,7 +1810,9 @@ int scheme_minus_zero_p(double d)
+   return minus_zero_p(d);
+ }
+ 
+-static int rational_dbl_p(double f) {
++XFORM_NONGCING static int rational_dbl_p(double f)
++  XFORM_SKIP_PROC
++{
+   return !(MZ_IS_NAN(f)
+|| MZ_IS_INFINITY(f));
+ }
+@@ -1955,7 +1958,7 @@ real_p(int argc, Scheme_Object *argv[])
+   return (SCHEME_REALP(o) ? scheme_true : scheme_false);
+ }
+ 
+-static int is_rational(const Scheme_Object *o)
++XFORM_NONGCING static int is_rational(const Scheme_Object *o)
+ {
+   if (SCHEME_FLOATP(o))
+ return rational_dbl_p(SCHEME_FLOAT_VAL(o));
\ No newline at end of file
diff --git a/gnu/packages/patches/racket-minus_zero_p-disable-xform.patch 
b/gnu/packages/patches/racket-minus_zero_p-disable-xform.patch
deleted file mode 100644
index 08887a6..000
--- a/gnu/packages/patches/racket-minus_zero_p-disable-xform.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/src/racket/src/number.c  2018-02-24 18:16:32.031698079 -0600
-+++ b/src/racket/src/number.c  2018-02-24 18:15:41.055445301 -0600
-@@ -1775,6 +1775,7 @@
- }
- 
- XFORM_NONGCING static MZ_INLINE int minus_zero_p(double d)
-+  XFORM_SKIP_PROC
- {
- #ifdef MZ_IS_NEG_ZERO
-   return MZ_IS_NEG_ZERO(d);
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index d89b123..c9e1a15 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -418,7 +418,8 @@ implementation techniques and as an expository tool.")
"0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"))
  (patches (search-patches
;; See: https://github.com/racket/racket/issues/1962
-   "racket-minus_zero_p-disable-xform.patch"
+   ;; This can be removed in whatever Racket release comes 
after 6.12
+   "racket-fix-xform-issue.patch"
 (build-system gnu-build-system)
 (arguments
  '(#:phases

branch master updated (35b3135 -> 75afbd2)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  35b3135   gnu: notmuch: Update to 0.26.1.
   new  02283a6   gnu: racket: Update to 6.12.
   new  75afbd2   gnu: racket: Patch xform compilation errors.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/patches/racket-fix-xform-issue.patch | 63 +++
 gnu/packages/scheme.scm   |  8 ++-
 2 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/racket-fix-xform-issue.patch

01/02: gnu: racket: Update to 6.12.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 02283a61304205244dde9c2c648372960cd2e493
Author: Christopher Lemmer Webber 
Date:   Sat Feb 24 18:36:13 2018 -0600

gnu: racket: Update to 6.12.

* gnu/packages/patches/racket-minus_zero_p-disable-xform.patch: New file.
* gnu/packages/scheme.scm (racket): Update version and patch.
---
 gnu/packages/patches/racket-minus_zero_p-disable-xform.patch | 10 ++
 gnu/packages/scheme.scm  |  7 +--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/patches/racket-minus_zero_p-disable-xform.patch 
b/gnu/packages/patches/racket-minus_zero_p-disable-xform.patch
new file mode 100644
index 000..08887a6
--- /dev/null
+++ b/gnu/packages/patches/racket-minus_zero_p-disable-xform.patch
@@ -0,0 +1,10 @@
+--- a/src/racket/src/number.c  2018-02-24 18:16:32.031698079 -0600
 b/src/racket/src/number.c  2018-02-24 18:15:41.055445301 -0600
+@@ -1775,6 +1775,7 @@
+ }
+ 
+ XFORM_NONGCING static MZ_INLINE int minus_zero_p(double d)
++  XFORM_SKIP_PROC
+ {
+ #ifdef MZ_IS_NEG_ZERO
+   return MZ_IS_NEG_ZERO(d);
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 37593fe..d89b123 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -405,7 +405,7 @@ implementation techniques and as an expository tool.")
 (define-public racket
   (package
 (name "racket")
-(version "6.11")
+(version "6.12")
 (source (origin
  (method url-fetch)
  (uri (list (string-append 
"http://mirror.racket-lang.org/installers/;
@@ -415,7 +415,10 @@ implementation techniques and as an expository tool.")
  version "/racket-" version "-src.tgz")))
  (sha256
   (base32
-   "1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw"
+   "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"))
+ (patches (search-patches
+   ;; See: https://github.com/racket/racket/issues/1962
+   "racket-minus_zero_p-disable-xform.patch"
 (build-system gnu-build-system)
 (arguments
  '(#:phases

01/01: gnu: golly: Fix source url.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 04e7b1e7f91a649dd6cf424c27d73d5d7aeae52b
Author: Christopher Lemmer Webber 
Date:   Thu Mar 1 11:00:30 2018 -0600

gnu: golly: Fix source url.

* gnu/packages/games.scm (golly): Fix source url.
---
 gnu/packages/games.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 272e9bc..5917bbd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -370,7 +370,7 @@ effects and music to make a completely free game.")
 (version "3.1")
 (source (origin
   (method url-fetch)
-  (uri (string-append "mirror://sourceforge/golly/golly-"
+  (uri (string-append "mirror://sourceforge/golly/golly/golly-"
   version "/golly-" version
   "-src.tar.gz"))
   (sha256

branch master updated (52fb59e -> 04e7b1e)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  52fb59e   gnu: imagemagick: Update to 6.9.9-36.
   new  04e7b1e   gnu: golly: Fix source url.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/games.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

01/02: gnu: Add thermald.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 589896843854cbdb24f627a53e5a9af628c6e7fb
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Sat May 13 19:36:01 2017 -0500

gnu: Add thermald.

* gnu/packages/admin.scm (thermald): New variable.
---
 gnu/packages/admin.scm | 54 +-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index ef7bff1..1610729 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2016 John Darrington <j...@gnu.org>
 ;;; Copyright © 2017 Ben Sturmfels <b...@sturm.com.au>
 ;;; Copyright © 2017 Ethan R. Jones <doubleplusgoo...@gmail.com>
+;;; Copyright © 2017 Christopher Allan Webber <cweb...@dustycloud.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -80,7 +81,8 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages kerberos)
-  #:use-module (gnu packages gtk))
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages xml))
 
 (define-public aide
   (package
@@ -2180,3 +2182,53 @@ navigation, opening files and running tasks.  There is 
no config file and
 mime associations are hard-coded.  The incredible user-friendliness and speed
 make it a perfect utility on modern distros.")
 (license license:bsd-2)))
+
+(define-public thermald
+  (package
+(name "thermald")
+(version "1.6")
+(source
+ (origin
+  (method url-fetch)
+  (uri (string-append "https://github.com/01org/thermal_daemon/archive/v;
+  version ".tar.gz"))
+  (sha256 (base32
+   "14klz9fnvi9jdlaqwrp61xa5nh051n8ykrs1fh1wxd7j66qf2fn6"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases (modify-phases %standard-phases
+  (add-after
+   'unpack 'autogen.sh-and-fix-paths
+   (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+   ;; upstartconfir is hardcoded to /etc/init and the build
+   ;; system tries to mkdir that.  We don't even need 
upstart
+   ;; files at all; this is a fast and kludgy workaround
+   (substitute* "data/Makefile.am"
+ (("upstartconfdir = /etc/init")
+  (string-append "upstartconfdir = "
+ out "/etc/init")))
+   ;; Now run autogen
+   (zero? (system* "sh" "autogen.sh"))
+   #:configure-flags
+   (let ((out  (assoc-ref %outputs "out")))
+ (list (string-append "--sysconfdir="
+  out "/etc")
+   (string-append "--with-udev-dir="
+  out "/lib/udev")
+   (string-append "--with-dbus-sys-dir="
+  out "/etc/dbus-1/system.d")
+   "--localstatedir=/var"
+(native-inputs
+ `(("autoconf" ,autoconf)
+   ("automake" ,automake)
+   ("glib" ,glib "bin") ; for glib-genmarshal, etc.
+   ("pkg-config" ,pkg-config)))
+(inputs
+ `(("dbus-glib" ,dbus-glib)
+   ("libxml2" ,libxml2)))
+(home-page "https://01.org/linux-thermal-daemon/;)
+(synopsis "CPU scaling for thermal management")
+(description "The Linux Thermal Daemon helps monitor and control 
temperature
+on systems running the Linux kernel.")
+(license license:gpl2+)))

branch master updated (73c791b -> d7fa39c)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  73c791b   maint: 'release' now depends on 'dist', not 'distcheck'.
   new  5898968   gnu: Add thermald.
   new  d7fa39c   services: Add 'thermald-service-type'.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/guix.texi  | 28 +-
 gnu/packages/admin.scm | 54 +-
 gnu/services/pm.scm| 41 +-
 3 files changed, 120 insertions(+), 3 deletions(-)

02/02: services: Add 'thermald-service-type'.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit d7fa39ccec34bc223d52a04dfc3e1f756e2dfa24
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Sat May 13 19:37:02 2017 -0500

services: Add 'thermald-service-type'.

* gnu/services/pm.scm (): New record type.
(thermald-shepherd-service, thermald-service-type): New variables.
* doc/guix.texi (Thermal Management): New section documenting thermald.
---
 doc/guix.texi   | 28 +++-
 gnu/services/pm.scm | 41 -
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 844f0d7..43ed051 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -35,7 +35,8 @@ Copyright @copyright{} 2017 Mathieu Othacehe@*
 Copyright @copyright{} 2017 Federico Beffa@*
 Copyright @copyright{} 2017 Carlo Zancanaro@*
 Copyright @copyright{} 2017 Thomas Danckaert@*
-Copyright @copyright{} 2017 humanitiesNerd
+Copyright @copyright{} 2017 humanitiesNerd@*
+Copyright @copyright{} 2017 Christopher Allan Webber
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -14617,6 +14618,31 @@ Defaults to @samp{#f}.
 
 @end deftypevr
 
+
+The @code{(gnu services pm)} module provides an interface to
+thermald, a CPU frequency scaling service which helps prevent overheating.
+
+@defvr {Scheme Variable} thermald-service-type
+This is the service type for
+@uref{https://01.org/linux-thermal-daemon/, thermald}, the Linux
+Thermal Daemon, which is responsible for controlling the thermal state
+of processors and preventing overheating.
+@end defvr
+
+@deftp {Data Type} thermald-configuration
+Data type representing the configuration of @code{thermald-service-type}.
+
+@table @asis
+@item @code{ignore-cpuid-check?} (default: @code{#f})
+Ignore cpuid check for supported CPU models.
+
+@item @code{thermald} (default: @var{thermald})
+Package object of thermald.
+
+@end table
+@end deftp
+
+
 @node Miscellaneous Services
 @subsubsection Miscellaneous Services
 
diff --git a/gnu/services/pm.scm b/gnu/services/pm.scm
index 3cefe18..d40cb99 100644
--- a/gnu/services/pm.scm
+++ b/gnu/services/pm.scm
@@ -20,6 +20,7 @@
   #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix records)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages linux)
   #:use-module (gnu services)
   #:use-module (gnu services base)
@@ -27,7 +28,10 @@
   #:use-module (gnu services shepherd)
   #:use-module (gnu system shadow)
   #:export (tlp-service-type
-tlp-configuration))
+tlp-configuration
+
+thermald-configuration
+thermald-service-type))
 
 (define (uglify-field-name field-name)
   (let ((str (symbol->string field-name)))
@@ -403,3 +407,38 @@ shutdown on system startup."))
   (generate-documentation
`((tlp-configuration ,tlp-configuration-fields))
'tlp-configuration))
+
+
+
+;;;
+;;; thermald
+;;;
+;;; This service implements cpu scaling.  Helps prevent overheating!
+
+(define-record-type* 
+  thermald-configuration make-thermald-configuration
+  thermald-configuration?
+  (ignore-cpuid-check? thermald-ignore-cpuid-check?;boolean
+   (default #f))
+  (thermaldthermald-thermald   ;package
+   (default thermald)))
+
+(define (thermald-shepherd-service config)
+  (list
+   (shepherd-service
+(provision '(thermald))
+(documentation "Run thermald cpu frequency scaling.")
+(start #~(make-forkexec-constructor
+  '(#$(file-append (thermald-thermald config) "/sbin/thermald")
+"--no-daemon"
+#$@(if (thermald-ignore-cpuid-check? config)
+   '("--ignore-cpuid-check")
+   '()
+(stop #~(make-kill-destructor)
+
+(define thermald-service-type
+  (service-type
+   (name 'thermald)
+   (extensions (list (service-extension shepherd-root-service-type
+thermald-shepherd-service)))
+   (default-value (thermald-configuration

branch master updated (584da12 -> a62a16a)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  584da12   gnu: Add LLVM, CLANG 3.9.1.
   new  a62a16a   gnu: guile-sjson: Update to 0.2.1.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/guile.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

01/01: gnu: guile-sjson: Update to 0.2.1.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit a62a16a4d38bc702da4fb9725fe7e1715ada2c4c
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Wed May 10 09:29:31 2017 -0500

gnu: guile-sjson: Update to 0.2.1.

* gnu/packages/guile.scm (guile-sjson): Update to 0.2.1.
---
 gnu/packages/guile.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index c7f3b82..8766e33 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1838,14 +1838,14 @@ HTML (via SXML) or any other format for rendering.")
 (define-public guile-sjson
   (package
 (name "guile-sjson")
-(version "0.2")
+(version "0.2.1")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://dustycloud.org/misc/sjson-; version
   ".tar.gz"))
   (sha256
(base32
-"09hnh2brc7ihh8dv4g5hdmdj8rs8p9l3pmlgafkx145grdg7wprx"
+"1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3"
 (build-system gnu-build-system)
 (arguments
  '(#:phases

01/01: python-sphinxcontrib-programoutput: Update to 0.10.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit b9ce9eca23ff326b3a98c6e9e49a60e1a4b81d8b
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Fri Apr 28 14:29:16 2017 -0500

python-sphinxcontrib-programoutput: Update to 0.10.

* gnu/packages/python.scm (python-sphinxcontrib-programoutput): Update to 
0.10.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 22fadea..e25a55d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10033,13 +10033,13 @@ programmatically interfacing with your system's 
$EDITOR.")
 (define-public python-sphinxcontrib-programoutput
   (package
 (name "python-sphinxcontrib-programoutput")
-(version "0.8")
+(version "0.10")
 (source (origin
   (method url-fetch)
   (uri (pypi-uri "sphinxcontrib-programoutput" version))
   (sha256
(base32
-"098as6z1s0gb4dh5xcr1fd2vpm91zj93jzvgawspxf5s4hqs0xhp"
+"153hhnlbx4688zj9wd64819ps5znc2jlyp5crkgzvn5hxgy99vpx"
 (build-system python-build-system)
 (arguments
  ;; FIXME: Many tests are failing and the upstream is gone.

branch master updated (564324f -> b9ce9ec)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  564324f   gnu: xapian: Update to 1.4.4.
   new  b9ce9ec   python-sphinxcontrib-programoutput: Update to 0.10.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

01/01: gnu: Add guile-sjson.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit d26ae96c3da6d968cd38348197f3581e456e56cc
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Apr 25 00:18:29 2017 -0500

gnu: Add guile-sjson.

* gnu/packages/guile.scm (guile-sjson): Add guile-sjson.
---
 gnu/packages/guile.scm | 29 +
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 9dd524e..26606f9 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1768,4 +1768,33 @@ HTML (via SXML) or any other format for rendering.")
   (home-page "http://dthompson.us/software/guile-syntax-highlight;)
   (license license:lgpl3+
 
+(define-public guile-sjson
+  (package
+(name "guile-sjson")
+(version "0.2")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://dustycloud.org/misc/sjson-; version
+  ".tar.gz"))
+  (sha256
+   (base32
+"09hnh2brc7ihh8dv4g5hdmdj8rs8p9l3pmlgafkx145grdg7wprx"
+(build-system gnu-build-system)
+(arguments
+ '(#:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'bootstrap
+   (lambda _ (zero? (system* "sh" "bootstrap.sh")))
+(native-inputs
+ `(("autoconf" ,autoconf)
+   ("automake" ,automake)
+   ("pkg-config" ,pkg-config)))
+(inputs
+ `(("guile" ,guile-2.2)))
+(home-page "https://gitlab.com/dustyweb/guile-sjson;)
+(synopsis "S-expression based json reader/writer for Guile")
+(description "guile-sjson is a json reader/writer for Guile.
+It has a nice, simple s-expression based syntax.")
+(license license:lgpl3+)))
+
 ;;; guile.scm ends here

branch master updated (57d0bdf -> 525acb6)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  57d0bdf   gnu: guix: Don't ignore user's GUILE_LOAD_COMPILED_PATH.
   new  525acb6   gnu: guile-8sync: Update to 0.4.2.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/guile.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

01/01: gnu: guile-8sync: Update to 0.4.2.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 525acb6e826c1a800c422ce6ee6f4c68348e3bf1
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Sat Mar 18 12:15:28 2017 -0500

gnu: guile-8sync: Update to 0.4.2.

* gnu/packages/guile.scm (guile-8sync): Update to 0.4.2.
---
 gnu/packages/guile.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index e44c065..9289c40 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1630,14 +1630,14 @@ and then run @command{scm example.scm}.")
 (define-public guile-8sync
   (package
 (name "guile-8sync")
-(version "0.4.1")
+(version "0.4.2")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://gnu/8sync/8sync-" version
   ".tar.gz"))
   (sha256
(base32
-"1fvf8d2s3vvg4nyskbqaiqmlm2x571hv7hizcnmny45zvalydr9h"
+"031wm13srak3wsnll7j2mbbi29g1pcm4swdb71ds9yn567pn20qw"
 (build-system gnu-build-system)
 (native-inputs `(("autoconf" ,autoconf)
  ("automake" ,automake)

01/01: gnu: Add guile-fibers.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit aaf1bdc3497bb76b22019ded6b0846d02833e79e
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Feb 21 11:20:02 2017 +0100

gnu: Add guile-fibers.

* gnu/packages/guile.scm (guile-fibers): New variable.
---
 gnu/packages/guile.scm | 33 +
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 6d8f30e..293579b 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira 
<https://libreplanet.org/wiki/User:Adfeno> <adf...@openmailbox.org>
 ;;; Copyright © 2016 Amirouche <amirou...@hypermove.net>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <jann...@gnu.org>
+;;; Copyright © 2017 Andy Wingo <wi...@igalia.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1655,6 +1656,38 @@ library for GNU Guile based on the actor model.
 Note that 8sync is only available for Guile 2.2 (guile-next in Guix).")
 (license license:lgpl3+)))
 
+(define-public guile-fibers
+  (package
+(name "guile-fibers")
+(version "1.0.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://wingolog.org/pub/fibers/fibers-;
+  version ".tar.gz"))
+  (sha256
+   (base32
+"0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"
+(build-system gnu-build-system)
+(native-inputs
+ `(("texinfo" ,texinfo)
+   ("pkg-config" ,pkg-config)))
+(inputs
+ `(("guile" ,guile-next)))
+(synopsis "Lightweight concurrency facility for Guile")
+(description
+ "Fibers is a Guile library that implements a a lightweight concurrency
+facility, inspired by systems like Concurrent ML, Go, and Erlang.  A fiber is
+like a \"goroutine\" from the Go language: a lightweight thread-like
+abstraction.  Systems built with Fibers can scale up to millions of concurrent
+fibers, tens of thousands of concurrent socket connections, and many parallel
+cores.  The Fibers library also provides Concurrent ML-like channels for
+communication between fibers.
+
+Note that Fibers makes use of some Guile 2.1/2.2-specific features and
+is not available for Guile 2.0.")
+(home-page "https://github.com/wingo/fibers;)
+(license license:lgpl3+)))
+
 (define-public guile-git
   (let ((revision "0")
 (commit "969514aa7224217bc3c1a4c5312a9469ac5f13d5"))

branch master updated (53a55c9 -> aaf1bdc)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  53a55c9   gnu: curl: Update replacement to 7.53.0 [fixes 
CVE-2017-2629].
   new  aaf1bdc   gnu: Add guile-fibers.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/guile.scm | 33 +
 1 file changed, 33 insertions(+)

branch master updated (856b703 -> 52ddeaa)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  856b703   gnu: icedtea-7: Update to 2.6.9 [security fixes].
   new  8a0c255   gnu: Add scheme48-rx.
   new  52ddeaa   gnu: Add scsh.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/scheme.scm | 41 -
 gnu/packages/shells.scm | 49 +
 2 files changed, 89 insertions(+), 1 deletion(-)

02/02: gnu: Add scsh.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 52ddeaa0c24ed428bd9351fd051fc52810d80ccd
Author: ng0 
Date:   Thu Feb 16 10:02:57 2017 -0600

gnu: Add scsh.

* gnu/packages/shells.scm (scsh): New variable.
---
 gnu/packages/shells.scm | 49 +
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index a7a7fbc..7b30a1d 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -37,6 +37,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages scheme)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix download)
@@ -382,3 +383,51 @@ primitives that you are used to from Bash and IPython.  It 
works on all major
 systems including Linux, Mac OSX, and Windows.  Xonsh is meant for the daily
 use of experts and novices alike.")
 (license bsd-2)))
+
+(define-public scsh
+  (let ((commit "114432435e4eadd54334df6b37fcae505079b49f")
+(revision "1"))
+(package
+  (name "scsh")
+  (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url "https://github.com/scheme/scsh;)
+   (commit commit)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+  (base32
+   "1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q"
+  (build-system gnu-build-system)
+  (arguments
+   `(#:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+   (add-before 'configure 'replace-rx
+ (lambda* (#:key inputs #:allow-other-keys)
+   (let* ((rx (assoc-ref inputs "scheme48-rx"))
+  (rxpath (string-append rx "/share/scheme48-"
+ ,(package-version scheme48)
+ "/rx")))
+ (delete-file-recursively "rx")
+ (symlink rxpath "rx"))
+   #t))
+   (add-before 'configure 'autoreconf
+ (lambda _
+   (zero? (system* "autoreconf")))
+  (inputs
+   `(("scheme48" ,scheme48)
+ ("scheme48-rx" ,scheme48-rx)))
+  (native-inputs
+   `(("autoconf" ,autoconf)
+ ("automake" ,automake)))
+  (home-page "https://github.com/scheme/scsh;)
+  (synopsis "Unix shell embedded in Scheme")
+  (description
+   "Scsh is a Unix shell embedded in Scheme.  Scsh has two main
+components: a process notation for running programs and setting up pipelines
+and redirections, and a complete syscall library for low-level access to the
+operating system.")
+  (license bsd-3

01/02: gnu: Add scheme48-rx.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 8a0c2552b4cf15e5709fd205530f62c007e195aa
Author: ng0 
Date:   Thu Feb 16 10:01:34 2017 -0600

gnu: Add scheme48-rx.

* gnu/packages/scheme.scm (scheme48-rx): New variable.
---
 gnu/packages/scheme.scm | 41 -
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 1210ab5..af416c5 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus 
 ;;; Copyright © 2016 Efraim Flashner 
 ;;; Copyright © 2016 Jan Nieuwenhuizen 
-;;; Copyright © 2016 ng0 
+;;; Copyright © 2016, 2017 ng0 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -805,3 +805,42 @@ Using Scheme, a dialect of the Lisp programming language, 
the book explains
 core computer science concepts such as abstraction in programming,
 metalinguistic abstraction, recursion, interpreters, and modular programming.")
   (license cc-by-sa4.0
+
+(define-public scheme48-rx
+  (let* ((commit "d3231ad13de2b44e3ee173b1c9d09ff165e8b6d5")
+ (revision "1"))
+(package
+  (name "scheme48-rx")
+  (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url "https://github.com/scheme/rx;)
+   (commit commit)))
+ (sha256
+  (base32
+   "1nmziaibgmfi346kzidj6xyad0vm7724qymbzgxvdzyrqji6v6yz"))
+ (file-name (string-append name "-" version "-checkout"
+  (build-system trivial-build-system)
+  (arguments
+   `(#:modules ((guix build utils))
+ #:builder
+ (begin
+   (use-modules (guix build utils))
+   (let ((share (string-append %output
+   "/share/scheme48-"
+   ,(package-version scheme48)
+   "/rx")))
+ (chdir (assoc-ref %build-inputs "source"))
+ (mkdir-p share)
+ (copy-recursively "." share)
+  (native-inputs
+   `(("source" ,source)
+ ("scheme48" ,scheme48)))
+  (home-page "https://github.com/scheme/rx/;)
+  (synopsis "SRE String pattern-matching library for scheme48")
+  (description
+   "String pattern-matching library for scheme48 based on the SRE
+regular-expression notation.")
+  (license bsd-3

01/01: guile-gdbm-ffi: Write to correct guile output directory and use guild.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit a5bd6a5e15f6f8bff77e760f8de53d979abfe1d9
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Fri Feb 10 19:24:57 2017 -0600

guile-gdbm-ffi: Write to correct guile output directory and use guild.

* gnu/packages/guile.scm (guile-gdbm-ffi): Check guile for effective version
before writing to output path.  Also fixes a bug where the guild command was
not getting called, and instead was calling the internal guile compile-file
procedure.  This meant that the package produced was dependent on whatever
version of guile was powering Guix at the time.  Also set GUILE_AUTO_COMPILE
to 0 to avoid gnarly looking warnings during build.
---
 gnu/packages/guile.scm | 24 +++-
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 52b9245..457ee2e 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -846,10 +846,22 @@ inspired by the SCSH regular expression system.")
#:builder
(begin
  (use-modules (guix build utils)
-  (system base compile))
+  (ice-9 rdelim)
+  (ice-9 popen))
+
+ ;; Avoid warnings we can safely ignore
+ (setenv "GUILE_AUTO_COMPILE" "0")
 
  (let* ((out (assoc-ref %outputs "out"))
-(module-dir (string-append out "/share/guile/site/2.0"))
+(effective-version
+ (read-line
+  (open-pipe* OPEN_READ
+  (string-append
+   (assoc-ref %build-inputs "guile")
+   "/bin/guile")
+  "-c" "(display (effective-version))")))
+(module-dir (string-append out "/share/guile/site/"
+   effective-version))
 (source (assoc-ref %build-inputs "source"))
 (doc (string-append out "/share/doc"))
 (guild (string-append (assoc-ref %build-inputs "guile")
@@ -857,7 +869,10 @@ inspired by the SCSH regular expression system.")
 (gdbm.scm-dest
  (string-append module-dir "/gdbm.scm"))
 (gdbm.go-dest
- (string-append module-dir "/gdbm.go")))
+ (string-append module-dir "/gdbm.go"))
+(compile-file
+ (lambda (in-file out-file)
+   (system* guild "compile" "-o" out-file in-file
;; Make installation directories.
(mkdir-p module-dir)
(mkdir-p doc)
@@ -875,8 +890,7 @@ inspired by the SCSH regular expression system.")
   (assoc-ref %build-inputs "gdbm"
 
;; compile to the destination
-   (compile-file gdbm.scm-dest
- #:output-file gdbm.go-dest)
+   (compile-file gdbm.scm-dest gdbm.go-dest)
 (inputs
  `(("guile" ,guile-2.0)))
 (propagated-inputs

branch master updated (8034560 -> a5bd6a5)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  8034560   build: dub-build-system: Don't use "dub run" at all.
   new  a5bd6a5   guile-gdbm-ffi: Write to correct guile output directory 
and use guild.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/guile.scm | 24 +++-
 1 file changed, 19 insertions(+), 5 deletions(-)

branch master updated (83f805b -> b76c94e)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  83f805b   gnu: postgresql: Update to 9.5.6.
   new  b76c94e   gnu: Add angband.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/games.scm | 53 +-
 1 file changed, 52 insertions(+), 1 deletion(-)

01/01: gnu: Add angband.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit b76c94e639bd41f53d47d8d48ea696023d5aefdd
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Fri Feb 10 16:45:11 2017 -0600

gnu: Add angband.

* gnu/packages/games.scm (angband): New variable.
---
 gnu/packages/games.scm | 53 +-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 0867089..4bcdd48 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <m...@netris.org>
 ;;; Copyright © 2015, 2016 Andreas Enge <andr...@enge.fr>
 ;;; Copyright © 2015 David Hashe <david.ha...@dhashe.com>
-;;; Copyright © 2015 Christopher Allan Webber <cweb...@dustycloud.org>
+;;; Copyright © 2015, 2017 Christopher Allan Webber <cweb...@dustycloud.org>
 ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rek...@elephly.net>
 ;;; Copyright © 2015, 2016, 2017 Alex Kost <alez...@gmail.com>
 ;;; Copyright © 2015 Paul van der Walt <p...@denknerd.org>
@@ -227,6 +227,57 @@ them, called Jean Raymond, found an old church in which to 
hide, not knowing
 that beneath its ruins lay buried an ancient evil.")
 (license license:gpl3)))
 
+(define-public angband
+  (package
+(name "angband")
+(version "4.0.5")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://rephial.org/downloads/4.0/;
+   "angband-" version ".tar.gz"))
+   (sha256
+(base32
+ "0lpq2kms7hp421vrasx2bkkn9w08kr581ldwik3v0hlq6h7rlxhd"))
+   (modules '((guix build utils)))
+   (snippet
+;; So, some of the sounds/graphics/tilesets are under different
+;; licenses... some of them even nonfree!  This is a console-only
+;; version of this package so we just remove them.
+;; In the future, if someone tries to make a graphical variant of
+;; this package, they can deal with that mess themselves. :)
+'(begin
+   (for-each
+(lambda (subdir)
+  (let ((lib-subdir (string-append "lib/" subdir)))
+(delete-file-recursively lib-subdir)))
+'("fonts" "icons" "sounds" "tiles"))
+   (substitute* "lib/Makefile"
+ ;; And don't try to invoke makefiles in the directories we removed
+ (("gamedata customize help screens fonts tiles sounds icons user")
+  "gamedata customize help screens user"))
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ;no check target
+   #:configure-flags (list (string-append "--bindir=" %output "/bin"))
+   #:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'autogen.sh
+   (lambda _
+ (substitute* "acinclude.m4"
+   (("ncursesw5-config") "ncursesw6-config"))
+ (zero? (system* "sh" "autogen.sh"))) 
+(native-inputs
+ `(("autoconf" ,autoconf)
+   ("automake" ,automake)))
+(inputs `(("ncurses" ,ncurses)))
+(home-page "http://rephial.org/;)
+(synopsis "Dungeon exploration roguelike")
+(description "Angband is a Classic dungeon exploration roguelike.  Explore
+the depths below Angband, seeking riches, fighting monsters, and preparing to
+fight Morgoth, the Lord of Darkness.")
+(license license:gpl2)))
+
 (define-public pingus
   (package
 (name "pingus")

01/01: gnu: Add guile2.2-gdbm-ffi.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 2737bcff5d70f6815588a82780679756f63c56c1
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Fri Feb 10 12:42:12 2017 -0600

gnu: Add guile2.2-gdbm-ffi.

* gnu/packages/guile.scm (guile2.2-gdbm-ffi): New variable.
---
 gnu/packages/guile.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 7307823..3e8ab00 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -887,6 +887,9 @@ inspired by the SCSH regular expression system.")
 Guile's foreign function interface.")
 (license gpl3+)))
 
+(define-public guile2.2-gdbm-ffi
+  (package-for-guile-2.2 guile-gdbm-ffi))
+
 (define-public guile-sqlite3
   (let ((commit "607721fe1174a299e45d457acacf94eefb964071"))
 (package

branch master updated (49dbae5 -> 2737bcf)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  49dbae5   gnu: Add font-go.
   new  2737bcf   gnu: Add guile2.2-gdbm-ffi.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/guile.scm | 3 +++
 1 file changed, 3 insertions(+)

branch master updated (a4824c6 -> 6554be6)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  a4824c6   import: hackage: Handle unknown packages gracefully.
   new  6554be6   git-download: Add 'git-predicate'.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/package-management.scm | 37 +--
 guix/git-download.scm   | 43 -
 2 files changed, 43 insertions(+), 37 deletions(-)

01/01: git-download: Add 'git-predicate'.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 6554be68b43d5b240c8075cdbb479c66a9780f59
Author: Mathieu Lirzin 
Date:   Sun Jan 29 00:34:48 2017 +0100

git-download: Add 'git-predicate'.

* guix/git-download.scm (git-predicate): New procedure.
* gnu/packages/package-management.scm (current-guix): Use it.
(make-git-predicate): Remove.
---
 gnu/packages/package-management.scm | 37 +--
 guix/git-download.scm   | 43 -
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 26802e0..8291740 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -25,7 +25,6 @@
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
-  #:use-module ((guix build utils) #:select (with-directory-excursion))
   #:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl2.1+ asl2.0))
   #:use-module (gnu packages)
   #:use-module (gnu packages guile)
@@ -53,10 +52,6 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages vim)
-  #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-26)
-  #:use-module (ice-9 popen)
-  #:use-module (ice-9 rdelim)
   #:use-module (ice-9 match))
 
 (define (boot-guile-uri arch)
@@ -275,38 +270,8 @@ generated file."
 (_
  #t)))
 
-(define (make-git-predicate directory)
-  "Return a predicate that returns true if a file is part of the Git checkout
-living at DIRECTORY.  Upon Git failure, return #f instead of a predicate."
-  (define (parent-directory? thing directory)
-;; Return #t if DIRECTORY is the parent of THING.
-(or (string-suffix? thing directory)
-(and (string-index thing #\/)
- (parent-directory? (dirname thing) directory
-
-  (let* ((pipe(with-directory-excursion directory
-(open-pipe* OPEN_READ "git" "ls-files")))
- (files   (let loop ((lines '()))
-(match (read-line pipe)
-  ((? eof-object?)
-   (reverse lines))
-  (line
-   (loop (cons line lines))
- (status  (close-pipe pipe)))
-(and (zero? status)
- (lambda (file stat)
-   (match (stat:type stat)
- ('directory
-  ;; 'git ls-files' does not list directories, only regular files,
-  ;; so we need this special trick.
-  (any (cut parent-directory? <> file) files))
- ((or 'regular 'symlink)
-  (any (cut string-suffix? <> file) files))
- (_
-  #f))
-
 (define-public current-guix
-  (let ((select? (delay (or (make-git-predicate
+  (let ((select? (delay (or (git-predicate
  (string-append (current-source-directory)
 "/../.."))
 source-file?
diff --git a/guix/git-download.scm b/guix/git-download.scm
index 62e625c..5d86ab2 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès 
+;;; Copyright © 2017 Mathieu Lirzin 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,6 +18,7 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (guix git-download)
+  #:use-module (guix build utils)
   #:use-module (guix gexp)
   #:use-module (guix store)
   #:use-module (guix monads)
@@ -24,6 +26,9 @@
   #:use-module (guix packages)
   #:autoload   (guix build-system gnu) (standard-packages)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 popen)
+  #:use-module (ice-9 rdelim)
+  #:use-module (srfi srfi-1)
   #:export (git-reference
 git-reference?
 git-reference-url
@@ -32,7 +37,8 @@
 
 git-fetch
 git-version
-git-file-name))
+git-file-name
+git-predicate))
 
 ;;; Commentary:
 ;;;
@@ -119,4 +125,39 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a 
generic name if #f."
   "Return the file-name for packages using git-download."
   (string-append name "-" version "-checkout"))
 
+(define (git-predicate directory)
+  "Return a predicate that returns true if a file is part of the Git checkout
+living at DIRECTORY.  Upon Git failure, return #f instead of a predicate.
+
+The returned predicate takes two arguments FILE and STAT where FILE is an
+absolute file name and STAT is the result of 'lstat'."
+  (define (parent-directory? thing directory)
+;; Return #t if DIRECTORY is the parent of THING.
+(or (string-suffix? thing directory)
+(and (string-index thing #\/)
+ 

branch master updated (c5793e7 -> ab4a173)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  c5793e7   gnu: Add guile-8sync.
   new  ab4a173   gnu: guile-8sync: Add #t at end of setenv phase.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/guile.scm |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

branch master updated (7bbf2e3 -> c5793e7)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  7bbf2e3   gnu: hdf4: Update to 4.2.12.
   new  c5793e7   gnu: Add guile-8sync.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/guile.scm |   35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

01/01: gnu: python-pyld: Update to 0.7.1.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 8957af324be5014c433cb7d0e18fc2d35ce8cf4b
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Nov 22 15:25:51 2016 -0600

gnu: python-pyld: Update to 0.7.1.

* gnu/packages/python.scm (python-pyld): Update to 0.7.1.
---
 gnu/packages/python.scm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 61bb695..123b308 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2328,13 +2328,13 @@ files.")
 (define-public python-pyld
   (package
 (name "python-pyld")
-(version "0.6.8")
+(version "0.7.1")
 (source (origin
   (method url-fetch)
   (uri (pypi-uri "PyLD" version))
   (sha256
(base32
-"0k881ffazpf8q1z8862g4bb3pzwpnz9whrci2mf311mvn1qbyqad"
+"1m0fs6897vxfkf7awah5i66i7b7smm5fnywf1w50fpzyfbfhr156"
 (build-system python-build-system)
 (inputs
  `(("python-setuptools" ,python-setuptools)))

branch master updated (2947ff6 -> 8957af3)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  2947ff6   gnu: Update mit-krb5 to version 1.14.4.
   new  8957af3   gnu: python-pyld: Update to 0.7.1.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/python.scm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

01/01: gnu: Add autossh.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 8caeb11772cc1df06cb6bf227c3280ae6858bd59
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Mon Feb 8 16:01:49 2016 -0800

gnu: Add autossh.

* gnu/packages/ssh.scm (autossh): New variable.
---
 gnu/packages/ssh.scm |   26 ++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index af5aae1..5fdeeb7 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner <efr...@flashner.co.il>
 ;;; Copyright © 2016 Leo Famulari <l...@famulari.name>
 ;;; Copyright © 2016 Nicolas Goaziou <m...@nicolasgoaziou.fr>
+;;; Copyright © 2016 Christopher Allan Webber <cweb...@dustycloud.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -506,3 +507,28 @@ manipulating key files.")
 authentication with SSH's so-called @dfn{interactive keyboard password
 authentication}.")
 (license license:gpl2+)))
+
+(define-public autossh
+  (package
+(name "autossh")
+(version "1.4e")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "http://www.harding.motd.ca/autossh/autossh-;
+ version ".tgz"))
+   (sha256
+(base32 "0mlicw28vq2jxa0jf0dys5ja75v0fxpjavlq9dpif6bnknji13ly"
+(build-system gnu-build-system)
+(arguments `(#:tests? #f)) ; There is no "make check" or anything similar
+(inputs `(("openssh" ,openssh)))
+(synopsis "Automatically restart SSH sessions and tunnels")
+(description "autossh is a program to start a copy of @command{ssh} and
+monitor it, restarting it as necessary should it die or stop passing traffic.")
+(home-page "http://www.harding.motd.ca/autossh/;)
+(license
+ ;; Why point to a source file?  Well, all the individual files have a
+ ;; copy of this license in their headers, but there's no separate file
+ ;; with that information.
+ (license:non-copyleft "file://autossh.c"

branch master updated (aba6463 -> 8caeb11)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  aba6463   gnu: r: Update to 3.3.1.
   new  8caeb11   gnu: Add autossh.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/ssh.scm |   26 ++
 1 file changed, 26 insertions(+)

branch master updated (666619d -> 7d2ee59)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  19d   gnu: lrzip: Update to 0.631.
   new  7d2ee59   gnu: slim: Fix line numbers in slim-login.patch.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/patches/slim-login.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

01/01: gnu: slim: Fix line numbers in slim-login.patch.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 7d2ee59b4aa8e66bb86b980f40346d9e02764e3c
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Fri Oct 21 12:51:18 2016 -0500

gnu: slim: Fix line numbers in slim-login.patch.

This was causing build failures.

* gnu/packages/patches/slim-login.patch: Fix line numbers.
---
 gnu/packages/patches/slim-login.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/patches/slim-login.patch 
b/gnu/packages/patches/slim-login.patch
index 6fa25de..515573c 100644
--- a/gnu/packages/patches/slim-login.patch
+++ b/gnu/packages/patches/slim-login.patch
@@ -4,7 +4,7 @@ Patch by E. Bavier
 
 --- slim-1.3.6/panel.cpp.orig  1969-12-31 18:00:00.0 -0600
 +++ slim-1.3.6/panel.cpp   2016-10-17 17:00:07.259649063 -0500
-@@ -260,19 +260,19 @@
+@@ -260,6 +260,7 @@
  
  void Panel::ClosePanel() {
XUngrabKeyboard(Dpy, CurrentTime);

branch master updated (3d1fe34 -> f7017a7)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  3d1fe34   gnu: kobodeluxe: Indicate origin of 
kobodeluxe-paths.patch.
   new  f7017a7   build: Remove reference to nonexistant patch file.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk |1 -
 1 file changed, 1 deletion(-)

01/01: build: Remove reference to nonexistant patch file.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit f7017a719d6831862198d2af4800e45cd5bbf016
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Oct 18 21:31:32 2016 -0500

build: Remove reference to nonexistant patch file.

* gnu/local.mk: Remove reference to kobodeluxe-spelling.patch,
  which was removed during a revision to the submitted kobodeluxe package.
---
 gnu/local.mk |1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 8c30e92..f275775 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -611,7 +611,6 @@ dist_patch_DATA =   
\
   %D%/packages/patches/khmer-use-libraries.patch\
   %D%/packages/patches/kmod-module-directory.patch \
   %D%/packages/patches/kobodeluxe-paths.patch  \
-  %D%/packages/patches/kobodeluxe-spelling.patch   \
   %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch  \
   %D%/packages/patches/kobodeluxe-const-charp-conversion.patch \
   %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch   \

branch master updated (ca121ae -> 3d1fe34)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  ca121ae   gnu: mariadb: Update to 10.1.18.
   new  3d1fe34   gnu: kobodeluxe: Indicate origin of 
kobodeluxe-paths.patch.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/patches/kobodeluxe-paths.patch |3 +++
 1 file changed, 3 insertions(+)

01/01: gnu: kobodeluxe: Indicate origin of kobodeluxe-paths.patch.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 3d1fe340db4f9d0d64d502fe2d2dbabf4ec811dd
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Oct 18 20:33:47 2016 -0500

gnu: kobodeluxe: Indicate origin of kobodeluxe-paths.patch.

* gnu/packages/patches/kobodeluxe-paths.patch: Update header, pointing
  to Debian tarball for provenance.
---
 gnu/packages/patches/kobodeluxe-paths.patch |3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/patches/kobodeluxe-paths.patch 
b/gnu/packages/patches/kobodeluxe-paths.patch
index 87c7b3a..ac8ee67 100644
--- a/gnu/packages/patches/kobodeluxe-paths.patch
+++ b/gnu/packages/patches/kobodeluxe-paths.patch
@@ -1,3 +1,6 @@
+# Patch snarfed from
+# 
http://http.debian.net/debian/pool/main/k/kobodeluxe/kobodeluxe_0.5.1-8.debian.tar.xz
+#
 # Disable reading of configs, graphics, and data from the current directory.
 # So it's safe to run kobodeluxe from anywhere w/o worry about an attacker
 # feeding it bad data.

01/01: gnu: Add kobodeluxe.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit a56145e1fa8c8c9cb866518efdeaaf4ad4017ba1
Author: Stephen Webber 
Date:   Sun Oct 16 15:04:35 2016 -0500

gnu: Add kobodeluxe.

* gnu/packages/games.scm (kobodeluxe): New variable.
* gnu/packages/patches/kobodeluxe-paths.patch: New file.
* gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch: New file.
* gnu/packages/patches/kobodeluxe-const-charp-conversion.patch: New file.
* gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch: New file.
* gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch: New 
file.
* gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch: New 
file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk   |7 ++
 gnu/packages/games.scm |   33 ++
 .../kobodeluxe-const-charp-conversion.patch|   17 +
 .../patches/kobodeluxe-enemies-pipe-decl.patch |   67 
 .../kobodeluxe-graphics-window-signed-char.patch   |   38 +++
 .../kobodeluxe-manpage-minus-not-hyphen.patch  |   15 +
 .../kobodeluxe-midicon-segmentation-fault.patch|   24 +++
 gnu/packages/patches/kobodeluxe-paths.patch|   40 
 8 files changed, 241 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index a492716..8c30e92 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -610,6 +610,13 @@ dist_patch_DATA =  
\
   %D%/packages/patches/jq-CVE-2015-8863.patch  \
   %D%/packages/patches/khmer-use-libraries.patch\
   %D%/packages/patches/kmod-module-directory.patch \
+  %D%/packages/patches/kobodeluxe-paths.patch  \
+  %D%/packages/patches/kobodeluxe-spelling.patch   \
+  %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch  \
+  %D%/packages/patches/kobodeluxe-const-charp-conversion.patch \
+  %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch   \
+  %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \
+  %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch\
   %D%/packages/patches/laby-make-install.patch \
   %D%/packages/patches/ldc-disable-tests.patch \
   %D%/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 17ca12b..a2c8ac0 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -23,6 +23,7 @@
 ;;; Copyright © 2016 Alex Griffin 
 ;;; Copyright © 2016 Efraim Flashner 
 ;;; Copyright © 2016 Jan Nieuwenhuizen 
+;;; Copyright © 2016 Steve Webber 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2966,3 +2967,35 @@ symbols, the game needs graphics to render the 
non-euclidean world.")
license:public-domain ; src/direntx.*
license:zlib  ; src/savepng.*
license:gpl2+ ; remaining files
+
+(define-public kobodeluxe
+  (package
+(name "kobodeluxe")
+(version "0.5.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append 
"http://olofson.net/kobodl/download/KoboDeluxe-;
+  version ".tar.bz2"))
+  (sha256
+   (base32
+"0b2wvdpnmaibsy419c16dfwj5kvd3pccby2aaqvm964x74592yqg"))
+  (patches (search-patches
+"kobodeluxe-const-charp-conversion.patch"
+"kobodeluxe-enemies-pipe-decl.patch"
+"kobodeluxe-graphics-window-signed-char.patch"
+"kobodeluxe-manpage-minus-not-hyphen.patch"
+"kobodeluxe-midicon-segmentation-fault.patch"
+"kobodeluxe-paths.patch"
+(build-system gnu-build-system)
+(arguments
+ '(#:configure-flags
+   (list (string-append "CPPFLAGS=-I"
+(assoc-ref %build-inputs "sdl-union")
+"/include/SDL"
+(inputs `(("sdl-union" ,(sdl-union (list sdl sdl-image)
+(synopsis "Shooter with space station destruction")
+(description
+ "Kobo Deluxe is an enhanced version of Akira Higuchi's XKobo graphical 
game
+for Un*x systems with X11.")
+(home-page "http://olofson.net/kobodl/;)
+(license license:gpl2+)))
diff --git a/gnu/packages/patches/kobodeluxe-const-charp-conversion.patch 
b/gnu/packages/patches/kobodeluxe-const-charp-conversion.patch
new file mode 100644
index 000..8386cf8
--- /dev/null
+++ b/gnu/packages/patches/kobodeluxe-const-charp-conversion.patch
@@ -0,0 +1,17 @@
+Description: Avoid compilation error with gcc-4.4.
+ "const char* -> char*" conversion is fatal in that version
+Origin: vendor, 

branch master updated (91988ae -> a56145e)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  91988ae   gnu: torsocks: Update to 2.2.0.
   new  a56145e   gnu: Add kobodeluxe.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk   |7 ++
 gnu/packages/games.scm |   33 ++
 .../kobodeluxe-const-charp-conversion.patch|   17 +
 .../patches/kobodeluxe-enemies-pipe-decl.patch |   67 
 .../kobodeluxe-graphics-window-signed-char.patch   |   38 +++
 .../kobodeluxe-manpage-minus-not-hyphen.patch  |   15 +
 .../kobodeluxe-midicon-segmentation-fault.patch|   24 +++
 gnu/packages/patches/kobodeluxe-paths.patch|   40 
 8 files changed, 241 insertions(+)
 create mode 100644 gnu/packages/patches/kobodeluxe-const-charp-conversion.patch
 create mode 100644 gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch
 create mode 100644 
gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch
 create mode 100644 
gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch
 create mode 100644 
gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch
 create mode 100644 gnu/packages/patches/kobodeluxe-paths.patch

01/01: scripts: Add deploy.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-deploy
in repository guix.

commit fcd6fc84e493d05be1f7590ee77509c81ac315c2
Author: David Thompson 
Date:   Mon Apr 13 19:14:31 2015 -0400

scripts: Add deploy.

* gnu/machines.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* guix/scripts/deploy.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu.scm: Export (gnu machines) symbols.
* gnu/system/vm.scm (virtualized-operating-system): Export it.
---
 Makefile.am |1 +
 gnu.scm |1 +
 gnu/local.mk|2 +
 gnu/machines.scm|  127 ++
 gnu/system/vm.scm   |2 +
 guix/scripts/deploy.scm |  154 +++
 6 files changed, 287 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 908eaf6..b8dbc39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,6 +148,7 @@ MODULES =   \
   guix/scripts/graph.scm   \
   guix/scripts/container.scm   \
   guix/scripts/container/exec.scm  \
+  guix/scripts/deploy.scm  \
   guix.scm \
   $(GNU_SYSTEM_MODULES)
 
diff --git a/gnu.scm b/gnu.scm
index 932e4cd..0edecb0 100644
--- a/gnu.scm
+++ b/gnu.scm
@@ -43,6 +43,7 @@
 (gnu services base)
 (gnu packages)
 (gnu packages base)
+(gnu machines)
 (guix gexp))) ; so gexps can be used
 
 (for-each (let ((i (module-public-interface (current-module
diff --git a/gnu/local.mk b/gnu/local.mk
index 19dd9ae..8b382c2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -430,6 +430,8 @@ GNU_SYSTEM_MODULES =\
   %D%/build/marionette.scm \
   %D%/build/vm.scm \
\
+  %D%/machines.scm \
+   \
   %D%/tests.scm\
   %D%/tests/base.scm   \
   %D%/tests/install.scm\
diff --git a/gnu/machines.scm b/gnu/machines.scm
new file mode 100644
index 000..a02f668
--- /dev/null
+++ b/gnu/machines.scm
@@ -0,0 +1,127 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 David Thompson 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu machines)
+  #:use-module (guix records)
+  #:use-module (gnu system)
+  #:use-module (gnu system vm)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1)
+  #:export (deployment
+make-deployment
+deployment?
+deployment-name
+deployment-machines
+
+machine
+make-machine
+machine?
+machine-name
+machine-system
+machine-platform
+
+platform
+make-platform
+platform-name
+platform-description
+platform-provision
+platform-install
+platform-reconfigure
+platform-boot
+platform-reboot
+platform-halt
+platform-destroy
+
+machine-os-for-platform
+provision-machine
+boot-machine
+
+local-vm))
+
+(define-record-type*  deployment
+  make-deployment
+  deployment?
+  (name deployment-name) ; string
+  (machines deployment-machines)) ; list of 
+
+(define-record-type*  machine
+  make-machine
+  machine?
+  (name machine-name) ; string
+  (system machine-system) ; 
+  (platform machine-platform)) ; 
+
+(define-record-type*  platform
+  make-platform
+  platform?
+  (name platform-name) ; string
+  (description platform-description) ; string
+  (transform platform-transform) ; procedure
+  (provision platform-provision) ; procedure
+  ;; (install platform-install) ; procedure
+  ;; (reconfigure platform-reconfigure) ; procedure
+  (boot platform-boot) ; procedure
+  ;; (reboot platform-reboot) ; procedure
+  ;; (halt platform-halt) ; procedure
+  ;; (destroy platform-destroy) ; procedure
+  )
+
+(define (machine-os-for-platform machine)
+  

branch wip-deploy created (now fcd6fc8)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-deploy
in repository guix.

at  fcd6fc8   scripts: Add deploy.

This branch includes the following new commits:

   new  fcd6fc8   scripts: Add deploy.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

01/01: scripts: Add deploy.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-deploy
in repository guix.

commit 16b6fc36712f345e5ac9702a20ed6df99f4bac76
Author: David Thompson 
Date:   Mon Apr 13 19:14:31 2015 -0400

scripts: Add deploy.

* gnu/machines.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* guix/scripts/deploy.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu.scm: Export (gnu machines) symbols.
* gnu/system/vm.scm (virtualized-operating-system): Export it.
---
 Makefile.am |1 +
 gnu.scm |1 +
 gnu/local.mk|2 +
 gnu/machines.scm|  127 +++
 gnu/system/vm.scm   |2 +
 guix/scripts/deploy.scm |  153 +++
 6 files changed, 286 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 908eaf6..b8dbc39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,6 +148,7 @@ MODULES =   \
   guix/scripts/graph.scm   \
   guix/scripts/container.scm   \
   guix/scripts/container/exec.scm  \
+  guix/scripts/deploy.scm  \
   guix.scm \
   $(GNU_SYSTEM_MODULES)
 
diff --git a/gnu.scm b/gnu.scm
index 932e4cd..0edecb0 100644
--- a/gnu.scm
+++ b/gnu.scm
@@ -43,6 +43,7 @@
 (gnu services base)
 (gnu packages)
 (gnu packages base)
+(gnu machines)
 (guix gexp))) ; so gexps can be used
 
 (for-each (let ((i (module-public-interface (current-module
diff --git a/gnu/local.mk b/gnu/local.mk
index 19dd9ae..8b382c2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -430,6 +430,8 @@ GNU_SYSTEM_MODULES =\
   %D%/build/marionette.scm \
   %D%/build/vm.scm \
\
+  %D%/machines.scm \
+   \
   %D%/tests.scm\
   %D%/tests/base.scm   \
   %D%/tests/install.scm\
diff --git a/gnu/machines.scm b/gnu/machines.scm
new file mode 100644
index 000..a02f668
--- /dev/null
+++ b/gnu/machines.scm
@@ -0,0 +1,127 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 David Thompson 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu machines)
+  #:use-module (guix records)
+  #:use-module (gnu system)
+  #:use-module (gnu system vm)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1)
+  #:export (deployment
+make-deployment
+deployment?
+deployment-name
+deployment-machines
+
+machine
+make-machine
+machine?
+machine-name
+machine-system
+machine-platform
+
+platform
+make-platform
+platform-name
+platform-description
+platform-provision
+platform-install
+platform-reconfigure
+platform-boot
+platform-reboot
+platform-halt
+platform-destroy
+
+machine-os-for-platform
+provision-machine
+boot-machine
+
+local-vm))
+
+(define-record-type*  deployment
+  make-deployment
+  deployment?
+  (name deployment-name) ; string
+  (machines deployment-machines)) ; list of 
+
+(define-record-type*  machine
+  make-machine
+  machine?
+  (name machine-name) ; string
+  (system machine-system) ; 
+  (platform machine-platform)) ; 
+
+(define-record-type*  platform
+  make-platform
+  platform?
+  (name platform-name) ; string
+  (description platform-description) ; string
+  (transform platform-transform) ; procedure
+  (provision platform-provision) ; procedure
+  ;; (install platform-install) ; procedure
+  ;; (reconfigure platform-reconfigure) ; procedure
+  (boot platform-boot) ; procedure
+  ;; (reboot platform-reboot) ; procedure
+  ;; (halt platform-halt) ; procedure
+  ;; (destroy platform-destroy) ; procedure
+  )
+
+(define (machine-os-for-platform machine)
+  

branch wip-deploy deleted (was 8e9a37c)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-deploy
in repository guix.

   was  8e9a37c   scripts: Add deploy.

This change permanently discards the following revisions:

  discards  8e9a37c   scripts: Add deploy.

branch wip-deploy created (now 16b6fc3)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-deploy
in repository guix.

at  16b6fc3   scripts: Add deploy.

This branch includes the following new commits:

   new  16b6fc3   scripts: Add deploy.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

01/01: base64: Restore original license header.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit b47f7510f032b795c60b1fa6628562e9f62044e4
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Fri Aug 26 15:14:20 2016 -0500

base64: Restore original license header.

When incorporating a copyleft licensed program with a lax licensed program,
it is correct to preserve the original license notice.  See also:
  
https://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html

* guix/base64.scm: Restored original license header.
---
 guix/base64.scm |   26 --
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/guix/base64.scm b/guix/base64.scm
index e4d2ec5..4bd5dc5 100644
--- a/guix/base64.scm
+++ b/guix/base64.scm
@@ -6,8 +6,6 @@
 ;;
 ;; Some optimizations made by Ludovic Courtès <l...@gnu.org>, 2015.
 ;;
-;; Copyright © 2009, 2010 Göran Weinholt <go...@weinholt.se>
-;;
 ;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -20,6 +18,30 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;
+;; This file incorporates work covered by the following copyright and  
+;; permission notice:
+;;
+;;   Copyright © 2009, 2010 Göran Weinholt <go...@weinholt.se>
+;;
+;;   Permission is hereby granted, free of charge, to any person obtaining a
+;;   copy of this software and associated documentation files (the "Software"),
+;;   to deal in the Software without restriction, including without limitation
+;;   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+;;   and/or sell copies of the Software, and to permit persons to whom the
+;;   Software is furnished to do so, subject to the following conditions:
+;;
+;;   The above copyright notice and this permission notice shall be included in
+;;   all copies or substantial portions of the Software.
+;;
+;;   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;;   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;;   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+;;   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+;;   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+;;   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+;;   DEALINGS IN THE SOFTWARE.
+
 #!r6rs
 
 ;; RFC 4648 Base-N Encodings

branch master updated (aa12701 -> b47f751)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  aa12701   gnu: octave: Update to 4.0.3.
   new  b47f751   base64: Restore original license header.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 guix/base64.scm |   26 --
 1 file changed, 24 insertions(+), 2 deletions(-)

01/01: gnu: Add geiser-next.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 11e4c1fd104884999a84633baea1d2e298d2e334
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Fri Apr 29 17:53:50 2016 -0500

gnu: Add geiser-next.

Also, I previously committed to this repository in 2015; add self to 
copyright
headers for that year too.

* gnu/packages/emacs.scm (geiser-next): New variable.
---
 gnu/packages/emacs.scm |   31 +++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 11010b2..f0c1555 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <rek...@elephly.net>
 ;;; Copyright © 2016 Nils Gillmann <niaster...@grrlz.net>
 ;;; Copyright © 2016 Chris Marusich <cmmarus...@gmail.com>
+;;; Copyright © 2015, 2016 Christopher Allan Webber <cweb...@dustycloud.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -260,6 +261,36 @@ implementation, Emacs and, ultimately, the schemer, giving 
them access to live
 metadata.")
 (license license:bsd-3)))
 
+(define-public geiser-next
+  ;; Geiser's upcoming version supports guile-next, and 0.8.1 does not.
+  ;; When the next Geiser release comes out, we can remove this.
+  (let ((commit "2e335695fc1a4a0b520b50deb761b958194cbec4"))
+(package
+  (inherit geiser)
+  (name "geiser-next")
+  (version (string-append "0.8.1-1"
+  (string-take commit 7)))
+  (source (origin
+(method git-fetch)
+(uri (git-reference
+  (url "git://git.sv.gnu.org/geiser.git")
+  (commit commit)))
+(sha256
+ (base32
+  "00rmpn8zncq1fiah5m12l26z0s28bh7ql63kxdvksqdgfrisnmgf"
+  (native-inputs
+   `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("texinfo" ,texinfo)
+ ,@(package-native-inputs geiser)))
+  (arguments
+   (substitute-keyword-arguments (package-arguments geiser)
+ ((#:phases phases)
+  `(modify-phases ,phases
+ (add-after 'unpack 'autogen
+   (lambda _
+ (zero? (system* "sh" "autogen.sh")))
+
 (define-public paredit
   (package
 (name "paredit")

branch master updated (9916ae1 -> 11e4c1f)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  9916ae1   import cran: latest-bioconductor-release: Wrap 
Bioconductor URL in list.
   new  11e4c1f   gnu: Add geiser-next.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/emacs.scm |   31 +++
 1 file changed, 31 insertions(+)

01/01: gnu: Add xscreensaver.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit b4c400a75c9f432820146dfe24fcebdfbc276e4b
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Fri Apr 8 10:36:05 2016 -0500

gnu: Add xscreensaver.

* gnu/packages/xdisorg.scm (xscreensaver): New variable.
---
 gnu/packages/xdisorg.scm |   69 ++
 1 files changed, 69 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 5a77a6c..1a8305e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -37,6 +37,7 @@
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages asciidoc)
+  #:use-module (gnu packages algebra)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
@@ -47,6 +48,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages gtk)
@@ -714,6 +716,7 @@ the X.Org X Server version 1.7 and later (X11R7.5 or 
later).")
("libx11" ,libx11)
("libxcb" ,libxcb)
("libxxf86vm" ,libxxf86vm)
+   ("libjpeg" ,libjpeg)
("glib" ,glib)))   ;for Geoclue2 support
 (home-page "https://github.com/jonls/redshift;)
 (synopsis "Adjust the color temperature of your screen")
@@ -724,3 +727,69 @@ twilight and early morning, the color temperature 
transitions smoothly from
 night to daytime temperature to allow your eyes to slowly adapt.  At night the
 color temperature should be set to match the lamps in your room.")
 (license license:gpl3+)))
+
+(define-public xscreensaver
+  (package
+(name "xscreensaver")
+(version "5.34")
+(source
+ (origin
+   (method url-fetch)
+   (uri
+(string-append "https://www.jwz.org/xscreensaver/xscreensaver-;
+   version ".tar.gz"))
+   (sha256
+(base32
+ "09sy5v8bn62hiq4ib3jyvp8lipqcvn3rdsj74q25qgklpv27xzvg"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f  ; no check target
+   #:phases
+   (modify-phases %standard-phases
+ (add-before 'configure 'adjust-gtk-resource-paths
+   (lambda _
+ (substitute* '("driver/Makefile.in" "po/Makefile.in.in")
+   (("@GTK_DATADIR@") "@datadir@")
+   (("@PO_DATADIR@") "@datadir@")
+   #:configure-flags '("--with-pam" "--with-proc-interrupts"
+   "--without-readdisplay")
+   #:make-flags (list (string-append "AD_DIR="
+ (assoc-ref %outputs "out")
+ "/usr/lib/X11/app-defaults"
+(native-inputs
+ `(("pkg-config" ,pkg-config)
+   ("intltool" ,intltool)))
+(inputs
+ `(("libx11" ,libx11)
+   ("libxext" ,libxext)
+   ("libxi" ,libxi)
+   ("libxt" ,libxt)
+   ("libxft" ,libxft)
+   ("libxmu" ,libxmu)
+   ("libxpm" ,libxpm)
+   ("libglade" ,libglade)
+   ("libxml2" ,libxml2)
+   ("libsm" ,libsm)
+   ("libjpeg" ,libjpeg)
+   ("linux-pam" ,linux-pam)
+   ("pango" ,pango)
+   ("gtk+" ,gtk+)
+   ("perl" ,perl)
+   ("cairo" ,cairo)
+   ("bc" ,bc)
+   ("libxrandr" ,libxrandr)
+   ("glu" ,glu)
+   ("glib" ,glib)))
+(home-page "https://www.jwz.org/xscreensaver/;)
+(synopsis "Classic screen saver suite supporting screen locking")
+(description
+ "xscreensaver is a popular screen saver collection with many entertaining
+demos.  It also acts as a nice screen locker.")
+;; xscreensaver doesn't have a single copyright file and instead relies on
+;; source comment headers, though most files have the same lax
+;; permissions.  To reduce complexity, we're pointing at Debian's
+;; breakdown of the copyright information.
+(license (license:non-copyleft
+  (string-append
+   "http://metadata.ftp-master.debian.org/changelogs/;
+   "/main/x/xscreensaver/xscreensaver_5.34-2_copyright")

branch master updated (927e176 -> b4c400a)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  927e176   gnu: fontforge: Update to 20160404.
   new  b4c400a   gnu: Add xscreensaver.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/xdisorg.scm |   69 ++
 1 files changed, 69 insertions(+), 0 deletions(-)

01/01: doc: Add footnote about pointing ~/.config/guix/latest at user's checkout

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit b5f990a68075a3dcc1e8198857f1ca04d9c73ad7
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Thu Mar 10 09:52:18 2016 -0800

doc: Add footnote about pointing ~/.config/guix/latest at user's checkout

* doc/contributing.texi (Running Guix Before It Is Installed): New footnote.
---
 doc/contributing.texi |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 3dbd3db..91759b6 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -140,7 +140,13 @@ necessary to support this, including @env{PATH} and 
@env{GUILE_LOAD_PATH}.
 Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the
 local source tree; it simply updates the @file{~/.config/guix/latest}
 symlink (@pxref{Invoking guix pull}).  Run @command{git pull} instead if
-you want to upgrade your local source tree.
+you want to upgrade your local source tree.@footnote{If you would like
+to set up @command{guix} to use your Git checkout, you can point the
+@file{~/.config/guix/latest} symlink to your Git checkout directory.
+If you are the sole user of your system, you may also consider pointing
+the @file{/root/.config/guix/latest} symlink to point to
+@file{~/.config/guix/latest}; this way it will always use the same
+@command{guix} as your user does.}
 
 
 @node The Perfect Setup

branch master updated (66a30a3 -> b5f990a)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  66a30a3   gnu: libevent: Update to 2.0.22 [fixes CVE-2015-6525].
   new  b5f990a   doc: Add footnote about pointing ~/.config/guix/latest at 
user's checkout

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/contributing.texi |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)

branch master updated (daeb61f -> aa5946e)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  daeb61f   gnu: guile-for-guile-emacs: Use guile-2.0 search paths.
   new  aa5946e   gnu: Remove python2-pil.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/python.scm |   61 ---
 1 files changed, 0 insertions(+), 61 deletions(-)

01/01: gnu: Remove python2-pil.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit aa5946edb20a10a245ea24082bee0e01265235f9
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Mon Feb 29 14:36:01 2016 -0800

gnu: Remove python2-pil.

python2-pil is vulnerable to several security issues (CVE-2016-0740,
CVE-2016-0775, and CVE-2016-2533).  Fortunately, python2-pillow provides
equivalent functionality, so this package can be cleanly removed.

* gnu/packages/python.scm (python2-pil): Remove variable.
---
 gnu/packages/python.scm |   61 ---
 1 files changed, 0 insertions(+), 61 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 812aeb0..4f34537 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4596,67 +4596,6 @@ converts incoming documents to Unicode and outgoing 
documents to UTF-8.")
   (strip-python2-variant python-beautifulsoup4)))
 (native-inputs `(("python2-setuptools" ,python2-setuptools)
 
-(define-public python2-pil
-  (package
-(name "python2-pil")
-(version "1.1.7")
-(source
-  (origin
-(method url-fetch)
-(uri (string-append
-  "http://effbot.org/downloads/Imaging-;
-  version ".tar.gz"))
-(sha256
-  (base32
-"04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"))
-   (modules '((guix build utils)))
-   (snippet
-;; Adapt to newer freetype. As the package is unmaintained upstream,
-;; there is no use in creating a patch and reporting it.
-'(substitute* "_imagingft.c"
-   (("freetype/")
-"freetype2/")
-(build-system python-build-system)
-(inputs
-  `(("freetype" ,freetype)
-("libjpeg" ,libjpeg)
-("libtiff" ,libtiff)
-("python-setuptools" ,python-setuptools)
-("zlib" ,zlib)))
-(arguments
- ;; Only the fork python-pillow works with Python 3.
- `(#:python ,python-2
-   #:tests? #f ; no check target
-   #:phases
- (alist-cons-before
-  'build 'configure
-  ;; According to README and setup.py, manual configuration is
-  ;; the preferred way of "searching" for inputs.
-  ;; lcms is not found, TCL_ROOT refers to the unavailable tkinter.
-  (lambda* (#:key inputs #:allow-other-keys)
-(let ((jpeg (assoc-ref inputs "libjpeg"))
-  (zlib (assoc-ref inputs "zlib"))
-  (tiff (assoc-ref inputs "libtiff"))
-  (freetype (assoc-ref inputs "freetype")))
-  (substitute* "setup.py"
-(("JPEG_ROOT = None")
- (string-append "JPEG_ROOT = libinclude(\"" jpeg "\")"))
-(("ZLIB_ROOT = None")
- (string-append "ZLIB_ROOT = libinclude(\"" zlib "\")"))
-(("TIFF_ROOT = None")
- (string-append "TIFF_ROOT = libinclude(\"" tiff "\")"))
-(("FREETYPE_ROOT = None")
- (string-append "FREETYPE_ROOT = libinclude(\""
-freetype "\")")
-  %standard-phases)))
-(home-page "http://www.pythonware.com/products/pil/;)
-(synopsis "Python Imaging Library")
-(description "The Python Imaging Library (PIL) adds image processing
-capabilities to the Python interpreter.")
-(license (x11-style
-   "file://README"
-   "See 'README' in the distribution."
-
 (define-public python2-cssutils
   (package
 (name "python2-cssutils")

01/01: gnu: Add python-psycopg2.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit b31fbea566d432ae8be616ac774d51a23436c362
Author: Danny Milosavljevic 
Date:   Thu Feb 25 13:26:45 2016 -0800

gnu: Add python-psycopg2.

* gnu/packages/python.scm (python-psycopg2, python2-psycopg2): New 
variables.
---
 gnu/packages/python.scm |   32 
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 02883f8..b67aed0 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner 
 ;;; Copyright © 2015 Kyle Meyer 
 ;;; Copyright © 2015 Chris Marusich 
+;;; Copyright © 2016 Danny Milosavljevic 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8235,3 +8236,34 @@ introspection of @code{zope.interface} instances in 
code.")
 
 (define-public python2-sphinx-repoze-autointerface
   (package-with-python2 python-sphinx-repoze-autointerface))
+
+(define-public python-psycopg2
+  (package
+(name "python-psycopg2")
+(version "2.6.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "psycopg2" version))
+   (sha256
+(base32
+ "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"
+(build-system python-build-system)
+(arguments
+ ;; Tests would require a postgresql database "psycopg2_test"
+ ;; and a running postgresql database management service.
+ `(#:tests? #f)) ; TODO re-enable after providing a test-db.
+(inputs
+ `(("postgresql" ,postgresql))) ; libpq
+(home-page "http://initd.org/psycopg/;)
+(synopsis "Python PostgreSQL adapter")
+(description
+ "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0. 
")
+(license lgpl3+)
+(properties `((python2-variant . ,(delay python2-psycopg2))
+
+(define-public python2-psycopg2
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-psycopg2)))
+(native-inputs `(("python2-setuptools" ,python2-setuptools)

branch master updated (7dd2110 -> b31fbea)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  7dd2110   gnu: diffoscope: Update to 49.
   new  b31fbea   gnu: Add python-psycopg2.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/python.scm |   32 
 1 files changed, 32 insertions(+), 0 deletions(-)

01/01: gnu: Add python-chardet.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 61b70fcf45b96a65e71d1377083d8709796f66c4
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Thu Feb 25 13:02:49 2016 -0800

gnu: Add python-chardet.

* gnu/packages/python.scm (python-chardet, python2-chardet): New variables.
---
 gnu/packages/python.scm |   27 +++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0f95140..3c95ad5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8163,6 +8163,33 @@ ISO 8859, etc.).")
   (strip-python2-variant python-translitcodec)))
 (native-inputs `(("python2-setuptools" ,python2-setuptools)
 
+(define-public python-chardet
+  (package
+(name "python-chardet")
+(version "2.3.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "chardet" version))
+   (sha256
+(base32
+ "1ak87ikcw34fivcgiz2xvi938dmclh078az65l9x3rmgljrkhgp5"
+(build-system python-build-system)
+(home-page "https://github.com/chardet/chardet;)
+(synopsis
+ "Universal encoding detector for Python 2 and 3")
+(description
+ "Character encoding auto-detection in Python.  Effectively determines what
+character set to use for input with a high degree of accuracy.")
+(license lgpl2.1+)
+(properties `((python2-variant . ,(delay python2-chardet))
+
+(define-public python2-chardet
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-chardet)))
+(native-inputs `(("python2-setuptools" ,python2-setuptools)
+
 (define-public python-editor
   (package
   (name "python-editor")

branch wip-mediagoblin updated (215d10f -> 61b70fc)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-mediagoblin
in repository guix.

  from  215d10f   [wip] Add python-gst
   new  61b70fc   gnu: Add python-chardet.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/python.scm |   27 +++
 1 files changed, 27 insertions(+), 0 deletions(-)

01/02: gnu: Add mediagoblin.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 89dc2e25e61d0b3effe16aaff4af8210fa9e0ba0
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Mon Feb 15 11:15:41 2016 -0800

gnu: Add mediagoblin.

* gnu/packages/python.scm (mediagoblin): New variable.
---
 gnu/packages/python.scm |  104 +++
 1 files changed, 104 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1b274a3..0f95140 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8242,3 +8242,107 @@ introspection of @code{zope.interface} instances in 
code.")
 
 (define-public python2-sphinx-repoze-autointerface
   (package-with-python2 python-sphinx-repoze-autointerface))
+
+;;pyversion_install_requires = []
+;;if PY2:
+;;pyversion_install_requires.append('argparse')  # only for < 2.7
+;;pyversion_install_requires.append('PasteScript')
+;;# newer sqlalchemy-migrate requires pbr which BREAKS EVERYTHING AND IS
+;;# TERRIBLE AND IS THE END OF ALL THINGS
+;;# I'd love to remove this restriction.
+;;pyversion_install_requires.append('sqlalchemy-migrate<0.8')
+;;# # Annoying.  Please remove once we can!  We only indirectly
+;;# # use pbr, and currently it breaks things, presumably till
+;;# # their next release.
+;;# pyversion_install_requires.append('pbr==0.5.22')
+;;pyversion_install_requires.append('mock==1.0.1')  # mock is in the 
stdlib for 3.3+
+;;# PyPI version (1.4.2) does not have proper Python 3 support
+;;pyversion_install_requires.append('ExifRead')
+;;pyversion_install_requires.append('PasteScript')
+;;# Paste 2.0 is breaking wsgi, see:
+;;#  https://bitbucket.org/ianb/paste/issue/4/wsgi-environ-totally-borked
+;;pyversion_install_requires.append('Paste')
+;;else:
+;;[ ] pyversion_install_requires.append('gunicorn')
+;;
+;;install_requires = [
+;;[X] 'alembic==0.6.6',
+;;[X] 'python-dateutil',
+;;[X] 'wtforms',
+;;[X] 'py-bcrypt',
+;;[X] 'pytest>=2.3.1',
+;;[X] 'pytest-xdist',
+;;[X] 'werkzeug>=0.7',
+;;[X] 'celery>=3.0',
+;;[X] 'kombu',
+;;[X] 'jinja2',
+;;[X] 'Babel>=1.3',
+;;[X] 'WebTest>=2.0.18',
+;;[X] 'ConfigObj',
+;;[X] 'Markdown',
+;;[X] 'sqlalchemy<0.9.0, >0.8.0',
+;;[X] 'itsdangerous',
+;;[X] 'pytz',
+;;[X] 'sphinx',
+;;[X] 'six',
+;;[X] 'oauthlib',
+;;[X] 'unidecode',
+;;[X] 'jsonschema',
+;;[X] 'PasteDeploy',
+;;[X] 'requests>=2.6.0',
+;;[X] 'pyld',
+;;# This is optional:
+;;[X] 'translitcodec',
+;;# For now we're expecting that users will install this from
+;;# their package managers.
+;;[X] 'lxml',
+;;[X] 'Pillow',
+
+(define-public mediagoblin
+  (package
+(name "mediagoblin")
+(version "0.8.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "mediagoblin" version))
+   (sha256
+(base32
+ "0p2gj4z351166d1zqmmd8wc9bzb69w0fjm8qq1fs8dw2yhcg2wwv"
+(build-system python-build-system)
+(native-inputs
+ `(("python-pytest" ,python-pytest)))
+(inputs
+ `(("python-alembic" ,python-alembic)
+   ("python-pytest-xdist" ,python-pytest-xdist)
+   ("python-celery" ,python-celery)
+   ("python-kombu" ,python-kombu)
+   ("python-webtest" ,python-webtest)
+   ("python-pastedeploy" ,python-pastedeploy)
+   ("python-translitcodec" ,python-translitcodec)
+   ("python-babel" ,python-babel)
+   ("python-configobj" ,python-configobj)
+   ("python-dateutil" ,python-dateutil)
+   ("python-itsdangerous" ,python-itsdangerous)
+   ("python-jinja2" ,python-jinja2)
+   ("python-jsonschema" ,python-jsonschema)
+   ("python-lxml" ,python-lxml)
+   ("python-markdown" ,python-markdown)
+   ("python-oauthlib" ,python-oauthlib)
+   ("python-pillow" ,python-pillow)
+   ("python-py-bcrypt" ,python-py-bcrypt)
+   ("python-pyld" ,python-pyld)
+   ("python-pytz" ,python-pytz)
+   ("python-requests" ,python-requests)
+   ("python-setuptools" ,python-setuptools)
+   ("python-six" ,python-six)
+   ("python-sphinx" ,python-sphinx)
+   ("python-sqlalchemy" ,python-sqlalchemy)
+   ("python-unidecode" ,python-unidecode)
+   ("python-werkzeug" ,python-werkzeug)
+   ("python-wtforms" ,python-wtforms)))
+(home-page "http://mediagoblin.org/;)
+(synopsis "Web application for media publishing")
+(description "MediaGoblin is a web application for publishing all kinds of
+media.")
+(license agpl3+)))

02/02: [wip] Add python-gst

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 215d10f8058d9a7beffd3c852a4c1c0f2f3b6a26
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Feb 23 12:34:56 2016 -0800

[wip] Add python-gst
---
 gnu/packages/gstreamer.scm |   30 ++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 45dded1..99d5c4c 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014 John Darrington <j...@gnu.org>
 ;;; Copyright © 2015 Sou Bunnbu <iyzs...@gmail.com>
 ;;; Copyright © 2015 Mark H Weaver <m...@netris.org>
+;;; Copyright © 2016 Christopher Allan Webber <cweb...@dustycloud.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -41,6 +42,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)
@@ -400,3 +402,31 @@ distribution problems in some jurisdictions, e.g. due to 
patent threats.")
  "This GStreamer plugin supports a large number of audio and video
 compression formats through the use of the libav library.")
 (license gpl2+)))
+
+(define-public python-gst
+  (package
+(name "python-gst")
+(version "1.6.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"https://gstreamer.freedesktop.org/src/; name "/"
+name "-" version ".tar.xz"))
+  (sha256
+   (base32
+"1w84pmvzki8fza10b6bx5zf1xb3r9x0nrsgfvlisybpx30p37giw"
+(build-system gnu-build-system)
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(inputs
+ `(("python" ,python)
+   ("gstreamer" ,gstreamer)
+   ("libffi" ,libffi)
+   ("gobject-introspection" ,gobject-introspection)))
+(propagated-inputs
+ `(("python-pygobject" ,python-pygobject)))
+(home-page "https://gstreamer.freedesktop.org/modules/gst-python.html;)
+(synopsis "GStreamer Python bindings supplement")
+(description "GStreamer Python overrides for the 
gobject-introspection-based
+pygst bindings.")
+(license lgpl2.0+)))

branch wip-mediagoblin created (now 215d10f)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-mediagoblin
in repository guix.

at  215d10f   [wip] Add python-gst

This branch includes the following new commits:

   new  89dc2e2   gnu: Add mediagoblin.
   new  215d10f   [wip] Add python-gst

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

branch wip-mediagoblin deleted (was 5194960)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-mediagoblin
in repository guix.

   was  5194960   [wip] Add python-gst

This change permanently discards the following revisions:

  discards  5194960   [wip] Add python-gst
  discards  7e89003   gnu: Add mediagoblin.
  discards  466e897   gnu: Add python-pastescript.
  discards  d3cfa0c   gnu: Add python-paste.

02/02: gnu: Add python-pastescript.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit a8f20f63dce1f41126bbc0fdbe6a3b1bf28fb69d
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Thu Feb 25 11:01:56 2016 -0800

gnu: Add python-pastescript.

* gnu/packages/python.scm (python-pastescript, python2-pastescript):
  New variables.
---
 gnu/packages/python.scm |   38 ++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 03b2778..1b274a3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7822,6 +7822,44 @@ follows ideas flowing from WSGI (Web Standard Gateway 
Interface).")
`(#:tests? #t
  ,@(package-arguments paste))
 
+(define-public python-pastescript
+  (package
+(name "python-pastescript")
+(version "2.0.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "PasteScript" version))
+   (sha256
+(base32
+ "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0"
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
+(propagated-inputs
+ `(;; Uses pkg_resources provided by setuptools internally.
+   ("python-setuptools" ,python-setuptools)
+   ("python-paste" ,python-paste)
+   ("python-pastedeploy" ,python-pastedeploy)))
+(home-page "http://pythonpaste.org/script/;)
+(arguments
+ '(;; Unfortunately, this requires the latest unittest2,
+   ;; but that requires traceback2 which requires linecache2 which requires
+   ;; unittest2.  So we're skipping tests for now.
+   ;; (Note: Apparently linetest2 only needs unittest2 for its tests,
+   ;; so in theory we could get around this situation somehow.)
+   #:tests? #f))
+(synopsis
+ "Pluggable command line tool for serving web applications and more")
+(description
+ "PasteScript is a plugin-friendly command line tool which provides a
+variety of features, from launching web applications to bootstrapping project
+layouts.")
+(license license:expat)))
+
+(define-public python2-pastescript
+  (package-with-python2 python-pastescript))
+
 (define-public python-pyquery
   (package
 (name "python-pyquery")

branch master updated (e62b5c6 -> a8f20f6)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  e62b5c6   Merge branch 'media-updates'
   new  c4a7904   gnu: Add python-paste.
   new  a8f20f6   gnu: Add python-pastescript.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu-system.am  |2 +
 .../patches/python-paste-remove-timing-test.patch  |   16 
 .../patches/python-paste-remove-website-test.patch |   21 +
 gnu/packages/python.scm|   86 
 4 files changed, 125 insertions(+), 0 deletions(-)
 create mode 100644 gnu/packages/patches/python-paste-remove-timing-test.patch
 create mode 100644 gnu/packages/patches/python-paste-remove-website-test.patch

01/02: gnu: Add python-paste.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit c4a7904c21c854d5f1d49eeecf76bbefe087a893
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Thu Feb 25 11:01:45 2016 -0800

gnu: Add python-paste.

* gnu/packages/python.scm (python-paste, python2-paste): New variables.
* gnu/packages/patches/python-paste-remove-timing-test.patch: New file.
* gnu/packages/patches/python-paste-remove-website-test.patch: New file.
* gnu-system.am (dist_patch_DATA): Add them.
---
 gnu-system.am  |2 +
 .../patches/python-paste-remove-timing-test.patch  |   16 +++
 .../patches/python-paste-remove-website-test.patch |   21 +
 gnu/packages/python.scm|   48 
 4 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 431c2b5..6ccca12 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -679,6 +679,8 @@ dist_patch_DATA =   
\
   gnu/packages/patches/python-ipython-inputhook-ctype.patch\
   gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   gnu/packages/patches/python-configobj-setuptools.patch   \
+  gnu/packages/patches/python-paste-remove-website-test.patch  \
+  gnu/packages/patches/python-paste-remove-timing-test.patch   \
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   gnu/packages/patches/qemu-CVE-2015-8558.patch\
   gnu/packages/patches/qemu-CVE-2015-8567.patch\
diff --git a/gnu/packages/patches/python-paste-remove-timing-test.patch 
b/gnu/packages/patches/python-paste-remove-timing-test.patch
new file mode 100644
index 000..6ab8d1a
--- /dev/null
+++ b/gnu/packages/patches/python-paste-remove-timing-test.patch
@@ -0,0 +1,16 @@
+Remove this test to verify that things were modified since a certain time.
+
+That assumption doesn't hold up when your environment doesn't have access to a
+real clock and thinks it's living in 1970 :)
+
+--- a/tests/test_fileapp.py2015-04-23 13:48:37.0 -0700
 b/tests/test_fileapp.py2016-02-22 19:20:08.332802417 -0800
+@@ -223,8 +223,6 @@
+   status=304)
+ res = app.get('/', headers={'If-None-Match': 'asdf'},
+   status=200)
+-res = app.get('/', headers={'If-Modified-Since': 'Sat, 1 Jan 2005 
12:00:00 GMT'},
+-  status=200)
+ res = app.get('/', headers={'If-Modified-Since': last_mod + '; 
length=100'},
+   status=304)
+ res = app.get('/', headers={'If-Modified-Since': 'invalid date'},
diff --git a/gnu/packages/patches/python-paste-remove-website-test.patch 
b/gnu/packages/patches/python-paste-remove-website-test.patch
new file mode 100644
index 000..93417fb
--- /dev/null
+++ b/gnu/packages/patches/python-paste-remove-website-test.patch
@@ -0,0 +1,21 @@
+Remove the test to see if the Python Paste website is up.
+
+Obviously without network access there is no way for us to check this, and
+it's pretty strange to test a project's website when you really mean to test
+the project anyhow...
+
+--- a/tests/test_proxy.py  2016-02-22 19:13:04.040117767 -0800
 b/tests/test_proxy.py  2016-02-22 19:13:04.040117767 -0800
+@@ -1,12 +1,3 @@
+ from paste import proxy
+ from paste.fixture import TestApp
+
+-def test_paste_website():
+-# Not the most robust test...
+-# need to test things like POSTing to pages, and getting from pages
+-# that don't set content-length.
+-app = proxy.Proxy('http://pythonpaste.org')
+-app = TestApp(app)
+-res = app.get('/')
+-assert 'documentation' in res
+-
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 55a62a9..03b2778 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7774,6 +7774,54 @@ file.")
 (define-public python2-pastedeploy
   (package-with-python2 python-pastedeploy))
 
+(define-public python-paste
+  (package
+(name "python-paste")
+(version "2.0.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "Paste" version))
+   (sha256
+(base32
+ "16dsv9qi0r4qsrsb6dilpq2rx0fnglvh36flzywcdnm2jg43mb5d"))
+   (patches (list (search-patch
+   "python-paste-remove-website-test.patch")
+  (search-patch
+   "python-paste-remove-timing-test.patch")
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
+(propagated-inputs
+ `(;; Uses pkg_resources provided by setuptools internally.
+   ("python-setuptools" ,python-setuptools)
+   ("python-six" ,python-six)))
+(arguments
+ '(;; Tests don't pass on Python 3, but work fine on Python 2.
+   ;; (As of 2.0.2, Python 3 support

04/04: [wip] Add python-gst

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 5194960aa4a8843555cfc206a33f3209051687d8
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Feb 23 12:34:56 2016 -0800

[wip] Add python-gst
---
 gnu/packages/gstreamer.scm |   30 ++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 45dded1..99d5c4c 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014 John Darrington <j...@gnu.org>
 ;;; Copyright © 2015 Sou Bunnbu <iyzs...@gmail.com>
 ;;; Copyright © 2015 Mark H Weaver <m...@netris.org>
+;;; Copyright © 2016 Christopher Allan Webber <cweb...@dustycloud.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -41,6 +42,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)
@@ -400,3 +402,31 @@ distribution problems in some jurisdictions, e.g. due to 
patent threats.")
  "This GStreamer plugin supports a large number of audio and video
 compression formats through the use of the libav library.")
 (license gpl2+)))
+
+(define-public python-gst
+  (package
+(name "python-gst")
+(version "1.6.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"https://gstreamer.freedesktop.org/src/; name "/"
+name "-" version ".tar.xz"))
+  (sha256
+   (base32
+"1w84pmvzki8fza10b6bx5zf1xb3r9x0nrsgfvlisybpx30p37giw"
+(build-system gnu-build-system)
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(inputs
+ `(("python" ,python)
+   ("gstreamer" ,gstreamer)
+   ("libffi" ,libffi)
+   ("gobject-introspection" ,gobject-introspection)))
+(propagated-inputs
+ `(("python-pygobject" ,python-pygobject)))
+(home-page "https://gstreamer.freedesktop.org/modules/gst-python.html;)
+(synopsis "GStreamer Python bindings supplement")
+(description "GStreamer Python overrides for the 
gobject-introspection-based
+pygst bindings.")
+(license lgpl2.0+)))

03/04: gnu: Add mediagoblin.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 7e89003c5e466c92eec063812c14ea46e5feb05d
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Mon Feb 15 11:15:41 2016 -0800

gnu: Add mediagoblin.

* gnu/packages/python.scm (mediagoblin): New variable.
---
 gnu/packages/python.scm |  104 +++
 1 files changed, 104 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1b274a3..0f95140 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8242,3 +8242,107 @@ introspection of @code{zope.interface} instances in 
code.")
 
 (define-public python2-sphinx-repoze-autointerface
   (package-with-python2 python-sphinx-repoze-autointerface))
+
+;;pyversion_install_requires = []
+;;if PY2:
+;;pyversion_install_requires.append('argparse')  # only for < 2.7
+;;pyversion_install_requires.append('PasteScript')
+;;# newer sqlalchemy-migrate requires pbr which BREAKS EVERYTHING AND IS
+;;# TERRIBLE AND IS THE END OF ALL THINGS
+;;# I'd love to remove this restriction.
+;;pyversion_install_requires.append('sqlalchemy-migrate<0.8')
+;;# # Annoying.  Please remove once we can!  We only indirectly
+;;# # use pbr, and currently it breaks things, presumably till
+;;# # their next release.
+;;# pyversion_install_requires.append('pbr==0.5.22')
+;;pyversion_install_requires.append('mock==1.0.1')  # mock is in the 
stdlib for 3.3+
+;;# PyPI version (1.4.2) does not have proper Python 3 support
+;;pyversion_install_requires.append('ExifRead')
+;;pyversion_install_requires.append('PasteScript')
+;;# Paste 2.0 is breaking wsgi, see:
+;;#  https://bitbucket.org/ianb/paste/issue/4/wsgi-environ-totally-borked
+;;pyversion_install_requires.append('Paste')
+;;else:
+;;[ ] pyversion_install_requires.append('gunicorn')
+;;
+;;install_requires = [
+;;[X] 'alembic==0.6.6',
+;;[X] 'python-dateutil',
+;;[X] 'wtforms',
+;;[X] 'py-bcrypt',
+;;[X] 'pytest>=2.3.1',
+;;[X] 'pytest-xdist',
+;;[X] 'werkzeug>=0.7',
+;;[X] 'celery>=3.0',
+;;[X] 'kombu',
+;;[X] 'jinja2',
+;;[X] 'Babel>=1.3',
+;;[X] 'WebTest>=2.0.18',
+;;[X] 'ConfigObj',
+;;[X] 'Markdown',
+;;[X] 'sqlalchemy<0.9.0, >0.8.0',
+;;[X] 'itsdangerous',
+;;[X] 'pytz',
+;;[X] 'sphinx',
+;;[X] 'six',
+;;[X] 'oauthlib',
+;;[X] 'unidecode',
+;;[X] 'jsonschema',
+;;[X] 'PasteDeploy',
+;;[X] 'requests>=2.6.0',
+;;[X] 'pyld',
+;;# This is optional:
+;;[X] 'translitcodec',
+;;# For now we're expecting that users will install this from
+;;# their package managers.
+;;[X] 'lxml',
+;;[X] 'Pillow',
+
+(define-public mediagoblin
+  (package
+(name "mediagoblin")
+(version "0.8.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "mediagoblin" version))
+   (sha256
+(base32
+ "0p2gj4z351166d1zqmmd8wc9bzb69w0fjm8qq1fs8dw2yhcg2wwv"
+(build-system python-build-system)
+(native-inputs
+ `(("python-pytest" ,python-pytest)))
+(inputs
+ `(("python-alembic" ,python-alembic)
+   ("python-pytest-xdist" ,python-pytest-xdist)
+   ("python-celery" ,python-celery)
+   ("python-kombu" ,python-kombu)
+   ("python-webtest" ,python-webtest)
+   ("python-pastedeploy" ,python-pastedeploy)
+   ("python-translitcodec" ,python-translitcodec)
+   ("python-babel" ,python-babel)
+   ("python-configobj" ,python-configobj)
+   ("python-dateutil" ,python-dateutil)
+   ("python-itsdangerous" ,python-itsdangerous)
+   ("python-jinja2" ,python-jinja2)
+   ("python-jsonschema" ,python-jsonschema)
+   ("python-lxml" ,python-lxml)
+   ("python-markdown" ,python-markdown)
+   ("python-oauthlib" ,python-oauthlib)
+   ("python-pillow" ,python-pillow)
+   ("python-py-bcrypt" ,python-py-bcrypt)
+   ("python-pyld" ,python-pyld)
+   ("python-pytz" ,python-pytz)
+   ("python-requests" ,python-requests)
+   ("python-setuptools" ,python-setuptools)
+   ("python-six" ,python-six)
+   ("python-sphinx" ,python-sphinx)
+   ("python-sqlalchemy" ,python-sqlalchemy)
+   ("python-unidecode" ,python-unidecode)
+   ("python-werkzeug" ,python-werkzeug)
+   ("python-wtforms" ,python-wtforms)))
+(home-page "http://mediagoblin.org/;)
+(synopsis "Web application for media publishing")
+(description "MediaGoblin is a web application for publishing all kinds of
+media.")
+(license agpl3+)))

02/04: gnu: Add python-pastescript.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 466e8972634ce7e7be5845ed1c6a7cf1a40d2176
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Feb 23 11:57:15 2016 -0800

gnu: Add python-pastescript.

* gnu/packages/python.scm (python-pastescript, python2-pastescript):
  New variables.
---
 gnu/packages/python.scm |   38 ++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 03b2778..1b274a3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7822,6 +7822,44 @@ follows ideas flowing from WSGI (Web Standard Gateway 
Interface).")
`(#:tests? #t
  ,@(package-arguments paste))
 
+(define-public python-pastescript
+  (package
+(name "python-pastescript")
+(version "2.0.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "PasteScript" version))
+   (sha256
+(base32
+ "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0"
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
+(propagated-inputs
+ `(;; Uses pkg_resources provided by setuptools internally.
+   ("python-setuptools" ,python-setuptools)
+   ("python-paste" ,python-paste)
+   ("python-pastedeploy" ,python-pastedeploy)))
+(home-page "http://pythonpaste.org/script/;)
+(arguments
+ '(;; Unfortunately, this requires the latest unittest2,
+   ;; but that requires traceback2 which requires linecache2 which requires
+   ;; unittest2.  So we're skipping tests for now.
+   ;; (Note: Apparently linetest2 only needs unittest2 for its tests,
+   ;; so in theory we could get around this situation somehow.)
+   #:tests? #f))
+(synopsis
+ "Pluggable command line tool for serving web applications and more")
+(description
+ "PasteScript is a plugin-friendly command line tool which provides a
+variety of features, from launching web applications to bootstrapping project
+layouts.")
+(license license:expat)))
+
+(define-public python2-pastescript
+  (package-with-python2 python-pastescript))
+
 (define-public python-pyquery
   (package
 (name "python-pyquery")

branch wip-mediagoblin created (now 5194960)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-mediagoblin
in repository guix.

at  5194960   [wip] Add python-gst

This branch includes the following new commits:

   new  d3cfa0c   gnu: Add python-paste.
   new  466e897   gnu: Add python-pastescript.
   new  7e89003   gnu: Add mediagoblin.
   new  5194960   [wip] Add python-gst

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

01/04: gnu: Add python-paste.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit d3cfa0c9ebc4b4b04e42094f46127fdb972ad4d4
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Feb 23 11:54:43 2016 -0800

gnu: Add python-paste.

* gnu/packages/python.scm (python-paste, python2-paste): New variables.
* gnu/packages/patches/python-paste-remove-timing-test.patch: New file.
* gnu/packages/patches/python-paste-remove-website-test.patch: New file.
* gnu-system.am (dist_patch_DATA): Add them.
---
 gnu-system.am  |2 +
 .../patches/python-paste-remove-timing-test.patch  |   16 +++
 .../patches/python-paste-remove-website-test.patch |   21 +
 gnu/packages/python.scm|   48 
 4 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 431c2b5..6ccca12 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -679,6 +679,8 @@ dist_patch_DATA =   
\
   gnu/packages/patches/python-ipython-inputhook-ctype.patch\
   gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   gnu/packages/patches/python-configobj-setuptools.patch   \
+  gnu/packages/patches/python-paste-remove-website-test.patch  \
+  gnu/packages/patches/python-paste-remove-timing-test.patch   \
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   gnu/packages/patches/qemu-CVE-2015-8558.patch\
   gnu/packages/patches/qemu-CVE-2015-8567.patch\
diff --git a/gnu/packages/patches/python-paste-remove-timing-test.patch 
b/gnu/packages/patches/python-paste-remove-timing-test.patch
new file mode 100644
index 000..6ab8d1a
--- /dev/null
+++ b/gnu/packages/patches/python-paste-remove-timing-test.patch
@@ -0,0 +1,16 @@
+Remove this test to verify that things were modified since a certain time.
+
+That assumption doesn't hold up when your environment doesn't have access to a
+real clock and thinks it's living in 1970 :)
+
+--- a/tests/test_fileapp.py2015-04-23 13:48:37.0 -0700
 b/tests/test_fileapp.py2016-02-22 19:20:08.332802417 -0800
+@@ -223,8 +223,6 @@
+   status=304)
+ res = app.get('/', headers={'If-None-Match': 'asdf'},
+   status=200)
+-res = app.get('/', headers={'If-Modified-Since': 'Sat, 1 Jan 2005 
12:00:00 GMT'},
+-  status=200)
+ res = app.get('/', headers={'If-Modified-Since': last_mod + '; 
length=100'},
+   status=304)
+ res = app.get('/', headers={'If-Modified-Since': 'invalid date'},
diff --git a/gnu/packages/patches/python-paste-remove-website-test.patch 
b/gnu/packages/patches/python-paste-remove-website-test.patch
new file mode 100644
index 000..93417fb
--- /dev/null
+++ b/gnu/packages/patches/python-paste-remove-website-test.patch
@@ -0,0 +1,21 @@
+Remove the test to see if the Python Paste website is up.
+
+Obviously without network access there is no way for us to check this, and
+it's pretty strange to test a project's website when you really mean to test
+the project anyhow...
+
+--- a/tests/test_proxy.py  2016-02-22 19:13:04.040117767 -0800
 b/tests/test_proxy.py  2016-02-22 19:13:04.040117767 -0800
+@@ -1,12 +1,3 @@
+ from paste import proxy
+ from paste.fixture import TestApp
+
+-def test_paste_website():
+-# Not the most robust test...
+-# need to test things like POSTing to pages, and getting from pages
+-# that don't set content-length.
+-app = proxy.Proxy('http://pythonpaste.org')
+-app = TestApp(app)
+-res = app.get('/')
+-assert 'documentation' in res
+-
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 55a62a9..03b2778 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7774,6 +7774,54 @@ file.")
 (define-public python2-pastedeploy
   (package-with-python2 python-pastedeploy))
 
+(define-public python-paste
+  (package
+(name "python-paste")
+(version "2.0.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "Paste" version))
+   (sha256
+(base32
+ "16dsv9qi0r4qsrsb6dilpq2rx0fnglvh36flzywcdnm2jg43mb5d"))
+   (patches (list (search-patch
+   "python-paste-remove-website-test.patch")
+  (search-patch
+   "python-paste-remove-timing-test.patch")
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
+(propagated-inputs
+ `(;; Uses pkg_resources provided by setuptools internally.
+   ("python-setuptools" ,python-setuptools)
+   ("python-six" ,python-six)))
+(arguments
+ '(;; Tests don't pass on Python 3, but work fine on Python 2.
+   ;; (As of 2.0.2, Python 3 support

branch wip-mediagoblin deleted (was dabe327)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-mediagoblin
in repository guix.

   was  dabe327   gnu: Add mediagoblin.

This change permanently discards the following revisions:

  discards  dabe327   gnu: Add mediagoblin.
  discards  ae1a49c   gnu: Add python-pastescript.
  discards  0391cae   gnu: Add python-paste.

02/03: gnu: Add python-pastescript.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit ae1a49cced8a5cb021a801b7d062c941ea01a2d8
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Feb 23 11:57:15 2016 -0800

gnu: Add python-pastescript.

* gnu/packages/python.scm (python-pastescript, python2-pastescript):
  New variables.
---
 gnu/packages/python.scm |   37 +
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9673037..7a8f94a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7820,6 +7820,43 @@ follows ideas flowing from WSGI (Web Standard Gateway 
Interface).")
  `(#:python ,python-2
 #:tests? #t
 
+(define-public python-pastescript
+  (package
+(name "python-pastescript")
+(version "2.0.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "PasteScript" version))
+   (sha256
+(base32
+ "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0"
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
+(propagated-inputs
+ `(;; Uses pkg_resources provided by setuptools internally.
+   ("python-setuptools" ,python-setuptools)
+   ("python-paste" ,python-paste)
+   ("python-pastedeploy" ,python-pastedeploy)))
+(home-page "http://pythonpaste.org/script/;)
+(arguments
+ '(;; Unfortunately, this requires the latest unittest2,
+   ;; but that requires traceback2 which requires linecache2 which requires
+   ;; unittest2.  So we're skipping tests for now.
+   ;; (Note: Apparently linetest2 only needs unittest2 for its tests,
+   ;; so in theory we could get around this situation somehow.) 
+   #:tests? #f))
+(synopsis
+ "Pluggable command line tool for serving web applications and more")
+(description
+ "PasteScript is an extensible  command line tool which provides a variety
+of features, from launching web applications to bootstrapping project 
layouts.")
+(license license:expat)))
+
+(define-public python2-pastescript
+  (package-with-python2 python-pastescript))
+
 (define-public python-pyquery
   (package
 (name "python-pyquery")

01/03: gnu: Add python-paste.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 0391cae1cb41cbe573521aa1ebedf7b94f92c985
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Tue Feb 23 11:54:43 2016 -0800

gnu: Add python-paste.

* gnu/packages/python.scm (python-paste, python2-paste): New variables.
* gnu/packages/patches/python-paste-remove-timing-test.patch: New file.
* gnu/packages/patches/python-paste-remove-website-test.patch: New file.
* gnu-system.am (dist_patch_DATA): Add them.
---
 gnu-system.am  |2 +
 .../patches/python-paste-remove-timing-test.patch  |   16 +++
 .../patches/python-paste-remove-website-test.patch |   21 +
 gnu/packages/python.scm|   46 
 4 files changed, 85 insertions(+), 0 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index a93b005..2c8551c 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -679,6 +679,8 @@ dist_patch_DATA =   
\
   gnu/packages/patches/python-ipython-inputhook-ctype.patch\
   gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   gnu/packages/patches/python-configobj-setuptools.patch   \
+  gnu/packages/patches/python-paste-remove-website-test.patch  \
+  gnu/packages/patches/python-paste-remove-timing-test.patch   \
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   gnu/packages/patches/qemu-CVE-2015-8558.patch\
   gnu/packages/patches/qemu-CVE-2015-8567.patch\
diff --git a/gnu/packages/patches/python-paste-remove-timing-test.patch 
b/gnu/packages/patches/python-paste-remove-timing-test.patch
new file mode 100644
index 000..6ab8d1a
--- /dev/null
+++ b/gnu/packages/patches/python-paste-remove-timing-test.patch
@@ -0,0 +1,16 @@
+Remove this test to verify that things were modified since a certain time.
+
+That assumption doesn't hold up when your environment doesn't have access to a
+real clock and thinks it's living in 1970 :)
+
+--- a/tests/test_fileapp.py2015-04-23 13:48:37.0 -0700
 b/tests/test_fileapp.py2016-02-22 19:20:08.332802417 -0800
+@@ -223,8 +223,6 @@
+   status=304)
+ res = app.get('/', headers={'If-None-Match': 'asdf'},
+   status=200)
+-res = app.get('/', headers={'If-Modified-Since': 'Sat, 1 Jan 2005 
12:00:00 GMT'},
+-  status=200)
+ res = app.get('/', headers={'If-Modified-Since': last_mod + '; 
length=100'},
+   status=304)
+ res = app.get('/', headers={'If-Modified-Since': 'invalid date'},
diff --git a/gnu/packages/patches/python-paste-remove-website-test.patch 
b/gnu/packages/patches/python-paste-remove-website-test.patch
new file mode 100644
index 000..93417fb
--- /dev/null
+++ b/gnu/packages/patches/python-paste-remove-website-test.patch
@@ -0,0 +1,21 @@
+Remove the test to see if the Python Paste website is up.
+
+Obviously without network access there is no way for us to check this, and
+it's pretty strange to test a project's website when you really mean to test
+the project anyhow...
+
+--- a/tests/test_proxy.py  2016-02-22 19:13:04.040117767 -0800
 b/tests/test_proxy.py  2016-02-22 19:13:04.040117767 -0800
+@@ -1,12 +1,3 @@
+ from paste import proxy
+ from paste.fixture import TestApp
+
+-def test_paste_website():
+-# Not the most robust test...
+-# need to test things like POSTing to pages, and getting from pages
+-# that don't set content-length.
+-app = proxy.Proxy('http://pythonpaste.org')
+-app = TestApp(app)
+-res = app.get('/')
+-assert 'documentation' in res
+-
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 55a62a9..9673037 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7774,6 +7774,52 @@ file.")
 (define-public python2-pastedeploy
   (package-with-python2 python-pastedeploy))
 
+(define-public python-paste
+  (package
+(name "python-paste")
+(version "2.0.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "Paste" version))
+   (sha256
+(base32
+ "16dsv9qi0r4qsrsb6dilpq2rx0fnglvh36flzywcdnm2jg43mb5d"))
+   (patches (list (search-patch
+   "python-paste-remove-website-test.patch")
+  (search-patch
+   "python-paste-remove-timing-test.patch")
+(build-system python-build-system)
+(native-inputs
+ `(("python-nose" ,python-nose)))
+(propagated-inputs
+ `(;; Uses pkg_resources provided by setuptools internally.
+   ("python-setuptools" ,python-setuptools)
+   ("python-six" ,python-six)))
+(arguments
+ '(;; Tests don't pass on Python 3, but work fine on Python 2.
+   ;; (As of 2.0.2, Python 3 support

branch wip-mediagoblin created (now dabe327)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-mediagoblin
in repository guix.

at  dabe327   gnu: Add mediagoblin.

This branch includes the following new commits:

   new  0391cae   gnu: Add python-paste.
   new  ae1a49c   gnu: Add python-pastescript.
   new  dabe327   gnu: Add mediagoblin.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

03/03: gnu: Add mediagoblin.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit dabe327a6d3ffcd9a18df96d2a8a6fb14afb8787
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Mon Feb 15 11:15:41 2016 -0800

gnu: Add mediagoblin.

* gnu/packages/python.scm (mediagoblin): New variable.
---
 gnu/packages/python.scm |  104 +++
 1 files changed, 104 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7a8f94a..23d3137 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8239,3 +8239,107 @@ introspection of @code{zope.interface} instances in 
code.")
 
 (define-public python2-sphinx-repoze-autointerface
   (package-with-python2 python-sphinx-repoze-autointerface))
+
+;;pyversion_install_requires = []
+;;if PY2:
+;;pyversion_install_requires.append('argparse')  # only for < 2.7
+;;pyversion_install_requires.append('PasteScript')
+;;# newer sqlalchemy-migrate requires pbr which BREAKS EVERYTHING AND IS
+;;# TERRIBLE AND IS THE END OF ALL THINGS
+;;# I'd love to remove this restriction.
+;;pyversion_install_requires.append('sqlalchemy-migrate<0.8')
+;;# # Annoying.  Please remove once we can!  We only indirectly
+;;# # use pbr, and currently it breaks things, presumably till
+;;# # their next release.
+;;# pyversion_install_requires.append('pbr==0.5.22')
+;;pyversion_install_requires.append('mock==1.0.1')  # mock is in the 
stdlib for 3.3+
+;;# PyPI version (1.4.2) does not have proper Python 3 support
+;;pyversion_install_requires.append('ExifRead')
+;;pyversion_install_requires.append('PasteScript')
+;;# Paste 2.0 is breaking wsgi, see:
+;;#  https://bitbucket.org/ianb/paste/issue/4/wsgi-environ-totally-borked
+;;pyversion_install_requires.append('Paste')
+;;else:
+;;[ ] pyversion_install_requires.append('gunicorn')
+;;
+;;install_requires = [
+;;[X] 'alembic==0.6.6',
+;;[X] 'python-dateutil',
+;;[X] 'wtforms',
+;;[X] 'py-bcrypt',
+;;[X] 'pytest>=2.3.1',
+;;[X] 'pytest-xdist',
+;;[X] 'werkzeug>=0.7',
+;;[X] 'celery>=3.0',
+;;[X] 'kombu',
+;;[X] 'jinja2',
+;;[X] 'Babel>=1.3',
+;;[X] 'WebTest>=2.0.18',
+;;[X] 'ConfigObj',
+;;[X] 'Markdown',
+;;[X] 'sqlalchemy<0.9.0, >0.8.0',
+;;[X] 'itsdangerous',
+;;[X] 'pytz',
+;;[X] 'sphinx',
+;;[X] 'six',
+;;[X] 'oauthlib',
+;;[X] 'unidecode',
+;;[X] 'jsonschema',
+;;[X] 'PasteDeploy',
+;;[X] 'requests>=2.6.0',
+;;[X] 'pyld',
+;;# This is optional:
+;;[X] 'translitcodec',
+;;# For now we're expecting that users will install this from
+;;# their package managers.
+;;[X] 'lxml',
+;;[X] 'Pillow',
+
+(define-public mediagoblin
+  (package
+(name "mediagoblin")
+(version "0.8.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "mediagoblin" version))
+   (sha256
+(base32
+ "0p2gj4z351166d1zqmmd8wc9bzb69w0fjm8qq1fs8dw2yhcg2wwv"
+(build-system python-build-system)
+(native-inputs
+ `(("python-pytest" ,python-pytest)))
+(inputs
+ `(("python-alembic" ,python-alembic)
+   ("python-pytest-xdist" ,python-pytest-xdist)
+   ("python-celery" ,python-celery)
+   ("python-kombu" ,python-kombu)
+   ("python-webtest" ,python-webtest)
+   ("python-pastedeploy" ,python-pastedeploy)
+   ("python-translitcodec" ,python-translitcodec)
+   ("python-babel" ,python-babel)
+   ("python-configobj" ,python-configobj)
+   ("python-dateutil" ,python-dateutil)
+   ("python-itsdangerous" ,python-itsdangerous)
+   ("python-jinja2" ,python-jinja2)
+   ("python-jsonschema" ,python-jsonschema)
+   ("python-lxml" ,python-lxml)
+   ("python-markdown" ,python-markdown)
+   ("python-oauthlib" ,python-oauthlib)
+   ("python-pillow" ,python-pillow)
+   ("python-py-bcrypt" ,python-py-bcrypt)
+   ("python-pyld" ,python-pyld)
+   ("python-pytz" ,python-pytz)
+   ("python-requests" ,python-requests)
+   ("python-setuptools" ,python-setuptools)
+   ("python-six" ,python-six)
+   ("python-sphinx" ,python-sphinx)
+   ("python-sqlalchemy" ,python-sqlalchemy)
+   ("python-unidecode" ,python-unidecode)
+   ("python-werkzeug" ,python-werkzeug)
+   ("python-wtforms" ,python-wtforms)))
+(home-page "http://mediagoblin.org/;)
+(synopsis "Web application for media publishing")
+(description "MediaGoblin is a web application for publishing all kinds of
+media.")
+(license agpl3+)))

branch wip-mediagoblin deleted (was 41422c0)

[Christopher Allan Webber]

cwebber pushed a change to branch wip-mediagoblin
in repository guix.

   was  41422c0   gnu: Add mediagoblin.

This change permanently discards the following revisions:

  discards  41422c0   gnu: Add mediagoblin.

01/01: vm: Only pass "-enable-kvm" to qemu if /dev/kvm is present.

[Christopher Allan Webber]

cwebber pushed a commit to branch master
in repository guix.

commit 944d2b17b50b6e1890817d4724ed101bc2c4b0ef
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Mon Feb 22 11:23:14 2016 -0800

vm: Only pass "-enable-kvm" to qemu if /dev/kvm is present.

Fixes <http://bugs.gnu.org/22633>.

* gnu/build/vm.scm (load-in-linux-vm): Only pass "-enable-kvm" flag to qemu
  if "/dev/kvm" is present.
* gnu/system/vm.scm (common-kvm-options): Same as above.
---
 gnu/build/vm.scm  |   19 ++-
 gnu/system/vm.scm |   10 +-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index a095f9d..48e701a 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <l...@gnu.org>
+;;; Copyright © 2016 Christopher Allan Webber <cweb...@dustycloud.org>
+;;; Copyright © 2016 Leo Famulari <l...@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -97,7 +99,7 @@ the #:references-graphs parameter of 'derivation'."
 (_ #f))
 
   (unless (zero?
-   (apply system* qemu "-enable-kvm" "-nographic" "-no-reboot"
+   (apply system* qemu "-nographic" "-no-reboot"
   "-m" (number->string memory-size)
   "-net" "nic,model=virtio"
   "-virtfs"
@@ -111,10 +113,17 @@ the #:references-graphs parameter of 'derivation'."
   "-initrd" initrd
   "-append" (string-append "console=ttyS0 --load="
builder)
-  (if make-disk-image?
-  `("-drive" ,(string-append "file=" image-file
- ",if=virtio"))
-  '(
+  (append
+   (if make-disk-image?
+   `("-drive" ,(string-append "file=" image-file
+  ",if=virtio"))
+   '())
+   ;; Only enable kvm if we see /dev/kvm exists.
+   ;; This allows users without hardware virtualization to 
still
+   ;; use these commands.
+   (if (file-exists? "/dev/kvm")
+   '("-enable-kvm")
+   '()
 (error "qemu failed" qemu))
 
   (if make-disk-image?
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index a7c03bd..58a476a 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <l...@gnu.org>
+;;; Copyright © 2016 Christopher Allan Webber <cweb...@dustycloud.org>
+;;; Copyright © 2016 Leo Famulari <l...@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -457,7 +459,13 @@ with '-virtfs' options for the host file systems listed in 
SHARED-FS."
  "\" "))
 
   #~(string-append
- " -enable-kvm -no-reboot -net nic,model=virtio \
+ ;; Only enable kvm if we see /dev/kvm exists.
+ ;; This allows users without hardware virtualization to still use these
+ ;; commands.
+ #$(if (file-exists? "/dev/kvm")
+   " -enable-kvm "
+   "")
+ " -no-reboot -net nic,model=virtio \
   " #$@(map virtfs-option shared-fs) " \
   -net user \
   -serial stdio -vga std \

branch master updated (8b16a5e -> 944d2b1)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  8b16a5e   gnu: pkg-config: Add non-HTTPS alternate URL.
   new  944d2b1   vm: Only pass "-enable-kvm" to qemu if /dev/kvm is 
present.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/build/vm.scm  |   19 ++-
 gnu/system/vm.scm |   10 +-
 2 files changed, 23 insertions(+), 6 deletions(-)

07/19: gnu: Add python-wsgiproxy2.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 778a284be51d797497701444365d14fa877c1abc
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Sat Feb 13 20:22:47 2016 -0800

gnu: Add python-wsgiproxy2.

* gnu/packages/python.scm (python-wsgiproxy2, python2-wsgiproxy2):
  New variables.
---
 gnu/packages/python.scm |   37 +
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 76638cb..cad14c1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7707,3 +7707,40 @@ server with very acceptable performance.")
 (inherit (package-with-python2
   (strip-python2-variant python-waitress)))
 (native-inputs `(("python2-setuptools" ,python2-setuptools)
+
+(define-public python-wsgiproxy2
+  (package
+(name "python-wsgiproxy2")
+(version "0.4.2")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "WSGIProxy2" version ".zip"))
+   (sha256
+(base32
+ "13kf9bdxrc95y9vriaz0viry3ah11nz4rlrykcfvb8nlqpx3dcm4"
+(build-system python-build-system)
+(native-inputs
+ `(("unzip" ,unzip)
+   ("python-nose" ,python-nose)
+   ("python-coverage" ,python-coverage)))
+(propagated-inputs
+ `(("python-six" ,python-six)
+   ("python-webob" ,python-webob)))
+(home-page
+ "https://github.com/gawel/WSGIProxy2/;)
+(synopsis "WSGI Proxy with various http client backends")
+(description "WSGI turns HTTP requests into WSGI function calls.
+WSGIProxy turns WSGI function calls into HTTP requests.
+It also includes code to sign requests and pass private data,
+and to spawn subprocesses to handle requests.")
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-wsgiproxy2))
+
+(define-public python2-wsgiproxy2
+  (let ((wsgiproxy2 (package-with-python2
+ (strip-python2-variant python-wsgiproxy2
+(package
+  (inherit wsgiproxy2)
+  (inputs `(("python2-setuptools" ,python2-setuptools)
+,@(package-inputs wsgiproxy2))

05/19: gnu: Add python-beautifulsoup4.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit b32a1e47a9d473001a332ad07122947c8be0
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Sat Feb 13 18:35:57 2016 -0800

gnu: Add python-beautifulsoup4.

* gnu/packages/python.scm (python-beautifulsoup4, python2-beautifulsoup4):
  New variables.
---
 gnu/packages/python.scm |   33 +
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8742409..b099fcf 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4568,6 +4568,39 @@ libxml2 and libxslt.")
 (define-public python2-lxml
   (package-with-python2 python-lxml))
 
+;; beautifulsoup4 has a totally different namespace than 3.x,
+;; and pypi seems to put it under its own name, so I guess we should too
+(define-public python-beautifulsoup4
+  (package
+(name "python-beautifulsoup4")
+(version "4.4.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "beautifulsoup4" version))
+   (sha256
+(base32
+ "1d36lc4pfkvl74fmzdib2nqnvknm0jddgf2n9yd7im150qyh3m47"
+(build-system python-build-system)
+(home-page
+ "http://www.crummy.com/software/BeautifulSoup/bs4/;)
+(synopsis
+ "Python screen-scraping library")
+(description
+ "Beautiful Soup is a Python library designed for rapidly setting up
+screen-scraping projects.  It offers Pythonic idioms for navigating,
+searching, and modifying a parse tree, providing a toolkit for
+dissecting a document and extracting what you need.  It automatically
+converts incoming documents to Unicode and outgoing documents to UTF-8.")
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-beautifulsoup4))
+
+(define-public python2-beautifulsoup4
+  (package
+(inherit (package-with-python2
+  (strip-python2-variant python-beautifulsoup4)))
+(native-inputs `(("python2-setuptools" ,python2-setuptools)
+
 (define-public python2-pil
   (package
 (name "python2-pil")

10/19: gnu: Add python-webtest.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit aa6313d6995d243d551cfcdc0c80dc13c7cef444
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Sat Feb 13 22:13:14 2016 -0800

gnu: Add python-webtest.

* gnu/packages/python.scm (python-webtest, python2-webtest):
  New variables.
---
 gnu/packages/python.scm |   52 +++
 1 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index aedc163..93bf4bd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7805,3 +7805,55 @@ fast xml and html manipulation.")
 (package
   (inherit pyquery)
   (native-inputs `(("python2-setuptools" ,python2-setuptools))
+
+(define-public python-webtest
+  (package
+(name "python-webtest")
+(version "2.0.20")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "WebTest" version))
+   (sha256
+(base32
+ "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv"
+(build-system python-build-system)
+(arguments
+ `(;; Unfortunately we have to disable tests!
+   ;; This release of WebTest is pinned to python-nose < 1.3,
+   ;; but older versions of python-nose are plagued with the following
+   ;; bug(s), which rears its ugly head during test execution:
+   ;;   https://github.com/nose-devs/nose/issues/759
+   ;;   https://github.com/nose-devs/nose/pull/811
+   #:tests? #f))
+;; Commented out code is no good, but in this case, once tests
+;; are ready to be enabled again, we should put the following
+;; in place:
+;;  (native-inputs
+;;   `(("python-nose" ,python-nose) ; technially < 1.3,
+;;  ; but see above comment
+;; ("python-coverage" ,python-coverage)
+;; ("python-mock" ,python-mock)
+;; ("python-pastedeploy" ,python-pastedeploy)
+;; ("python-wsgiproxy2" ,python-wsgiproxy2)
+;; ("python-pyquery" ,python-pyquery)))
+(propagated-inputs
+ `(("python-waitress" ,python-waitress)
+   ("python-webob" ,python-webob)
+   ("python-six" ,python-six)
+   ("python-beautifulsoup4" ,python-beautifulsoup4)))
+(home-page "http://webtest.pythonpaste.org/;)
+(synopsis "Helper to test WSGI applications")
+(description "Webtest allows you to test your Python web applications
+without starting an HTTP server.  It supports anything that supports the
+minimum of WSGI.")
+(license license:expat)
+(properties `((python2-variant . ,(delay python2-webtest))
+
+(define-public python2-webtest
+  (let ((webtest (package-with-python2
+  (strip-python2-variant python-webtest
+(package
+  (inherit webtest)
+  (native-inputs `(("python2-setuptools" ,python2-setuptools)
+   ,@(package-native-inputs webtest))

11/19: gnu: Add python-anyjson.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 4cb122cd8d81b58d88920ec1c8fb09a72de3db70
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Sun Feb 14 12:16:49 2016 -0800

gnu: Add python-anyjson.

* gnu/packages/python.scm (python-anyjson, python2-anyjson): New variables.
---
 gnu/packages/python.scm |   40 
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 93bf4bd..785267d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7857,3 +7857,43 @@ minimum of WSGI.")
   (inherit webtest)
   (native-inputs `(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs webtest))
+
+(define-public python-anyjson
+  (package
+(name "python-anyjson")
+(version "0.3.3")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "anyjson" version))
+   (sha256
+(base32
+ "1fjph4alvcscsl5d4b6qpv1yh31jy05jxi1l0xff7lws7j32v09p"
+(build-system python-build-system)
+(arguments
+ `(;; We could possibly get tests working, but on Python 3 it's not so 
easy.
+   ;; Very strangely, 2to3 is run *during setup.py install* (or bdist, or
+   ;; whatever) so this transformation needs to be done before the tests
+   ;; can be run.  Maybe we could add a build step to transform beforehand
+   ;; but it could be annoying/difficult.
+   ;; We can enable tests for the Python 2 version, though, and do below.
+   #:tests? #f))
+(home-page "http://bitbucket.org/runeh/anyjson/;)
+(synopsis
+ "Wraps best available JSON implementation in a common interface")
+(description
+ "Anyjson loads whichever is the fastest JSON module installed
+and provides a uniform API regardless of which JSON implementation is used.")
+(license bsd-3)
+(properties `((python2-variant . ,(delay python2-anyjson))
+
+(define-public python2-anyjson
+  (let ((anyjson (package-with-python2
+  (strip-python2-variant python-anyjson
+(package
+  (inherit anyjson)
+  (arguments `(;; Unlike the python 3 variant, we do run tests.  See above!
+   #:tests? #t
+   ,@(package-arguments anyjson)))
+  (native-inputs `(("python2-setuptools" ,python2-setuptools)
+   ("python2-nose" ,python2-nose))

branch master updated (95001d4 -> 2de98fe)

[Christopher Allan Webber]

cwebber pushed a change to branch master
in repository guix.

  from  95001d4   download: Add 'url-fetch/tarbomb'.
  adds  af5a460   gnu: Add python-alembic.
  adds  e08739c   gnu: Add python2-apipkg.
  adds  16c84f9   gnu: Add python2-execnet.
  adds  8fa58fc   gnu: Add python-pytest-xdist.
  adds  b32a1e4   gnu: Add python-beautifulsoup4.
  adds  ae00a41   gnu: Add python-waitress.
  adds  778a284   gnu: Add python-wsgiproxy2.
  adds  bb7518b   gnu: Add python-pastedeploy.
  adds  1cf5365   gnu: Add python-pyquery.
  adds  aa6313d   gnu: Add python-webtest.
  adds  4cb122c   gnu: Add python-anyjson.
  adds  8dfceab   gnu: Add python-amqp.
  adds  7d38730   gnu: Add python-kombu.
  adds  b6f0b9f   gnu: Add python-billiard.
  adds  22df641   gnu: Add python-celery.
  adds  97e3294   gnu: Add python-translitcodec.
  adds  0c3b90d   gnu: Add python-editor.
  adds  2de98fe   gnu: python-apipkg: Remove unzip dependency.

No new revisions were added by this update.

Summary of changes:
 gnu/packages/python.scm |  553 ++-
 1 files changed, 549 insertions(+), 4 deletions(-)

13/19: gnu: Add python-kombu.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 7d387305077946c3a377f7247a7c32068ff55441
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Sun Feb 14 15:38:10 2016 -0800

gnu: Add python-kombu.

* gnu/packages/python.scm (python-kombu, python2-kombu): New variables.
---
 gnu/packages/python.scm |   38 ++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ed3a252..aee730b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7935,3 +7935,41 @@ alternative when librabbitmq is not available.")
,@(package-arguments amqp)))
   (native-inputs `(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs amqp))
+
+(define-public python-kombu
+  (package
+(name "python-kombu")
+(version "3.0.33")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "kombu" version))
+   (sha256
+(base32
+ "16brjx2lgwbj2a37d0pjbfb84nvld6irghmqrs3qfncajp51hgc5"
+(build-system python-build-system)
+(native-inputs
+ `(("python-mock" ,python-mock)
+   ("python-nose" ,python-nose)))
+(propagated-inputs
+ `(("python-anyjson" ,python-anyjson)
+   ("python-amqp" ,python-amqp)))
+(home-page "http://kombu.readthedocs.org;)
+(synopsis "Message passing library for Python")
+(description "The aim of Kombu is to make messaging in Python as easy as
+possible by providing an idiomatic high-level interface for the AMQ protocol,
+and also provide proven and tested solutions to common messaging problems.
+AMQP is the Advanced Message Queuing Protocol, an open standard protocol for
+message orientation, queuing, routing, reliability and security, for which the
+RabbitMQ messaging server is the most popular implementation.")
+(license bsd-3)
+(properties `((python2-variant . ,(delay python2-kombu))
+
+(define-public python2-kombu
+  (let ((kombu (package-with-python2
+(strip-python2-variant python-kombu
+(package
+  (inherit kombu)
+  (inputs `(("python2-setuptools" ,python2-setuptools)
+("python2-unittest2" ,python2-unittest2)
+,@(package-inputs kombu))

09/19: gnu: Add python-pyquery.

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-mediagoblin
in repository guix.

commit 1cf536521de0b6cdd096d6f396bd9a5bf117f7d8
Author: Christopher Allan Webber <cweb...@dustycloud.org>
Date:   Sat Feb 13 21:40:22 2016 -0800

gnu: Add python-pyquery.

* gnu/packages/python.scm (python-pyquery, python2-pyquery): New variables.
---
 gnu/packages/python.scm |   30 ++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c7e0e14..aedc163 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7775,3 +7775,33 @@ file.")
 
 (define-public python2-pastedeploy
   (package-with-python2 python-pastedeploy))
+
+(define-public python-pyquery
+  (package
+(name "python-pyquery")
+(version "1.2.11")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "pyquery" version))
+   (sha256
+(base32
+ "1ikz1387nsp0pp7mzzr6ip9n5gr67acpap24yn33987v7fkjp0sa"
+(build-system python-build-system)
+(propagated-inputs
+ `(("python-lxml" ,python-lxml)
+   ("python-cssselect" ,python-cssselect)))
+(home-page "https://github.com/gawel/pyquery;)
+(synopsis "Make jQuery-like queries on xml documents")
+(description "pyquery allows you to make jQuery queries on xml documents.
+The API is as much as possible the similar to jQuery.  pyquery uses lxml for
+fast xml and html manipulation.")
+(license bsd-3)
+(properties `((python2-variant . ,(delay python2-pyquery))
+
+(define-public python2-pyquery
+  (let ((pyquery (package-with-python2
+  (strip-python2-variant python-pyquery
+(package
+  (inherit pyquery)
+  (native-inputs `(("python2-setuptools" ,python2-setuptools))