Pass connection to EnvironmentContext.configure

[mediagoblin.git] / guix-env.scm

diff --git a/guix-env.scm b/guix-env.scm
index 82a309eae81c1b4687d2ed5992692ee25374117a..d56f8539183604f30266aae51df7493475cef05c 100644 (file)
--- a/guix-env.scm
+++ b/guix-env.scm
@@ -64,88 +64,17 @@
              (gnu packages python)
              (gnu packages gstreamer)
              (gnu packages glib)
+             (gnu packages rsync)
+             (gnu packages ssh)
              (gnu packages version-control)
              ((guix licenses) #:select (expat zlib) #:prefix license:))
 
 ;; =================================================================
 ;; These packages are on their way into Guix proper but haven't made
-;; it in yet...
+;; it in yet... or they're old versions of packages we're pinning
+;; ourselves to...
 ;; =================================================================
 
-(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"))
-       ;;; We patch away certain tests in Guix proper, but for here we'll
-       ;;; just comment out the patches and not run the tests
-       ;; (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 in Paste is presently a bit broken,
-       ;; but is usable enough for the minimal amount it's used in MediaGoblin
-       ;; still... things should be better by the next Paste release.)
-       #:tests? #f))
-    (home-page "http://pythonpaste.org")
-    (synopsis
-     "Python web development tools, focusing on WSGI")
-    (description
-     "Paste provides a variety of web development tools and middleware which
-can be nested together to build web applications.  Paste's design closely
-follows ideas flowing from WSGI (Web Standard Gateway Interface).")
-    (license license:expat)))
-
-(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 python-sqlalchemy-0.9.10
   (package
     (inherit python-sqlalchemy)
@@ -201,7 +130,7 @@ of features, from launching web applications to bootstrapping project layouts.")
     (native-inputs
      `(("python-pytest" ,python-pytest)))
     (propagated-inputs
-     `(("python-alembic" ,python-alembic-0.6.6)
+     `(("python-alembic" ,python-alembic)
        ("python-pytest-xdist" ,python-pytest-xdist)
        ("python-celery" ,python-celery)
        ("python-kombu" ,python-kombu)
@@ -228,7 +157,7 @@ of features, from launching web applications to bootstrapping project layouts.")
        ("python-six" ,python-six)
        ("python-sphinx" ,python-sphinx)
        ("python-docutils" ,python-docutils)
-       ("python-sqlalchemy" ,python-sqlalchemy-0.9.10)
+       ("python-sqlalchemy" ,python-sqlalchemy)
        ("python-unidecode" ,python-unidecode)
        ("python-werkzeug" ,python-werkzeug)
        ("python-exif-read" ,python-exif-read)
@@ -262,6 +191,14 @@ media.")
    `(("python" ,python)
      ("python-virtualenv" ,python-virtualenv)
      ("python-pygobject" ,python-pygobject)
+     ("python-gst" ,python-gst)
      ;; Needs python-gst in order for all tests to pass
-     ("python-numpy" ,python-numpy)
+     ("python-numpy" ,python-numpy)  ; this pulls in texlive...
+                                     ; and texlive-texmf is very large...
+     ("python-chardet", python-chardet)
+     ("python-psycopg2" ,python-psycopg2)
+     ;; For developing
+     ("openssh" ,openssh)
+     ("git" ,git)
+     ("rsync" ,rsync)
      ,@(package-propagated-inputs mediagoblin))))