trivionomicon: athena-bccr: add support for mirrors
This commit is contained in:
parent
789b1780cb
commit
286c49e369
5 changed files with 41 additions and 5 deletions
|
|
@ -5,7 +5,12 @@
|
|||
doctrine,
|
||||
...
|
||||
}: let
|
||||
athena = pkgs.${doctrine.prefix}.athena-bccr.${cfg.release};
|
||||
athena =
|
||||
(pkgs.${doctrine.prefix}.athena-bccr.override {
|
||||
inherit (cfg) mirror;
|
||||
}).${
|
||||
cfg.release
|
||||
};
|
||||
in {
|
||||
home.packages = [
|
||||
athena.firmador
|
||||
|
|
|
|||
|
|
@ -7,6 +7,12 @@ with lib.types; {
|
|||
description = "hash of the Gaudi client";
|
||||
};
|
||||
|
||||
mirror = lib.mkOption {
|
||||
type = nullOr str;
|
||||
default = null;
|
||||
description = "release zip mirror base URL, if null then the release zip must be manually added to the Nix store";
|
||||
};
|
||||
|
||||
release = lib.mkOption {
|
||||
type = str;
|
||||
default = "latest";
|
||||
|
|
@ -21,6 +27,12 @@ with lib.types; {
|
|||
description = "user group with full access to the smartcard reader";
|
||||
};
|
||||
|
||||
mirror = lib.mkOption {
|
||||
type = nullOr str;
|
||||
default = null;
|
||||
description = "release zip mirror base URL, if null then the release zip must be manually added to the Nix store";
|
||||
};
|
||||
|
||||
release = lib.mkOption {
|
||||
type = str;
|
||||
default = "latest";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,13 @@
|
|||
doctrine,
|
||||
...
|
||||
}: let
|
||||
athena = pkgs.${doctrine.prefix}.athena-bccr.${cfg.release};
|
||||
athena =
|
||||
(pkgs.${doctrine.prefix}.athena-bccr.override {
|
||||
inherit (cfg) mirror;
|
||||
}).${
|
||||
cfg.release
|
||||
};
|
||||
|
||||
inherit (athena) vendor;
|
||||
|
||||
driver = athena.card-driver.lib;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
callPackage,
|
||||
lib,
|
||||
mirror ? null,
|
||||
}: let
|
||||
latest = "deb64-rev26.2";
|
||||
|
||||
|
|
@ -18,7 +19,7 @@
|
|||
pkgsForRelease = release: let
|
||||
inherit (unwrapped) card-driver bccr-cacerts;
|
||||
|
||||
unwrapped = overrideUnwrapped {inherit release;} {};
|
||||
unwrapped = overrideUnwrapped {inherit mirror release;} {};
|
||||
pkcs11-module = "${card-driver.lib}/${card-driver.pkcs11-path}";
|
||||
in {
|
||||
inherit card-driver bccr-cacerts pkcs11-module;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
mirror ? null,
|
||||
requireFile,
|
||||
release,
|
||||
gaudiHash ? null,
|
||||
|
|
@ -7,10 +9,20 @@
|
|||
}: let
|
||||
inherit (release) srcPaths vendor;
|
||||
|
||||
src = requireFile {
|
||||
url = "https://soportefirmadigital.com";
|
||||
url =
|
||||
if mirror != null
|
||||
then "${mirror}/${release.filename}"
|
||||
else "https://soportefirmadigital.com";
|
||||
|
||||
fetchSrc =
|
||||
if mirror != null
|
||||
then fetchurl
|
||||
else requireFile;
|
||||
|
||||
src = fetchSrc {
|
||||
name = release.filename;
|
||||
|
||||
inherit url;
|
||||
inherit (release) hash;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue