File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -70,15 +70,19 @@ rec {
7070
7171 nixpkgsOverlay = callPackage ./nix/nixpkgs-overlay.nix { inherit searcher ; } ;
7272
73- importChannel = maybeBootstrap : name : value :
73+ importChannel = {
74+ bootstrapNixpkgs ? null ,
75+ nixpkgsConfig ? { } ,
76+ channel
77+ } :
7478 let
75- imported = import value ;
79+ imported = import channel ;
7680 overlays = [ nixpkgsOverlay ] ;
7781 in
7882 # Import codedown-languages
79- if ( builtins . isFunction imported && builtins . hasAttr "isCodeDown" ( builtins . functionArgs imported ) ) then imported ( { inherit system ; } // lib . optionalAttrs ( maybeBootstrap != null ) { inherit ( maybeBootstrap ) fetchFromGitHub ; } )
83+ if ( builtins . isFunction imported && builtins . hasAttr "isCodeDown" ( builtins . functionArgs imported ) ) then imported ( { inherit system ; } // lib . optionalAttrs ( bootstrapNixpkgs != null ) { inherit ( bootstrapNixpkgs ) fetchFromGitHub ; } )
8084 # Import Nixpkgs
81- else if ( builtins . isFunction imported && builtins . hasAttr "overlays" ( builtins . functionArgs imported ) ) then imported { inherit overlays system ; }
85+ else if ( builtins . isFunction imported && builtins . hasAttr "overlays" ( builtins . functionArgs imported ) ) then imported { inherit overlays system ; config = nixpkgsConfig ; }
8286 # Generic import
8387 else if ( builtins . isFunction imported ) then imported { inherit system ; }
8488 else imported
You can’t perform that action at this time.
0 commit comments