Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

stig: use pytestCheckHook framework #85364

Merged
merged 1 commit into from
Apr 24, 2020
Merged

stig: use pytestCheckHook framework #85364

merged 1 commit into from
Apr 24, 2020
+15 −9

Conversation

ju1m
Copy link
Contributor

@ju1m ju1m commented Apr 16, 2020 •
edited
Loading

Motivation for this change

Current package for ˋstigˋ overrides ˋcheckPhaseˋ hence setting ˋdoInstallCheck = falseˋ is ignored.

Things done

Use the ˋpytestCheckHookˋ framework.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 16, 2020
Mic92
Mic92 reviewed Apr 16, 2020
View reviewed changes
pkgs/applications/networking/p2p/stig/default.nix Outdated

preCheck = ''
export LC_ALL=C
export HOME=$(mktemp -d)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
export HOME=$(mktemp -d)
export HOME=$TMPDIR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The manual suggests HOME=$(mkdir -d), but both can be found in nixpkgs.
However I introduced it before setting dontUseSetuptoolsCheck = true; when I hit the following error:

Can't create directory /homeless-shelter/.local/share/stig/histories: Permission denied

But with dontUseSetuptoolsCheck = true; it doesn't fail, so let's remove it I guess.

@ju1m ju1m changed the title stig: fix checkPhase stig: use pytestCheckHook framework Apr 16, 2020
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 16, 2020
@ofborg ofborg bot requested a review from doronbehar April 16, 2020 10:46
doronbehar
doronbehar requested changes Apr 16, 2020
View reviewed changes
Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides that, builds and runs fine for me.

@ju1m
stig: use pytestCheckHook

Verified

This commit was signed with the committer’s verified signature.
turboMaCk Marek Fajkus
GPG key ID: 95585219BA6FE2CC
Verified
Learn about vigilant mode
f384a0e
@ju1m
Copy link
Contributor Author

ju1m commented Apr 16, 2020

Thanks @doronbehar.
Also, FYI, I've asked upstream for a new release (last one dates back to 2018). rndusr/stig#133

@ofborg ofborg bot requested a review from doronbehar April 16, 2020 16:30
@veprbl veprbl merged commit 3fe7332 into NixOS:master Apr 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92

@doronbehar doronbehar

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ju1m @Mic92 @doronbehar @veprbl