2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 20:53:48 +00:00
Commit Graph

1710 Commits

Author SHA1 Message Date
Frederik Rietdijk
8fa5eb488b Merge master into staging-next 2020-03-12 11:30:04 +01:00
Jan Tojnar
9c4f24a63e
meson: add jtojnar to maintainers 2020-03-11 13:53:15 +01:00
Thomas Tuegel
65d5cc1499
Merge pull request from r-ryantm/auto-update/cmake
cmake: 3.16.4 -> 3.16.5
2020-03-08 05:32:54 -05:00
R. RyanTM
b3793e1181 cmake: 3.16.4 -> 3.16.5 2020-03-06 06:14:36 +00:00
Frederik Rietdijk
188c3a4d03 Merge staging-next into staging 2020-03-06 07:09:30 +01:00
Matthew Bauer
dfbe76a681 waf: move binary to $out/bin/
Originally this was just the executable, but this breaks nix-shell
usage. Instead, just do a normal directory.

Fixes 
2020-03-06 07:06:01 +01:00
Jan Tojnar
1a44e325d2
Merge branch 'staging-next' into staging 2020-03-04 21:24:05 +01:00
Andreas Rammhold
1c0de27df3
bazel_0: init at 0.26.0 2020-03-04 16:41:17 +01:00
Andreas Rammhold
4c00e6f654 bazel-remote: fix fixed output derivation hash 2020-03-03 14:35:24 +01:00
Andreas Rammhold
846f300511
Merge pull request from andir/bazel-poison
buildBazelPackage: poison all the fixed output derivations
2020-03-03 10:39:05 +01:00
Andreas Rammhold
0ff376c03f
bazel-remote: update fixed output hash 2020-03-03 01:12:27 +01:00
Janne Heß
0723bf3b72 pkgs/bazel*: Fix path to update-srcDeps.py
Otherwise, the -small channel fails on the tarball output.
2020-03-02 13:11:14 +01:00
Michael Lingelbach
1c4f22a5da Add bazel 1.2.1 2020-03-02 09:08:47 +01:00
Frederik Rietdijk
21b808cd76 Merge staging-next into staging 2020-02-29 15:29:45 +01:00
Joao Neves
95c91cebf1 bazel: output correct binary name
From Bazel 2.0.0 onwards, Bazel looks for a binary named
`bazel-${version}-${os_arch}` if the project root contains a
`.bazelversion` file or the USE_BAZEL_VERSION environment
variable is set.

This change ensures we output a binary with the correct name
for the current version and OS/arch combination.
2020-02-28 12:21:22 +01:00
Joao Neves
dd413d4c2d bazel: 2.0.0 -> 2.1.0 2020-02-28 12:21:22 +01:00
Millian Poquet
65336dc3cf
meson: 0.52.1 -> 0.53.2
https://mesonbuild.com/Release-notes-for-0-53-0.html

https://github.com/mesonbuild/meson/releases/tag/0.53.0
https://github.com/mesonbuild/meson/releases/tag/0.53.1
https://github.com/mesonbuild/meson/releases/tag/0.53.2
2020-02-28 11:10:06 +01:00
Jan Tojnar
ca55015ed8
Revert "meson: 0.52.1 -> 0.53.2"
This reverts commit d607564d68.

should go to staging
2020-02-28 11:09:24 +01:00
Jan Tojnar
b0dfe1cf63
Merge pull request from mpoquet/meson-0.52.1-to-0.53.1
meson: 0.52.1 -> 0.53.1
2020-02-28 10:28:04 +01:00
Millian Poquet
d607564d68
meson: 0.52.1 -> 0.53.2
https://mesonbuild.com/Release-notes-for-0-53-0.html

https://github.com/mesonbuild/meson/releases/tag/0.53.0
https://github.com/mesonbuild/meson/releases/tag/0.53.1
https://github.com/mesonbuild/meson/releases/tag/0.53.2
2020-02-27 21:22:54 +01:00
R. RyanTM
0b919c249f
mill: 0.6.0 -> 0.6.1 () 2020-02-26 12:18:16 -05:00
Daiderd Jordan
e4af779056
Merge pull request from marsam/fix-bazel-darwin
bazel: fix build on darwin
2020-02-22 08:52:58 +01:00
Mario Rodas
1fe82110fe
Merge pull request from marsam/update-bazel-buildtools
bazel-buildtools: 0.29.0 -> 1.0.0
2020-02-21 23:44:41 -05:00
Silvan Mosberger
e0fc181f5c
Merge pull request from xfix/cmake_2_8-fix-build
cmake_2_8: fix build
2020-02-21 19:38:25 +01:00
Timo Kaufmann
ec6bf457bf
Merge pull request from timokau/maven-jdk-overridable
maven: make jdk overridable
2020-02-21 14:49:41 +00:00
Timo Kaufmann
0141cfefbc maven: make jdk overridable
This makes it possible to use maven with different (newer) jdks.

