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

Merge master into staging-next

parents f7c14927 a56230df

maintainers/maintainer-list.nix

+15 −0
Original line number Diff line number Diff line
@@ -8927,6 +8927,15 @@ 
    githubId = 546087;

    name = "Kristoffer K. Føllesdal";

  };

  kgtkr = {

    email = "contact@kgtkr.net";

    github = "kgtkr";

    githubId = 17868838;

    name = "kgtkr";

    keys = [{

      fingerprint = "B30D BE93 81E0 3D5D F301 88C8 1F6E B951 9F57 3241";

    }];

  };

  khaneliman = {

    email = "khaneliman12@gmail.com";

    github = "khaneliman";
@@ -9489,6 +9498,12 @@ 
    githubId = 621759;

    name = "Lassulus";

  };

  laurailway = {

    email = "laurailway.git@posteo.net";

    github = "LAURAilway";

    githubId = 118690640;

    name = "Laura";

  };

  laurent-f1z1 = {

    email = "laurent.nixpkgs@fainsin.bzh";

    github = "Laurent2916";

nixos/modules/services/backup/restic.nix

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,8 @@ in 
              backup.rcloneConfig);

            path = [ pkgs.openssh ];

            restartIfChanged = false;

            wants = [ "network-online.target" ];

            after = [ "network-online.target" ];

            serviceConfig = {

              Type = "oneshot";

              ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ])

pkgs/applications/misc/harsh/default.nix

0 → 100644
+26 −0
Original line number Diff line number Diff line 
{ lib

, buildGoModule

, fetchFromGitHub

}:



buildGoModule rec {

  pname = "harsh";

  version = "0.8.28";



  src = fetchFromGitHub {

    owner = "wakatara";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-6BeGyyy4RFBy4TvB3bLTyDtQGljG9xE3VFfbnq9KWcs=";

  };



  vendorHash = "sha256-zkz7X/qj8FwtQZXGuq4Oaoe5G9a4AJE1kv3j7wwQEp4=";



  meta = with lib; {

    description = "CLI habit tracking for geeks";

    homepage = "https://github.com/wakatara/harsh";

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

    license = licenses.mit;

    maintainers = with maintainers; [ laurailway ];

  };

}

pkgs/development/python-modules/django-widget-tweaks/default.nix

+11 −14
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub



# native

, setuptools-scm



# propagated

, django



# tests

, python

, pythonOlder

}:



buildPythonPackage rec {

  pname = "django-widget-tweaks";

  version = "1.4.12";

  version = "1.5.0";

  format = "setuptools";



  src = fetchFromGitHub { # package from Pypi missing runtests.py

  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "jazzband";

    repo = pname;

    rev = version;

    sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h";

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

    hash = "sha256-/3UIsg75X3R9YGv9cEcoPw3IN2vkhUb+HCy68813d2E=";

  };



  SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -38,11 +36,10 @@ buildPythonPackage rec { 
  '';



  meta = with lib; {

    description = "Tweak the form field rendering in templates, not in python-level form definitions.";

    description = "Tweak the form field rendering in templates, not in python-level form definitions";

    homepage = "https://github.com/jazzband/django-widget-tweaks";

    changelog = "https://github.com/jazzband/django-widget-tweaks/blob/${version}/CHANGES.rst";

    license = licenses.mit;

    maintainers = with maintainers; [

      maxxk

    ];

    maintainers = with maintainers; [ maxxk ];

  };

}

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

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


buildPythonPackage rec {

  pname = "jupytext";

  version = "1.15.0";

  version = "1.15.1";

  format = "pyproject";



  disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec { 
    owner = "mwouts";

    repo = pname;

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

    hash = "sha256-M4BoST18sf1C1lwhFkp4a0B3fc0VKerwuVEIfwkD7i0=";

    hash = "sha256-XGjAPeMtg2Epu85JiqQPyZJVez5Z8uA+E40SFcZM7WY=";

  };



  # Follow https://github.com/mwouts/jupytext/pull/1119 to see if the patch