* [bug#48997] [PATCH] gnu: Add ausweisapp2.
@ 2021-06-13 7:18 Sergey Trofimov
2021-06-15 13:02 ` Maxime Devos
2021-06-15 15:37 ` Sergey Trofimov
0 siblings, 2 replies; 4+ messages in thread
From: Sergey Trofimov @ 2021-06-13 7:18 UTC (permalink / raw)
To: 48997; +Cc: Sergey Trofimov
---
gnu/packages/security-token.scm | 55 +++++++++++++++++++++++++++++++++
guix/licenses.scm | 6 ++++
2 files changed, 61 insertions(+)
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 89783de965..da1334f1bf 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -34,6 +34,7 @@
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system cargo)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system python)
@@ -56,6 +57,7 @@
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages popt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages tls)
#:use-module (gnu packages tex)
#:use-module (gnu packages perl)
@@ -720,3 +722,56 @@ an unprivileged user.")
for interaction with Nitrokey Pro, Nitrokey Storage, and Librem Key
devices.")
(license license:gpl3+)))
+
+(define-public ausweisapp2
+ (package
+ (name "ausweisapp2")
+ (version "1.22.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/Governikus/AusweisApp2/releases"
+ "/download/" version "/AusweisApp2-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1qh1m057va7njs3yk0s31kwsvv44fjlsdac6lhiw5npcwssgjn8l"))))
+
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("qttools" ,qttools)))
+ (inputs `(("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtwebsockets" ,qtwebsockets)
+ ("qtgraphicaleffects" ,qtgraphicaleffects)
+ ("qtquickcontrols2" ,qtquickcontrols2)
+ ("pcsc-lite" ,pcsc-lite)
+ ("openssl" ,openssl)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/AusweisApp2")
+ `("QT_PLUGIN_PATH" ":" prefix
+ ,(map (lambda (label)
+ (string-append (assoc-ref inputs label)
+ "/lib/qt5/plugins"))
+ '("qtbase" "qtdeclarative"
+ "qtsvg" "qtwebsockets")))
+ `("QML2_IMPORT_PATH" ":" prefix
+ ,(map (lambda (label)
+ (string-append (assoc-ref inputs label)
+ "/lib/qt5/qml"))
+ '("qtdeclarative" "qtgraphicaleffects"
+ "qtquickcontrols2" "qtsvg"))))
+ #t))))))
+ (home-page "https://github.com/Governikus/AusweisApp2")
+ (synopsis
+ "Official authentication app for German ID cards and residence permits")
+ (description
+ "This app is developed and issued by the German government to be used for online
+authentication with electronic German ID cards and residence titles. To use this app,
+a supported RFID card reader or NFC-enabled smart phone is required.")
+ (license license:eupl1.2)))
diff --git a/guix/licenses.scm b/guix/licenses.scm
index e7457799ce..c455cc8c39 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -56,6 +56,7 @@
edl1.0
epl1.0
epl2.0
+ eupl1.2
expat
freetype
freebsd-doc
@@ -307,6 +308,11 @@ at URI, which may be a file:// URI pointing the package's tree."
"https://www.eclipse.org/legal/epl-2.0/"
"https://www.gnu.org/licenses/license-list#EPL2"))
+(define eupl1.2
+ (license "EUPL 1.2"
+ "https://directory.fsf.org/wiki/License:EUPL-1.2"
+ "https://www.gnu.org/licenses/license-list#EPL2"))
+
(define expat
(license "Expat"
"http://directory.fsf.org/wiki/License:Expat"
--
2.32.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#48997] [PATCH] gnu: Add ausweisapp2.
2021-06-13 7:18 [bug#48997] [PATCH] gnu: Add ausweisapp2 Sergey Trofimov
@ 2021-06-15 13:02 ` Maxime Devos
2021-06-15 15:37 ` Sergey Trofimov
1 sibling, 0 replies; 4+ messages in thread
From: Maxime Devos @ 2021-06-15 13:02 UTC (permalink / raw)
To: Sergey Trofimov, 48997
[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]
Hi,
> + (wrap-program (string-append out "/bin/AusweisApp2")
> + `("QT_PLUGIN_PATH" ":" prefix
> + ,(map (lambda (label)
> + (string-append (assoc-ref inputs label)
> + "/lib/qt5/plugins"))
> + '("qtbase" "qtdeclarative"
> + "qtsvg" "qtwebsockets")))
> + `("QML2_IMPORT_PATH" ":" prefix
> + ,(map (lambda (label)
> + (string-append (assoc-ref inputs label)
> + "/lib/qt5/qml"))
> + '("qtdeclarative" "qtgraphicaleffects"
> + "qtquickcontrols2" "qtsvg"))))
There is procedure 'wrap-qt-program' in (guix build qt-utils).
It should set QML2_IMPORT_PATH, QT_PLUGIN_PATH, XDG_DATA_DIRS and
XDG_CONFIG_DIRS appropriately. (Actually, wrap-qt-program's usage
of 'getenv' when cross-compiling looks incorrect to me, but that's a
separate issue.)
Perhaps you could use 'wrap-qt-program' instead of 'wrap-program'?
See, e.g., the package definition of qbittorrent.
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#48997] [PATCH] gnu: Add ausweisapp2.
2021-06-13 7:18 [bug#48997] [PATCH] gnu: Add ausweisapp2 Sergey Trofimov
2021-06-15 13:02 ` Maxime Devos
@ 2021-06-15 15:37 ` Sergey Trofimov
2021-06-24 21:38 ` bug#48997: " Ludovic Courtès
1 sibling, 1 reply; 4+ messages in thread
From: Sergey Trofimov @ 2021-06-15 15:37 UTC (permalink / raw)
To: 48997; +Cc: Sergey Trofimov
* gnu/packages/security-token.scm (ausweisapp2): New variable.
* guix/licenses.scm (eupl1.2): New variable.
---
gnu/packages/security-token.scm | 47 +++++++++++++++++++++++++++++++++
guix/licenses.scm | 6 +++++
2 files changed, 53 insertions(+)
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 89783de965..555b8216a2 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -34,6 +34,7 @@
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system cargo)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system python)
@@ -56,6 +57,7 @@
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages popt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages tls)
#:use-module (gnu packages tex)
#:use-module (gnu packages perl)
@@ -720,3 +722,48 @@ an unprivileged user.")
for interaction with Nitrokey Pro, Nitrokey Storage, and Librem Key
devices.")
(license license:gpl3+)))
+
+(define-public ausweisapp2
+ (package
+ (name "ausweisapp2")
+ (version "1.22.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/Governikus/AusweisApp2/releases"
+ "/download/" version "/AusweisApp2-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1qh1m057va7njs3yk0s31kwsvv44fjlsdac6lhiw5npcwssgjn8l"))))
+
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("qttools" ,qttools)))
+ (inputs `(("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtwebsockets" ,qtwebsockets)
+ ("qtgraphicaleffects" ,qtgraphicaleffects)
+ ("qtquickcontrols2" ,qtquickcontrols2)
+ ("pcsc-lite" ,pcsc-lite)
+ ("openssl" ,openssl)))
+ (arguments
+ `(#:modules ((guix build cmake-build-system)
+ (guix build qt-utils)
+ (guix build utils))
+ #:imported-modules (,@%cmake-build-system-modules
+ (guix build qt-utils))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-qt
+ (lambda* (#:key outputs #:allow-other-keys)
+ (wrap-qt-program (assoc-ref outputs "out") "AusweisApp2")
+ #t)))))
+ (home-page "https://github.com/Governikus/AusweisApp2")
+ (synopsis
+ "Official authentication app for German ID cards and residence permits")
+ (description
+ "This app is developed and issued by the German government to be used for online
+authentication with electronic German ID cards and residence titles. To use this app,
+a supported RFID card reader or NFC-enabled smart phone is required.")
+ (license license:eupl1.2)))
diff --git a/guix/licenses.scm b/guix/licenses.scm
index e7457799ce..c455cc8c39 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -56,6 +56,7 @@
edl1.0
epl1.0
epl2.0
+ eupl1.2
expat
freetype
freebsd-doc
@@ -307,6 +308,11 @@ at URI, which may be a file:// URI pointing the package's tree."
"https://www.eclipse.org/legal/epl-2.0/"
"https://www.gnu.org/licenses/license-list#EPL2"))
+(define eupl1.2
+ (license "EUPL 1.2"
+ "https://directory.fsf.org/wiki/License:EUPL-1.2"
+ "https://www.gnu.org/licenses/license-list#EPL2"))
+
(define expat
(license "Expat"
"http://directory.fsf.org/wiki/License:Expat"
--
2.32.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#48997: [PATCH] gnu: Add ausweisapp2.
2021-06-15 15:37 ` Sergey Trofimov
@ 2021-06-24 21:38 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2021-06-24 21:38 UTC (permalink / raw)
To: Sergey Trofimov; +Cc: 48997-done
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
Hi,
Sergey Trofimov <sarg@sarg.org.ru> skribis:
> * gnu/packages/security-token.scm (ausweisapp2): New variable.
> * guix/licenses.scm (eupl1.2): New variable.
Applied with the changes below.
Thanks!
Ludo’.
[-- Attachment #2: Type: text/x-patch, Size: 2821 bytes --]
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 555b8216a2..49ca1dc01e 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Raphaël Mélotte <raphael.melotte@mind.be>
;;; Copyright © 2021 Antero Mejr <antero@kodmin.com>
+;;; Copyright © 2021 Sergey Trofimov <sarg@sarg.org.ru>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -739,14 +740,15 @@ devices.")
(native-inputs
`(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
- (inputs `(("qtbase" ,qtbase)
- ("qtsvg" ,qtsvg)
- ("qtdeclarative" ,qtdeclarative)
- ("qtwebsockets" ,qtwebsockets)
- ("qtgraphicaleffects" ,qtgraphicaleffects)
- ("qtquickcontrols2" ,qtquickcontrols2)
- ("pcsc-lite" ,pcsc-lite)
- ("openssl" ,openssl)))
+ (inputs
+ `(("qtbase" ,qtbase-5)
+ ("qtsvg" ,qtsvg)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtwebsockets" ,qtwebsockets)
+ ("qtgraphicaleffects" ,qtgraphicaleffects)
+ ("qtquickcontrols2" ,qtquickcontrols2)
+ ("pcsc-lite" ,pcsc-lite)
+ ("openssl" ,openssl)))
(arguments
`(#:modules ((guix build cmake-build-system)
(guix build qt-utils)
@@ -755,15 +757,15 @@ devices.")
(guix build qt-utils))
#:phases
(modify-phases %standard-phases
- (add-after 'install 'wrap-qt
- (lambda* (#:key outputs #:allow-other-keys)
- (wrap-qt-program (assoc-ref outputs "out") "AusweisApp2")
- #t)))))
+ (add-after 'install 'wrap-qt
+ (lambda* (#:key outputs #:allow-other-keys)
+ (wrap-qt-program (assoc-ref outputs "out") "AusweisApp2"))))))
(home-page "https://github.com/Governikus/AusweisApp2")
(synopsis
- "Official authentication app for German ID cards and residence permits")
+ "Authentication program for German ID cards and residence permits")
(description
- "This app is developed and issued by the German government to be used for online
-authentication with electronic German ID cards and residence titles. To use this app,
-a supported RFID card reader or NFC-enabled smart phone is required.")
+ "This application is developed and issued by the German government to be
+used for online authentication with electronic German ID cards and residence
+titles. To use this app, a supported RFID card reader or NFC-enabled smart
+phone is required.")
(license license:eupl1.2)))
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-24 21:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-13 7:18 [bug#48997] [PATCH] gnu: Add ausweisapp2 Sergey Trofimov
2021-06-15 13:02 ` Maxime Devos
2021-06-15 15:37 ` Sergey Trofimov
2021-06-24 21:38 ` bug#48997: " Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.