diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2020-10-05 14:17:25 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-10-05 14:17:25 +0200 |
| commit | 87c079d9b55afda249ddc1b11798a62547a2cbb6 (patch) | |
| tree | a7a0dbcfd8c3fb8935e00cc44f8b514fa790975b /gnu/packages/patchutils.scm | |
| parent | de96ed11efdfb450ca45952aceda656a78d981c4 (diff) | |
| parent | 3699ed63501a28629956ca60e198f5fafa57ad4e (diff) | |
| download | guix-87c079d9b55afda249ddc1b11798a62547a2cbb6.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patchutils.scm')
| -rw-r--r-- | gnu/packages/patchutils.scm | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index c26977be1f..12dd472c68 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -321,7 +321,7 @@ you to figure out what is going on in that merge you keep avoiding.") (define-public patchwork (package (name "patchwork") - (version "2.1.5") + (version "2.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -330,7 +330,7 @@ you to figure out what is going on in that merge you keep avoiding.") (file-name (git-file-name name version)) (sha256 (base32 - "1n4hfwlgmw6mj5kp261zfx47mgb0l7g2yzl1rf0rnm8x69lr3as6")))) + "1cr3lhm589zhvcgfm8gni036866k2livq1rcxbnigjxlw9p5znaf")))) (build-system python-build-system) (arguments `(;; TODO: Tests require a running database @@ -396,23 +396,10 @@ application = get_wsgi_application()\n") port))))) (install-file file (string-append out "/bin"))) (list (string-append out-site-packages - "patchwork/bin/pwclient") - (string-append out-site-packages "patchwork/bin/parsemail.sh") (string-append out-site-packages "patchwork/bin/parsemail-batch.sh"))) - ;; Delete the symlink to pwclient, and replace it with the - ;; actual file, as this can cause issues when serving the file - ;; from a webserver. - (let ((template-pwclient (string-append - out-site-packages - "patchwork/templates/patchwork/pwclient"))) - (delete-file template-pwclient) - (copy-file (string-append out-site-packages - "patchwork/bin/pwclient") - template-pwclient)) - ;; Collect the static assets, this includes JavaScript, CSS and ;; fonts. This is a standard Django process when running a ;; Django application for regular use, and includes assets for @@ -467,7 +454,7 @@ if __name__ == \"__main__\": (inputs `(("python-wrapper" ,python-wrapper))) (propagated-inputs - `(("python-django" ,python-django) + `(("python-django" ,python-django-2.2) ;; TODO: Make this configurable ("python-psycopg2" ,python-psycopg2) ("python-mysqlclient" ,python-mysqlclient) |