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

Merge pull request #114681 from abathur/hammering/bashup-events 

bashup-events: fix nixpkgs-hammering warnings
This commit is contained in:
Sandro 2021-02-28 19:00:12 +01:00 committed by GitHub
parent da653923e1 1b9a5b3f9f
commit 7012a7be42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/bashup-events/generic.nix
View File

@ -1,8 +1,6 @@
{ {
# general # general
lib lib
, callPackage
, runCommand
, resholvePackage , resholvePackage
, bash , bash
, shellcheck , shellcheck
@ -46,7 +44,9 @@ resholvePackage rec {
inherit src; inherit src;
installPhase = '' installPhase = ''
runHook preInstall
install -Dt $out/bin bashup.events install -Dt $out/bin bashup.events
runHook postInstall
''; '';
inherit doCheck; inherit doCheck;
@ -54,9 +54,11 @@ resholvePackage rec {
# check based on https://github.com/bashup/events/blob/master/.dkrc # check based on https://github.com/bashup/events/blob/master/.dkrc
checkPhase = '' checkPhase = ''
runHook preCheck
SHELLCHECK_OPTS='-e SC2016,SC2145' ${shellcheck}/bin/shellcheck ./bashup.events SHELLCHECK_OPTS='-e SC2016,SC2145' ${shellcheck}/bin/shellcheck ./bashup.events
${bash}/bin/bash -n ./bashup.events ${bash}/bin/bash -n ./bashup.events
${bash}/bin/bash ./bashup.events ${bash}/bin/bash ./bashup.events
runHook postCheck
''; '';
solutions = { solutions = {
@ -70,7 +72,11 @@ resholvePackage rec {
inherit doInstallCheck; inherit doInstallCheck;
installCheckInputs = [ bash ]; installCheckInputs = [ bash ];
installCheckPhase = installCheck "${bash}/bin/bash"; installCheckPhase = ''
runHook preInstallCheck
${installCheck "${bash}/bin/bash"}
runHook postInstallCheck
'';
meta = with lib; { meta = with lib; {
inherit branch; inherit branch;