Merge commit 'efcef47c37e27be128082fa9585b8fa1be3c4dd5' into master

2 files changed, 5 insertions, 9 deletions

diff --git a/trivionomicon/pkgs/athena-bccr/default.nix b/trivionomicon/pkgs/athena-bccr/default.nix
index c17911e..038220b 100644
--- a/trivionomicon/pkgs/athena-bccr/default.nix
+++ b/trivionomicon/pkgs/athena-bccr/default.nix
@@ -2,14 +2,10 @@
   callPackage,
   lib,
   mirror ? null,
-  vendor ? "idopte",
 }: let
-  releases = lib.mapAttrs resolveRelease (import ./releases.nix).${vendor};
+  latest = "deb64-rev26.2";
 
-  resolveRelease = name: release:
-    if builtins.isString release
-    then releases.${release}
-    else release // {name = name;};
+  releases = lib.mapAttrs (name: release: release // {name = name;}) (import ./releases.nix);
 
   overrideUnwrapped = default: new: let
     args = default // new;
@@ -23,7 +19,7 @@
   pkgsForRelease = release: let
     inherit (unwrapped) card-driver bccr-cacerts;
 
-    unwrapped = overrideUnwrapped {inherit mirror release vendor;} {};
+    unwrapped = overrideUnwrapped {inherit mirror release;} {};
     pkcs11-module = "${card-driver.lib}/${card-driver.pkcs11-path}";
   in {
     inherit card-driver bccr-cacerts pkcs11-module;
@@ -33,4 +29,4 @@
     firmador = callPackage ./firmador.nix {inherit pkcs11-module;};
   };
 in
-  lib.mapAttrs (_: pkgsForRelease) releases
+  lib.mapAttrs (_: pkgsForRelease) (releases // {latest = releases.${latest};})
diff --git a/trivionomicon/pkgs/athena-bccr/firmador.nix b/trivionomicon/pkgs/athena-bccr/firmador.nix
index feec48e..e8e0a2d 100644
--- a/trivionomicon/pkgs/athena-bccr/firmador.nix
+++ b/trivionomicon/pkgs/athena-bccr/firmador.nix
@@ -27,7 +27,7 @@ in
       ./0001-Remove-CheckUpdatePlugin-from-default-list.patch
     ];
 
-    mvnHash = "sha256-QDjhwrKZK/cEQxRYUM+z1zMCNrTHyxRqAhUfNtubhhI=";
+    mvnHash = "sha256-iqooTe8xTrkG0JxJXlAMHExt6D8n+msB/VrCNrSJ10c=";
 
     nativeBuildInputs = [
       makeWrapper