From b3981bba78691799de30f38e5636259773f5d86b Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sat, 1 Aug 2020 22:16:24 +0200 Subject: gnu: android: Export android-libcutils. * gnu/packages/android.scm (android-libcutils): Export it. Signed-off-by: Mathieu Othacehe --- gnu/packages/android.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 0fb4330d3e..af2b817298 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -229,7 +229,7 @@ in Main, System, Radio and Events sub-logs.") various Android core host applications.") (license license:asl2.0))) -(define android-libcutils +(define-public android-libcutils (package (name "android-libcutils") (version (android-platform-version)) -- cgit v1.2.3 From 87194d5783c1848b44a0596432cb66940d7874d2 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sat, 1 Aug 2020 22:16:25 +0200 Subject: gnu: android: Export android-liblog. * gnu/packages/android.scm (android-liblog): Export it. Signed-off-by: Mathieu Othacehe --- gnu/packages/android.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index af2b817298..f7f3aca4a2 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -185,7 +185,7 @@ use their packages mostly unmodified in our Android NDK build system.") (base32 checksum)))) -(define android-liblog +(define-public android-liblog (package (name "android-liblog") (version (android-platform-version)) -- cgit v1.2.3 From 0c46e1b510bfca6b0a46eb3210da54431c0b6615 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 7 Aug 2020 04:10:26 +0200 Subject: gnu: android: Export android-platform-version. * gnu/packages/android.scm (android-platform-version): Export it. Signed-off-by: Mathieu Othacehe --- gnu/packages/android.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index f7f3aca4a2..8a094d0827 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -126,7 +126,7 @@ use their packages mostly unmodified in our Android NDK build system.") ;; Big thanks to them for laying the groundwork. ;; The version tag is consistent between all repositories. -(define (android-platform-version) "7.1.2_r36") +(define-public (android-platform-version) "7.1.2_r36") (define (android-platform-system-core version) (origin -- cgit v1.2.3 From 7105487875197f7e493b5a9cdce0746542ba4568 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 7 Aug 2020 04:10:27 +0200 Subject: gnu: android: Export android-platform-system-core. * gnu/packages/android.scm (android-platform-system-core): Export it. Signed-off-by: Mathieu Othacehe --- gnu/packages/android.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 8a094d0827..544a65d0af 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -128,7 +128,7 @@ use their packages mostly unmodified in our Android NDK build system.") ;; The version tag is consistent between all repositories. (define-public (android-platform-version) "7.1.2_r36") -(define (android-platform-system-core version) +(define-public (android-platform-system-core version) (origin (method git-fetch) (uri (git-reference -- cgit v1.2.3 From 150f2afc9266ecf3e927c9c90ae5b25b9b18248f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Aug 2020 15:56:05 +0200 Subject: gnu: android-udev-rules: Update to 20200613. * gnu/packages/android.scm (android-udev-rules): Update to 20200613. --- gnu/packages/android.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 544a65d0af..69366693a4 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2017 Maxim Cournoyer -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2019 Ricardo Wurmus @@ -691,7 +691,7 @@ file system.") (define-public android-udev-rules (package (name "android-udev-rules") - (version "20191103") + (version "20200613") (source (origin (method git-fetch) @@ -700,7 +700,7 @@ file system.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x2f2sv0x0ry7kccp47s0hlxps3hbpg37dj3xjjgpdm5hmn2cjq3")))) + (base32 "0cf5br8x6iwxc1cifv0i1klw7skgs8hghdx6qlqby68kyqg81bb2")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) (arguments -- cgit v1.2.3 From ed62aa0af5e6801c398d59c3d67a42d61b060ada Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 11 Aug 2020 13:12:28 +0200 Subject: gnu: android-liblog: Install headers. * gnu/packages/android.scm (android-liblog): Install headers in a new phase. --- gnu/packages/android.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 69366693a4..3c3a9cd594 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -201,7 +201,16 @@ use their packages mostly unmodified in our Android NDK build system.") (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (symlink "liblog.so.0" (string-append out "/lib/liblog.so")) - #t)))))) + #t))) + (add-after 'install 'install-headers + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively + "../include/log" (string-append out "/include/log")) + ;; For android/log.h, the only header in the android directory. + (copy-recursively + "../include/android" (string-append out "/include/android"))) + #t))))) (home-page "https://developer.android.com/") (synopsis "Logging library from the Android platform.") (description "@code{liblog} represents an interface to the volatile Android -- cgit v1.2.3 From 46096a0acbabaf8361a7629c9ee99ac86ad8b4a4 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 28 Aug 2020 17:45:54 +0200 Subject: 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(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 3c3a9cd594..5bed0af11d 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Maxim Cournoyer ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner -;;; Copyright © 2019 Andreas Enge +;;; Copyright © 2019, 2020 Andreas Enge ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Maxim Cournoyer ;;; @@ -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) -- cgit v1.2.3 From 95eade1389beaad79f6d07c7ffeff4235424eab0 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 28 Aug 2020 17:51:19 +0200 Subject: gnu: fdroidserver: Update to 1.1.9. * gnu/packages/android.scm (fdroidserver): Update to 1.1.9. --- gnu/packages/android.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 5bed0af11d..e354f849f7 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -916,14 +916,14 @@ useful for reverse engineering, analysis of Android applications and more.") (define-public fdroidserver (package (name "fdroidserver") - (version "1.1.1") + (version "1.1.9") (source (origin (method url-fetch) (uri (pypi-uri "fdroidserver" version)) (sha256 (base32 - "0fp7q8faicx6i6wxm717qqaham3jpilb23mvynpz6v73z7hm6wcg")))) + "0m07f791z45w7r2dzx4yb6s54b3c3wykm3w9hn25p2jcyax082a2")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From b8cb3eb63bf298d7b8965b3b41d45dce34771952 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 5 Sep 2020 12:29:36 +0200 Subject: gnu: python-docker-py: Rename to python-docker. This is a follow-up to commit 3146b6da6dd3124f8693f48a9ed7ff8208324e23. * gnu/packages/docker.scm (python-docker-py): Rename to... (python-docker): ...this. (docker-compose): Adjust inputs. * gnu/packages/android.scm (fdroidserver): Adjust inputs. --- gnu/packages/android.scm | 2 +- gnu/packages/docker.scm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index e354f849f7..2535c1238a 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -944,7 +944,7 @@ useful for reverse engineering, analysis of Android applications and more.") ("python-apache-libcloud" ,python-apache-libcloud) ("python-clint" ,python-clint) ("python-defusedxml" ,python-defusedxml) - ("python-docker-py" ,python-docker-py) + ("python-docker" ,python-docker) ("python-gitpython" ,python-gitpython) ("python-mwclient" ,python-mwclient) ("python-paramiko" ,python-paramiko) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 4beba12c11..bc7e02ec46 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -50,9 +50,9 @@ (define %docker-version "19.03.12") -(define-public python-docker-py +(define-public python-docker (package - (name "python-docker-py") + (name "python-docker") (version "3.7.3") (source (origin @@ -116,7 +116,7 @@ client.") (inputs `(("python-cached-property" ,python-cached-property) - ("python-docker-py" ,python-docker-py) + ("python-docker" ,python-docker) ("python-dockerpty" ,python-dockerpty) ("python-docopt" ,python-docopt) ("python-jsonschema" ,python-jsonschema) -- cgit v1.2.3