Unverified Commit 66f0ec84 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 5dc9994a 3b020181

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -20443,6 +20443,12 @@ 
    githubId = 13489144;

    name = "Calle Rosenquist";

  };

  xbz = {

    email = "renatochavez7@gmail.com";

    github = "Xbz-24";

    githubId = 68678258;

    name = "Renato German Chavez Chicoma";

  };

  xddxdd = {

    email = "b980120@hotmail.com";

    github = "xddxdd";

pkgs/applications/misc/meerk40t/default.nix

+32 −12
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, meerk40t-camera

, python3

, python3Packages

, gtk3

, wrapGAppsHook

}:



python3.pkgs.buildPythonApplication rec {

python3Packages.buildPythonApplication rec {

  pname = "MeerK40t";

  version = "0.8.1000";

  format = "setuptools";

  version = "0.9.3010";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "meerk40t";

    repo = pname;

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

    hash = "sha256-YCcnqaH4Npmct5IBHsnufswRz8bS7mUb1YFwTta/Dxc=";

    hash = "sha256-RlIWqxmUiL1gFMxwcdWxDiebmEzVz6kTaSlAZHr8S+I=";

  };



  nativeBuildInputs = [

    wrapGAppsHook

  ];

  ] ++ (with python3Packages; [

    setuptools

  ]);



  # prevent double wrapping

  dontWrapGApps = true;



  propagatedBuildInputs = with python3.pkgs; [

    ezdxf

  # https://github.com/meerk40t/meerk40t/blob/main/setup.py

  propagatedBuildInputs = with python3Packages; [

    meerk40t-camera

    opencv4

    pillow

    numpy

    pyserial

    pyusb

    setuptools

    wxpython

  ]

  ++ lib.flatten (lib.attrValues passthru.optional-dependencies);



  passthru.optional-dependencies = with python3Packages; {

    cam = [

      opencv4

    ];

    camhead = [

      opencv4

    ];

    dxf = [

      ezdxf

    ];

    gui = [

      wxpython

      pillow

      opencv4

      ezdxf

    ];

  };



  preFixup = ''

    gappsWrapperArgs+=(
@@ -43,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { 
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  nativeCheckInputs = with python3.pkgs; [

  nativeCheckInputs = with python3Packages; [

    unittestCheckHook

  ];

pkgs/applications/misc/mozphab/default.nix

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


python3.pkgs.buildPythonApplication rec {

  pname = "mozphab";

  version = "1.4.3";

  version = "1.5.1";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "mozilla-conduit";

    repo = "review";

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

    hash = "sha256-FUHT4MPzSxO3MCNYWodNxvFR2kL0P4eGmSHPtCt0Cug=";

    hash = "sha256-HxwQ+mGtjnruppPAD01QUg3aca+k5vpj814BWM+3VfQ=";

  };



  postPatch = ''

pkgs/applications/misc/sigal/copytree-permissions.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
diff -Nurp sigal-2.3.orig/sigal/writer.py sigal-2.3/sigal/writer.py

--- sigal-2.3.orig/sigal/writer.py	2022-08-08 19:43:10.934707194 +0200

+++ sigal-2.3/sigal/writer.py	2022-08-08 19:44:57.542382532 +0200

@@ -103,7 +103,11 @@ class AbstractWriter:

             os.path.join(THEMES_PATH, 'default', 'static'),

             os.path.join(self.theme, 'static'),

         ):

-            shutil.copytree(static_path, self.theme_path, dirs_exist_ok=True)

+            # https://stackoverflow.com/a/17022146/4935114

+            orig_copystat = shutil.copystat

+            shutil.copystat = lambda x, y: x

+            shutil.copytree(static_path, self.theme_path, dirs_exist_ok=True, copy_function=shutil.copy)

+            shutil.copystat = orig_copystat

 

         if self.settings["user_css"]:

             if not os.path.exists(self.settings["user_css"]):

pkgs/applications/misc/sigal/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -7,15 +7,17 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "sigal";

  version = "2.3";

  format = "setuptools";

  version = "2.4";

  pyproject = true;



  src = fetchPypi {

    inherit version pname;

    hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q=";

    hash = "sha256-pDTaqtqfuk7tACkyaKClTJotuVcTKli5yx1wbEM93TM=";

  };



  patches = [ ./copytree-permissions.patch ];

  nativeBuildInputs = with python3.pkgs; [

    setuptools-scm

  ];



  propagatedBuildInputs = with python3.pkgs; [

    # install_requires
@@ -31,8 +33,6 @@ python3.pkgs.buildPythonApplication rec { 
    feedgenerator

    zopfli

    cryptography



    setuptools # needs pkg_resources

  ];



  nativeCheckInputs = [