Commit Graph

2114 Commits

Author SHA1 Message Date
John Ericson
f5a7d8bb41
Merge pull request #115228 from siraben/unzip-buildInputs
treewide: unzip buildInputs to nativeBuildInputs (2)
2021-03-06 13:30:43 -05:00
Ben Siraphob
4f0cdb68d7 treewide: unzip buldInputs to nativeBuildInputs (2) 2021-03-06 15:18:05 +07:00
Jan Tojnar
6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00
Tim Steinbach
0355cd98e8 sbt-extras: 2021-03-01 → 2021-03-03 2021-03-04 12:29:00 -05:00
Sandro
e061350a36
Merge pull request #114474 from NeQuissimus/sbt_jdk11
sbt: Fix check
2021-03-03 14:12:42 +01:00
John Ericson
09d0e10e95
Merge pull request #114817 from thefloweringash/darwin-arch
darwin: introduce darwinArch, apply in {cc,bintools}-wrappers
2021-03-02 15:27:15 -05:00
Tim Steinbach
44164e9cd4
sbt: Remove installCheck
The check is very fragile.
We cannot replace it with different logic as that would require
network access.
`
2021-03-02 14:56:48 -05:00
github-actions[bot]
f5bb0053a6
Merge staging-next into staging 2021-03-02 18:17:42 +00:00
Tim Steinbach
8d25cac779
sbt-extras: 2021-02-24 → 2021-03-01 2021-03-02 15:00:39 +00:00
Andrew Childs
d16a8753d9 stdenv: set CMAKE_OSX_ARCHITECTURES appropriately 2021-03-02 17:21:07 +09:00
Jan Tojnar
913394a1d9
Merge branch 'staging-next' into staging 2021-03-01 19:30:56 +01:00
Mario Rodas
a1a6da5418 conan: fix build on darwin 2021-02-27 04:20:00 +00:00
github-actions[bot]
e8162c62e3
Merge staging-next into staging 2021-02-27 00:37:54 +00:00
Sandro
e8446a3f77
Merge pull request #114396 from NeQuissimus/sbtextras
sbt-extras: 2021-02-04 → 2021-02-24
2021-02-26 20:40:10 +01:00
Robert Schütz
54757b35c1 Merge branch 'staging-next' into staging 2021-02-26 10:56:17 +01:00
Frederik Rietdijk
c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Tim Steinbach
0b1942a4d4
sbt-extras: 2021-02-04 → 2021-02-24 2021-02-25 16:40:42 +00:00
Tim Steinbach
c3178c39b0 sbt: Remove updateScript
`nix-shell -p nix-update --command "nix-update sbt"` is more reliable
2021-02-24 09:51:14 -05:00
Tim Steinbach
af2e9e5046 sbt: Replace VM test with installCheckPhase 2021-02-24 09:51:14 -05:00
Marvin Strangfeld
072018e87e
gradle: 6.8.1 -> 6.8.3 2021-02-23 10:20:13 +01:00
Jesús Martínez
66ae5f1b10
bloop: 1.4.6 -> 1.4.8 (#113972)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-02-23 06:11:55 +01:00
Tim Steinbach
cb72a93d2e sbt-extras: Convert VM test into installCheckPhase 2021-02-22 10:07:42 -05:00
Jan Tojnar
921cf0fc78
Merge pull request #113787 from jtojnar/meson-0.57
meson: 0.56.0 → 0.57.1
2021-02-22 06:20:00 +01:00
Ivan Babrou
5269ed23f2
cmake: remove obsolete substituteInPlace (#113843)
This `substituteInPlace` was introduced in 2016 when cmake was at v3.4:

* https://github.com/NixOS/nixpkgs/commit/5286c0aebb

In 2018 cmake v3.12.0 changed the code to make it not match anything:

* https://github.com/Kitware/CMake/commit/50b5e9ed13

```
substituteStream(): WARNING: pattern '${PYTHON_EXECUTABLE}' doesn't match anything in file 'Modules/FindCxxTest.cmake'
```

Having it around in 2021 with cmake v3.19.3 doesn't help,
and tests are disabled anyway.
2021-02-21 22:29:45 -05:00
Ben Siraphob
127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
Jan Tojnar
3242c2f8ae
meson: 0.56.0 → 0.57.1
- https://mesonbuild.com/Release-notes-for-0-57-0.html
- https://github.com/mesonbuild/meson/releases/tag/0.57.0
- https://github.com/mesonbuild/meson/releases/tag/0.57.1
2021-02-20 15:27:20 +01:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
zowoq
3dab057264 Merge staging-next into staging 2021-02-19 10:47:46 +10:00
Peter Hoeg
88eb9ce528 shards: 0.12 -> 0.13 2021-02-18 09:11:23 +00:00
R. RyanTM
1bfa781657 cmake: 3.19.3 -> 3.19.4 2021-02-11 10:26:17 +01:00
github-actions[bot]
8064cff79c
Merge master into staging-next 2021-02-09 18:16:33 +00:00
Wael Nasreddine
25174d14f6
Merge pull request #106984 from divanorama/bazel_4
bazel_4: init at 4.0.0
2021-02-09 09:04:03 -08:00
github-actions[bot]
30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Mario Rodas
2d9e678efa
Merge pull request #111831 from r-ryantm/auto-update/samurai
samurai: 1.1 -> 1.2
2021-02-08 21:09:02 -05:00
github-actions[bot]
bef005163c
Merge master into staging-next 2021-02-08 12:19:33 +00:00
Eric Bailey
35056b3b61 maintainers/teams: add beam team 2021-02-07 13:01:11 -06:00
github-actions[bot]
3c4d8b38c4
Merge staging-next into staging 2021-02-05 00:36:22 +00:00
Dmitry Ivankov
cf1935583e bazel_4: update src-deps after java update 2021-02-04 20:38:08 +01:00
Claudio Bley
b56ac70602 bazel_4: Use jdk11_headless to build bazel
Use the same JDK for building bazel and for its runtime.

Effectively, the former `toolchain_hostjdk8` java toolchain has been deprecated
and should no longer be used (in newer bazel)[1]:

```
default_java_toolchain(
    name = "toolchain_hostjdk8",
    ...
)
```

[1]: 4fc4868065/tools/jdk/BUILD.tools (L384-L387)
2021-02-04 20:33:40 +01:00
Claudio Bley
b461c9e5bc bazel_4: Fix build on darwin
* use default stdenv (clang 7)
* add no-arc.patch to make the xcode_locate tool compile without libarc-lite
* remove the `-mmacosx-version-min=10.9` flag from the bootstrap compile script
2021-02-04 20:31:43 +01:00
Dmitry Ivankov
56c25c5653 bazel: fix protobuf-test compatibility with bazel_4
- bump protobuf to 3.13.0
- use recent rules_proto
- use recent bazel-skylib
- remove use of native.bind

Hopefully this is backward-compatible with bazel_3 and below
2021-02-04 20:24:56 +01:00
Dmitry Ivankov
2751275f1a bazel_4: bump examples repo just in case 2021-02-04 20:24:56 +01:00
Dmitry Ivankov
cd65145664 bazel: cosmetic fix: test name cpp->java 2021-02-04 20:24:55 +01:00
Dmitry Ivankov
55a810443d bazel_4: use --verbose_failures for the build 2021-02-04 20:24:55 +01:00
Dmitry Ivankov
0f5783f80a bazel_4: init at 4.0.0
Bazel 4 is going to be a long term support release.

Latest version in NixPkgs so far was 3.3.1
There's a need for more recent version
https://github.com/NixOS/nixpkgs/issues/97497

All versions from 3.5.0 to 3.7.1 had some reproducibility issues
as noted in issue above, but there also seems to be
a working PR for 3.7.1 now at
https://github.com/NixOS/nixpkgs/pull/105439

Notable changes from bazel_3 setup:
- put python to default bash path

  For autodetecting python toolchain
  with strict action_env on and without this change
  bazel would fail to autodetect host python.

  There are some repos that define hermetic python
  toolchains, but they aren't easy to use yet. Also
  telling python paths to bazel isn't a 1-liner it
  seems:
  - action_env=PATH would affect cache
  - declaring toolchain via BUILD&WORKSPACE files
    is not per-user but more like per-repo and
    affects cache too

  Using python from nixpkgs shouldn't be too bad
  in the lack of simpler hermetic python toolchain
  options

- bazel_4.updater is bazel on `bazel query` to support
  new constructs in WORKSPACE (load of vars, transitive
  load etc). This is more robust but requires bazel
  to run the updater, using bazel_3 for now. This is
  only needed to bump package version, doesn't introduce
  bazel_4 build dependency on bazel_3

https://blog.bazel.build/2020/11/10/bazel-4.0-announce.html
https://blog.bazel.build/2020/11/10/long-term-support-release.html
https://github.com/bazelbuild/bazel/issues/12455
https://github.com/bazelbuild/bazel/releases/tag/4.0.0
https://blog.bazel.build/2021/01/19/bazel-4-0.html
2021-02-04 20:24:54 +01:00
Sandro
8a4a984fd5
Merge pull request #105439 from avdv/bazel_3.7.1 2021-02-04 20:15:45 +01:00
Jan Tojnar
da66296930
Merge branch 'staging-next' into staging
libkeyfinder no longer uses Qt so dontWrapQtApps is moot.
2021-02-04 19:34:26 +01:00
Tim Steinbach
0d98eb3ab0
sbt-extras: 2021-02-01 → 2021-02-04 2021-02-04 10:39:45 -05:00
R. RyanTM
90fd0c0714 samurai: 1.1 -> 1.2 2021-02-03 23:11:03 +00:00
Claudio Bley
a42d59b208 bazel-remote: Mark as broken on Darwin
It currently fails during compilation because C++ standard
header files cannot be found.
2021-02-03 11:51:11 +01:00