Skip to content

Commit

Permalink
Pull up attrset
Browse files Browse the repository at this point in the history
  • Loading branch information
fmaste committed Aug 8, 2022
1 parent 294ac5a commit fdc2692
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions nix/workbench/default.nix
Expand Up @@ -73,16 +73,16 @@ let

all-profiles =
## The backend is an attrset of AWS/supervisord-specific methods and parameters.
{ backend }:
{ services-config }:
rec {
mkProfile =
profileName:
pkgs.callPackage ./profiles
{ inherit
pkgs
runWorkbenchJqOnly runJq workbench
services-config
profileName;
inherit (backend) services-config;
};

value = genAttrs profile-names mkProfile;
Expand All @@ -100,7 +100,7 @@ let
with-profile =
{ backend, profileName }:
let
ps = all-profiles { inherit backend; };
ps = all-profiles { inherit (backend) services-config; };

profileNix = ps.value."${profileName}"
or (throw "No such profile: ${profileName}; Known profiles: ${toString (__attrNames ps.value)}");
Expand Down
2 changes: 1 addition & 1 deletion nix/workbench/docker.nix
Expand Up @@ -51,7 +51,7 @@ let

all-profiles =
workbench.all-profiles
{ inherit backend; };
{ inherit (backend) services-config; };
in
{
inherit cacheDir stateDir basePort;
Expand Down
2 changes: 1 addition & 1 deletion nix/workbench/supervisor.nix
Expand Up @@ -51,7 +51,7 @@ let

all-profiles =
workbench.all-profiles
{ inherit backend; };
{ inherit (backend) services-config; };
in
{
inherit cacheDir stateDir basePort;
Expand Down

0 comments on commit fdc2692

Please sign in to comment.