[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: fdroidserver: Have the package compile with current inputs.
From: |
guix-commits |
Subject: |
05/06: gnu: fdroidserver: Have the package compile with current inputs. |
Date: |
Fri, 28 Aug 2020 11:52:17 -0400 (EDT) |
andreas pushed a commit to branch master
in repository guix.
commit 46096a0acbabaf8361a7629c9ee99ac86ad8b4a4
Author: Andreas Enge <andreas@enge.fr>
AuthorDate: Fri Aug 28 17:45:54 2020 +0200
gnu: fdroidserver: Have the package compile with current inputs.
* gnu/packages/android.scm (fdroidserver)[arguments]: Accept higher versions
of python-docker-py as required in setup.py.
---
gnu/packages/android.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 3c3a9cd..5bed0af 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2019, 2020 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@@ -931,7 +931,13 @@ useful for reverse engineering, analysis of Android
applications and more.")
(add-after 'unpack 'fix-versioning
(lambda _
(substitute* "setup.py"
- (("0.2.1") ,(package-version python-pyasn1-modules)))
+ (("0.2.1") ,(package-version python-pyasn1-modules))
+ ;; The dependency on docker has been removed upstream by
+ ;; a fairly large patch:
+ ;;
https://gitlab.com/fdroid/fdroidserver/-/commit/89614851250c79a05db84070feca6dea033af334
+ ;; that is not in a release yet. It appears we can compile with
+ ;; a newer version.
+ (("docker-py >= 1.9, < 2.0") "docker >= 1.9"))
#t)))))
(propagated-inputs
`(("python-androguard" ,python-androguard)
- branch master updated (3afa95e -> 95eade1), guix-commits, 2020/08/28
- 01/06: gnu: Remove python-requests@2.7., guix-commits, 2020/08/28
- 02/06: gnu: Add python-purl., guix-commits, 2020/08/28
- 03/06: gnu: python-requests-mock: Update to 1.8.0., guix-commits, 2020/08/28
- 04/06: gnu: python-apache-libcloud: Update to 3.1.0., guix-commits, 2020/08/28
- 05/06: gnu: fdroidserver: Have the package compile with current inputs.,
guix-commits <=
- 06/06: gnu: fdroidserver: Update to 1.1.9., guix-commits, 2020/08/28