Skip to content

Commit 55d3c31

Browse files
committedJan 19, 2025
Name 'source-repository-packages' to make them overridable
1 parent c8cbb96 commit 55d3c31

File tree

1 file changed

+14
-21
lines changed

1 file changed

+14
-21
lines changed
 

‎modules/common.nix

+14-21
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ with lib;
230230

231231
source-repository-packages-driver = mkOption {
232232
type = types.attrs;
233-
default = (import ../libs/cabal.nix { inherit pkgs; }).source-repository-packages config.source-repository-packages;
233+
default = (import ../libs/cabal.nix { inherit pkgs; }).source-repository-packages (attrValues config.source-repository-packages);
234234
defaultText = literalMD ''
235235
```
236236
(import ../libs/cabal.nix { inherit pkgs; }).source-repository-packages config.source-repository-packages;
@@ -240,28 +240,21 @@ with lib;
240240
};
241241

242242
source-repository-packages = mkOption {
243-
type = types.nullOr (types.listOf (types.either types.path types.attrs));
244-
default = null;
243+
type = types.attrsOf (types.either types.path types.attrs);
244+
default = {};
245245
example = literalMD ''
246246
```
247-
[
248-
(deps.obelisk + "/lib/executable-config/inject")
249-
(deps.obelisk + "/lib/executable-config/lookup")
250-
(deps.obelisk + "/lib/frontend")
251-
(deps.obelisk + "/lib/route")
252-
(deps.obelisk + "/lib/tabulation")
253-
{ src = deps.obelisk + "/lib/asset/manifest"; condition = "!arch(javascript)"; }
254-
{ src = deps.obelisk + "/lib/asset/serve-snap"; condition = "!arch(javascript)"; }
255-
{ src = deps.obelisk + "/lib/backend"; condition = "!arch(javascript)"; }
256-
{ src = deps.obelisk + "/lib/command"; condition = "!arch(javascript)"; }
257-
{ src = deps.obelisk + "/lib/run"; condition = "!arch(javascript)"; }
258-
{ src = deps.obelisk + "/lib/selftest"; condition = "!arch(javascript)"; }
259-
{ src = deps.obelisk + "/lib/snap-extras"; condition = "!arch(javascript)"; }
260-
261-
(deps.reflex-dom + "/reflex-dom")
262-
(deps.reflex-dom + "/reflex-dom-core")
263-
deps.reflex
264-
]
247+
{
248+
obelisk-frontend = deps.obelisk + "/lib/frontend";
249+
obelisk-backend = {
250+
src = deps.obelisk + "/lib/backend";
251+
condition = "!arch(javascript)";
252+
};
253+
254+
reflex-dom = deps.reflex-dom + "/reflex-dom";
255+
reflex-dom-core = deps.reflex-dom + "/reflex-dom-core";
256+
reflex = deps.reflex;
257+
}
265258
```
266259
'';
267260
};

0 commit comments

Comments
 (0)
Please sign in to comment.