Merge pull request #245785 from lopsided98/writers-callpackages

writers: use `callPackages` to import sub-groups of writers

pkgs/build-support/writers/data.nix

@@ -1,4 +1,4 @@
-{ lib, runCommandNoCC, dasel }:
+{ lib, runCommand, dasel }:
 let
   daselBin = lib.getExe dasel;
 
@@ -28,7 +28,7 @@ rec {
     let
       name = last (builtins.split "/" nameOrPath);
     in
-    runCommandNoCC name
+    runCommand name
       {
         input = input data;
         passAsFile = [ "input" ];

pkgs/build-support/writers/default.nix

@@ -1,17 +1,13 @@
-{ pkgs, config, lib }:
+{ config, lib, callPackages }:
 
 let
   aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};
 
   # Writers for JSON-like data structures
-  dataWriters = import ./data.nix {
-    inherit lib; inherit (pkgs) runCommandNoCC dasel;
-  };
+  dataWriters = callPackages ./data.nix { };
 
   # Writers for scripts
-  scriptWriters = import ./scripts.nix {
-    inherit lib pkgs;
-  };
+  scriptWriters = callPackages ./scripts.nix { };
 
   writers = scriptWriters // dataWriters;
 in

pkgs/build-support/writers/scripts.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib }:
+{ pkgs, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }:
 let
   inherit (lib)
     concatMapStringsSep
@@ -10,15 +10,6 @@ let
     strings
     types
     ;
-
-  inherit (pkgs)
-    buildPackages
-    gixy
-    libiconv
-    mkNugetDeps
-    mkNugetSource
-    stdenv
-    ;
 in
 rec {
   # Base implementation for non-compiled executables.