GNU bug report logs - #48997
[PATCH] gnu: Add ausweisapp2.

Previous Next

Package: guix-patches;

Reported by: Sergey Trofimov <sarg <at> sarg.org.ru>

Date: Sun, 13 Jun 2021 07:19:01 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 48997 in the body.
You can then email your comments to 48997 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#48997; Package guix-patches. (Sun, 13 Jun 2021 07:19:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Sergey Trofimov <sarg <at> sarg.org.ru>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sun, 13 Jun 2021 07:19:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: guix-patches <at> gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH] gnu: Add ausweisapp2.
Date: Sun, 13 Jun 2021 09:18:37 +0200
---
 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





Information forwarded to guix-patches <at> gnu.org:
bug#48997; Package guix-patches. (Tue, 15 Jun 2021 13:03:02 GMT) Full text and rfc822 format available.

Message #8 received at 48997 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: Sergey Trofimov <sarg <at> sarg.org.ru>, 48997 <at> debbugs.gnu.org
Subject: Re: [bug#48997] [PATCH] gnu: Add ausweisapp2.
Date: Tue, 15 Jun 2021 15:02:39 +0200
[Message part 1 (text/plain, inline)]
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.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#48997; Package guix-patches. (Tue, 15 Jun 2021 15:37:01 GMT) Full text and rfc822 format available.

Message #11 received at 48997 <at> debbugs.gnu.org (full text, mbox):

From: Sergey Trofimov <sarg <at> sarg.org.ru>
To: 48997 <at> debbugs.gnu.org
Cc: Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [PATCH] gnu: Add ausweisapp2.
Date: Tue, 15 Jun 2021 17:37:21 +0200
* 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





Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Thu, 24 Jun 2021 21:39:02 GMT) Full text and rfc822 format available.

Notification sent to Sergey Trofimov <sarg <at> sarg.org.ru>:
bug acknowledged by developer. (Thu, 24 Jun 2021 21:39:02 GMT) Full text and rfc822 format available.

Message #16 received at 48997-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Sergey Trofimov <sarg <at> sarg.org.ru>
Cc: 48997-done <at> debbugs.gnu.org
Subject: Re: bug#48997: [PATCH] gnu: Add ausweisapp2.
Date: Thu, 24 Jun 2021 23:38:49 +0200
[Message part 1 (text/plain, inline)]
Hi,

Sergey Trofimov <sarg <at> 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’.

[Message part 2 (text/x-patch, inline)]
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 <at> systemreboot.net>
 ;;; Copyright © 2020 Raphaël Mélotte <raphael.melotte <at> mind.be>
 ;;; Copyright © 2021 Antero Mejr <antero <at> kodmin.com>
+;;; Copyright © 2021 Sergey Trofimov <sarg <at> 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)))

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 23 Jul 2021 11:24:09 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 250 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.