From 4d0c402584166e29512a36c0945f7806070370da Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 18 Apr 2025 08:48:07 +0200 Subject: [PATCH 1/6] python313Packages.pymediainfo: fix build pymediainfo had some breaking changes regarding their build proces, hence the update in #395156 broke it. --- .../development/python-modules/pymediainfo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 248e84394bcf..d19432cc46b5 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -4,7 +4,7 @@ fetchPypi, buildPythonPackage, libmediainfo, - setuptools-scm, + pdm-backend, pytest, pythonOlder, }: @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "pymediainfo"; version = "7.0.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; @@ -22,7 +22,7 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace pymediainfo/__init__.py \ + substituteInPlace src/pymediainfo/__init__.py \ --replace "libmediainfo.0.dylib" \ "${libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}" \ --replace "libmediainfo.dylib" \ @@ -31,7 +31,7 @@ buildPythonPackage rec { "${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0" ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ pdm-backend ]; nativeCheckInputs = [ pytest From a11f1567b41bd0cb1539b9eb7b2cd349be428aae Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 18 Apr 2025 09:11:51 +0200 Subject: [PATCH 2/6] rapid-photo-downloader: Add update script --- .../graphics/rapid-photo-downloader/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index f7a2685169ca..a072e90d5d5e 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -17,6 +17,7 @@ gdk-pixbuf, libmediainfo, vmtouch, + gitUpdater, }: mkDerivationWith python3Packages.buildPythonApplication rec { @@ -118,6 +119,11 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ) ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "a.*"; + }; + meta = with lib; { description = "Photo and video importer for cameras, phones, and memory cards"; mainProgram = "rapid-photo-downloader"; From ed5b4d1bec3105ec2dc17dd60984a6af2a1027d4 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 18 Apr 2025 09:40:10 +0200 Subject: [PATCH 3/6] rapid-photo-downloader: 0.9.34 -> 0.9.36 --- .../rapid-photo-downloader/default.nix | 69 ++++++++++--------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index a072e90d5d5e..500936379f19 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -22,15 +22,50 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.34"; + version = "0.9.36"; + pyproject = true; src = fetchFromGitHub { owner = "damonlynch"; repo = "rapid-photo-downloader"; rev = "v${version}"; - hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw="; + hash = "sha256-fFmIbqymYkg2Z1/x0mNsCNlDCOyqVg65CM4a67t+kPQ="; }; + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = + with python3Packages; + [ + ifuse + libimobiledevice + # Python dependencies + pyqt5 + pygobject3 + gphoto2 + pyzmq + tornado + psutil + pyxdg + arrow + python-dateutil + easygui + babel + colour + pillow + pymediainfo + sortedcontainers + requests + colorlog + pyprind + setuptools + show-in-file-manager + tenacity + ] + ++ lib.optional (pythonOlder "3.8") importlib-metadata; + postPatch = '' # Drop broken version specifier sed -i '/python_requires/d' setup.py @@ -73,36 +108,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { # "Namespace [Notify / GExiv2 / GUdev] not available" strictDeps = false; - propagatedBuildInputs = - with python3Packages; - [ - ifuse - libimobiledevice - pyqt5 - pygobject3 - gphoto2 - pyzmq - tornado - psutil - pyxdg - arrow - python-dateutil - easygui - babel - colour - pillow - pyheif - pymediainfo - sortedcontainers - requests - colorlog - pyprind - setuptools - show-in-file-manager - tenacity - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; - preFixup = '' makeWrapperArgs+=( --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" From 63d4e1300bf89db2917004a0db2261a5bbec9112 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 18 Apr 2025 17:47:37 +0200 Subject: [PATCH 4/6] maintainers: add philipdb --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 08d80e631b64..b2fc53d893d9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18858,6 +18858,13 @@ githubId = 1640697; name = "Philipp Hausmann"; }; + philipdb = { + email = "philipdb.art110@passmail.com"; + name = "Philip de Bruin"; + github = "PhiliPdB"; + githubId = 7051056; + keys = [ { fingerprint = "01AE 5EC2 39D9 CE4B DDB0 166A 4EC5 5FB7 07DC 24C4"; } ]; + }; Philipp-M = { email = "philipp@mildenberger.me"; github = "Philipp-M"; From cadf02efa23215f613366c67ba51461242f2eceb Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 18 Apr 2025 17:52:35 +0200 Subject: [PATCH 5/6] python313Packages.pymediainfo: add philipdb to maintainers --- pkgs/development/python-modules/pymediainfo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index d19432cc46b5..7b97714a454e 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -43,11 +43,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pymediainfo" ]; - meta = with lib; { + meta = { description = "Python wrapper for the mediainfo library"; homepage = "https://github.com/sbraz/pymediainfo"; changelog = "https://github.com/sbraz/pymediainfo/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ philipdb ]; }; } From f3c2c61fb3807a5ca4c30042d3713bbd45d181de Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 18 Apr 2025 17:53:07 +0200 Subject: [PATCH 6/6] rapid-photo-downloader: add philipdb to maintainers --- .../graphics/rapid-photo-downloader/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 500936379f19..da1e3487a5c1 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -129,12 +129,12 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ignoredVersions = "a.*"; }; - meta = with lib; { + meta = { description = "Photo and video importer for cameras, phones, and memory cards"; mainProgram = "rapid-photo-downloader"; homepage = "https://www.damonlynch.net/rapid/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ philipdb ]; }; }