3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1938 commits

Author SHA1 Message Date
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
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
Daniël de Kok 280147c510
Merge pull request #95489 from danieldk/rocm-3.7.0
Update ROCm to 3.7.0
2020-08-22 13:30:01 +02:00
Daniël de Kok 8c2bc9a8c0 rocm-cmake: 3.5.0 -> 3.7.0
This only bumps the tag. But the tag points at the same commit, so no
sha256 changes.
2020-08-21 08:50:51 +02:00
Frederik Rietdijk 7dba683656 Merge staging-next into staging 2020-08-17 17:51:54 +02:00
Frederik Rietdijk 0ac85bc455 Merge master into staging-next 2020-08-17 14:54:39 +02:00
Florian Klink d93c4e2f85
Merge pull request #95600 from dasj19/ant-updates
apache ant: 1.9.6 -> 1.9.15; 1.10.2 -> 1.10.8
2020-08-17 00:34:42 +02:00
Jan Tojnar c6acf50360 meson: 0.55.0 → 0.55.1
https://github.com/mesonbuild/meson/compare/0.55.0...0.55.1

setuptools have been removed from runtime dependencies:
https://github.com/mesonbuild/meson/pull/7461
2020-08-16 19:48:32 +02:00
Daniel Șerbănescu c7224f12c3 ant: 1.10.2 -> 1.10.8 2020-08-16 17:19:35 +02:00
Daniel Șerbănescu 9072b63bcb ant: 1.9.6 -> 1.9.15 2020-08-16 17:19:01 +02:00
Marvin Strangfeld cb4cfcf948 gradle: 6.5 -> 6.6 2020-08-16 13:10:15 +00:00
zowoq a83a88db05 buildGoPackage: remove platform.all from packages 2020-08-15 19:34:47 -07:00
zowoq 42313b92bc buildGoModule: remove platform.all from packages 2020-08-15 19:34:47 -07:00
Frederik Rietdijk cfe6081cee Merge staging-next into staging 2020-08-15 09:12:42 +02:00
R. RyanTM 4005fe7f55 cmake: 3.18.0 -> 3.18.1 2020-08-15 08:33:21 +02:00
Anders Kaseorg 729e7295cf meson: Add upstream patch to stop failing on skipped tests
https://github.com/mesonbuild/meson/pull/7525

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-08-14 21:01:46 +02:00
Anders Kaseorg dbac38cf0e meson: Add upstream patch to stop failing on skipped tests
https://github.com/mesonbuild/meson/pull/7525

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-08-14 08:23:53 +02:00
Michael Weiss 57f0574595
cmake: Add a patch to fix a regression since CMake 3.18
This fixes all CMake builds that use target_precompile_headers() and
as a result fail since CMake 3.18 with e.g.:
g++: error: unrecognized command line option '-Xarch_x86_64'; did you mean '-march=x86-64'?

Fix #94905.

CMake references:
- https://gitlab.kitware.com/cmake/cmake/-/issues/21072
- https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5118
2020-08-13 12:50:12 +02:00
Frederik Rietdijk 7e189c56a1 Merge staging-next into staging 2020-08-13 08:52:48 +02:00