From e20dc30419aa762fb1dc7901dddbe8198a863514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jul 2026 20:54:20 +0200 Subject: [PATCH 1/4] picard: move update script comment to proper update script --- pkgs/by-name/pi/picard/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix index 51336472ded0..5b1673638009 100644 --- a/pkgs/by-name/pi/picard/package.nix +++ b/pkgs/by-name/pi/picard/package.nix @@ -12,6 +12,7 @@ gst_all_1, writableTmpDirAsHomeHook, + nix-update-script, }: let @@ -20,7 +21,6 @@ let in pythonPackages.buildPythonApplication (finalAttrs: { pname = "picard"; - # nix-update --commit picard --version-regex 'release-(.*)' version = "2.13.3"; pyproject = true; strictDeps = true; @@ -108,6 +108,13 @@ pythonPackages.buildPythonApplication (finalAttrs: { makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release-(.*)" + ]; + }; + meta = { homepage = "https://picard.musicbrainz.org"; changelog = "https://picard.musicbrainz.org/changelog"; From 3255983a75f5967bb8cf19efd0784837f3fb8a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jul 2026 21:13:46 +0200 Subject: [PATCH 2/4] picard: bump python to 3.13 --- pkgs/by-name/pi/picard/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix index 5b1673638009..27148d5b1682 100644 --- a/pkgs/by-name/pi/picard/package.nix +++ b/pkgs/by-name/pi/picard/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - python312Packages, + python313Packages, fetchFromGitHub, chromaprint, @@ -16,7 +16,9 @@ }: let - pythonPackages = python312Packages; + # A few more tests fail with python314Pacakges, indicating the code isn't + # ready for it yet. + pythonPackages = python313Packages; pyqt5 = if enablePlayback then pythonPackages.pyqt5-multimedia else pythonPackages.pyqt5; in pythonPackages.buildPythonApplication (finalAttrs: { From 8cf990d70a9ebc700190d5ec978f47b37c08a147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jul 2026 21:13:58 +0200 Subject: [PATCH 3/4] picard: use pyproject's dependencies --- pkgs/by-name/pi/picard/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix index 27148d5b1682..f6446d8d44dc 100644 --- a/pkgs/by-name/pi/picard/package.nix +++ b/pkgs/by-name/pi/picard/package.nix @@ -61,7 +61,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { "pyobjc-framework-Cocoa" ]; - propagatedBuildInputs = + dependencies = with pythonPackages; [ charset-normalizer From 0c9d1fd9ea7a33cf04e510fe3650fb13695ace9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Jul 2026 21:14:29 +0200 Subject: [PATCH 4/4] picard: remove unnecessary brackets --- pkgs/by-name/pi/picard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix index f6446d8d44dc..cac8e2bd6906 100644 --- a/pkgs/by-name/pi/picard/package.nix +++ b/pkgs/by-name/pi/picard/package.nix @@ -47,7 +47,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform qt5.qtwayland) [ qt5.qtwayland ] - ++ lib.optionals (pyqt5.multimediaEnabled) [ + ++ lib.optionals pyqt5.multimediaEnabled [ qt5.qtmultimedia.bin gst_all_1.gst-libav gst_all_1.gst-plugins-base @@ -106,7 +106,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") '' - + lib.optionalString (pyqt5.multimediaEnabled) '' + + lib.optionalString pyqt5.multimediaEnabled '' makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") '';