@@ -1,5 +1,5 @@
11{ stdenv49
2−, lib, fetchurl, fetchFromGitHub
2+, lib, fetchurl, fetchpatch, fetchFromGitHub
33
44, which, findutils, m4, gawk
55, python, openjdk, mono58, libressl
@@ -47,8 +47,8 @@ let
4747 inherit rev sha256;
4848 };
4949
50− nativeBuildInputs = [ gawk which m4 findutils mono58 ];
51− buildInputs = [ python openjdk libressl boost ];
50+ nativeBuildInputs = [ python openjdk gawk which m4 findutils mono58 ];
51+ buildInputs = [ libressl boost ];
5252
5353 patches =
5454 [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags
@@ -57,10 +57,24 @@ let
5757 then ./ldflags-6.0.patch
5858 else ./ldflags-5.2.patch)
5959 else ./ldflags-5.1.patch)
60− ] ++
60+ ]
6161 # for 6.0+, we do NOT need to apply this version fix, since we can specify
6262 # it ourselves. see configurePhase
63− (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch);
63+ ++ (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch)
64+ # Versions less than 6.0 have a busted Python 3 build due to an outdated
65+ # use of 'print'. Also apply an update to the six module with many bugfixes,
66+ # which is in 6.0+ as well
67+ ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch {
68+ name = "update-python-six.patch";
69+ url = "https://github.com/apple/foundationdb/commit/4bd9efc4fc74917bc04b07a84eb065070ea7edb2.patch";
70+ sha256 = "030679lmc86f1wzqqyvxnwjyfrhh54pdql20ab3iifqpp9i5mi85";
71+ }))
72+ ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch {
73+ name = "import-for-python-print.patch";
74+ url = "https://github.com/apple/foundationdb/commit/ded17c6cd667f39699cf663c0e87fe01e996c153.patch";
75+ sha256 = "11y434w68cpk7shs2r22hyrpcrqi8vx02cw7v5x79qxvnmdxv2an";
76+ }))
77+ ;
6478
6579 postPatch = ''
6680 # note: this does not do anything for 6.0+
@@ -106,7 +120,6 @@ let
106120
107121 installPhase = ''
108122 mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
109− mkdir -vp $python/lib/${python.libPrefix}/site-packages
110123
111124 '' + lib.optionalString (!lib.versionAtLeast version "6.0") ''
112125 # we only copy the TLS library on < 6.0, since it's compiled-in otherwise
@@ -123,10 +136,15 @@ let
123136 cp -v ./bindings/java/foundationdb-client.jar $lib/share/java/fdb-java.jar
124137
125138 # python
139+ cp LICENSE ./bindings/python
140+ substitute ./bindings/python/setup.py.in ./bindings/python/setup.py \
141+ --replace 'VERSION' "${version}"
142+ rm -f ./bindings/python/setup.py.in
126143 rm -f ./bindings/python/fdb/*.pth # remove useless files
127− cp -R ./bindings/python/fdb $python/lib/${python.libPrefix}/site-packages/fdb
128− # symlink a copy of the shared object into place, so that impl.py can load it
129− ln -sv $lib/lib/libfdb_c.so $python/lib/${python.libPrefix}/site-packages/fdb/libfdb_c.so
144+ rm -f ./bindings/python/*.rst ./bindings/python/*.mk
145+
146+ cp -R ./bindings/python/ tmp-pythonsrc/
147+ tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
130148
131149 # binaries
132150 for x in fdbbackup fdbcli fdbserver fdbmonitor; do
@@ -140,7 +158,7 @@ let
140158 ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent
141159 '';
142160
143− outputs = [ "out" "lib" "dev" "python" ];
161+ outputs = [ "out" "lib" "dev" "pythonsrc" ];
144162
145163 meta = with stdenv.lib; {
146164 description = "Open source, distributed, transactional key-value store";