From d73def49bd0ae2f20fdde89774c1a117a586c0c0 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Tue, 10 Mar 2026 20:03:02 -0600 Subject: trivionomicon: athena-bccr: separate releases by vendor, add 'vendor' option --- trivionomicon/pkgs/athena-bccr/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'trivionomicon/pkgs/athena-bccr/default.nix') diff --git a/trivionomicon/pkgs/athena-bccr/default.nix b/trivionomicon/pkgs/athena-bccr/default.nix index 038220b..c17911e 100644 --- a/trivionomicon/pkgs/athena-bccr/default.nix +++ b/trivionomicon/pkgs/athena-bccr/default.nix @@ -2,10 +2,14 @@ callPackage, lib, mirror ? null, + vendor ? "idopte", }: let - latest = "deb64-rev26.2"; + releases = lib.mapAttrs resolveRelease (import ./releases.nix).${vendor}; - releases = lib.mapAttrs (name: release: release // {name = name;}) (import ./releases.nix); + resolveRelease = name: release: + if builtins.isString release + then releases.${release} + else release // {name = name;}; overrideUnwrapped = default: new: let args = default // new; @@ -19,7 +23,7 @@ pkgsForRelease = release: let inherit (unwrapped) card-driver bccr-cacerts; - unwrapped = overrideUnwrapped {inherit mirror release;} {}; + unwrapped = overrideUnwrapped {inherit mirror release vendor;} {}; pkcs11-module = "${card-driver.lib}/${card-driver.pkcs11-path}"; in { inherit card-driver bccr-cacerts pkcs11-module; @@ -29,4 +33,4 @@ firmador = callPackage ./firmador.nix {inherit pkcs11-module;}; }; in - lib.mapAttrs (_: pkgsForRelease) (releases // {latest = releases.${latest};}) + lib.mapAttrs (_: pkgsForRelease) releases -- cgit v1.2.3