nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-23.05 into staging-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-07-03 00:17:14 +00:00
committed by GitHub
parent 791ac4a897 dcc5a85cd8
commit 9995344603
4 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/nss/generic.nix
View File

@@ -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

4
pkgs/development/libraries/nss/latest.nix
View File

@@ -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=";
}

3
pkgs/tools/audio/beets/common.nix
View File

@@ -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";

24
pkgs/tools/audio/beets/patches/remove-failing-embedart-test.patch Normal file
View File

@@ -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')