From 9e0678b571a0cb5e71b20328dcd40f82a67fd3df Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 16 Aug 2024 18:46:21 +0300
Subject: [PATCH 1/5] picard: switch back to Python 3.12

PR #325893 has reached `master` branch, so the pyqt5 issue with Python
3.12 is no longer an issue.
---
 pkgs/applications/audio/picard/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 75d5dc09a613..3e54f65bbefb 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,7 +1,5 @@
 { lib
-# Python 3.12 demonstrates a peculiar segmentation fault with pyqt5. Using
-# pyqt6 with Python 3.12 should work, but this is not released yet.
-, python311Packages
+, python312Packages
 , fetchFromGitHub
 
 , chromaprint
@@ -13,7 +11,7 @@
 }:
 
 let
-  pythonPackages = python311Packages;
+  pythonPackages = python312Packages;
   pyqt5 =
     if enablePlayback then
       pythonPackages.pyqt5-multimedia

From db8fd4c34f0a746a429aea8554dbaaa5e033b53e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 16 Aug 2024 18:50:36 +0300
Subject: [PATCH 2/5] picard: 2.12 -> 2.12.1

Diff: https://github.com/metabrainz/picard/compare/refs/tags/release-2.12...release-2.12.1

Changelog: https://picard.musicbrainz.org/changelog
---
 pkgs/applications/audio/picard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 3e54f65bbefb..2096f53d7b02 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -21,14 +21,14 @@ in
 pythonPackages.buildPythonApplication rec {
   pname = "picard";
   # nix-update --commit picard --version-regex 'release-(.*)'
-  version = "2.12";
+  version = "2.12.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "metabrainz";
     repo = "picard";
     rev = "refs/tags/release-${version}";
-    hash = "sha256-+++NDJzXw4tA5eQd24r+l3UK3YS8Jy1t9WNiEU9sH0Q=";
+    hash = "sha256-wKPE4lj3DIlY+X5A/MqhnwyrhPTXGjmUnLK1VWXUOas=";
   };
 
   nativeBuildInputs = [

From 43033473541b26a3c569512d2d7d826fd81e489d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 16 Aug 2024 18:52:30 +0300
Subject: [PATCH 3/5] picard: run tests

---
 pkgs/applications/audio/picard/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 2096f53d7b02..5343dff0b1cf 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -34,6 +34,7 @@ pythonPackages.buildPythonApplication rec {
   nativeBuildInputs = [
     gettext
     qt5.wrapQtAppsHook
+    pythonPackages.pytestCheckHook
   ] ++ lib.optionals (pyqt5.multimediaEnabled) [
     gst_all_1.gst-libav
     gst_all_1.gst-plugins-base
@@ -66,6 +67,7 @@ pythonPackages.buildPythonApplication rec {
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
+  doCheck = true;
 
   # In order to spare double wrapping, we use:
   preFixup = ''

From 1d5e59acffd9723cdb28d692582b126a7600da83 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 16 Aug 2024 18:54:10 +0300
Subject: [PATCH 4/5] picard: don't use with lib in meta

---
 pkgs/applications/audio/picard/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 5343dff0b1cf..ad1e9cfed246 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -76,12 +76,12 @@ pythonPackages.buildPythonApplication rec {
     makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://picard.musicbrainz.org";
     changelog = "https://picard.musicbrainz.org/changelog";
     description = "Official MusicBrainz tagger";
     mainProgram = "picard";
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
   };
 }

From 1decf9f446ef9755608ed090a7a28cf07111b055 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 16 Aug 2024 18:54:43 +0300
Subject: [PATCH 5/5] picard: add doronbehar to maintainers

---
 pkgs/applications/audio/picard/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index ad1e9cfed246..fda748573616 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -83,5 +83,6 @@ pythonPackages.buildPythonApplication rec {
     mainProgram = "picard";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ doronbehar ];
   };
 }