Merge branch 'master' into staging-next

Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
This commit is contained in:
Vladimír Čunát
2020-10-10 11:32:10 +02:00
138 changed files with 4330 additions and 3214 deletions
+2 -2
View File
@@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "borgbackup";
version = "1.1.13";
version = "1.1.14";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "089q3flmwbz7dc28zlscwylf64kgck3jf1n6lqpwww8hlrk8cjhn";
sha256 = "1fpdj73cgp96xwasdcifxl7q2pr1my2f4vfdjpv771llri3hgfvx";
};
nativeBuildInputs = with python3.pkgs; [