summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2023-01-30 20:11:49 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-01-30 21:48:07 +0000
commit7737a434fcf1f476f6ee7ab153fc17aec358d748 (patch)
tree8e6831d2ccc02f27d517d5ba65ef9ca7fde9e374
parentMerge pull request #213576 from NixOS/backport-213520-to-release-22.11 (diff)
downloadnixpkgs-origin/backport-213627-to-release-22.11.tar.gz
libde265: drop imagemagick6 from passthru.testsorigin/backport-213627-to-release-22.11
`imagemagick6` has been marked insecure in 84747dae9a7244d06ddf9374238771f53e57b3cf. It is not really necessary to keep it in the `passthru.tests` of libde265 and we do not want to break those tests for someone building them without ALLOW_INSECURE. (cherry picked from commit 29ab6bb3b95293351aa8d7c8e20d497bebbd6c48)
-rw-r--r--pkgs/development/libraries/libde265/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix
index d054e223cf0d..18b8d6ba5d6f 100644
--- a/pkgs/development/libraries/libde265/default.nix
+++ b/pkgs/development/libraries/libde265/default.nix
@@ -6,7 +6,6 @@
# for passthru.tests
, imagemagick
-, imagemagick6
, libheif
, imlib2Full
, gst_all_1
@@ -28,7 +27,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.tests = {
- inherit imagemagick imagemagick6 libheif imlib2Full;
+ inherit imagemagick libheif imlib2Full;
inherit (gst_all_1) gst-plugins-bad;
};