diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/patchutils.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/patchutils.scm')
| -rw-r--r-- | gnu/packages/patchutils.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 9ac10dc8e4..5f16deaffa 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -322,7 +322,7 @@ you to figure out what is going on in that merge you keep avoiding.") (define-public patchwork (package (name "patchwork") - (version "3.0.1") + (version "3.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -331,7 +331,7 @@ you to figure out what is going on in that merge you keep avoiding.") (file-name (git-file-name name version)) (sha256 (base32 - "049ih1fbbbmj11v5m9ilahifl8x7gi6wyba58552y9n9djzs8csc")))) + "0dl0prsyzsnlq6g0jw05mxx00bq9y2rpc3vrbfxfiblyyydrn2xn")))) (build-system python-build-system) (arguments `(;; TODO: Tests require a running database @@ -455,7 +455,7 @@ if __name__ == \"__main__\": (inputs (list python-wrapper)) (propagated-inputs - (list python-django-2.2 + (list python-django-3.2 ;; TODO: Make this configurable python-psycopg2 python-mysqlclient |