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

diffoscope: 98 -> 99 #43769

Merged
merged 3 commits into from Jul 18, 2018
Merged

diffoscope: 98 -> 99 #43769

merged 3 commits into from Jul 18, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jul 18, 2018

Version bump.

  • 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
Copy link
Member Author

dtzWill commented Jul 18, 2018

https://salsa.debian.org/reproducible-builds/diffoscope/commit/0cb74c0974bf05534882b23fbddf22b4fc4402c6 I think?

Also:
http://metadata.ftp-master.debian.org/changelogs/main/d/diffoscope/diffoscope_99_changelog

@dezgeg
Copy link
Contributor

dezgeg commented Jul 18, 2018

Does pkgs/tools/misc/diffoscope/list-tools.sh list new things to be added as tools?

@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: diffoscope

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: diffoscope

Partial log (click to expand)

make: Leaving directory '/build/diffoscope/doc'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ww2bymwd4j0h514i0dm6bqihd8q75jzc-diffoscope-99
gzipping man pages under /nix/store/ww2bymwd4j0h514i0dm6bqihd8q75jzc-diffoscope-99/share/man/
strip is /nix/store/7iyn7gn33i7xxjgmwf25k20246y6nd9d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ww2bymwd4j0h514i0dm6bqihd8q75jzc-diffoscope-99/lib  /nix/store/ww2bymwd4j0h514i0dm6bqihd8q75jzc-diffoscope-99/bin
patching script interpreter paths in /nix/store/ww2bymwd4j0h514i0dm6bqihd8q75jzc-diffoscope-99
checking for references to /build in /nix/store/ww2bymwd4j0h514i0dm6bqihd8q75jzc-diffoscope-99...
wrapping `/nix/store/ww2bymwd4j0h514i0dm6bqihd8q75jzc-diffoscope-99/bin/diffoscope'...
/nix/store/ww2bymwd4j0h514i0dm6bqihd8q75jzc-diffoscope-99

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: diffoscope

Partial log (click to expand)

make: Leaving directory '/build/diffoscope/doc'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/s4h3969y5f4mkl6fw0fz2f0b5wakmk5l-diffoscope-99
gzipping man pages under /nix/store/s4h3969y5f4mkl6fw0fz2f0b5wakmk5l-diffoscope-99/share/man/
strip is /nix/store/90vmpr41dzsx350k5argycaf693hnl1l-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/s4h3969y5f4mkl6fw0fz2f0b5wakmk5l-diffoscope-99/lib  /nix/store/s4h3969y5f4mkl6fw0fz2f0b5wakmk5l-diffoscope-99/bin
patching script interpreter paths in /nix/store/s4h3969y5f4mkl6fw0fz2f0b5wakmk5l-diffoscope-99
checking for references to /build in /nix/store/s4h3969y5f4mkl6fw0fz2f0b5wakmk5l-diffoscope-99...
wrapping `/nix/store/s4h3969y5f4mkl6fw0fz2f0b5wakmk5l-diffoscope-99/bin/diffoscope'...
/nix/store/s4h3969y5f4mkl6fw0fz2f0b5wakmk5l-diffoscope-99

@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: diffoscope

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: diffoscope

Partial log (click to expand)

make: Leaving directory '/build/diffoscope/doc'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/mx25vpyd77pcix5kzvdhp0ybp1msh2mi-diffoscope-99
gzipping man pages under /nix/store/mx25vpyd77pcix5kzvdhp0ybp1msh2mi-diffoscope-99/share/man/
strip is /nix/store/7iyn7gn33i7xxjgmwf25k20246y6nd9d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/mx25vpyd77pcix5kzvdhp0ybp1msh2mi-diffoscope-99/lib  /nix/store/mx25vpyd77pcix5kzvdhp0ybp1msh2mi-diffoscope-99/bin
patching script interpreter paths in /nix/store/mx25vpyd77pcix5kzvdhp0ybp1msh2mi-diffoscope-99
checking for references to /build in /nix/store/mx25vpyd77pcix5kzvdhp0ybp1msh2mi-diffoscope-99...
wrapping `/nix/store/mx25vpyd77pcix5kzvdhp0ybp1msh2mi-diffoscope-99/bin/diffoscope'...
/nix/store/mx25vpyd77pcix5kzvdhp0ybp1msh2mi-diffoscope-99

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: diffoscope

Partial log (click to expand)

make: Leaving directory '/build/diffoscope/doc'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/497blvagggc10kcs2ighp0f7wrvpjy75-diffoscope-99
gzipping man pages under /nix/store/497blvagggc10kcs2ighp0f7wrvpjy75-diffoscope-99/share/man/
strip is /nix/store/90vmpr41dzsx350k5argycaf693hnl1l-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/497blvagggc10kcs2ighp0f7wrvpjy75-diffoscope-99/lib  /nix/store/497blvagggc10kcs2ighp0f7wrvpjy75-diffoscope-99/bin
patching script interpreter paths in /nix/store/497blvagggc10kcs2ighp0f7wrvpjy75-diffoscope-99
checking for references to /build in /nix/store/497blvagggc10kcs2ighp0f7wrvpjy75-diffoscope-99...
wrapping `/nix/store/497blvagggc10kcs2ighp0f7wrvpjy75-diffoscope-99/bin/diffoscope'...
/nix/store/497blvagggc10kcs2ighp0f7wrvpjy75-diffoscope-99