Fixes 
2020-02-21 14:26:33 +01:00
Konrad Borowski
4bad7d67cd cmake_2_8: fix build 2020-02-20 16:09:14 +01:00
Mario Rodas
572a6672d0
bazel-buildtools: add marsam to maintainers 2020-02-20 04:21:00 -05:00
Mario Rodas
d1ee615f1c
bazel: fix linker flags for darwin 2020-02-20 04:20:00 -05:00
Mario Rodas
3dd0593020
bazel-buildtools: 0.29.0 -> 1.0.0 2020-02-20 04:20:00 -05:00
Mario Rodas
82a6834e3b
Merge pull request from marsam/update-bazel-remote
bazel-remote: 2020-01-29 -> 1.0.0
2020-02-19 20:03:47 -05:00
R. RyanTM
24bc04b9d2 bmake: 20181221 -> 20200212 2020-02-19 14:18:49 -06:00
Frederik Rietdijk
0c7143462b Merge master into staging 2020-02-16 08:50:59 +01:00
Mario Rodas
2e651faa3c
bazel-remote: 2020-01-29 -> 1.0.0 2020-02-14 04:20:00 -05:00
Will Dietz
18d9cc22c6
Merge pull request from dtzWill/feature/samurai
samurai: init at 1.0
2020-02-13 00:24:39 -06:00
R. RyanTM
f00bda0148 cmake: 3.16.3 -> 3.16.4 2020-02-12 09:07:49 +01:00
Frederik Rietdijk
1a6c3cb06b Merge staging into staging-next 2020-02-11 07:59:53 +01:00
R. RyanTM
40c98652e2 mage: 1.8.0 -> 1.9.0 2020-02-10 13:33:33 +01:00
Tobias Mayer
3a39ea06d2 ninja: 1.9.0 -> 1.10.0 2020-02-09 16:57:56 -06:00
R. RyanTM
2357a15348 sbt: 1.3.7 -> 1.3.8 2020-02-07 18:35:39 +00:00
Frederik Rietdijk
76a439239e Merge master into staging-next 2020-02-05 10:28:52 +01:00
Uri Baghin
10d1a04b02 bazel-deps: remove 2020-02-04 12:35:47 +11:00
Uri Baghin
3dc9c1b885 bazel-remote: 2019-01-12 -> 2020-01-29 2020-02-04 02:26:15 +01:00
Benjamin Hipple
e73fa05f30 waf: 2.0.18 -> 2.0.19
The patch for sorting files in `tar` is no longer needed, as it has been fixed
upstream: https://gitlab.com/ita1024/waf/-/merge_requests/2227
2020-02-02 20:07:38 +01:00
Daiderd Jordan
68513e4071
cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv
This was initially introduced in 92188d9d17,
not clear how relevant this still is but i686 isn't supported anymore so
disable it explicitly.
2020-01-31 21:52:13 +01:00
Daiderd Jordan
b984c227d2
cmake: remove CMAKE_OSX_DEPLOYMENT_TARGET overrides
We _do_ want minimum versions in our packages.
2020-01-31 21:52:12 +01:00
Frederik Rietdijk
5cc0468a20 Merge staging into staging-next 2020-01-31 00:16:31 +01:00
Jörg Thalheim
2dfc3e5254
build-rebar3: restore rebar3-nix-bootstrap path ()
build-rebar3: restore rebar3-nix-bootstrap path
2020-01-30 14:21:29 +00:00
Yorick van Pelt
e8889fe676
rebar3: restore bootstrapper attribute
partially reverts 8de4654d4b
2020-01-29 20:17:27 +01:00
R. RyanTM
6e6615dfcc cmake: 3.16.2 -> 3.16.3 2020-01-29 08:57:00 +01:00