fabian/nix
1
0
Fork 2
Code Issues 16 Pull requests Projects Releases Packages Wiki Activity

Revert "Merge commit 'efcef47c37' into user"

Browse source 
This reverts commit 93d87124e90859011855467b93592bd3d1bb7723, reversing
changes made to 194efc5c4b7c1dabebd0731c81952e17d935c4d8.
This commit is contained in:
Alejandro Soto 2026-03-24 17:42:30 -06:00
parent cf2823d14e
commit 5b3df597d0
5 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/athena-bccr/hm.nix
View file

@ -5,12 +5,11 @@
doctrine,
...
}: let
athena =
(pkgs.${doctrine.prefix}.athena-bccr.override {
inherit (cfg) mirror;
}).${
cfg.release
};
releases = pkgs.${doctrine.prefix}.athena-bccr.override {
inherit (cfg) mirror vendor;
};
athena = releases.${cfg.release};
in {
home.packages = [
athena.firmador

48
modules/athena-bccr/options.nix
View file

@ -1,42 +1,40 @@
{lib, ...}:
with lib.types; {
with lib.types; let
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";
description = "pinned athena-bccr release tag";
};
vendor = lib.mkOption {
type = enum ["athena" "idopte"];
default = "idopte";
description = "driver dvendor";
};
in {
hm = {
inherit mirror release vendor;
gaudiHash = lib.mkOption {
type = nullOr str;
default = null;
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";
description = "pinned athena-bccr release tag";
};
};
sys = {
inherit mirror release vendor;
group = lib.mkOption {
type = str;
default = "users";
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";
description = "pinned athena-bccr release tag";
};
};
}

14
modules/athena-bccr/sys.nix
View file

@ -6,17 +6,15 @@
doctrine,
...
}: let
athena =
(pkgs.${doctrine.prefix}.athena-bccr.override {
inherit (cfg) mirror;
}).${
cfg.release
};
inherit (athena) vendor;
releases = pkgs.${doctrine.prefix}.athena-bccr.override {
inherit (cfg) mirror vendor;
};
athena = releases.${cfg.release};
driver = athena.card-driver.lib;
scmiddleware = "${driver}/lib/SCMiddleware";
inherit (cfg) vendor;
in {
environment = {
etc =