1497 Commits

Author SHA1 Message Date
Frederik Rietdijk
e343a85cfb Merge master into staging-next 2018-11-19 09:55:32 +01:00
Matthew Bauer
b75d5adb33 ninja: restore old -l flag value
This can be set unconditionally to $NIX_BUILD_CORES according to
@orivej.
2018-11-18 19:31:03 -06:00
Matthew Bauer
a16c04c9d3 ninja: don’t use build/install/check flags in setup-hook
These don’t have much use in ninja, so easiest to leave them out.
2018-11-18 19:31:02 -06:00
Matthew Bauer
4ebab3de1e ninja: use -t query to find test target 2018-11-18 19:31:02 -06:00
Matthew Bauer
f6f7283e69 meson: remove check phase
This is now handled in ninja.
2018-11-18 19:31:01 -06:00
Matthew Bauer
9433a3882b ninja: fix mistake in setup-hook 2018-11-18 19:31:01 -06:00
Matthew Bauer
69d1151bfa ninja: make setup-hook.sh closer to setup.sh
Things changed in the Ninja setup-hook:
- Respect installFlags
- Automatically add checkPhase (can be disabled with dontUseNinjaCheck
  in the same way as dontUseNinjaBuild and dontUseNinjaInstall). Tests
  are only run when "ninja test" exists.
- Error in build phase when build.ninja is missing. We don’t have a
  way to fall back to other build methods, so it’s best to be very
  clear when we aren’t able to build with ninja
