Commit Graph

1776 Commits

Author SHA1 Message Date
Niklas Hambüchen
0bc0823ff7
Merge pull request #83144 from nh2/conan-1.23.0
Conan 1.23.0
2020-03-26 15:55:39 +01:00
Doron Behar
7f2fc686af bear: Use python3 by default 2020-03-26 07:25:15 +01:00
Andreas Rammhold
d7673d7889 bazel_0: init at 0.26.0
(cherry picked from commit 1c0de27df3)
2020-03-25 11:32:39 -04:00
Janne Heß
cfe8e0e1ad pkgs/bazel*: Fix path to update-srcDeps.py
Otherwise, the -small channel fails on the tarball output.

(cherry picked from commit 0723bf3b72)
2020-03-25 11:27:15 -04:00
Michael Lingelbach
3fab55793d Add bazel 1.2.1
(cherry picked from commit 1c4f22a5da)
2020-03-25 11:27:14 -04:00
Michael Weiss
a1b4bfe34f
gn: 20190403 -> 2020-03-09
This updates gn to the required version for chromiumDev (the recommended
version for the stable release of Chromium isn't sufficient [0]).

[0]: The Chromium build fails during the configuration phase:
ERROR at //mojo/public/tools/bindings/mojom.gni:393:16: Undefined identifier
               "cpp_typemaps",
               ^-------------
2020-03-24 14:41:11 +01:00
Orivej Desh
1b89aa3f7a Merge branch 'master' into staging 2020-03-23 00:53:16 +00:00
Christian Kögler
4c9bd5d52a redo-apenwarr: 0.42 -> 0.42a; use python3 and fixed building manpage
Removed dependency to mkdoc, which is only needed to build the webpage.
2020-03-22 19:11:15 +01:00
Niklas Hambüchen
f460e62d9b conan: 1.12.3 -> 1.23.0
* remove pinned dependencies where nixpkgs provides a version
  in the acceptable range
* disable tests;
  they are no longer in the Pypi archive, see
  https://github.com/conan-io/conan/issues/4563
2020-03-22 16:34:55 +01:00
Niklas Hambüchen
03d5611ae0 conan: Remove unnecessary patching.
The pluginbase dependency is now pinned further up with commit

    244fcfc8 - conan: pin pluginbase to 0.7
2020-03-22 16:03:44 +01:00
Niklas Hambüchen
3a158da8e8 conan: Reformat inputs list 2020-03-22 15:45:49 +01:00
Matthew Bauer
46f8756aee
Merge pull request #79593 from thefloweringash/wafhook-phases
wafHook: allow overriding phases and disabling of cross flags
2020-03-22 01:59:41 -04:00
Patrick Hilhorst
9fc5e7e473
treewide: fix redirected urls (again)
Ran the same script as #78265.
Additionally, manually replaced `http://goodies.xfce.org`
with https.
2020-03-20 13:36:23 +01:00
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 #81869 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 #79909
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 #80953 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 #80797 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 (#81017) 2020-02-26 12:18:16 -05:00
Daiderd Jordan
e4af779056
Merge pull request #80635 from marsam/fix-bazel-darwin
bazel: fix build on darwin
2020-02-22 08:52:58 +01:00
Mario Rodas
1fe82110fe
Merge pull request #80627 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 #80645 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 #80728 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 #75630
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 #80527 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 #77140 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
Andrew Childs
03ffda3d1e wafHoook: fix whitespace 2020-02-09 16:13:43 +09:00
Andrew Childs
032d5e7e83 wafHook: make crossFlags optional
The convention of `--cross-compile` and `--cross-execute` is common
enough that it seems like a reasonable default. However there are
projects like mpv which do not use these flags, and rightfully fails
to configure when passed unexpected flags.
2020-02-09 16:03:02 +09:00
Andrew Childs
c6791b2117 wafHook: allow overriding phases
This makes the wafHook a lot closer to the structure of standard hooks
like cmake and ninja.
2020-02-09 16:03:02 +09: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 (#78418)
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
Frederik Rietdijk
dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
Maximilian Bosch
258d4b3ca4
Merge pull request #78487 from r-ryantm/auto-update/sbt
sbt: 1.3.5 -> 1.3.7
2020-01-26 00:26:10 +01:00
R. RyanTM
5d19c3525e sbt: 1.3.5 -> 1.3.7 2020-01-25 22:58:10 +00:00
scalavision
de193e105d mill: 0.5.6 -> 0.6.0 2020-01-24 15:01:47 +01:00
Pascal Wittmann
00482247e1
Merge pull request #78200 from r-ryantm/auto-update/icmake
icmake: 9.02.09 -> 9.03.01
2020-01-22 08:55:37 +01:00
R. RyanTM
aed4be2de3 icmake: 9.02.09 -> 9.03.01 2020-01-21 18:55:15 +00:00
R. RyanTM
a98253f848 rebar: 2.5.1 -> 2.6.4 2020-01-17 10:22:22 +00:00
Frederik Rietdijk
bc18cc72dd
Merge pull request #77610 from LnL7/darwin-stdenv-python3
darwin-stdenv: bootstrap with python3
2020-01-15 09:24:57 +01:00
Daiderd Jordan
587c66c877
ninja: python2 -> python3 2020-01-13 11:13:06 +01:00
Frederik Rietdijk
960f062825 Merge master into staging-next 2020-01-12 09:47:19 +01:00
Mario Rodas
b19f27a785
Merge pull request #76328 from r-ryantm/auto-update/mill
mill: 0.5.3 -> 0.5.6
2020-01-11 05:20:24 -05:00
Frederik Rietdijk
348eaa280b Merge master into staging-next 2020-01-10 18:32:07 +01:00
Milan Pässler
8337bb607c gradle: remove old versions 2020-01-10 04:21:18 +01:00
Frederik Rietdijk
a823616723 Merge master into staging-next 2020-01-07 20:06:22 +01:00
Danju Visvanathan
0a6551f48c bazel: 1.2.1 -> 2.0.0 (#76851)
* bazel: 1.2.1 -> 2.0.0

* .
2020-01-07 17:24:54 +01:00
Will Dietz
80f043b738
samurai: init at 1.0 2020-01-06 16:06:32 -06:00
Frederik Rietdijk
8fff915659
Merge pull request #76488 from jtojnar/more-python-cleanups
Another batch of Python 2 clean-ups
2020-01-06 12:00:36 +01:00
markuskowa
bba84b607e
Merge pull request #76396 from r-ryantm/auto-update/qbs
qbs: 1.14.1 -> 1.15.0
2020-01-04 12:03:56 +01:00
Jonathan Ringer
d72c4791bc Merge remote-tracking branch 'origin' into staging-next 2019-12-30 14:36:16 -08:00
Tim Steinbach
d835f229f4
Merge pull request #76711 from ktor/master
gradle: 5.6.1 -> 5.6.4
2019-12-30 13:20:25 -05:00
Jonathan Ringer
446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Pawel Kruszewski
5f182a9eed gradle: 5.6.1 -> 5.6.4 2019-12-30 18:33:21 +01:00
Andrew Childs
63c9e4ee9d meson: add armv5tel cpu family 2019-12-30 17:21:39 +01:00
Robin Gloster
a8822b6ec2
gnumake: *Flags are lists 2019-12-30 11:13:41 +01:00
Jan Tojnar
c72e388b7f
gn: switch to python 3 2019-12-29 11:21:08 +01:00
Jan Tojnar
4bbc6cc66f
Merge branch 'staging-next' into staging 2019-12-25 05:18:52 +01:00
Tim Steinbach
ecbcdc8a4c
Merge pull request #76416 from r-ryantm/auto-update/sbt
sbt: 1.3.4 -> 1.3.5
2019-12-24 21:36:46 -05:00
R. RyanTM
23436b5529 sbt: 1.3.4 -> 1.3.5 2019-12-24 07:59:37 -08:00
R. RyanTM
5d33d676eb qbs: 1.14.1 -> 1.15.0 2019-12-24 05:08:43 -08:00
Pascal Wittmann
332dbf1e52
Merge pull request #76281 from r-ryantm/auto-update/icmake
icmake: 9.02.08 -> 9.02.09
2019-12-24 08:57:49 +01:00
R. RyanTM
0fa2ab2a74 mill: 0.5.3 -> 0.5.6 2019-12-23 15:31:52 -08:00
R. RyanTM
d7cec21555 icmake: 9.02.08 -> 9.02.09 2019-12-23 08:46:51 -08:00
R. RyanTM
5fb48efd99 doit: 0.31.1 -> 0.32.0 2019-12-23 02:33:40 -08:00
Tobias Mayer
dfee92cd2e cmake: 3.15.4 -> 3.16.2 2019-12-20 15:59:32 +01:00