Unverified Commit ca566ec8 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

rapid-photo-downloader: 0.9.34 -> 0.9.36 (#399667)

parents 35729f8c f3c2c61f

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -19015,6 +19015,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";

pkgs/applications/graphics/rapid-photo-downloader/default.nix

+47 −36
Original line number Diff line number Diff line
@@ -17,19 +17,55 @@ 
  gdk-pixbuf,

  libmediainfo,

  vmtouch,

  gitUpdater,

}:



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
@@ -72,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"
@@ -118,12 +124,17 @@ mkDerivationWith python3Packages.buildPythonApplication rec { 
    )

  '';



  meta = with lib; {

  passthru.updateScript = gitUpdater {

    rev-prefix = "v";

    ignoredVersions = "a.*";

  };



  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 ];

  };

}

pkgs/development/python-modules/pymediainfo/default.nix

+8 −8
Original line number Diff line number Diff line
@@ -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
@@ -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 ];

  };

}