- Set -l flag to 1 when enableParallelBuilding is disabled
2018-11-18 19:31:01 -06:00
Matthew Bauer
2c1d3a9a82 Merge remote-tracking branch 'upstream/master' into staging 2018-11-18 19:02:09 -06:00
Jan Tojnar
85bd2a7acb
Merge pull request #46020 from jtojnar/meson-0.47
meson: 0.46.1 → 0.48.2
2018-11-18 22:17:49 +01:00
Scott Dunlop
611ef59485 mage: init at 1.7.1
(#46407)
* mage: init at 1.2.4

* mage: init at 1.7.1
2018-11-18 17:35:41 +01:00
xeji
a292829e58
Merge pull request #50491 from oxij/pkgs/tiny-fixes
trivial: random fixes
2018-11-18 16:58:55 +01:00
Frederik Rietdijk
63c6875f26 Merge master into staging-next 2018-11-18 10:32:12 +01:00
Guillaume Maudoux
de8fe66ba0 buck: use upstream version convention
Changes added in 4d1fd3775d33d5d46a8d691c4e12c7eef8fcefbd break
automated updates by moving to a custom version scheme.

This switches back to upstream versioning, while maintaining version
schema convention of `builtins.parseDrvName`.

See issue #43717
2018-11-18 09:56:23 +01:00
Jan Malakhovski
fe50c0c096 cmake_2_8: fix fetchpatch src
Old link no longer works. There're other broken patches in that file,
but I was too lazy to investigate where one can download them now.
2018-11-17 10:16:30 +00:00
Piotr Bogdan
2c60a41d0a gnumake3: remove 2018-11-15 17:41:25 +00:00
Matthew Bauer
b6fce7201e xboxdrv: add dontUseSconsInstall flag
xboxdrv doesn’t use scons for installing, but instead using a
makefile! Everything else is in scons so we have to keep that. I’ve
added a dontUseSconsInstall flag to the scons setup-hook to skip the
automatic overwrite of default “make install” call.
2018-11-14 13:57:41 -06:00
Matthew Bauer
73951bc0c8
Merge pull request #50293 from matthewbauer/cleanups2
Add setup-hooks for scons and waf
2018-11-13 19:17:00 -06:00
Matthew Bauer
1ba9fd335d scons: add setup hook
The scons build system is python-based and has a binary named scons. Unlike CMake, it cannot generate makefiles so we end up having to override the build, install, and check phases. I have added the setupHook to the scons package so that integration requires no unique steps - just putting scons in nativeBuildInputs should be enough. sconsFlags controls the flags specifically passed to scons while buildFlags, installFlags, and checkFlags should still be usable. Some packages use different names for the prefix flag. In those cases you will have to set "prefixKey" to something like "PREFIX=" as there are multiple names for the "prefix" used in scons.
2018-11-13 19:13:50 -06:00
Matthew Bauer
92ebfa1383 wafHook: init
The waf build system is python-based and hosted locally in each package in the executable file named "waf". Unlike CMake, it cannot generate makefiles so we end up having to override the configure, build, and install phases. I've tried to keep these as close to what's in setup.sh as possible. If there is no waf file in the root directory, then we just copy the one hosted in Nixpkgs. Otherwise the only thing you have to add to a package using Waf is "wafHook" into nativeBuildInputs. wafFlags controls the flags specifically passed to waf while configureFlags, buildFlags, and installFlags are still used as in the generic builder.
2018-11-13 19:13:13 -06:00
Jan Tojnar
340dd80175
meson: 0.46.1 → 0.48.2 2018-11-13 14:39:34 +01:00
Frederik Rietdijk
53d00c3351 Merge master into staging-next 2018-11-10 11:08:54 +01:00
Renaud
4cd4f7a2c5
qbs: 1.8 -> 1.12.1
(#49869)
2018-11-08 22:59:17 +01:00
Profpatsch
cc6d5b34fa bazel: refactor tests a bit 2018-11-08 11:25:18 +01:00
Andy Scott
e4fbd57165 bazel: add tests for boostrap script behavior 2018-11-08 11:25:18 +01:00
Andy Scott
02b2f62d65 bazel: support tools/bazel workspace bootstrap scripts
Bazel supports per-workspace bootstrap scripts at $WORKSPACE_ROOT/
tools/bazel. This adds support for this behavior, which is needed
by many Bazel projects (OSS and private).
2018-11-08 11:25:18 +01:00
Tim Steinbach
c1d9f57dcc
gradle: 4.10 -> 4.10.2 2018-11-07 19:53:40 -05:00
John Ericson
a054d74507
Merge pull request #48244 from volth/patch-257
meson: fix cross compilation of systemd
2018-11-05 15:09:32 -05:00
volth
9e1b883144 meson: fix cross compilation of systemd
Co-authored-by: Robin Gloster <mail@glob.in>
2018-11-05 14:39:30 -05:00
Uri Baghin
71449e70e9 bazel-deps: 2018-08-16 -> 2018-11-01 2018-11-04 20:26:07 +11:00
Frederik Rietdijk
64d50a0099 meson: fix building with python 3.7 2018-11-04 08:46:30 +01:00
Will Dietz
7e470fdac7 gn: 20180830 -> 20181031 2018-11-01 11:13:06 -05:00
Uri Baghin
1c7d38bcfb bazel: 0.17.1 -> 0.18.0 2018-10-18 10:21:13 +02:00
Tim Steinbach
b2dabdc697
sbt: 1.2.4 -> 1.2.6 2018-10-17 20:48:19 -04:00
catern
0ec21495ed bazel-buildtools: upgrade to 2018-10-11 (#48243) 2018-10-14 17:08:33 +02:00
Ben Wolsieffer
73c523a605 buildbot: add Python 3 support 2018-10-11 21:39:11 -04:00
Ben Wolsieffer
71c42462ab buildbot: 1.2.0 -> 1.4.0 2018-10-11 18:15:16 -04:00
Joachim F
bb95996fa2
Merge pull request #47853 from r-ryantm/auto-update/buildbot-worker
buildbot-worker: 1.3.0 -> 1.4.0
2018-10-09 08:59:03 +00:00
Tim Steinbach
844bcbd137
sbt: 1.2.3 -> 1.2.4 2018-10-08 20:13:31 -04:00
R. RyanTM
e5c5eae928 buildbot-worker: 1.3.0 -> 1.4.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/buildbot-worker/versions
2018-10-03 23:16:00 -07:00
Tim Steinbach
28839e4b2b
sbt-extras: 3c8fcad -> 2018-09-28
Changing the versioning scheme to fix proper detection of
"versionOlder" etc.
2018-10-03 14:07:19 -04:00
Frederik Rietdijk
4d1abc4419
Merge pull request #47604 from NixOS/staging-next
Staging next
2018-10-02 18:22:18 +02:00
Peter Hoeg
3916f71a16
Merge pull request #47166 from peterhoeg/u/crystal
crystal: 0.26.1 and introduce 0.25.1
2018-10-02 13:29:22 +08:00
Peter Hoeg
b7efce77d0 shards: minor cleanups 2018-10-02 10:29:10 +08:00
John Ericson
7319013ea1 Merge remote-tracking branch 'upstream/master' into staging 2018-09-18 16:55:42 -04:00
Frederik Rietdijk
de419917a3 Merge master into staging-next 2018-09-18 18:44:48 +02:00
Uri Baghin
61dbb0c74e bazel: 0.16.1 -> 0.17.1 2018-09-17 17:04:51 +02:00
Orivej Desh
06c63123cc Fix comment location after #46704 2018-09-15 22:36:21 +00:00
Yuriy Taraday
b53e495a38 gn: generate last_commit_position.h without git
For Git to work properly, I used fetchgit with leaveDotGit. This seems
to be causing hash to change on different systems in different times.
I've replaced generation of last_commit_position.h in tools/gen.py with
just plain nix template. "gn --version" will loose a bit (just commit
hash, without commit height in front of it), but I hope noone relies on
it.
2018-09-16 01:58:11 +04:00
volth
9dc249fceb
gn: fix hash 2018-09-15 20:29:48 +00:00
Dan Peebles
4efd4053ed stdenv/darwin: integrate a new CoreFoundation
This also updates the bootstrap tool builder to LLVM 5, but not the ones
we actually use for bootstrap. I'll make that change in a subsequent commit
so as to provide traceable provenance of the bootstrap tools.
2018-09-15 16:05:46 -04:00