diff options
| author | Alejandro Soto <alejandro@34project.org> | 2026-03-24 17:42:30 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2026-03-24 17:42:30 -0600 |
| commit | bf70cffaa6537a4c1aff558398e71fd4329d8efb (patch) | |
| tree | 91a9309465c1d622c41047ec274d3b110ecd6123 /trivionomicon/pkgs/athena-bccr | |
| parent | 5e95091f5347c8b08109ed75e05400685ac98f12 (diff) | |
Revert "Merge commit 'efcef47c37e27be128082fa9585b8fa1be3c4dd5' into master"
This reverts commit 93d87124e90859011855467b93592bd3d1bb7723, reversing
changes made to 194efc5c4b7c1dabebd0731c81952e17d935c4d8.
Diffstat (limited to '')
| -rw-r--r-- | trivionomicon/pkgs/athena-bccr/default.nix | 12 | ||||
| -rw-r--r-- | trivionomicon/pkgs/athena-bccr/firmador.nix | 2 |
2 files changed, 9 insertions, 5 deletions
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 diff --git a/trivionomicon/pkgs/athena-bccr/firmador.nix b/trivionomicon/pkgs/athena-bccr/firmador.nix index e8e0a2d..feec48e 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-iqooTe8xTrkG0JxJXlAMHExt6D8n+msB/VrCNrSJ10c="; + mvnHash = "sha256-QDjhwrKZK/cEQxRYUM+z1zMCNrTHyxRqAhUfNtubhhI="; nativeBuildInputs = [ makeWrapper |