Commit graph

2255 commits

Author SHA1 Message Date
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
Sandro Jäckel e3d19670a0
curl: enable brotli by default 2021-02-13 00:04:40 +01: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
Claudio Bley a6e18b4758 bazel: Reword comment that memory leaks are acceptable
Co-authored-by: Greg Roodt <groodt@gmail.com>
2021-02-03 10:46:09 +01:00
Claudio Bley 5f71a0ff5d bazel: 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-03 10:46:09 +01:00
Claudio Bley e22cf98520 bazel: 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]:

```
# Deprecated, do not use.
# It will be removed after migration to Java toolchain resolution.
default_java_toolchain(
    name = "toolchain_hostjdk8",
    ...
)
```

[1]: 4fc4868065/tools/jdk/BUILD.tools (L384-L387)
2021-02-03 10:46:09 +01:00
Claudio Bley 6d8c431eb0 bazel: 3.7.1 -> 3.7.2
* update sha256 for gvisor, tensorflow{,WithCuda}, bazel-watcher, bazel-remote
  and envoy
2021-02-03 10:44:07 +01:00
Jan Tojnar 75153ede17
Merge branch 'staging-next' into staging 2021-02-02 19:46:31 +01:00
Tim Steinbach fab6fcdceb
sbt-extras: 2020-12-26 → 2021-02-01 2021-02-02 11:07:23 -05:00
github-actions[bot] 4c1eae9176
Merge staging-next into staging 2021-02-02 00:42:42 +00:00
Tim Steinbach a7a64001a9
sbt: 1.4.6 -> 1.4.7 2021-02-01 15:22:16 -05:00
github-actions[bot] f92395cf3c
Merge staging-next into staging 2021-01-31 06:19:43 +00:00
Lorenz Leutgeb 113bc6492d gradle: 6.7 -> 6.8.1 2021-01-30 14:15:56 +01:00
Claudio Bley 71cda4f111 bazel: 3.3.1 -> 3.7.1
* remove python-shebang patch since it was integrated upstream[1]

[1]: https://github.com/bazelbuild/bazel/pull/11535/files
2021-01-29 21:53:25 +01:00
Thomas Tuegel 0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
Thomas Tuegel 5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
github-actions[bot] a127deeb88
Merge master into staging-next 2021-01-25 18:52:08 +00:00
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Jan Tojnar cc8fd11ffb
Merge branch 'master' into staging-next 2021-01-24 20:41:42 +01:00
Sandro 81e3b9d15b
Merge pull request #110670 from siraben/double-quotes-fix
treewide: fix double quoted strings in one-liners
2021-01-24 16:17:14 +01:00
volth bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Robert Schütz 98e624eb7d doit: move to pythonPackages 2021-01-24 09:52:28 +01:00
Ryan Burns a761d5ed1b cmake: fix build on darwin
Fixes missing CoreFoundation declarations since bump to 3.19.3,
e.g. `error: unknown type name 'CFUUIDRef'`

