BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #145586 from abathur/resholve_0.6.7

Browse source 
resholve: 0.6.6 -> 0.6.8
This commit is contained in:
Thiago Kenji Okada 2021-11-12 12:05:22 -03:00 committed by GitHub
commit 2ffe7421ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/misc/resholve/source.nix
View file

@ -3,7 +3,7 @@
}: }:
rec { rec {
version = "0.6.6"; version = "0.6.8";
rSrc = rSrc =
# local build -> `make ci`; `make clean` to restore # local build -> `make ci`; `make clean` to restore
# return to remote source # return to remote source
@ -14,6 +14,6 @@ rec {
owner = "abathur"; owner = "abathur";
repo = "resholve"; repo = "resholve";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-bupf3c9tNPAEMzFEDcvg483bSiwZFuB3ZqveG89dgkE="; hash = "sha256-1bb22GcOIzmQ31ULZuNNCJ8Vcz4Y0+qAhsJ9PhbqnDM=";
}; };
} }

17
pkgs/development/misc/resholve/test.nix
View file

@ -21,10 +21,17 @@
, rSrc , rSrc
, runDemo ? false , runDemo ? false
, binlore , binlore
, sqlite
, util-linux
, gawk
, rlwrap
, gnutar
, bc
}: }:
let let
default_packages = [ bash file findutils gettext ];
parsed_packages = [ coreutils sqlite util-linux gnused gawk findutils rlwrap gnutar bc ];
in in
rec { rec {
re_shunit2 = with shunit2; re_shunit2 = with shunit2;
@ -56,9 +63,6 @@ rec {
"/usr/bin/od" = true; "/usr/bin/od" = true;
}; };
keep = { keep = {
# dynamically defined in shunit2:_shunit_mktempFunc
eval = [ "shunit_condition_" "_shunit_test_" "_shunit_prepForSourcing" ];
# variables invoked as commands; long-term goal is to # variables invoked as commands; long-term goal is to
# resolve the *variable*, but that is complexish, so # resolve the *variable*, but that is complexish, so
# this is where we are... # this is where we are...
@ -166,13 +170,14 @@ rec {
# LOGLEVEL="DEBUG"; # LOGLEVEL="DEBUG";
# default path # default path
RESHOLVE_PATH = "${lib.makeBinPath [ bash file findutils gettext ]}"; RESHOLVE_PATH = "${lib.makeBinPath default_packages}";
# but separate packages for combining as needed # but separate packages for combining as needed
PKG_FILE = "${lib.makeBinPath [ file ]}"; PKG_FILE = "${lib.makeBinPath [ file ]}";
PKG_FINDUTILS = "${lib.makeBinPath [ findutils ]}"; PKG_FINDUTILS = "${lib.makeBinPath [ findutils ]}";
PKG_GETTEXT = "${lib.makeBinPath [ gettext ]}"; PKG_GETTEXT = "${lib.makeBinPath [ gettext ]}";
PKG_COREUTILS = "${lib.makeBinPath [ coreutils ]}"; 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... # explicit interpreter for demo suite; maybe some better way...
INTERP = "${bash}/bin/bash"; INTERP = "${bash}/bin/bash";