diff options
author | Doron Behar <doron.behar@gmail.com> | 2023-10-26 23:51:27 +0300 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2023-10-27 00:33:45 +0300 |
commit | 1772a2ac206a9c4b6f293128fac626895074481f (patch) | |
tree | 24d2efa3af64cdb6323e4e033c97d0bfaf36dadd /pkgs | |
parent | 4f2859fd38a74cb264fea922efeebb11ba2fc36d (diff) |
beets-unstable: unstable-2023-07-05 -> unstable-2023-10-26
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/audio/beets/default.nix | 22 | ||||
-rw-r--r-- | pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch | 46 |
2 files changed, 34 insertions, 34 deletions
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c6b99978fe38a..c78ccced9a80c 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -62,29 +62,27 @@ lib.makeExtensible (self: { beets-unstable = callPackage ./common.nix { inherit python3Packages; - version = "unstable-2023-07-05"; + version = "unstable-2023-10-26"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "9481402b3c20739ca0b879d19adbfca22ccd6a44"; - hash = "sha256-AKmozMNVchysoQcUWd90Ic6bQBKQgylVn0E3i85dGb8="; + rev = "6655760732100f5387fad2d2890c015ee5039981"; + hash = "sha256-Nz9BHtacYpJMLmB3f9WFg6GvMa+BuUhiNbJ9cyannek="; }; extraPatches = [ # Bash completion fix for Nix ./patches/unstable-bash-completion-always-print.patch - # Pillow 10 compatibility fix, see: - # https://github.com/beetbox/beets/pull/4868 - (fetchpatch { - url = "https://github.com/beetbox/beets/commit/c2118a8b9cd8c9c91135c6e178830b89b40867be.patch"; - hash = "sha256-HWf940WrF10Jnu9iyoHovFDcvj9LY8p7zIlJg1TfKxQ="; - # Doesn't apply on this file, and it we don't care. - excludes = [ "docs/changelog.rst" ]; - }) ]; pluginOverrides = { - # unstable has a new plugin, so we register it here. + # unstable has new plugins, so we register them here. limit = { builtin = true; }; + substitute = { builtin = true; }; + advancedrewrite = { builtin = true; }; + autobpm = { builtin = true; }; }; + extraNativeBuildInputs = [ + python3Packages.pydata-sphinx-theme + ]; }; alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; }; diff --git a/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch b/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch index 395f40f92c986..96b175117572b 100644 --- a/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch +++ b/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch @@ -1,34 +1,36 @@ -diff --git a/beets/ui/commands.py b/beets/ui/commands.py -index 1377ad0c..e178eeae 100755 ---- a/beets/ui/commands.py -+++ b/beets/ui/commands.py -@@ -1831,20 +1831,6 @@ default_commands.append(config_cmd) +diff --git i/beets/ui/commands.py w/beets/ui/commands.py +index ad4f7821..5077191d 100755 +--- i/beets/ui/commands.py ++++ w/beets/ui/commands.py +@@ -2381,22 +2381,6 @@ default_commands.append(config_cmd) def print_completion(*args): for line in completion_script(default_commands + plugins.commands()): - print_(line, end='') + print_(line, end="") - if not any(os.path.isfile(syspath(p)) for p in BASH_COMPLETION_PATHS): -- log.warning('Warning: Unable to find the bash-completion package. ' -- 'Command line completion might not work.') +- log.warning( +- "Warning: Unable to find the bash-completion package. " +- "Command line completion might not work." +- ) - - -BASH_COMPLETION_PATHS = [ -- b'/etc/bash_completion', -- b'/usr/share/bash-completion/bash_completion', -- b'/usr/local/share/bash-completion/bash_completion', +- b"/etc/bash_completion", +- b"/usr/share/bash-completion/bash_completion", +- b"/usr/local/share/bash-completion/bash_completion", - # SmartOS -- b'/opt/local/share/bash-completion/bash_completion', +- b"/opt/local/share/bash-completion/bash_completion", - # Homebrew (before bash-completion2) -- b'/usr/local/etc/bash_completion', +- b"/usr/local/etc/bash_completion", -] def completion_script(commands): -diff --git a/test/test_ui.py b/test/test_ui.py -index f66917dc..f3d934c6 100644 ---- a/test/test_ui.py -+++ b/test/test_ui.py -@@ -1310,12 +1310,7 @@ class CompletionTest(_common.TestCase, TestHelper): - stdout=subprocess.PIPE, env=env) +diff --git i/test/test_ui.py w/test/test_ui.py +index cae86148..faf266a8 100644 +--- i/test/test_ui.py ++++ w/test/test_ui.py +@@ -1434,12 +1434,7 @@ class CompletionTest(_common.TestCase, TestHelper): + ) # Load bash_completion library. - for path in commands.BASH_COMPLETION_PATHS: @@ -36,8 +38,8 @@ index f66917dc..f3d934c6 100644 - bash_completion = path - break - else: -- self.skipTest('bash-completion script not found') -+ self.skipTest('bash-completion script not found') +- self.skipTest("bash-completion script not found") ++ self.skipTest("bash-completion script not found") try: - with open(util.syspath(bash_completion), 'rb') as f: + with open(util.syspath(bash_completion), "rb") as f: tester.stdin.writelines(f) |