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

tmpdir audit: only fail with files referenced below #35068

Merged
merged 1 commit into from
Nov 16, 2018
Merged

tmpdir audit: only fail with files referenced below #35068

merged 1 commit into from
Nov 16, 2018
+5 −5

Conversation

zimbatm
Copy link
Member

@zimbatm zimbatm commented Feb 17, 2018

Motivation for this change

On Linux the $TMPDIR is /build. The TMPDIR audit looks for $TMPDIR
in the build output, which will then fail with packages like
/buildkite-agent.

This fixes the heuristic to look for $TMPDIR/ instead.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@zimbatm zimbatm requested a review from edolstra February 17, 2018 09:34
@zimbatm zimbatm requested a review from Ericson2314 as a code owner February 17, 2018 09:34
@zimbatm zimbatm changed the base branch from master to staging February 24, 2018 19:54
@zimbatm zimbatm force-pushed the stricted-tmpdir-audit branch from febbcc3 to 5d6c965 Compare November 16, 2018 21:34
@zimbatm
tmpdir audit: only fail with files referenced below
f068e4b 
On Linux the `$TMPDIR` is `/build`. The TMPDIR audit looks for `$TMPDIR`
in the build output, which will then fail with packages like
/buildkite-agent.

This fixes the heuristic to look for `$TMPDIR/` instead.
@zimbatm zimbatm force-pushed the stricted-tmpdir-audit branch from 5d6c965 to f068e4b Compare November 16, 2018 21:35
@zimbatm zimbatm merged commit 551aecf into NixOS:staging Nov 16, 2018
@zimbatm zimbatm deleted the stricted-tmpdir-audit branch November 16, 2018 21:36
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-linux-stdenv This PR causes stdenv to rebuild 10.rebuild-darwin: 1-10 10.rebuild-linux: 501+ labels Nov 16, 2018
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Nov 16, 2018
@dtzWill
Revert "tmpdir audit: only fail with files referenced below (NixOS#35068
371c572 
)"

This reverts commit 551aecf.
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Nov 17, 2018
@dtzWill
Revert "Revert "tmpdir audit: only fail with files referenced below (N…
a4e6d33 
…ixOS#35068)""

This reverts commit 371c572.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314

@edolstra edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zimbatm @Ericson2314 @GrahamcOfBorg