colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resholve: fix CLI tests

Browse Source
This commit is contained in:
Thiago Kenji Okada 2023-01-10 21:50:29 +00:00
parent 03ab899a45
commit 1d77a86904
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/misc/resholve/default.nix
View File

@ -33,18 +33,22 @@ let
deps = callPackage ./deps.nix { }; deps = callPackage ./deps.nix { };
in in
rec { rec {
# not exposed in all-packages
resholveBuildTimeOnly = removeKnownVulnerabilities resholve;
# resholve itself # resholve itself
resholve = callPackage ./resholve.nix { resholve = callPackage ./resholve.nix {
inherit (source) rSrc version; inherit (source) rSrc version;
inherit (deps.oil) oildev; inherit (deps.oil) oildev;
inherit (deps) configargparse; inherit (deps) configargparse;
inherit resholve-utils; inherit resholve-utils;
# used only in tests
resholve = resholveBuildTimeOnly;
}; };
# funcs to validate and phrase invocations of resholve # funcs to validate and phrase invocations of resholve
# and use those invocations to build packages # and use those invocations to build packages
resholve-utils = callPackage ./resholve-utils.nix { resholve-utils = callPackage ./resholve-utils.nix {
# we can still use resholve-utils without triggering a security warn # we can still use resholve-utils without triggering a security warn
# this is safe since we will only use `resholve` at build time # this is safe since we will only use `resholve` at build time
resholve = removeKnownVulnerabilities resholve; resholve = resholveBuildTimeOnly;
}; };
} }

3
pkgs/development/misc/resholve/resholve.nix
View File

@ -8,6 +8,7 @@
, oildev , oildev
, configargparse , configargparse
, binlore , binlore
, resholve
, resholve-utils , resholve-utils
}: }:
@ -41,7 +42,7 @@ python27.pkgs.buildPythonApplication {
passthru = { passthru = {
inherit (resholve-utils) mkDerivation phraseSolution writeScript writeScriptBin; inherit (resholve-utils) mkDerivation phraseSolution writeScript writeScriptBin;
tests = callPackage ./test.nix { inherit rSrc binlore python27; }; tests = callPackage ./test.nix { inherit rSrc binlore python27 resholve; };
}; };
meta = with lib; { meta = with lib; {