3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1217 commits

Author SHA1 Message Date
Frederik Rietdijk 5f554279ec Merge master into staging-next 2018-12-07 15:22:35 +01:00
Kevin Rauscher 0fc90852d9 bloop: 1.1.0 -> 1.1.1 2018-12-07 11:41:42 +01:00
Sarah Brofeldt 01389f1ad6
Merge pull request #51440 from Tomahna/bloop
bloop: 1.0.0 -> 1.1.0
2018-12-06 12:30:49 +01:00
Herwig Hochleitner da511852c1 leiningen: move leiningen-x.x-standalone.jar out of share/java
fixes #51448
2018-12-04 02:58:58 +01:00
Frederik Rietdijk a510aa2672 Merge master into staging-next 2018-12-03 12:18:43 +01:00
Kevin Rauscher 57ec5d0edc bloop: 1.0.0 -> 1.1.0 2018-12-03 12:01:58 +01:00
Dmitry Kalinkin 62b4b790b7
mill-bin: nitpicks 2018-12-02 23:45:58 -05:00
scalavision e0e8486a06 mill-bin: init at 0.3.5 2018-12-02 23:15:52 -05:00
markuskowa 506d4c7e44
Merge pull request #51329 from c0bw3b/cleanup/gnu-https
Favor HTTPS URLs - the GNU edition
2018-12-02 16:52:33 +01:00
c0bw3b 0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
Jan Tojnar 4920f0c0ad
Merge pull request #50977 from jtojnar/parallel-update.nix
update.nix: Run update scripts in parallel
2018-12-02 01:23:39 +01:00
Jan Tojnar 59a94b57f0
update.nix: Run update scripts in parallel
To make updating large attribute sets faster, the update scripts
are now run in parallel.

Please note the following changes in semantics:

- The string passed to updateScript needs to be a path to an executable file.
- The updateScript can also be a list: the tail elements will then be passed
  to the head as command line arguments.
2018-12-01 19:17:13 +01:00
Tim Steinbach 813e74a2bf
sbt: 1.2.6 -> 1.2.7 2018-12-01 11:20:37 -05:00
Frederik Rietdijk 9b81c7e455 Merge staging-next into staging 2018-11-29 09:18:35 +01:00
Frederik Rietdijk 9db2421d1f Merge master into staging-next 2018-11-29 08:12:56 +01:00
Tim Steinbach dc1a0df1bb
gradle: Add 5.0 2018-11-27 16:37:19 -05:00
Alyssa Ross 3ec6262cca
rake: 12.0.0 -> 12.3.1
Fixes https://github.com/NixOS/nixpkgs/issues/36912.
2018-11-25 18:56:52 +00:00
Matthew Bauer d492f53faf
Merge pull request #50527 from matthewbauer/ninja-check-phase
Add check phase to ninja setup hook
2018-11-20 16:55:12 -06:00
Matthew Bauer 70e2b0bef0 cmake: also set CTEST_PARALLEL_LEVEL 2018-11-19 18:14:44 -06:00
Matthew Bauer 285eb9a894 cmake: set CTEST_OUTPUT_ON_FAILURE globally
We should always use this.
2018-11-19 16:16:16 -06:00
Tor Hedin Brønner 7a48c7ccf8 meson: remove obsolete and blocking patch
meson is now upgraded to 0.48.2 which includes the patch causing the build to
fail.
2018-11-19 12:11:06 +01:00
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 4d1fd3775d 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