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

radare2: 2.9.0 -> 3.0.0, fix to use deps we provide #48581

Merged
merged 4 commits into from Oct 17, 2018
Merged

radare2: 2.9.0 -> 3.0.0, fix to use deps we provide #48581

merged 4 commits into from Oct 17, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Oct 16, 2018

  • 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@dtzWill
radare2: 2.9.0 -> 3.0.0
56ef6ee
@dtzWill
radare2: libuv and actually use deps we're providing
f88957d 
Particularly openssl and zlib.
There are others we may wish to provide but for now
let's at least use the ones in buildInputs :).
@dtzWill
r2-for-cutter: revert accidental change to version info
6fdc165
@dtzWill dtzWill requested a review from Mic92 October 16, 2018 17:36
@dtzWill
Copy link
Member Author

dtzWill commented Oct 16, 2018

Cutter updated in #48582 .

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: radare2

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 aarch64-linux (full log)

Attempted: radare2

Partial log (click to expand)

shrinking /nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0/lib/libr_socket.so.3.0.0
shrinking /nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0/lib/libr_crypto.so.3.0.0
shrinking /nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0/lib/libr_hash.so.3.0.0
shrinking /nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0/lib/libr_util.so.3.0.0
gzipping man pages under /nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0/lib  /nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0/bin
patching script interpreter paths in /nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0
/nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0/bin/r2pm: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0...

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: radare2

Partial log (click to expand)

shrinking /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin/radiff2
shrinking /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin/radare2
shrinking /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin/rasm2
shrinking /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin/rahash2
gzipping man pages under /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/lib  /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin
patching script interpreter paths in /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0
/nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin/r2pm: interpreter directive changed from "/bin/sh" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0...

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: r2-for-cutter, radare2

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 aarch64-linux (full log)

Attempted: r2-for-cutter, radare2

Partial log (click to expand)

shrinking /nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14/lib/libr_hash.so.2.9.0-git
shrinking /nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14/lib/libr_util.so.2.9.0-git
gzipping man pages under /nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14/lib  /nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14/bin
patching script interpreter paths in /nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14
/nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14/bin/r2pm: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14...
/nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14
/nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: r2-for-cutter, radare2

Partial log (click to expand)

shrinking /nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14/bin/radiff2
shrinking /nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14/bin/radare2
shrinking /nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14/bin/rasm2
shrinking /nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14/bin/rahash2
gzipping man pages under /nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14/lib  /nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14/bin
patching script interpreter paths in /nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14
/nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14/bin/r2pm: interpreter directive changed from "/bin/sh" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14...

@dtzWill
radare2: fix update script to handle invocation from elsewhere
26dfc0c 
It looks like `with Path:` is supposed to be a context-manager
for changing directory but it doesn't seem to work and the only
way I've found to make that work is if we made our own and annotated it.

Instead just use nix search path to tell the expression where
to find the file it looks for.

Also re-use SCRIPT_DIR elsewhere instead of re-"computing" it.
@dtzWill
Copy link
Member Author

dtzWill commented Oct 16, 2018

Small fix for the update script too while visiting this code :).

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: r2-for-cutter, radare2

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 aarch64-linux (full log)

Attempted: r2-for-cutter, radare2

Partial log (click to expand)

/nix/store/lykcpvxrgpladb3d7z8ci2f8502cq5px-radare2-2018-08-14
/nix/store/087bm04fps8avkh88vzp5chyxxqy32fb-radare2-3.0.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: r2-for-cutter, radare2

Partial log (click to expand)

shrinking /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin/r2agent
shrinking /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin/rahash2
/nix/store/fck8hn8v64c19w7n5il1nvss9blx994k-radare2-2018-08-14
gzipping man pages under /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
/nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0
stripping (with command strip and flags -S) in /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/lib  /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin
patching script interpreter paths in /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0
/nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0/bin/r2pm: interpreter directive changed from "/bin/sh" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/0ir3wnwcdl62la5fvria8229xwcwgh1i-radare2-3.0.0...

@Mic92 Mic92 merged commit 35c037c into NixOS:master Oct 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Awaiting requested review from Mic92

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @GrahamcOfBorg @Mic92