Commit Graph

55 Commits

Author SHA1 Message Date
github-actions[bot]
f8c265f433
Merge master into staging-next 2022-04-26 06:01:08 +00:00
Anders Kaseorg
6920d8ca42 treewide: Simplify negated uses of versionAtLeast, versionOlder
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2022-04-25 13:35:24 -07:00
Ben Siraphob
259fa13d53 treewide: remove nativeBuildInputs that are in stdenv 2022-04-16 21:46:46 +03:00
Will Young
8b0b5be13a
foundationdb61: pin Boost dep to boost168 (#157967) 2022-02-07 23:01:47 -05:00
Sandro
d5bd34ebf2
treewide: convert phases that contain ":" to dont* = true (#130500) 2021-07-18 23:42:48 +02:00
Frederik Rietdijk
f0754b8ab8 foundationdb: use python2 and python3 2021-03-25 13:12:27 +01:00
Frederik Rietdijk
c15ad415b1 foundationdb vsmake: stay with python2
CMake builds already use python3. Stay with python2, just to be safe.
2021-03-25 12:55:20 +01:00
Sandro
a908dd415d
Merge pull request #114176 from omasanori/fix-foundationdb61
foundationdb61: 6.1.12 -> 6.1.13, fix build
2021-03-05 02:12:20 +01:00
Masanori Ogino
cd98de0816 foundationdb60: fix build
- Add missing #include, mainly <cmath>
- Add missing 'std::'
- Remove prototype conflicting with the libc's definition

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2021-02-24 12:48:58 +09:00
Masanori Ogino
3aa47450f1 foundationdb61: 6.1.12 -> 6.1.13, fix build
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2021-02-24 06:19:32 +09:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Pavol Rusnak
90f7338112
treewide: stdenv.lib -> lib 2021-01-24 01:49:49 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Raphael Borun Das Gupta
450de176cf foundationdb: fix build: use glibc's gettid()
to avoid build error due to conflicting declaration:

    flow/Profiler.actor.cpp: In function 'uint64_t gettid()':
    flow/Profiler.actor.cpp:56:17: error: ambiguating new declaration of 'uint64_t gettid()'
      FILE* f;
                     ^
    In file included from /nix/store/4wy9j24psf9ny4di3anjs7yk2fvfb0gq-glibc-2.31-dev/include/unistd.h:1170:0,
                     from ./flow/Platform.h:49,
                     from ./flow/flow.h:40,
                     from flow/Profiler.actor.cpp:39:
    /nix/store/4wy9j24psf9ny4di3anjs7yk2fvfb0gq-glibc-2.31-dev/include/bits/unistd_ext.h:34:16: note: old declaration '__pid_t gettid()'
     extern __pid_t gettid (void) __THROW;
                    ^~~~~~
2020-10-11 19:53:53 +02:00
Raphael Borun Das Gupta
4406883af1 foundationdb: fix "was not declared" build errors
Since glibc 2.28, `<sys/types.h>` no longer includes
`<sys/sysmacros.h>`, which provides these macros,
so we have to explicitly import the latter, too, to fix the following
build problems:

    flow/Platform.cpp: In function 'void getDiskStatistics(const string&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&)':
    flow/Platform.cpp:626:56: error: 'gnu_dev_major' was not declared in this scope
       if(majorId == (unsigned int) gnu_dev_major(buf.st_dev) && minorId == (unsigned int) gnu_dev_minor(buf.st_dev)) {
                                                            ^
    flow/Platform.cpp:626:111: error: 'gnu_dev_minor' was not declared in this scope
       if(majorId == (unsigned int) gnu_dev_major(buf.st_dev) && minorId == (unsigned int) gnu_dev_minor(buf.st_dev)) {
                                                                                                                   ^
2020-10-11 15:32:17 +02:00
Raphael Borun Das Gupta
f1e628e7af foundationdb: refresh gcc-fixes-patch
by applying it to apple/foundationdb@5.1.7 and running

    git diff > ${path_to_nixpkgs}/pkgs/servers/foundationdb/patches/gcc-fixes.patch

again.
2020-10-11 15:25:28 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Maximilian Bosch
ea8ae88f04
Merge branch 'staging' into glibc230 2020-02-01 17:42:03 +01:00
Maximilian Bosch
a064678390
foundationdb5: build with gcc6 2020-01-28 20:11:02 +01:00
Maximilian Bosch
c36d8a8338
foundationdb61: fix build w/glibc-2.30 2020-01-23 09:33:34 +01:00
Austin Seipp
53a7ae0185
foundationdb: no clang, use default gcc
These options should be experimental, and I'm keeping them off for now.
This also avoids any ABI concerns between libraries, too.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-11-01 00:36:31 -05:00
Austin Seipp
462d2b73c2
foundationdb61: 6.1.10 -> 6.1.12
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-11-01 00:36:27 -05:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
worldofpeace
cab7c6cbd9 treewide: use dontConfigure 2019-07-01 04:23:51 -04:00
Austin Seipp
348489c685
foundationdb61: 6.1.8 -> 6.1.10
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-06-16 19:20:11 -05:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Austin Seipp
2a56ea3593
foundationdb61: 6.1.7pre4928_a990458e -> 6.1.8
This bumps the 6.1.x branch to the official 6.1.8 release. Also fixes a
minor bug in the new CMake build (an invalid parameter passed to CMake)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-27 23:27:38 -05:00
Austin Seipp
b38b0f610f
foundationdb61: 6.1.6pre4898 -> 6.1.7pre4928
Also includes some minor, miscellaneous cleanups to the CMake build
expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-21 10:48:56 -05:00
Austin Seipp
3f1c6801a2
foundationdb: init 6.1.6pre4898_26fbbbf, cmake build
This adds a new build of FoundationDB 6.1, using the new, much improved
with CMake build system with fewer patches and rough edges.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-15 09:54:10 -05:00
Austin Seipp
a13a0c8de4
foundationdb: refactor vsmake patch application
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-15 09:54:10 -05:00
Austin Seipp
34e15b1c73
foundationdb: refactor 'vsmake' build system into its own file [NFC]
FoundationDB is currently in the process of migrating to CMake, and it
will eventually be the only build system. In preparation for this, split
off the current (somewhat nasty) builder into its own file, and allow
default.nix to be more declarative -- containing only the main supported
versions.

Similarly, a cmake.nix file will be added later.

There is no functional change here (NFC), only an organizational change
(file moves, no hash changes).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-05-15 09:54:07 -05:00
Austin Seipp
c19807e25d
foundationdb60: 6.0.17 -> 6.0.18
Fixes numerous bugs in blobstore backup.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-02-12 23:03:25 -06:00
obadz
55af73e156 mono: only maintain major versions (mono4 & mono5) 2018-12-23 00:04:46 +00:00
Austin Seipp
3ebdd65ad7 foundationdb: x86_64-linux only
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-12-04 22:32:54 -06:00
Austin Seipp
c9fd7dc0ee foundationdb60: 6.0.15 -> 6.0.17
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-12-04 22:32:54 -06:00
Austin Seipp
47b3086bdf foundationdb: set RELEASE=true for official builds
This ensures the proper version is reported in the server status
information; otherwise it has a '-PRERELEASE' suffix.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-11-17 22:12:40 -06:00
Austin Seipp
8d4f8a6d26 foundationdb60: 6.0.11pre2716 -> 6.0.15
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-11-16 20:34:20 -06:00
Austin Seipp
6054dabc11 foundationdb: rework python bindings, build system
FoundationDB uses Python at build time for some code generation.
However, it also has the official python bindings inside the source code
too, and the code for the Python bindings has some of it auto-generated
at compile time.

This made building python packages unattractive: we want to use the
source code generated from the FoundationDB build, but we don't want to
rebuild it. Previously we would override the 'python' input to the
FoundationDB module, but this meant we would do a complete rebuild, as
it was a necessary build time dependency, even though the resulting
generated code itself would not change. Furthermore, FoundationDB
versions < 6.0 don't properly support Python 3 *for the build system*,
though the bindings supported it, so that caused build failures. But the
first effect is the worst: it meant building separate python2 and
python3 packages implied two complete rebuilds of a single FoundationDB
version. This meant rather than 3 FDB builds, we'd do 3*N where N = the
number of major Python versions we support.

Finally, because we did not use pip to generate a wheel that we install
with metadata recorded for the installation, the FoundationDB python
package couldn't be used as an input to other setup.py-based packages:
there would be no recorded metadata in the dist-info folder which would
say this is the foundationdb package. This greatly limits its utility.

To fix all this, we do a few things:

  - Apply some patches to fix the build system with Python 3.x for
    older FoundationDB versions. (This is nice if end-users have
    overridden the global Python version for some reason.)
  - Move python directly into nativeBuildInputs, so it is only a
    build time dependency.
  - Take the python source code from the ./bindings directory and
    tar it up use later after the build is done, so we get to keep
    the generated code. This is the new 'pythonsrc' output from the
    build. This code doesn't change based on whether or not the input
    or resulting package is using Python 2 or 3, it's totally
    deterministic.
  - The build system also patches up the python source code a little,
    so it can be installed directly with setup.py (it needs a little
    stuff that it normally expects the build system to do.)
  - Rework the python package to a separate file that uses
    buildPythonPackage directly. Because the source code is already
    prepared, it needs almost nothing else. Furthermore, this kills
    the override itself for the foundationdb package, meaning rebuilds
    are no longer needed.
  - This package is very simple and just uses foundationdb.pythonsrc
    as its source input. It also ensures a link to libfdb_c.so can
    be found by ctypes (using substituteInPlace)
  - python-packages.nix now just uses callPackage directly.

The net effect of this is, most importantly, that python packages do not
imply a full rebuild of the server source code: building python2 and
python3 packages from a version of FoundationDB now does not need to
override the foundationdb python input, reducing the number of needless
builds. They instead just run setup.py with the given version as input.

The second biggest effect is that wheel metadata is recorded correctly,
meaning dependent-python-packages that want to use the FoundationDB
bindings e.g. from PyPi should now work fine with buildPythonPackage.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-11-16 20:34:19 -06:00
Austin Seipp
32948a6f3d foundationdb: include fdb.options in .dev for binding generators
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-11-16 20:22:40 -06:00
Austin Seipp
f1737fa646 foundationdb60: 6.0.4pre2497_73d64cb2 -> 6.0.11pre2716_9e8c1941e
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-09-17 17:49:09 -05:00
Austin Seipp
aa79ae0c64 foundationdb: install python bindings
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-08-04 16:56:16 -05:00
Austin Seipp
6b0451c060 foundationdb60: 6.0.3pre2446 -> 6.0.4pre2497
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-08-04 09:47:41 -05:00
Austin Seipp
d8652e9fc2 foundationdb52: 5.2.6 -> 5.2.8
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-08-04 09:47:41 -05:00
Austin Seipp
f8e8ecde51 foundationdb60: 6.0.2pre2430 -> 6.0.3pre2446
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-07-26 18:58:40 -05:00
Austin Seipp
a14a75a567 foundationdb: include debug info in all builds
This puts the debug information in a separate output, as expected. This allows
meaningful symbol names to appear in DWARF-based tools like perf and gdb.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-07-26 18:44:49 -05:00
Austin Seipp
f517b5a8dd foundationdb: bump to 5.2.6, 6.0.2-prelease
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-07-20 17:57:44 -05:00
Austin Seipp
e42e0c8179 foundationdb: add 5.2.5 release, and new 6.0.0 snapshot
This requires a bit of fiddling with the ldflags patches and reworking a few
things about how the SCM info is configured. Ideally, not much more will change
before the 6.0 release, I think...

This also upgrades all FoundationDB packages to use the ordinary libressl
expression (which is now at 2.7.x), and changes around a few other things,
which will require a rebuild.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-07-03 09:09:02 -05:00
Sarah Brofeldt
6abb68d47a Revert "foundationdb: add 5.2.5 release, and new 6.0.0 snapshot"
This reverts commit 1fa2503f9d.
Broke ofborg evals due to missing required argument sdvend49
2018-07-02 16:08:54 +02:00