bup: update to version 0.25-rc1-107-g96c6fa2 and drop -Werror to fix the build
/nix/store/4jfqcb4mzh3vl08zgfh9ir46jii7rcb9-python-2.7.3/include/python2.7/modsupport.h:27:1: error: 'PyArg_ParseTuple' is an unrecognized format function type [-Werror=format=] PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3); ^ cc1: all warnings being treated as errors
This commit is contained in:
parent
98bf728dce
commit
2879cf569e
@ -6,26 +6,21 @@ assert par2Support -> par2cmdline != null;
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "bup-0.25git20121224";
|
||||
name = "bup-0.25-rc1-107-g96c6fa2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/bup/bup.git";
|
||||
sha256 = "f0e0c835ab83f00b28920d493e4150d2247113aad3a74385865c2a8c6f1ba7b8";
|
||||
rev = "458e92da32ddd3c18fc1c3e52a76e9f0b48b832f";
|
||||
rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58";
|
||||
sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n";
|
||||
};
|
||||
|
||||
buildInputs = [ python git ];
|
||||
nativeBuildInputs = [ pandoc perl makeWrapper ];
|
||||
|
||||
buildInputs = [ python git ];
|
||||
|
||||
postInstall = optionalString (elem stdenv.system platforms.linux) ''
|
||||
wrapProgram $out/bin/bup --prefix PYTHONPATH : \
|
||||
${stdenv.lib.concatStringsSep ":"
|
||||
(map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])}
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
for f in cmd/* lib/tornado/* lib/tornado/test/* t/* wvtest.py main.py; do
|
||||
substituteInPlace Makefile --replace "-Werror" ""
|
||||
for f in "cmd/"* "lib/tornado/"* "lib/tornado/test/"* "t/"* wvtest.py main.py; do
|
||||
test -f $f || continue
|
||||
substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
|
||||
done
|
||||
substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
|
||||
@ -33,6 +28,8 @@ stdenv.mkDerivation {
|
||||
substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'"
|
||||
'';
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
makeFlags = [
|
||||
"MANDIR=$(out)/share/man"
|
||||
"DOCDIR=$(out)/share/doc/bup"
|
||||
@ -40,11 +37,20 @@ stdenv.mkDerivation {
|
||||
"LIBDIR=$(out)/lib/bup"
|
||||
];
|
||||
|
||||
postInstall = optionalString (elem stdenv.system platforms.linux) ''
|
||||
wrapProgram $out/bin/bup --prefix PYTHONPATH : \
|
||||
${stdenv.lib.concatStringsSep ":"
|
||||
(map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = ''
|
||||
homepage = "https://github.com/bup/bup";
|
||||
description = "efficient file backup system based on the git packfile format";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
longDescription = ''
|
||||
Highly efficient file backup system based on the git packfile format.
|
||||
Capable of doing *fast* incremental backups of virtual machine images.
|
||||
'';
|
||||
homepage = "https://github.com/bup/bup";
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user