Commit Graph

2108 Commits

Author SHA1 Message Date
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
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
Kevin Rauscher
df6e489c4b Bloop: adapt derivation to darwin 2020-07-28 11:36:42 -07:00
Kevin Rauscher
147cab1ee5 Bloop: 1.4.1 -> 1.4.3 2020-07-28 11:36:42 -07:00
Karol Chmist
58f609160c Bloop: rework bloop packaging
* Include all completions
* Update derivation to make it similar to archlinux packaging
2020-07-28 11:36:42 -07:00
Karol Chmist
9a6386fd6f Bloop: 1.3.4 -> 1.4.1 2020-07-28 11:36:42 -07:00
Nikolay Korotkiy
b53902f535
cmake: fix CMAKE_FIND_FRAMEWORK 2020-07-28 19:05:43 +03:00
Ryan Burns
3a57356721 cmake: 3.17.3 -> 3.18.0 2020-07-26 18:57:06 +02:00
Michael Weiss
b9de39c2a1
scons: 4.0.0 -> 4.0.1 (#93415) 2020-07-19 11:41:41 +02:00
Vladimír Čunát
4244b73917
Merge branch 'master' into staging 2020-07-18 17:50:23 +02:00
Michael Weiss
5b14758d31
Merge pull request #92920 from primeos/scons
scons: 3.1.2 -> 4.0.0
2020-07-18 13:36:29 +02:00
Michael Weiss
d41cd156d0
scons: 3.1.2 -> 4.0.0 2020-07-18 10:48:13 +02:00
Jan Tojnar
7dff6d6681
Merge pull request #93166 from jtojnar/cmake-docdir 2020-07-18 06:51:29 +02:00