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.

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

diffoscope: 148 -> 150 #91713

Merged
merged 1 commit into from Jul 6, 2020
Merged

diffoscope: 148 -> 150 #91713

merged 1 commit into from Jul 6, 2020

Conversation

delroth
Copy link
Contributor

@delroth delroth commented Jun 28, 2020

Motivation for this change

Note that diffoscope is currently broken on master, and this bump only addresses part of the breakage. The other part is in #91711 which unfortunately needs to land in staging. This PR + #91711 together combine into a working (again) diffoscope on NixOS.

Things done
  • 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.

@Ma27
Copy link
Member

Ma27 commented Jun 28, 2020

A few more tests are failing for me:

diffoscope> result = None, func = <_FuncPtr object at 0x7ffff5ccaa00>
diffoscope> args = (12385872, b'/build/diffoscope-149/tests/data/hello1.wasm')
diffoscope> def errorcheck_null(result, func, args):
diffoscope> if result is None:
diffoscope> err = magic_error(args[0])
diffoscope> >           raise MagicException(err)
diffoscope> E           magic.MagicException: b"Bad magic format `version %#x (MVP)' (bad format char: #)"
diffoscope> /nix/store/cpijcjhlxl95kjsj8iq3xh8jgjl0q6dn-python3.8-python-magic-0.4.18/lib/python3.8/site-packages/magic.py:209: MagicException
diffoscope> =========================== short test summary info ============================
diffoscope> ERROR tests/comparators/test_wasm.py::test_identification - magic.MagicExcept...
diffoscope> ERROR tests/comparators/test_wasm.py::test_no_differences - magic.MagicExcept...
diffoscope> ============ 349 passed, 99 skipped, 2 errors in 103.55s (0:01:43) =============

@delroth
Copy link
Contributor Author

delroth commented Jun 28, 2020

Yes, see PR description :)

@Ma27
Copy link
Member

Ma27 commented Jun 28, 2020

Ahh right, sorry.

@danieldk
Copy link
Contributor

Since #91711 has landed:

@ofborg build diffoscope

@danieldk
Copy link
Contributor

Never mind, didn't notice that that goes through staging.

@vcunat
Copy link
Member

vcunat commented Jun 29, 2020

Well, you can retarget this at staging (or staging-next after the change gets there).

@grahamc
Copy link
Member

grahamc commented Jul 6, 2020

@ofborg build diffoscope

@vcunat
Copy link
Member

vcunat commented Jul 6, 2020

The prerequisite is not in master yet – staging-next ATM.

@delroth delroth changed the title diffoscope: 148 -> 149 diffoscope: 148 -> 150 Jul 6, 2020
@delroth
Copy link
Contributor Author

delroth commented Jul 6, 2020

I dropped the custom patch and just bumped to 150 instead.

@grahamc grahamc merged commit 8d2179a into NixOS:master Jul 6, 2020
@raboof
Copy link
Member

raboof commented Jul 10, 2020

(I can confirm diffoscope works again for me when I use staging with 8b9e7fd cherry-picked on top)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants