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

imagemagick: 6.9.9-21 -> 6.9.9-23 #31964

Merged
merged 1 commit into from Nov 23, 2017
Merged

imagemagick: 6.9.9-21 -> 6.9.9-23 #31964

merged 1 commit into from Nov 23, 2017

Conversation

srhb
Copy link
Contributor

@srhb srhb commented Nov 23, 2017

Motivation for this change

Fixes #31943

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.

@srhb
Copy link
Contributor Author

srhb commented Nov 23, 2017

@GrahamcOfBorg build imagemagickBig

@srhb
Copy link
Contributor Author

srhb commented Nov 23, 2017

@GrahamcOfBorg build imagemagickBig

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-darwin

patching script interpreter paths in /nix/store/xcrjq0yy6fi6g64r19nla8jjs3fcn2bd-imagemagick-6.9.9-23
stripping (with flags -S) in /nix/store/62pdg3pj67pqp88kfx6w24q637bfw3bq-imagemagick-6.9.9-23-dev/lib  /nix/store/62pdg3pj67pqp88kfx6w24q637bfw3bq-imagemagick-6.9.9-23-dev/bin
patching script interpreter paths in /nix/store/62pdg3pj67pqp88kfx6w24q637bfw3bq-imagemagick-6.9.9-23-dev
/nix/store/62pdg3pj67pqp88kfx6w24q637bfw3bq-imagemagick-6.9.9-23-dev/bin/Magick++-config: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/62pdg3pj67pqp88kfx6w24q637bfw3bq-imagemagick-6.9.9-23-dev/bin/Magick-config: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/62pdg3pj67pqp88kfx6w24q637bfw3bq-imagemagick-6.9.9-23-dev/bin/MagickCore-config: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/62pdg3pj67pqp88kfx6w24q637bfw3bq-imagemagick-6.9.9-23-dev/bin/MagickWand-config: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/62pdg3pj67pqp88kfx6w24q637bfw3bq-imagemagick-6.9.9-23-dev/bin/Wand-config: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
patching script interpreter paths in /nix/store/r4l0n1mysbiysslngq0a18cfjnwrv3sy-imagemagick-6.9.9-23-doc
/nix/store/xcrjq0yy6fi6g64r19nla8jjs3fcn2bd-imagemagick-6.9.9-23

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-linux

/nix/store/71j7ibd0gjj68dlsbga4rqdd2z57f1kf-imagemagick-6.9.9-23-dev/bin/Wand-config: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/71j7ibd0gjj68dlsbga4rqdd2z57f1kf-imagemagick-6.9.9-23-dev/bin/Magick++-config: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/71j7ibd0gjj68dlsbga4rqdd2z57f1kf-imagemagick-6.9.9-23-dev/bin/MagickWand-config: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/71j7ibd0gjj68dlsbga4rqdd2z57f1kf-imagemagick-6.9.9-23-dev/bin/Magick-config: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/71j7ibd0gjj68dlsbga4rqdd2z57f1kf-imagemagick-6.9.9-23-dev/bin/MagickCore-config: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-imagemagick-6.9.9-23.drv-0 in /nix/store/71j7ibd0gjj68dlsbga4rqdd2z57f1kf-imagemagick-6.9.9-23-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/zk6bzb9m0jbygwffqsizwbs9kg6896d9-imagemagick-6.9.9-23-doc
patching script interpreter paths in /nix/store/zk6bzb9m0jbygwffqsizwbs9kg6896d9-imagemagick-6.9.9-23-doc
checking for references to /tmp/nix-build-imagemagick-6.9.9-23.drv-0 in /nix/store/zk6bzb9m0jbygwffqsizwbs9kg6896d9-imagemagick-6.9.9-23-doc...
/nix/store/vdaa0j0l4fn94cw92529cdagpv0vn29q-imagemagick-6.9.9-23

@grahamc grahamc merged commit e1c020d into NixOS:master Nov 23, 2017
@grahamc
Copy link
Member

grahamc commented Nov 23, 2017

@srhb should this be backported?

@srhb
Copy link
Contributor Author

srhb commented Nov 23, 2017

I'm not sure. The upstream source for the older version is gone, but the nar is on cache.nixos.org, so it would only affect stable users that override imagemagick somehow.

@grahamc
Copy link
Member

grahamc commented Nov 23, 2017

Is the version in 17.09 missing, and 6.9.9-x too?

@srhb
Copy link
Contributor Author

srhb commented Nov 23, 2017

The source for 17.09 is missing, since it is also 6.9.9-21

@grahamc
Copy link
Member

grahamc commented Nov 23, 2017

Great, let's backport. Can you open that PR? git cherry-pick -x <thecommitinthisPR>

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

3 participants