diff options
| author | Travis A. Everett <travis.a.everett@gmail.com> | 2021-11-11 21:10:45 -0600 |
|---|---|---|
| committer | Travis A. Everett <travis.a.everett@gmail.com> | 2021-11-12 00:24:36 -0600 |
| commit | 3b83eeb9033e6f400348a87e55ebe48935af9315 (patch) | |
| tree | 686acb94e16893aabdc0481957c6b0d7a09f1c65 /pkgs/development/misc | |
| parent | 77e7d796b838eae999b7649495770345b54825d2 (diff) | |
| download | nixpkgs-3b83eeb9033e6f400348a87e55ebe48935af9315.tar nixpkgs-3b83eeb9033e6f400348a87e55ebe48935af9315.tar.gz nixpkgs-3b83eeb9033e6f400348a87e55ebe48935af9315.tar.bz2 nixpkgs-3b83eeb9033e6f400348a87e55ebe48935af9315.tar.lz nixpkgs-3b83eeb9033e6f400348a87e55ebe48935af9315.tar.xz nixpkgs-3b83eeb9033e6f400348a87e55ebe48935af9315.tar.zst nixpkgs-3b83eeb9033e6f400348a87e55ebe48935af9315.zip | |
resholve: 0.6.6 -> 0.6.8
Diffstat (limited to 'pkgs/development/misc')
| -rw-r--r-- | pkgs/development/misc/resholve/source.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/misc/resholve/test.nix | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/development/misc/resholve/source.nix b/pkgs/development/misc/resholve/source.nix index 5633e90f4bb..046f9ffe24f 100644 --- a/pkgs/development/misc/resholve/source.nix +++ b/pkgs/development/misc/resholve/source.nix @@ -3,7 +3,7 @@ }: rec { - version = "0.6.6"; + version = "0.6.8"; rSrc = # local build -> `make ci`; `make clean` to restore # return to remote source @@ -14,6 +14,6 @@ rec { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-bupf3c9tNPAEMzFEDcvg483bSiwZFuB3ZqveG89dgkE="; + hash = "sha256-1bb22GcOIzmQ31ULZuNNCJ8Vcz4Y0+qAhsJ9PhbqnDM="; }; } diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index dd847462420..2c17cf2ea03 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -21,10 +21,17 @@ , rSrc , runDemo ? false , binlore +, sqlite +, util-linux +, gawk +, rlwrap +, gnutar +, bc }: let - + default_packages = [ bash file findutils gettext ]; + parsed_packages = [ coreutils sqlite util-linux gnused gawk findutils rlwrap gnutar bc ]; in rec { re_shunit2 = with shunit2; @@ -56,9 +63,6 @@ rec { "/usr/bin/od" = true; }; keep = { - # dynamically defined in shunit2:_shunit_mktempFunc - eval = [ "shunit_condition_" "_shunit_test_" "_shunit_prepForSourcing" ]; - # variables invoked as commands; long-term goal is to # resolve the *variable*, but that is complexish, so # this is where we are... @@ -166,13 +170,14 @@ rec { # LOGLEVEL="DEBUG"; # default path - RESHOLVE_PATH = "${lib.makeBinPath [ bash file findutils gettext ]}"; + RESHOLVE_PATH = "${lib.makeBinPath default_packages}"; # but separate packages for combining as needed PKG_FILE = "${lib.makeBinPath [ file ]}"; PKG_FINDUTILS = "${lib.makeBinPath [ findutils ]}"; PKG_GETTEXT = "${lib.makeBinPath [ gettext ]}"; PKG_COREUTILS = "${lib.makeBinPath [ coreutils ]}"; - RESHOLVE_LORE = "${binlore.collect { drvs = [ bash file findutils gettext coreutils ]; } }"; + RESHOLVE_LORE = "${binlore.collect { drvs = default_packages ++ [ coreutils ] ++ parsed_packages; } }"; + PKG_PARSED = "${lib.makeBinPath parsed_packages}"; # explicit interpreter for demo suite; maybe some better way... INTERP = "${bash}/bin/bash"; |