Unverified Commit 70eaec08 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #325941 from SFrijters/maestral-1.9.4 

python3Packages.maestral: 1.9.3 -> 1.9.4, maestral-qt: 1.9.3 -> 1.9.4
parents f877ef1f 025db4d9

pkgs/applications/networking/maestral-qt/default.nix

+18 −18
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, python3

, qtbase

, qtsvg

, qtwayland

, nixosTests

, wrapQtAppsHook

{

  lib,

  fetchFromGitHub,

  python3,

  qtbase,

  qtsvg,

  qtwayland,

  nixosTests,

  wrapQtAppsHook,

}:



python3.pkgs.buildPythonApplication rec {

  pname = "maestral-qt";

  version = "1.9.3";

  version = "1.9.4";

  pyproject = true;



  disabled = python3.pythonOlder "3.7";
@@ -19,12 +20,10 @@ python3.pkgs.buildPythonApplication rec { 
    owner = "SamSchott";

    repo = "maestral-qt";

    rev = "refs/tags/v${version}";

    hash = "sha256-7Lt0Neobtofd1JDoz8BhGn+nFKaMLbM/6z0QQmtEKpA=";

    hash = "sha256-VkJOKKYnoXux3WjD1JwINGWwv1SMIXfidyV2ITE7dJc=";

  };



  build-system = with python3.pkgs; [

    setuptools

  ];

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



  dependencies = with python3.pkgs; [

    click
@@ -40,9 +39,7 @@ python3.pkgs.buildPythonApplication rec { 
    qtsvg # Needed for the systray icon

  ];



  nativeBuildInputs = [

    wrapQtAppsHook

  ];

  nativeBuildInputs = [ wrapQtAppsHook ];



  dontWrapQtApps = true;
@@ -67,7 +64,10 @@ python3.pkgs.buildPythonApplication rec { 
    homepage = "https://maestral.app";

    changelog = "https://github.com/samschott/maestral/releases/tag/v${version}";

    license = licenses.mit;

    maintainers = with maintainers; [ peterhoeg sfrijters ];

    maintainers = with maintainers; [

      peterhoeg

      sfrijters

    ];

    platforms = platforms.linux;

    mainProgram = "maestral_qt";

  };

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

+2 −10
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


buildPythonPackage rec {

  pname = "maestral";

  version = "1.9.3";

  version = "1.9.4";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -41,7 +41,7 @@ buildPythonPackage rec { 
    owner = "SamSchott";

    repo = "maestral";

    rev = "refs/tags/v${version}";

    hash = "sha256-h7RDaCVICi3wl6/b1s01cINhFirDOpOXoxTPZIBH3jE=";

    hash = "sha256-akh0COltpUU4Z4kfubg6A7k6W8ICoqVYkmFpMkTC8H8=";

  };



  build-system = [ setuptools ];
@@ -67,14 +67,6 @@ buildPythonPackage rec { 
    xattr

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ];



  patches = [

    (fetchpatch {

      name = "upgrade-dropbox-version-bounds";

      url = "https://github.com/samschott/maestral/commit/8fd581fa503391534913afbc33a61132ff2e21ce.patch";

      hash = "sha256-2Dke9iF/5Ptsf3CSRHUkjdFRrmdKY+L3sILRMyYrUH0=";

    })

  ];



  makeWrapperArgs = [

    # Add the installed directories to the python path so the daemon can find them

    "--prefix PYTHONPATH : ${makePythonPath dependencies}"