Skip to content

osquery: 3.2.2 -> 3.2.8#42164

Merged
adisbladis merged 1 commit intoNixOS:masterfrom
Ma27:bump-osquery
Jun 18, 2018
Merged

osquery: 3.2.2 -> 3.2.8#42164
adisbladis merged 1 commit intoNixOS:masterfrom
Ma27:bump-osquery

Conversation

@Ma27
Copy link
Member

@Ma27 Ma27 commented Jun 18, 2018

Motivation for this change

The 3.2.2 build fails ATM on Hydra: https://hydra.nixos.org/build/75998362

Bumping to 3.2.8 and rebasing osquery/CMakeLists.txt with misc.patch
fixes the issue. Additionally the NixOS test remains functional.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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.

The 3.2.2 build fails ATM on Hydra: https://hydra.nixos.org/build/75998362

Bumping to 3.2.8 and rebasing `osquery/CMakeLists.txt` with `misc.patch`
fixes the issue. Additionally the NixOS test remains functional.
@adisbladis
Copy link
Member

@GrahamcOfBorg test osquery

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: tests.osquery

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 18, 2018
@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: osquery

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: osquery

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/4r8zwdmbdiqmi1r4i27ila0mwp7kjak7-osquery-3.2.8
shrinking /nix/store/4r8zwdmbdiqmi1r4i27ila0mwp7kjak7-osquery-3.2.8/bin/osqueryd
shrinking /nix/store/4r8zwdmbdiqmi1r4i27ila0mwp7kjak7-osquery-3.2.8/bin/osqueryi
strip is /nix/store/4mf2xm9p32lzrim927yk92xhx35yaz62-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/4r8zwdmbdiqmi1r4i27ila0mwp7kjak7-osquery-3.2.8/bin
patching script interpreter paths in /nix/store/4r8zwdmbdiqmi1r4i27ila0mwp7kjak7-osquery-3.2.8
/nix/store/4r8zwdmbdiqmi1r4i27ila0mwp7kjak7-osquery-3.2.8/etc/init.d/osqueryd: interpreter directive changed from "/bin/sh" to "/nix/store/0aa1ngxygf1iqanfbpdb10klc7r343c0-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/4r8zwdmbdiqmi1r4i27ila0mwp7kjak7-osquery-3.2.8...
/nix/store/4r8zwdmbdiqmi1r4i27ila0mwp7kjak7-osquery-3.2.8

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.osquery

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 14.66s
cleaning up
killing machine (pid 593)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/acaz9xww4asxnnm25csk2wa0qplfrmwq-vm-test-run-osquery

@adisbladis
Copy link
Member

LGTM. Thanks!

@adisbladis adisbladis merged commit 22f818d into NixOS:master Jun 18, 2018
@Ma27 Ma27 deleted the bump-osquery branch June 18, 2018 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants