There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
imagemagickBig and imagemagick7Big were marked broken in #55634 due
to #55118. #57313 fixed the bug but reverted the broken bit only on
imagemagickBig. Revert it on imagemagick7Big too.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/imagemagick/versions.
These checks were done:
- built on NixOS
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/animate passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/compare passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/composite passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/conjure passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/convert passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/display passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/identify passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/import passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/magick-script passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/mogrify passed the binary check.
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/montage passed the binary check.
- Warning: no invocation of /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/stream had a zero exit code or showed the expected version
- /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2/bin/magick passed the binary check.
- 12 of 13 passed binary check by having a zero exit code.
- 0 of 13 passed binary check by having the new version present in output.
- found 7.0.8-2 with grep in /nix/store/x4mcjcryj5q7mm7bcmr1shyx1rvazpw1-imagemagick-7.0.8-2
- directory tree listing: https://gist.github.com/de6e213f2639e6aea0a5c353ee83f68b
- du listing: https://gist.github.com/936da3ad90cfeb17b4597d3a305dbffb
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/imagemagick/versions.
These checks were done:
- built on NixOS
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/animate passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/compare passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/composite passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/conjure passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/convert passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/display passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/identify passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/import passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/magick-script passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/mogrify passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/montage passed the binary check.
- Warning: no invocation of /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/stream had a zero exit code or showed the expected version
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/magick passed the binary check.
- 12 of 13 passed binary check by having a zero exit code.
- 0 of 13 passed binary check by having the new version present in output.
- found 7.0.7-35 with grep in /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35
- directory tree listing: https://gist.github.com/416a1bac07dc41a682c21f3ef7014908
- du listing: https://gist.github.com/e9a89e0789ef0f799410b18f783e01fc
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/imagemagick/versions.
These checks were done:
- built on NixOS
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/animate passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/compare passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/composite passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/conjure passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/convert passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/display passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/identify passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/import passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/magick-script passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/mogrify passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/montage passed the binary check.
- Warning: no invocation of /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/stream had a zero exit code or showed the expected version
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/magick passed the binary check.
- 12 of 13 passed binary check by having a zero exit code.
- 0 of 13 passed binary check by having the new version present in output.
- found 7.0.7-32 with grep in /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32
- directory tree listing: https://gist.github.com/f22a02931178895b4d9ac8401f7d6eb8
- du listing: https://gist.github.com/d5150ae0b886668b2b42f583409a14a4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/imagemagick/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick-script -h’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick-script --help’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick -h’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick --help’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick help’ got 0 exit code
- found 7.0.7-29 with grep in /nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29
- directory tree listing: https://gist.github.com/12ed56d2de915ea05dcb89d5486181f8
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
/tmp/tmp.quAyurRyhL /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick -h` got 0 exit code
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick --help` got 0 exit code
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick help` got 0 exit code
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick --version` and found version 7.0.7-27
- found 7.0.7-27 with grep in /nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27
- directory tree listing: https://gist.github.com/4c89cc9d32b6739922d277619629d087
