Merge commit 'd1102d5b6f'
This commit is contained in:
commit
460da3db0b
6 changed files with 207 additions and 126 deletions
|
|
@ -2,7 +2,7 @@
|
|||
callPackage,
|
||||
lib,
|
||||
}: let
|
||||
latest = "deb64-rev26";
|
||||
latest = "deb64-rev26.2";
|
||||
|
||||
releases = lib.mapAttrs (name: release: release // {name = name;}) (import ./releases.nix);
|
||||
|
||||
|
|
@ -16,15 +16,16 @@
|
|||
};
|
||||
|
||||
pkgsForRelease = release: let
|
||||
ase-pkcs11 = unwrapped.ase-idprotect.lib;
|
||||
libasep11 = "${ase-pkcs11}/lib/x64-athena/libASEP11.so";
|
||||
inherit (unwrapped) card-driver bccr-cacerts;
|
||||
|
||||
unwrapped = overrideUnwrapped {inherit release;} {};
|
||||
pkcs11-module = "${card-driver.lib}/${card-driver.pkcs11-path}";
|
||||
in {
|
||||
inherit ase-pkcs11 libasep11;
|
||||
inherit (unwrapped) ase-idprotect bccr-cacerts;
|
||||
inherit card-driver bccr-cacerts pkcs11-module;
|
||||
inherit (release) vendor;
|
||||
|
||||
gaudi = callPackage ./gaudi-env.nix {inherit unwrapped;};
|
||||
firmador = callPackage ./firmador.nix {inherit libasep11;};
|
||||
firmador = callPackage ./firmador.nix {inherit pkcs11-module;};
|
||||
};
|
||||
in
|
||||
lib.mapAttrs (_: pkgsForRelease) (releases // {latest = releases.${latest};})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue