From 58e280d9b7eeebb34aa2cfe9db546d416bd7daef Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 30 Oct 2023 11:57:12 +0100 Subject: [PATCH] overlays: patch device pairing in ausweisapp2 --- flake.lock | 18 +++++++++--------- overlays/default.nix | 10 ++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b1cedb7..6ea809a 100644 --- a/flake.lock +++ b/flake.lock @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1697946153, - "narHash": "sha256-7k7qIwWLaYPgQ4fxmEdew3yCffhK6rM4I4Jo3X/79DA=", + "lastModified": 1698550809, + "narHash": "sha256-Um8+Wi6EAH5dCgfgl7OqaVd4wFJn6FKLafcP5QPr/98=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5a2006282caaf32663cdcd582c5b18809c7d7d8d", + "rev": "1f0981f5baeb78e3c89a8980ff1a39f06876fa8c", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1697929210, - "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", + "lastModified": 1698544399, + "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", + "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", "type": "github" }, "original": { @@ -481,11 +481,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1698273636, - "narHash": "sha256-swsqg/ckSVJnravx7ie9NFQSKIH27owtlk0wh4+xStk=", + "lastModified": 1698548647, + "narHash": "sha256-7c03OjBGqnwDW0FBaBc+NjfEBxMkza+dxZGJPyIzfFE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "014e44d334a39481223a5d163530d4c4ca2e75cb", + "rev": "632c3161a6cc24142c8e3f5529f5d81042571165", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index 85342c1..0263d99 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -34,6 +34,16 @@ in pww = callPackage ../pkgs/pww { }; + # fix pairing + AusweisApp2 = prev.AusweisApp2.overrideAttrs (_: { + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/Governikus/AusweisApp2/pull/47.patch"; + hash = "sha256-98ttPVOFHsxmvUFgNpxW0/C9PK64dUwmTxrNnXefkKo="; + }) + ]; + }); + tpm2-pkcs11 = prev.tpm2-pkcs11.overrideAttrs (_: { configureFlags = [ "--with-fapi=no" ]; patches = [