@@ -21,10 +21,17 @@
2121, rSrc
2222, runDemo ? false
2323, binlore
24+, sqlite
25+, util-linux
26+, gawk
27+, rlwrap
28+, gnutar
29+, bc
2430}:
2531
2632let
27−
33+ default_packages = [ bash file findutils gettext ];
34+ parsed_packages = [ coreutils sqlite util-linux gnused gawk findutils rlwrap gnutar bc ];
2835in
2936rec {
3037 re_shunit2 = with shunit2;
@@ -56,9 +63,6 @@ rec {
5663 "/usr/bin/od" = true;
5764 };
5865 keep = {
59− # dynamically defined in shunit2:_shunit_mktempFunc
60− eval = [ "shunit_condition_" "_shunit_test_" "_shunit_prepForSourcing" ];
61−
6266 # variables invoked as commands; long-term goal is to
6367 # resolve the *variable*, but that is complexish, so
6468 # this is where we are...
@@ -166,13 +170,14 @@ rec {
166170 # LOGLEVEL="DEBUG";
167171
168172 # default path
169− RESHOLVE_PATH = "${lib.makeBinPath [ bash file findutils gettext ]}";
173+ RESHOLVE_PATH = "${lib.makeBinPath default_packages}";
170174 # but separate packages for combining as needed
171175 PKG_FILE = "${lib.makeBinPath [ file ]}";
172176 PKG_FINDUTILS = "${lib.makeBinPath [ findutils ]}";
173177 PKG_GETTEXT = "${lib.makeBinPath [ gettext ]}";
174178 PKG_COREUTILS = "${lib.makeBinPath [ coreutils ]}";
175− RESHOLVE_LORE = "${binlore.collect { drvs = [ bash file findutils gettext coreutils ]; } }";
179+ RESHOLVE_LORE = "${binlore.collect { drvs = default_packages ++ [ coreutils ] ++ parsed_packages; } }";
180+ PKG_PARSED = "${lib.makeBinPath parsed_packages}";
176181
177182 # explicit interpreter for demo suite; maybe some better way...
178183 INTERP = "${bash}/bin/bash";