diff options
| -rw-r--r-- | nixos/modules/programs/ausweisapp.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/ausweisapp/default.nix | 62 | ||||
| -rw-r--r-- | pkgs/applications/misc/ausweisapp2/default.nix | 33 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 67 insertions, 37 deletions
diff --git a/nixos/modules/programs/ausweisapp.nix b/nixos/modules/programs/ausweisapp.nix index ef1f059568c..91870df2024 100644 --- a/nixos/modules/programs/ausweisapp.nix +++ b/nixos/modules/programs/ausweisapp.nix @@ -7,11 +7,11 @@ let in { options.programs.ausweisapp = { - enable = mkEnableOption (lib.mdDoc "AusweisApp2"); + enable = mkEnableOption (lib.mdDoc "AusweisApp"); openFirewall = mkOption { description = lib.mdDoc '' - Whether to open the required firewall ports for the Smartphone as Card Reader (SaC) functionality of AusweisApp2. + Whether to open the required firewall ports for the Smartphone as Card Reader (SaC) functionality of AusweisApp. ''; default = false; type = lib.types.bool; @@ -19,7 +19,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ AusweisApp2 ]; + environment.systemPackages = with pkgs; [ ausweisapp ]; networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ 24727 ]; }; } diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix new file mode 100644 index 00000000000..ab7089e5199 --- /dev/null +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + testers, + cmake, + pkg-config, + wrapQtAppsHook, + pcsclite, + qtscxml, + qtsvg, + qttools, + qtwayland, + qtwebsockets, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ausweisapp"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "Governikus"; + repo = "AusweisApp2"; + rev = finalAttrs.version; + hash = "sha256-RUjc4KqyKZXBW+CMaRhKsbwVzmWw6/QHNK+RpBd7Gxw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + # The build scripts copy the entire translations directory from Qt + # which ends up being read-only because it's in the store. + preBuild = '' + chmod +w resources/translations + ''; + + buildInputs = [ + pcsclite + qtscxml + qtsvg + qttools + qtwayland + qtwebsockets + ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "QT_QPA_PLATFORM=offscreen ${finalAttrs.meta.mainProgram} --version"; + }; + + meta = { + description = "Official authentication app for German ID card and residence permit"; + downloadPage = "https://github.com/Governikus/AusweisApp2/releases"; + homepage = "https://www.ausweisapp.bund.de/open-source-software"; + license = lib.licenses.eupl12; + mainProgram = "AusweisApp"; + maintainers = with lib.maintainers; [b4dm4n]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix deleted file mode 100644 index 6ef313fa6de..00000000000 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets -, qtquickcontrols2, qtgraphicaleffects }: - -mkDerivation rec { - pname = "AusweisApp2"; - version = "1.26.7"; - - src = fetchFromGitHub { - owner = "Governikus"; - repo = "AusweisApp2"; - rev = version; - hash = "sha256-i9hfmMp0pEqtIeKc1mcyINXetzD/33aM0utL8nomVcg="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - # The build scripts copy the entire translations directory from Qt - # which ends up being read-only because it's in the store. - preBuild = '' - chmod +w resources/translations - ''; - - buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; - - meta = with lib; { - description = "Authentication software for the German ID card"; - downloadPage = "https://github.com/Governikus/AusweisApp2/releases"; - homepage = "https://www.ausweisapp.bund.de/ausweisapp2/"; - license = licenses.eupl12; - maintainers = with maintainers; [ b4dm4n ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 23301bec0aa..0c1acad2e8e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ ### A ### + AusweisApp2 = ausweisapp; # Added 2023-11-08 a4term = a4; # Added 2023-10-06 aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 939161ca0e5..4ec31298a6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30550,7 +30550,7 @@ with pkgs; autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - AusweisApp2 = libsForQt5.callPackage ../applications/misc/ausweisapp2 { }; + ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; |