Unverified Commit 9e171a09 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #311750 from SFrijters/maestral-refactor

python3Packages.maestral, maestral-qt: refactor
parents fb561768 7c516c54
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@
python3.pkgs.buildPythonApplication rec {
  pname = "maestral-qt";
  version = "1.9.3";
  pyproject = true;

  disabled = python3.pythonOlder "3.7";

  src = fetchFromGitHub {
@@ -20,9 +22,11 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-7Lt0Neobtofd1JDoz8BhGn+nFKaMLbM/6z0QQmtEKpA=";
  };

  format = "pyproject";
  build-system = with python3.pkgs; [
    setuptools
  ];

  propagatedBuildInputs = with python3.pkgs; [
  dependencies = with python3.pkgs; [
    click
    markdown2
    maestral
+7 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@
buildPythonPackage rec {
  pname = "maestral";
  version = "1.9.3";
  format = "pyproject";
  pyproject = true;

  disabled = pythonOlder "3.8";

@@ -42,7 +42,11 @@ buildPythonPackage rec {
    hash = "sha256-h7RDaCVICi3wl6/b1s01cINhFirDOpOXoxTPZIBH3jE=";
  };

  propagatedBuildInputs = [
  build-system = [
    setuptools
  ];

  dependencies = [
    click
    desktop-notifier
    dbus-python
@@ -67,7 +71,7 @@ buildPythonPackage rec {

  makeWrapperArgs = [
    # Add the installed directories to the python path so the daemon can find them
    "--prefix PYTHONPATH : ${makePythonPath propagatedBuildInputs}"
    "--prefix PYTHONPATH : ${makePythonPath dependencies}"
    "--prefix PYTHONPATH : $out/${python.sitePackages}"
  ];