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

camlimages: fix regression #36476

Merged
merged 1 commit into from Mar 8, 2018
Merged

camlimages: fix regression #36476

merged 1 commit into from Mar 8, 2018

Conversation

mt-caret
Copy link
Contributor

@mt-caret mt-caret commented Mar 8, 2018

Motivation for this change

#36412 broke ocaml-ng.ocamlPackages_4_05.camlimages.
This fixes it.

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.

@vbgl
Copy link
Contributor

vbgl commented Mar 8, 2018

@GrahamcOfBorg build ocaml-ng.ocamlPackages_4_05.camlimages

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/djxk67q9mhicmrzsnxic196rkbpf0vkk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_exif.so
shrinking /nix/store/djxk67q9mhicmrzsnxic196rkbpf0vkk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_gif.so
shrinking /nix/store/djxk67q9mhicmrzsnxic196rkbpf0vkk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_jpeg.so
shrinking /nix/store/djxk67q9mhicmrzsnxic196rkbpf0vkk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_all_formats.so
shrinking /nix/store/djxk67q9mhicmrzsnxic196rkbpf0vkk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_png.so
shrinking /nix/store/djxk67q9mhicmrzsnxic196rkbpf0vkk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_tiff.so
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/djxk67q9mhicmrzsnxic196rkbpf0vkk-camlimages-4.1.2/lib 
patching script interpreter paths in /nix/store/djxk67q9mhicmrzsnxic196rkbpf0vkk-camlimages-4.1.2
checking for references to /tmp/nix-build-camlimages-4.1.2.drv-0 in /nix/store/djxk67q9mhicmrzsnxic196rkbpf0vkk-camlimages-4.1.2...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/ysnpqfsn5w9pgiy9m6fadbchiwf5irgk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_exif.so
shrinking /nix/store/ysnpqfsn5w9pgiy9m6fadbchiwf5irgk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_tiff.so
shrinking /nix/store/ysnpqfsn5w9pgiy9m6fadbchiwf5irgk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_jpeg.so
shrinking /nix/store/ysnpqfsn5w9pgiy9m6fadbchiwf5irgk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_png.so
shrinking /nix/store/ysnpqfsn5w9pgiy9m6fadbchiwf5irgk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_xpm.so
shrinking /nix/store/ysnpqfsn5w9pgiy9m6fadbchiwf5irgk-camlimages-4.1.2/lib/ocaml/4.05.0/site-lib/camlimages/dllcamlimages_gif.so
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/ysnpqfsn5w9pgiy9m6fadbchiwf5irgk-camlimages-4.1.2/lib
patching script interpreter paths in /nix/store/ysnpqfsn5w9pgiy9m6fadbchiwf5irgk-camlimages-4.1.2
checking for references to /build in /nix/store/ysnpqfsn5w9pgiy9m6fadbchiwf5irgk-camlimages-4.1.2...

@vbgl vbgl merged commit 09fb415 into NixOS:master Mar 8, 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: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mt-caret @vbgl @GrahamcOfBorg