ApplicationServices.h transitively includes CoreFoundation.h, but as we
patch ApplicationServices out of CMake, the CF symbols were not visible.
Previously this was not a concern, as they were not needed until
d250b67722
2021-01-24 08:45:10 +01:00
Jan Tojnar 01ee4ea574
Merge branch 'master' into staging-next 2021-01-24 00:09:45 +01:00
Ben Siraphob c522fec274 pkgs/development/tools: stdenv.lib -> lib 2021-01-23 20:30:03 +07:00
R. RyanTM 74c652e023 cmake: 3.19.2 -> 3.19.3 2021-01-22 21:33:15 +01:00
github-actions[bot] a5bbeb4fb1
Merge staging-next into staging 2021-01-22 12:43:02 +00:00
Michael Weiss 0f972a2534
Merge pull request #110328 from primeos/scons
scons: 4.0.1 -> 4.1.0
2021-01-22 12:38:27 +01:00
zowoq 59b83c43e0 treewide: add final newline 2021-01-22 07:18:04 +10:00
R. RyanTM 76a80a2616
mage: 1.10.0 -> 1.11.0 (#110090) 2021-01-21 09:58:34 -08:00
Michael Weiss 9d8900b8a4
scons: 4.0.1 -> 4.1.0 2021-01-21 13:37:58 +01:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
sternenseemann d629ba0fcc redo-sh: 4.0.3 -> 4.0.4 2021-01-18 16:39:44 +01:00
Ben Siraphob b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
github-actions[bot] 0984deb2b8
Merge master into staging-next 2020-12-29 06:22:28 +00:00
Sandro dcd375d236
Merge pull request #105269 from dukc/dubUpdate
dub: 1.14.0 -> 1.23.0
2020-12-29 04:41:50 +01:00
github-actions[bot] ac03278035
Merge master into staging-next 2020-12-28 18:34:55 +00:00
Tim Steinbach d7a66c7d4d
sbt-extras: 2020-12-17 → 2020-12-26 2020-12-28 10:48:03 -05:00
github-actions[bot] d5506c4c59
Merge master into staging-next 2020-12-28 12:24:08 +00:00
Peter Hoeg 7505046458 shards: minor cleanups 2020-12-28 16:21:23 +08:00
Linus Heckemann 8cc82534db
Merge pull request #107581 from mayflower/cmake-3.19.2
cmake: 3.19.1 -> 3.19.2
2020-12-27 09:08:01 +01:00
github-actions[bot] 7659201d58
Merge staging-next into staging 2020-12-25 18:28:52 +00:00
Linus Heckemann dfb2a526e3 cmake: 3.19.1 -> 3.19.2 2020-12-25 18:31:09 +01:00
Tim Steinbach c1951a1fb3
sbt: 1.4.5 -> 1.4.6 2020-12-25 11:03:04 -05:00
Dylan Baker 1bf598874f meson: install shell completions
meson ships with both bash and zsh completions, the zsh completions are
more complete than the bash ones.
2020-12-23 11:50:38 -08:00
github-actions[bot] f1957cd789
Merge staging-next into staging 2020-12-23 18:33:06 +00:00
Kevin Cox 6ae253fd5f
Merge pull request #107328 from thiagokokada/bump-lein
lein: 2.9.1 -> 2.9.5
2020-12-23 12:04:43 -05:00
github-actions[bot] 55868ac425
Merge staging-next into staging 2020-12-22 00:46:42 +00:00
github-actions[bot] f1ccef3fd4
Merge master into staging-next 2020-12-22 00:46:39 +00:00
Daniël de Kok 86477dafbb
Merge pull request #107136 from danieldk/rocm-4.0.0
rocm: 3.10.0 -> 4.0.0
2020-12-21 22:05:10 +01:00
Thiago Kenji Okada 4078999dc9 lein: 2.9.1 -> 2.9.5 2020-12-21 12:24:02 -03:00
github-actions[bot] 204a4ef360
Merge staging-next into staging 2020-12-21 00:45:57 +00:00
github-actions[bot] bdf1e394e4
Merge master into staging-next 2020-12-21 00:45:49 +00:00
Frederik Rietdijk f081225a83
Merge pull request #106533 from helsinki-systems/refactor/waf-hook
[staging] wafHook: Don't wrap Python 2
2020-12-19 19:28:05 +01:00
Daniël de Kok 03e8a2f03b rocm-cmake: 3.10.0 -> 4.0.0
No changes compared to the previous release.
2020-12-19 07:59:29 +01:00
Claudio Bley 9aac494076 bazel-buildtools: 3.3.0 -> 3.5.0 2020-12-18 23:36:31 +01:00
github-actions[bot] 8c3e8bd4b9
Merge master into staging-next 2020-12-17 18:17:15 +00:00
Janne Heß cfc4f6347f
wafHook: Don't wrap python2 2020-12-17 19:01:28 +01:00
Tim Steinbach 061ef26cb4
sbt-extras: 2020-11-23 → 2020-12-17 2020-12-17 09:02:47 -05:00
github-actions[bot] 6e0acbf2ec
Merge staging-next into staging 2020-12-15 18:20:53 +00:00
R. RyanTM 800c4724b7 sbt: 1.4.4 -> 1.4.5 2020-12-15 14:30:32 +00:00
Jonathan Ringer 8f02cddf30 cmake: patch namelink regression
see:
 - https://github.com/NixOS/nixpkgs/issues/106329
 - https://github.com/awslabs/aws-c-common/issues/734
2020-12-11 07:23:28 -08:00
Kevin Rauscher d1d8928bda bloop: 1.4.5 -> 1.4.6 2020-12-07 22:43:58 +01:00
github-actions[bot] 89e8bf0f2a
Merge master into staging-next 2020-12-02 12:30:55 +00:00
R. RyanTM f51da8c643 ninja: 1.10.1 -> 1.10.2 2020-12-01 14:40:18 +01:00
Daniël de Kok 71c017b816 rocm-cmake: 3.9.0 -> 3.10.0 2020-12-01 07:41:46 +01:00
Luke Granger-Brown 31dfbca2d7 cmake: 3.19.0 -> 3.19.1
This fixes issues with building LibreSSL, which is required for the
NixOS tests: https://cmake.org/cmake/help/latest/release/3.19.html#id1

> CMake 3.19.0 compiles source files with the `LANGUAGE` property by
> passing an explicit language flag such as -x c. This is consistent
> with the property’s documented meaning that the source file is written
> in the specified language. However, it can break projects that were
> using the property only to cause the specified language’s compiler to
> be used. This has been reverted to restore behavior from CMake 3.18
> and below.
2020-11-29 13:49:07 +01:00
John Ericson 73425f6c3b Merge remote-tracking branch 'upstream/master' into staging 2020-11-28 21:33:03 -05:00
R. RyanTM 26acfc708e mill: 0.8.0 -> 0.9.3 2020-11-28 20:01:06 +00:00
dukc 17af5377cf dub: 1.14.0 -> 1.23.0 2020-11-28 19:27:06 +02:00
Frederik Rietdijk ce9c513856 Merge staging-next into staging 2020-11-27 15:09:41 +01:00
R. RyanTM 91c6eb509b cmake: 3.18.4 -> 3.19.0 2020-11-26 12:28:45 -08:00
R. RyanTM fdfc81bd44 bear: 3.0.2 -> 3.0.3 2020-11-25 22:38:25 +00:00
Tim Steinbach 5ba4b41db6
sbt-extras: 2020-11-20 → 2020-11-23 2020-11-23 10:55:11 -05:00
Tim Steinbach d4de778e5b
sbt: 1.4.3 → 1.4.4 2020-11-23 10:55:07 -05:00
Anderson Torres f1fd8f36bf
Merge pull request #99372 from cw789/rebar3_update
rebar3: 3.12.0 -> 3.14.2
2020-11-21 10:44:18 -03:00
Frederik Rietdijk 1ffd7cf0d6 Merge master into staging-next 2020-11-21 08:43:10 +01:00
Tim Steinbach f944184738
sbt-extras: 2020-11-17 → 2020-11-20 2020-11-20 16:27:44 +00:00
cw f18d43efb5 rebar3: 3.12.0 -> 3.14.2 2020-11-20 08:30:44 +01:00
Frederik Rietdijk da12fc6838 Merge staging-next into staging 2020-11-18 15:36:56 +01:00
Tim Steinbach f3dc13bd09
sbt-extras: 2020-11-08 → 2020-11-17 2020-11-17 14:40:29 +00:00
Fabián Heredia Montiel 085da94ace shards: refactor and 0.11.0 -> {0.11.1, 0.12.0} 2020-11-17 22:19:04 +08:00
Tim Steinbach 9f9134c754
sbt: 1.4.2 → 1.4.3 2020-11-16 09:25:44 -05:00
Frederik Rietdijk 986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
John Ericson 5bafec36ef
Merge pull request #99176 from Ericson2314/meson-remove-extra-cc
meson: Remove propagated native C compiler
2020-11-15 14:18:15 -05:00
scalavision c1dfbaa8ad
mill: removing MILL_VERSION variable (#103736) 2020-11-13 18:15:01 -05:00
Frederik Rietdijk 463f738cc6 Merge master into staging-next 2020-11-13 20:58:35 +01:00
Kevin Rauscher 7fad668515 bloop: 1.4.4 -> 1.4.5 2020-11-11 15:17:43 -08:00
Frederik Rietdijk 4076ffe580 Merge staging-next into staging 2020-11-11 16:00:34 +01:00
R. RyanTM fad425cfbb cmake: 3.18.2 -> 3.18.4 2020-11-11 15:58:37 +01:00
Tim Steinbach b9c505b7bf
sbt-extras: Add test 2020-11-11 09:32:06 -05:00
Tim Steinbach 6134eafe08
sbt-extras: 2020-09-24 → 2020-11-08 2020-11-11 09:32:05 -05:00
Tim Steinbach e4d8eb1c30
sbt-extras: Add update script 2020-11-11 09:32:05 -05:00
R. RyanTM 376405314f bear: 3.0.1 -> 3.0.2 2020-11-10 22:20:26 +00:00
Frederik Rietdijk 0b2ca377b1 Merge staging-next into staging 2020-11-10 10:13:13 +01:00
R. RyanTM 400b29acf1 qbs: 1.16.0 -> 1.17.0 2020-11-10 02:38:09 +00:00
Frederik Rietdijk 8aaf2e60e5 Merge staging-next into staging 2020-11-09 14:49:10 +01:00
Doron Behar 4d79d20643
Merge pull request #103092 from Atemu/update/bear
bear: 2.4.2 -> 3.0.1
2020-11-09 01:11:13 +02:00
Atemu 51acdda618 bear: 2.4.2 -> 3.0.1
Bear has been completely redone, this is basically a new package
2020-11-07 17:27:17 +01:00
Michael Raskin 434d9676aa
Merge pull request #102579 from moinessim/msbuild/case-insensitive-file-system
MSBuild: Move to backup file to change LICENSE to lowercase.
2020-11-07 12:11:46 +00:00
Emery Hemingway be459ef9ff tup: 0.7.9 -> 0.7.10 2020-11-06 21:27:56 +01:00
Jan Tojnar d9b4611dd4
Merge branch 'staging-next' into staging 2020-11-05 09:43:10 +01:00
Jan Tojnar c0c4b481e6
Merge pull request #102144 from jtojnar/meson-0.56
meson: 0.55.3 → 0.56.0
2020-11-05 08:48:01 +01:00
Daniël de Kok 341aa3d3e0
Merge pull request #102602 from danieldk/rocm-3.9.0
Update ROCm to 3.9.0
2020-11-05 06:59:28 +01:00
Martin Weinelt 7f22603396
Merge pull request #102827 from redvers/update_ant_1.10.9
ant: 1.10.8 -> 1.10.9
2020-11-05 00:29:07 +01:00
Red Davies 89cd50903d ant: 1.10.8 -> 1.10.9 2020-11-04 21:07:36 +00:00
Tim Steinbach ac9ba67ec5
Merge pull request #102642 from NeQuissimus/sbt_1_4_2
SBT: Add test, update script, 1.4.0 -> 1.4.2
2020-11-04 12:49:34 -05:00
Tim Steinbach 23be792bad
sbt: Add test 2020-11-04 11:30:36 -05:00
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Michael Weiss 4b2c7fb106
gn: Add myself as maintainer
Since I maintain Chromium (I'll have to make sure that gnChromium always
builds and it would be good to get notified on any PRs/issues).
2020-11-03 20:01:28 +01:00
Tim Steinbach 8d279bbf67
sbt: 1.4.0 → 1.4.2 2020-11-03 11:39:07 -05:00
Tim Steinbach d92254fbeb
sbt: Add update script 2020-11-03 11:39:06 -05:00
Daniël de Kok 7b14f860ee rocm-cmake: 3.8.0 -> 3.9.0 2020-11-03 08:49:50 +01:00
Moises Nessim 258bae917a Move to backup file to change LICENSE to lowercase. 2020-11-02 23:10:37 -05:00
Vladimír Čunát dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Jan Tojnar f80fb9cb87
meson: 0.55.3 → 0.56.0
https://mesonbuild.com/Release-notes-for-0-56-0.html
https://github.com/mesonbuild/meson/releases/tag/0.56.0
2020-10-30 10:27:51 +01:00
Vladimír Čunát 31839c352e
Merge branch 'master' into staging-next 2020-10-28 18:48:18 +01:00
Matthieu Coudron 1f9ab74d4c buildBazelPackage: build name from pname/version
and updated bazel-remote accordingly.
2020-10-28 17:55:10 +01:00
Ben Siraphob db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Philippe Hürlimann fe217b9fb9 gradle: 6.6 -> 6.7 2020-10-26 14:26:24 +01:00
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Niklas Hambüchen 70a924fa80 meson: Patch out default boost search paths. See #86131.
Avoids impure builds on unsandboxed non-NixOS builds, see:
https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
2020-10-20 21:02:43 +02:00
Frederik Rietdijk 23890fc236 Merge staging-next into staging 2020-10-20 20:55:46 +02:00
Marco Farrugia ffac55a0da format 2020-10-19 18:32:48 +02:00
Marco Farrugia a360b05cb7 bazel: Fix bazel query and provide a default java toolchain
These are fixes for problems I ran into with:
- `bazel test //example:cpp-test`
This needed `build --host_javabase='@local_jdk//:jdk'`

- `bazel query 'deps(//example:cpp-test)'`
This needed the same flags as `build`.

Is it contentious to (partially?) configure the default java toolchain? I don't see it as much different than providing the bazel server's java.
It would continue to be configurable/overridable by overriding the flags. 

---
And a random notes from this escapade, but https://github.com/bazelbuild/bazel/blob/master/WORKSPACE#L144-L308 looks a little different from https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json so one of them is probably wrong :)
2020-10-19 18:32:48 +02:00
Jan Tojnar 5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Ben Siraphob 683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
John Ericson e54f6b1fde
Merge pull request #99401 from Ericson2314/cmake-optional-openssl
cmake: Tighten deps
2020-10-13 22:13:13 -04:00
John Ericson 5235a1e1fc Merge remote-tracking branch 'obsidian/cmake-nativeBuildInputs' into cmake-optional-openssl 2020-10-13 19:23:14 -04:00
John Ericson 3f93b59e6a
Merge pull request #99396 from obsidiansystems/cmake-nativeBuildInputs
cmake: Don't be target sensitive
2020-10-13 19:22:54 -04:00
Frederik Rietdijk 9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
regadas 4add0567b5
sbt: apply autoPatchelfHook only in Linux 2020-10-11 08:04:16 +01:00
Jan Tojnar aabcf2d8f5
Merge branch 'master' into staging-next 2020-10-11 00:27:21 +02:00
Robert Scott 96e42b0f55
Merge pull request #100012 from tricktron/fix-bazel_1-darwin
bazel_1: fix build on darwin
2020-10-10 18:24:52 +01:00
Thibault Gagnaux f7aafe6345 bazel_1: fix build on darwin
Use clang_8 instead of clang_7 on darwin to fix thread_local storage error.
2020-10-10 15:46:17 +02:00
Frederik Rietdijk ec28e32c9e Merge master into staging-next 2020-10-08 21:47:26 +02:00
Tim Steinbach d2b161582e
sbt: Format with nixfmt 2020-10-08 11:00:18 -04:00
Thibault Gagnaux fd2c495e97 bazel_0: fix build on darwin
Fixes `error: thread-local storage is not supported for the current target` by
upgrading clang_7 -> to clang_8 which supports thread-local storage.
2020-10-08 16:03:44 +02:00
Frederik Rietdijk 692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
John Ericson e6294cfb7e cmake: Tighten deps
- OpenSSL is evidentally an optional dep. I guess pkg-config found it
   before because it was a transitive dep?

 - `zstd` and cross-built CMake can get by with a `cmakeMinimal that we
   use during bootstrapping, so let's restrict to that.
2020-10-02 15:52:11 +00:00
John Ericson 54b7d5266b cmake: Don't be target sensative
pkg-config now has a target-sensative wrapper. We shouldn't rebuild
CMake because that wrapper changes. The setup hook should also be a
build time dep.

Fix #99325
2020-10-02 15:02:58 +00:00
John Ericson f60fc7f61f meson: Remove propagated native C compiler
Now that we have a Meson release containting [1], Meson will work fine
without a native compiler, so we don't need this trick anymore.

Fixes #58831

[1]: https://github.com/mesonbuild/meson/pull/6512
2020-09-30 10:31:39 -04:00
Jan Tojnar d471c5d1f3
Merge branch 'staging-next' into staging 2020-09-24 23:09:00 +02:00
Jan Tojnar 17f5821f94
Merge pull request #98228 from jtojnar/meson-0.55.3
meson: 0.55.1 → 0.55.3
2020-09-24 22:49:25 +02:00
WORLDofPEACE 34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
Daniël de Kok 44b5370af3 rocm-cmake: 3.7.0 -> 3.8.0
The tag refers to the same commit as 3.7.0, so the hash did not
change.
2020-09-19 08:08:29 +02:00
Jan Tojnar 87a69dafa3
meson: 0.55.1 → 0.55.3 2020-09-18 20:05:56 +02:00
Daniël de Kok 917a183d97
Merge pull request #97868 from dpercy/fac-build
fac-build: init at 0.5.3
2020-09-16 07:49:28 +02:00
David Percy 16beff405d fac-build: init at 0.5.3 2020-09-15 21:23:24 -04:00
sternenseemann 4a56effdfb redo-sh: 2.0.3 → 4.0.3
Additional changes:

* Change platforms from linux to unix. redo-sh should run as long as
  stdenv.shell is a bourne shell.
* Explicitly pass coreutils as a dependency so it can be overriden to
  use, say busybox.
2020-09-15 10:16:30 +02:00
R. RyanTM 749a260edd bmake: 20200710 -> 20200902 2020-09-07 15:20:05 +00:00
Frederik Rietdijk d362c0e54e Merge master into staging-next 2020-09-06 18:14:23 +02:00
JesusMtnez c6b0978fc6
bloop: 1.4.3 -> 1.4.4 2020-09-03 22:19:07 +02:00
Frederik Rietdijk 377242d587 Merge staging-next into staging 2020-09-03 19:21:10 +02:00
Matthew Bauer 304de03193
Merge pull request #96402 from matthewbauer/bazel-jdk-headless
Fix Bazel on macOS
2020-09-02 16:29:47 -05:00
Nikolay Korotkiy 3106c30903 cmake: fix CMAKE_FIND_FRAMEWORK 2020-08-29 13:37:56 +02:00
Michael Weiss b730ef35f1 cmake: 3.18.1 -> 3.18.2 2020-08-27 08:48:09 +02:00
Matthew Bauer 3777a4af76 bazel: pass -stdlibc=libc++ correctly
Fixes #93787
2020-08-26 15:52:38 -05:00
R. RyanTM 3d695776ae ninja: 1.10.0 -> 1.10.1 2020-08-24 11:58:01 +02:00
Jan Tojnar 58377555ed
Merge branch 'staging-next' into staging 2020-08-23 02:18:27 +02:00
Jan Tojnar 91104b5417
Merge branch 'master' into staging-next 2020-08-23 02:00:50 +02:00