Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-17 06:22:23 +00:00
committed by GitHub
154 changed files with 1062 additions and 1089 deletions

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, perl, unzip }:
{ lib, stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
pname = "zpaq";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
};
nativeBuildInputs = [ perl /* for pod2man */ unzip ];
nativeBuildInputs = [ perl /* for pod2man */ ];
preBuild = let
CPPFLAGS = with stdenv; ""