Unverified Commit 3866e056 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #298161 from SFrijters/maestral-1.9.0 

python3Packages.maestral: 1.8.0 -> 1.9.2, maestral-qt: 1.8.0 -> 1.9.2
parents b96918e5 0def3203

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

+2 −2
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "maestral-qt";

  version = "1.8.0";

  version = "1.9.2";

  disabled = python3.pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "SamSchott";

    repo = "maestral-qt";

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

    hash = "sha256-Ys7XrvV4qzq4Q9llua2WgU013Ui0+x+uMwLNIv6xxCw=";

    hash = "sha256-dgiVSwCTNDncbPJ+f0grjtq822TvtG0PhC9gDOKhwRI=";

  };



  format = "pyproject";

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

+6 −11
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
, survey

, typing-extensions

, watchdog

, xattr

, pytestCheckHook

, nixosTests

, pythonRelaxDepsHook

}:



buildPythonPackage rec {

  pname = "maestral";

  version = "1.8.0";

  version = "1.9.2";

  format = "pyproject";



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

    repo = "maestral";

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

    hash = "sha256-YYbdd0GLVKE7+Oi0mpQjqhFdjdlquk/XnIg5WrtKcfI=";

    hash = "sha256-Bb0yE2OKdlZd6ZsTEWOD+hMuV41fZanesY49L+v4BBE=";

  };



  propagatedBuildInputs = [
@@ -58,6 +58,7 @@ buildPythonPackage rec { 
    survey

    typing-extensions

    watchdog

    xattr

  ];



  makeWrapperArgs = [
@@ -68,14 +69,6 @@ buildPythonPackage rec { 


  nativeCheckInputs = [

    pytestCheckHook

    pythonRelaxDepsHook

  ];



  pythonRelaxDeps = [

    # https://github.com/samschott/maestral/commit/2c50d2ddb49a845ea97bd6b0f68c45d723fb304c

    # Allow the use of survey >= 5

    # Remove after new maestral release along with pythonRelaxDepsHook

    "survey"

  ];



  preCheck = ''
@@ -95,6 +88,8 @@ buildPythonPackage rec { 
    "test_cased_path_candidates"

    # AssertionError

    "test_locking_multiprocess"

    # OSError: [Errno 95] Operation not supported

    "test_move_preserves_xattrs"

  ];



  pythonImportsCheck = [

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -34633,7 +34633,7 @@ with pkgs; 














  maestral = with python3Packages; toPythonApplication maestral;



























  maestral-gui = qt6.callPackage ../applications/networking/maestral-qt { };













  maestral-gui = qt6Packages.callPackage ../applications/networking/maestral-qt { };





























  maestro = callPackage ../development/mobile/maestro { };