Commit graph

1916 commits

Author SHA1 Message Date
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
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
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
Wael Nasreddine 866eedcb69
bazel_3: use less resources when building Bazel (#95214)
Limit the resources Bazel is allowed to use during the build to 1/2 the
available RAM and 3/4 the available CPU cores. This should help avoid
overwhelming the build machine.
2020-08-12 10:47:01 -07:00
Florian Klink 0c46d8f140 Merge remote-tracking branch 'origin/staging-next' into master 2020-08-12 18:44:25 +02:00
Jan Tojnar 74ea2b2123
meson: Fix rpath clearing
Meson allows projects to set `build_rpath` property, containing paths
that will be added during build but will be removed when installing.

When Meson removes build_rpath from `DT_RUNPATH` entry, it just writes
the shorter ␀-terminated new rpath over the old one to reduce
the risk of potentially breaking the ELF files
(when the linker does string de-duplication or something).
But this can cause much bigger problem for Nix, as it can produce
cut-in-half-by-␀ store path references.

For example, in systemd’s libudev, it was removing three `$ORIGIN`-relative paths from

    $ORIGIN/../libsystemd:$ORIGIN/../basic:$ORIGIN/../shared:…␀

resulting in the following `DT_RUNPATH` entry:

    …␀store/v589pqjhvxrj73g3r0xb41yr84z5pwb7-gcc-9.3.0-lib/lib␀

We previously handled this in `fix-rpath.patch` but the method we prevent
Meson from removing paths added to rpath through `NIX_LDFLAGS` was changed
during 0.55.0 update and I forgot about this second purpose of the patch.

Let’s re-add this clearing code, as it worked without issues for a long time.
2020-08-12 12:17:39 +02:00
Jan Tojnar e8bfa708c4 meson: Fix rpath clearing
Meson allows projects to set `build_rpath` property, containing paths
that will be added during build but will be removed when installing.

When Meson removes build_rpath from `DT_RUNPATH` entry, it just writes
the shorter ␀-terminated new rpath over the old one to reduce
the risk of potentially breaking the ELF files
(when the linker does string de-duplication or something).
But this can cause much bigger problem for Nix, as it can produce
cut-in-half-by-␀ store path references.

For example, in systemd’s libudev, it was removing three `$ORIGIN`-relative paths from

    $ORIGIN/../libsystemd:$ORIGIN/../basic:$ORIGIN/../shared:…␀

resulting in the following `DT_RUNPATH` entry:

    …␀store/v589pqjhvxrj73g3r0xb41yr84z5pwb7-gcc-9.3.0-lib/lib␀

We previously handled this in `fix-rpath.patch` but the method we prevent
Meson from removing paths added to rpath through `NIX_LDFLAGS` was changed
during 0.55.0 update and I forgot about this second purpose of the patch.

Let’s re-add this clearing code, as it worked without issues for a long time.
2020-08-11 17:48:18 +02:00
Frederik Rietdijk 46ee7ddcad Merge staging-next into staging 2020-08-11 10:26:59 +02:00
Frederik Rietdijk f707715136 Merge master into staging-next 2020-08-11 10:26:35 +02:00
zowoq cea7cd902e buildGoModule packages: set doCheck = false 2020-08-10 16:02:30 +10:00
Alyssa Ross cec26d6391
cmake: fix grep in setupHook
This produced a warning:

> grep: Invalid range end

In a [], - has to come last.

Reported-by: Daniël de Kok <me@danieldk.eu>
Fixes: 75fdc1ced6
2020-08-08 15:12:12 +00:00
Vladimír Čunát 01c2ba8575
Merge branch 'staging-next' into staging 2020-08-04 21:38:08 +02:00
Frederik Rietdijk 26c481b435 Merge master into staging-next 2020-08-04 12:48:50 +02:00
Daniël de Kok 5e7fb7699c
Merge pull request #94526 from r-ryantm/auto-update/mill
mill: 0.7.4 -> 0.8.0
2020-08-04 09:17:29 +02:00
Jan Tojnar 5b543ef214
Merge pull request #93011 from jtojnar/meson-0.55.0 2020-08-04 04:04:50 +02:00
R. RyanTM 882179ef72 mill: 0.7.4 -> 0.8.0 2020-08-02 06:42:01 +00:00
R. RyanTM f792659486 bmake: 20200629 -> 20200710 2020-08-01 21:00:22 -07:00
Frederik Rietdijk cee7df4846 Merge staging-next into staging 2020-07-30 18:28:15 +02:00
Matthew Bauer 1a3b07cf8e Merge commit 'b53902f535f2c63d71e916b9de22dbcfeec9d99e' into staging 2020-07-29 18:24:08 -05:00
Matthew Bauer 22f82fc8ca Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"
This reverts commit e36b1d4ad1, reversing
changes made to c2ea7318be.

Should go to staging.
2020-07-29 18:20:56 -05:00
Matthew Bauer e36b1d4ad1
Merge pull request #94090 from sikmir/fix-cmake-hook
cmake: fix CMAKE_FIND_FRAMEWORK
2020-07-29 18:19:57 -05:00
Vladimír Čunát 60d89e5793
Merge branch 'master' into staging 2020-07-29 18:40:28 +02:00