lol

writers: use callPackages to import sub-groups of writers

Use callPackages instead of plain import to get proper splicing. Without this,
writeNginxConfig fails when cross-compiling.

+4 -17
+3 -7
pkgs/build-support/writers/default.nix
··· 1 - { pkgs, config, lib }: 2 3 let 4 aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {}; 5 6 # Writers for JSON-like data structures 7 - dataWriters = import ./data.nix { 8 - inherit lib; inherit (pkgs) runCommandNoCC dasel; 9 - }; 10 11 # Writers for scripts 12 - scriptWriters = import ./scripts.nix { 13 - inherit lib pkgs; 14 - }; 15 16 writers = scriptWriters // dataWriters; 17 in
··· 1 + { config, lib, callPackages }: 2 3 let 4 aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {}; 5 6 # Writers for JSON-like data structures 7 + dataWriters = callPackages ./data.nix { }; 8 9 # Writers for scripts 10 + scriptWriters = callPackages ./scripts.nix { }; 11 12 writers = scriptWriters // dataWriters; 13 in
+1 -10
pkgs/build-support/writers/scripts.nix
··· 1 - { pkgs, lib }: 2 let 3 inherit (lib) 4 concatMapStringsSep ··· 9 stringLength 10 strings 11 types 12 - ; 13 - 14 - inherit (pkgs) 15 - buildPackages 16 - gixy 17 - libiconv 18 - mkNugetDeps 19 - mkNugetSource 20 - stdenv 21 ; 22 in 23 rec {
··· 1 + { pkgs, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }: 2 let 3 inherit (lib) 4 concatMapStringsSep ··· 9 stringLength 10 strings 11 types 12 ; 13 in 14 rec {