From 2525e32eb00069623cf41c2a9822113d2d8991dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Jun 2023 12:27:09 +0200 Subject: [PATCH 1/2] nss_latest: 3.90 -> 3.91 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/i-wiqdBIjMI (cherry picked from commit fa93045a5b843395f510e7739197badf9a42004e) --- pkgs/development/libraries/nss/generic.nix | 2 +- pkgs/development/libraries/nss/latest.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 13ce24f24e59..04f0924bd3a3 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ./85_security_load_3.85+.patch ) ./fix-cross-compilation.patch - ] ++ lib.optionals (lib.versionAtLeast version "3.90") [ + ] ++ lib.optionals (lib.versionAtLeast version "3.90" && lib.versionOlder version "3.91") [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 # https://phabricator.services.mozilla.com/D180068 ./remove-c25519-support.patch diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 9434ccf1b3e9..4be20ad1ff77 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.90"; - hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; + version = "3.91"; + hash = "sha256-hL1GN23xcRjFX21z0w/ZOgryEpbGbnaQRxVH5YmPxLM="; } From 86ce8850712bb50af3130ea438f7513b40dda78d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 30 Jun 2023 15:40:30 +0300 Subject: [PATCH 2/2] beets: disable failing test Reported here: https://github.com/beetbox/beets/issues/4836 (cherry picked from commit 04ae8fffa73f05a25e14ff5ca4f0e51958bfe0a1) --- pkgs/tools/audio/beets/common.nix | 3 +++ .../remove-failing-embedart-test.patch | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/audio/beets/patches/remove-failing-embedart-test.patch diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index b3eefbf9cba6..10db9441258a 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -52,6 +52,9 @@ python3Packages.buildPythonApplication rec { patches = [ # Bash completion fix for Nix ./patches/bash-completion-always-print.patch + # Reported upstream at: + # https://github.com/beetbox/beets/issues/4836 + ./patches/remove-failing-embedart-test.patch (fetchpatch { # Fix unidecode>=1.3.5 compat url = "https://github.com/beetbox/beets/commit/5ae1e0f3c8d3a450cb39f7933aa49bb78c2bc0d9.patch"; diff --git a/pkgs/tools/audio/beets/patches/remove-failing-embedart-test.patch b/pkgs/tools/audio/beets/patches/remove-failing-embedart-test.patch new file mode 100644 index 000000000000..ac531ef20c65 --- /dev/null +++ b/pkgs/tools/audio/beets/patches/remove-failing-embedart-test.patch @@ -0,0 +1,24 @@ +diff --git i/test/test_embedart.py w/test/test_embedart.py +index 23a6f5e5..91b9c8c2 100644 +--- i/test/test_embedart.py ++++ w/test/test_embedart.py +@@ -163,19 +163,6 @@ class EmbedartCliTest(TestHelper, FetchImageHelper): + 'Image written is not {}'.format( + displayable_path(self.abbey_artpath))) + +- @require_artresizer_compare +- def test_accept_similar_art(self): +- self._setup_data(self.abbey_similarpath) +- album = self.add_album_fixture() +- item = album.items()[0] +- self.run_command('embedart', '-y', '-f', self.abbey_artpath) +- config['embedart']['compare_threshold'] = 20 +- self.run_command('embedart', '-y', '-f', self.abbey_similarpath) +- mediafile = MediaFile(syspath(item.path)) +- +- self.assertEqual(mediafile.images[0].data, self.image_data, +- 'Image written is not {}'.format( +- displayable_path(self.abbey_similarpath))) + + def test_non_ascii_album_path(self): + resource_path = os.path.join(_common.RSRC, b'image.mp3')