@dtzWill
diffoscope: fix manpage generation
dcf154e 
Was already broken, not sure for how long.

Without this the tool fails to run,
so help2man ends up producing an empty file.
@dtzWill
Copy link
Member Author

dtzWill commented Jul 18, 2018 •
edited

Does pkgs/tools/misc/diffoscope/list-tools.sh list new things to be added as tools?

D'oh i forgot about that. Was using the resulting tool's "--list-tools".

And.. nope! Same before/after! :)

EDIT: and if I revert the "add lz4" commit, it appears in the output, so looks good! :)

@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: diffoscope

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: diffoscope

Partial log (click to expand)

make: Leaving directory '/build/diffoscope/doc'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/km7psyq4jl6znbkk8gsgdidfjsaxc4hm-diffoscope-99
gzipping man pages under /nix/store/km7psyq4jl6znbkk8gsgdidfjsaxc4hm-diffoscope-99/share/man/
strip is /nix/store/7iyn7gn33i7xxjgmwf25k20246y6nd9d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/km7psyq4jl6znbkk8gsgdidfjsaxc4hm-diffoscope-99/lib  /nix/store/km7psyq4jl6znbkk8gsgdidfjsaxc4hm-diffoscope-99/bin
patching script interpreter paths in /nix/store/km7psyq4jl6znbkk8gsgdidfjsaxc4hm-diffoscope-99
checking for references to /build in /nix/store/km7psyq4jl6znbkk8gsgdidfjsaxc4hm-diffoscope-99...
wrapping `/nix/store/km7psyq4jl6znbkk8gsgdidfjsaxc4hm-diffoscope-99/bin/diffoscope'...
/nix/store/km7psyq4jl6znbkk8gsgdidfjsaxc4hm-diffoscope-99

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: diffoscope

Partial log (click to expand)

make: Leaving directory '/build/diffoscope/doc'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/3pjrc5ydb14h05vx2i2i3g0b7kzygyxc-diffoscope-99
gzipping man pages under /nix/store/3pjrc5ydb14h05vx2i2i3g0b7kzygyxc-diffoscope-99/share/man/
strip is /nix/store/90vmpr41dzsx350k5argycaf693hnl1l-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3pjrc5ydb14h05vx2i2i3g0b7kzygyxc-diffoscope-99/lib  /nix/store/3pjrc5ydb14h05vx2i2i3g0b7kzygyxc-diffoscope-99/bin
patching script interpreter paths in /nix/store/3pjrc5ydb14h05vx2i2i3g0b7kzygyxc-diffoscope-99
checking for references to /build in /nix/store/3pjrc5ydb14h05vx2i2i3g0b7kzygyxc-diffoscope-99...
wrapping `/nix/store/3pjrc5ydb14h05vx2i2i3g0b7kzygyxc-diffoscope-99/bin/diffoscope'...
/nix/store/3pjrc5ydb14h05vx2i2i3g0b7kzygyxc-diffoscope-99

@dezgeg
Copy link
Contributor

dezgeg commented Jul 18, 2018

Ok, great. Probably I should document the script so people actually know it exists :).

@dezgeg dezgeg merged commit 0a46f8c into NixOS:master Jul 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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 @dezgeg @GrahamcOfBorg