Commit Graph

2006 Commits

Author SHA1 Message Date
Dmitry Kalinkin c8041d97a5
cmake: process -iframework in setup-hook
This fixes a regression in #26197

Fixes: f496357585 ('cc-wrapper: use -iframework instead of -F')
2019-10-11 18:48:16 -04:00
Andreas Herrmann 1f3187c1b2 bazel: Comment on python versions. 2019-10-11 21:44:28 +02:00
Andreas Herrmann 1987d86007 bazel: shebang-test: Test for all `bin/env ...`
Fail on any form of `bin/env ...` shebang.
2019-10-11 21:44:28 +02:00
Andreas Herrmann f6572b4e64 bazel: patch #!/usr/bin/env bash
To point to the custom bash instead of `/nix/store.../bin/env bash`.
2019-10-11 21:44:28 +02:00
Andreas Herrmann d132d47199 bazel: shebang-test: pass bazel dir in Nix 2019-10-11 21:44:28 +02:00
Andreas Herrmann 7429acdea1 bazel: Test that all shebangs are patched correctly 2019-10-11 21:44:28 +02:00
Florian Klink a0380cbfe9 bazel: fix build on macosx 2019-10-11 21:41:23 +02:00
Guillaume Bouchard 7e5b2e74b7 bazel: 0.29 -> 1.0 2019-10-11 21:41:23 +02:00
Tim Steinbach 85abd40bcb
sbt-extras: 2019-08-14 -> 2019-09-30 2019-10-01 17:47:59 -04:00
R. RyanTM b572ff9f09 rebar3: 3.11.1 -> 3.12.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/rebar3/versions
2019-09-28 18:26:32 -07:00
markuskowa d30961c538
Merge pull request #69597 from r-ryantm/auto-update/jam
jam: 2.6 -> 2.6.1
2019-09-27 13:52:33 +02:00
Jörg Thalheim 7ec88c7b5d
sbt: 1.2.8 -> 1.3.2 (#69327)
sbt: 1.2.8 -> 1.3.2
2019-09-27 09:57:26 +01:00
R. RyanTM 6034acabd1 jam: 2.6 -> 2.6.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jam/versions
2019-09-26 15:14:19 -07:00
Filipe Regadas 4e990b2ff5
fixup! Updated list of urls 2019-09-26 23:14:10 +01:00
R. RyanTM 7c93929d3d buck: 2019.06.17.01 -> 2019.09.12.01
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/buck/versions
2019-09-26 04:32:44 -07:00
Filipe Regadas cf72659ca0
fixup! Updated list of urls 2019-09-25 20:08:50 +01:00
Filipe Regadas 5cd72ae5c4
Updated list of urls 2019-09-25 10:50:02 +01:00
Christine Koppelt e3dc1865d4 maven: 3.6.1 -> 3.6.2 2019-09-25 09:26:53 +02:00
Filipe Regadas fbd3e7b9e5
Update sbt to 1.3.2 2019-09-23 22:22:55 +01:00
Jörg Thalheim d217fce304
bazel-buildtools: 0.28.0 -> 0.29.0 (#68475)
bazel-buildtools: 0.28.0 -> 0.29.0
2019-09-22 14:45:17 +01:00
Pierre Bourdon ad4b97a233
redo-apenwarr: fix source URL 2019-09-20 22:31:08 +02:00
Vladimír Čunát c860babfe6
redo-apenwarr: fixup a hard evaluation error on Darwin 2019-09-15 13:17:37 +02:00
Robin Gloster ec64d881cb
Merge pull request #65457 from ck3d/redo-0.42
redo-apenwarr: update to release 0.42 and added docs and checks
2019-09-13 17:28:26 +02:00
Christian Kögler 9b7e7e726e redo-apenwarr: update to release 0.42 and added docs and checks 2019-09-13 15:43:50 +02:00
Uri Baghin b8ab4451b5 bazel-buildtools: 0.28.0 -> 0.29.0 2019-09-11 15:17:07 +10:00
Frederik Rietdijk e3f25191c4 Merge staging-next into staging 2019-09-09 08:11:34 +02:00
Frederik Rietdijk 731c82a447
Merge pull request #68244 from NixOS/staging-next
Staging next that includes gcc8
2019-09-09 08:09:36 +02:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Marek Mahut 8977ae2d90
Merge pull request #68254 from scalavision/mill-update-0.5.1
mill: 0.5.0->0.5.1
2019-09-08 21:34:52 +02:00
Frederik Rietdijk 9894a70299 Merge staging into staging-next 2019-09-06 22:47:40 +02:00
Frederik Rietdijk 66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Will Dietz 718dbcaf13 bear: 2.4.1 -> 2.4.2 2019-09-06 21:14:08 +02:00
Benjamin Hipple 7d3b44c9be waf: 2.0.15 -> 2.0.18 2019-09-06 14:35:59 +02:00
scalavision 24ebaf4f64 mill: 0.5.0->0.5.1 2019-09-06 10:26:30 +02:00
Jan Tojnar e7cccdbb13
Merge pull request #68105 from jtojnar/meson-darwin-fix
meson: fix darwin patch
2019-09-04 16:59:33 +02:00
Jan Tojnar 1be03500d5
meson: fix darwin patch
Somehow I missed this in https://github.com/NixOS/nixpkgs/pull/67596
2019-09-04 16:10:56 +02:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Guillaume Bouchard 67904dccbb bazel: 0.28.1 -> 0.29.0
- Upgraded dependencies
  - dependencies script upgraded to take into account new WORKSPACE
    rules
- Tests now depends on the `distdir`

Runtime bazel now also depends on the `distdir` setting which appears
in the global configuration file. This increases the bazel closure
size by 85 MO for stuffs which can normally be downloaded at runtime
by bazel. However, any invocation of `buildBazelPackage` (such as in
`bazel-watcher`) may fail in nix sandbox if theses files are not
available at runtime.

If this overhead is too important, we may later evolve to a finer
grained solution, where buildBazelPackage declares the list of
necessary dependencies.
2019-09-03 13:12:53 +02:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Andreas Herrmann 1bf70fd2f1 bazel: cctools runtime dependency on darwin (#66724)
The bazel build patches paths like `/usr/bin/install_name_tool` to refer
to `${cctools}/bin/install_name_tool` instead. If the corresponding
runtime dependency is not denoted, then darwin users can encounter "file
not found" errors, e.g. when they fetch bazel from a binary cache and
don't have `cctools` in their own nix store.
2019-08-30 22:35:33 -06:00
Averell Dalton 9a2f83feb9 gradle: 5.3.1 -> 5.6.1 2019-08-30 04:37:56 +02:00
Jan Tojnar 2d00fed978
Merge pull request #67596 from jtojnar/meson-0.51.2
meson: 0.50.1 → 0.51.2
2019-08-29 00:31:45 +02:00
Jan Tojnar b03016bf66
meson: 0.50.1 → 0.51.2
https://mesonbuild.com/Release-notes-for-0-51-0.html
2019-08-28 22:22:35 +02:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
obadz a9b4e7592f
Merge pull request #66299 from jdanekrh/jd_fsharp_update_mono
fsharp41: 4.1.7 -> 4.1.34; mono = mono6
2019-08-26 19:53:30 +01:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Rickard Nilsson 225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Frederik Rietdijk c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
Andreas Herrmann f426173e30 bazel: Fix python stub template
The shebang in the python stub template was incorrectly patched to
```
<store-path>/bin/env python
```
instead of
```
<store-path>/bin/python
```

The reason was that `patchShebangs` was called with `--replace` which is
an unknown argument.
```
patching script interpreter paths in src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt --replace /usr/bin/env python /nix/store/w7gsq8v86hni4ynaqgwwlnlny115ylng-python3-3.7.4/bin/python
find: unknown predicate `--replace'
```

Using `substituteInPlace` instead resolves that issue.

The wrong shebang caused failures of `py_binary` targets due to `python`
not being in `PATH` in certain circumstances.
2019-08-16 18:55:45 +02:00
Tim Steinbach aa9d7eedf2
sbt-extras: 2019-04-05 -> 2019-08-14 2019-08-15 09:08:05 -04:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk cff9e6429a Merge staging-next into staging 2019-08-14 13:46:33 +02:00
Frederik Rietdijk 8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Michael Weiss 63ad67cbbb
scons: 3.1.0 -> 3.1.1
Announcement:
https://scons.org/scons-311-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.1/src/CHANGES.txt
2019-08-10 13:53:10 +02:00
Wael Nasreddine b3668d68a2
bazel: 0.28.0 -> 0.28.1 (#66402) 2019-08-09 17:30:06 -07:00
Frederik Rietdijk 5bc501b7aa Merge staging-next into staging 2019-08-09 14:01:00 +02:00
Frederik Rietdijk 9bd78cb048 Merge master into staging-next 2019-08-09 14:00:27 +02:00
Jiri Danek 510c1c2c87 msbuild: init at 16.3 2019-08-07 23:58:39 +02:00
adisbladis 06260734de
Merge pull request #65720 from enumatech/gradle-major-versions
gradle: declare package major versions
2019-08-06 19:07:13 +01:00
Thomas Tuegel 2c55b3256c
Merge pull request #65896 from r-ryantm/auto-update/cmake-cursesUI-qt5UI
cmakeWithGui: 3.14.5 -> 3.15.1
2019-08-06 10:29:09 -05:00
Frederik Rietdijk 27e030a1cc
Merge pull request #62812 from Tomahna/bloop
bloop: 1.2.5 -> 1.3.2
2019-08-04 10:07:16 +02:00
R. RyanTM 5c0cdcfad2 cmakeWithGui: 3.14.5 -> 3.15.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cmake-cursesui-qt5ui/versions
2019-08-03 20:19:16 -07:00
R. RyanTM d8c7ac8714 bear: 2.4.0 -> 2.4.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bear/versions
2019-08-03 15:53:50 -07:00
Lionello Lunesu 15d5a93d16 gradle: declare package major versions 2019-08-01 21:04:14 +08:00
Frederik Rietdijk 4ca8e53e1d Merge staging-next into staging 2019-08-01 09:44:06 +02:00
Frederik Rietdijk 55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +02:00
Fabián Heredia Montiel 4ee4263fb9 mill: 0.4.1 -> 0.5.0 2019-07-31 17:24:13 +00:00
Nikolay Amiantov a956694aba buildBazelPackage: clear markers
Turns out markers are non-deterministic after all and even our patching still
doesn't solve this problem completely. For example (tensorflow deps, this is a
complete diff so actual dependencies don't differ):

30509c30509
< bc527ff00916b15caee38793bca8f294c748df4a256de55c5199281be0489e73  result/@bazel_skylib.marker
---
> 4e0303e815c78df1e43d4b88dfe65e73046e0c6157fb10aa9a4e8b910113cd9c  result/@bazel_skylib.marker
31045c31045
< fa13d04b2316214c3b4008b52546c2d5b633e006f6f019d597bb3f9745bacf7b  result/@bazel_toolchains.marker
---
> b36174bf5535e5157801b6de30c35ee03a03fe57766306393c3d65dd65cbebf4  result/@bazel_toolchains.marker
31144c31144
< b0ce4a3ac29ac22528336dd3a54b5b7af9ecc43bef2a2630713c1981a5cbbb51  result/@build_bazel_rules_swift.marker
---
> 7492528068ec4f8e7ace2ecf8f933ec4e1b2235bd7426ce6f70177919f1cd05e  result/@build_bazel_rules_swift.marker
36245c36245
< be2993536a8233d63251b664caf35b1e7cd57d194ab2a39a293876c232d6bbd0  result/@io_bazel_rules_closure.marker
---
> b6655cc3f2c78525e5a724d8a4e93b1e7f09f1e09fc817d231109e7f39103e88  result/@io_bazel_rules_closure.marker
36329c36329
< 087bc674c9509dfe157400d111db4a13eeb45fc76aeccd490cee9aad6771ecad  result/@io_bazel_rules_docker.marker
---
> f920ec07315ec71e800b05cd22b2a341c0a80807c6e335ee81739b13c532b422  result/@io_bazel_rules_docker.marker
79544d79543
< 85893a05a817036c61f6cd9f8247757baa1654f473c494ce4fc5253c2bbd2790  result/@platforms.marker

And here's an example of differences:

$ cat result-a/@bazel_skylib.marker
7dc7472d37424ba5ec6a5532765bc911
$MANAGED
cat result-b/@bazel_skylib.marker
a8f3f577798201157128e8e9934c4705
$MANAGED

Instead of trying to patch these markers further we now completely clear them.
Nix hacks for ignoring markers are restored and expanded so that we don't even
attempt to parse the marker.
2019-07-31 11:28:06 +03:00
Michael Weiss 51dc2cdd58
scons: 3.0.5 -> 3.1.0
Announcement:
https://scons.org/scons-310-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.0/src/CHANGES.txt
2019-07-30 18:50:56 +02:00
Ben Wolsieffer 8c73d4b14f gn: 20190726 -> 20190403
Downgrade to fix Chromium.
2019-07-29 22:30:53 -04:00
Ben Wolsieffer 2547d6cb18 gn: 20181031 -> 20190726 2019-07-28 15:58:51 -04:00
Frederik Rietdijk 0f6bda38fe Merge staging-next into staging 2019-07-26 14:45:31 +02:00
worldofpeace 883a1dffcf
Merge pull request #52859 from jtojnar/cmake-gid
cmake: use multiple outputs for GNUInstallDirs
2019-07-25 16:05:10 -04:00
Nikolay Amiantov 7b828532b9 bazel-deps: 2019-02-01 -> 2019-07-11, mark as broken
Also drop preInstall cleanup for dependencies. The reason is while it's more
thorough than default cleanup in buildBazelPackage if such a problem happens we
should fix buildBazelPackage instead. Perhaps even move this (awesome!) snippet
there but it's very slow-running so we'd rather attempt to fix it in other
ways.

Anyway after an update at least .deps build, checked with `nix-build -A --check`.
2019-07-25 17:40:46 +02:00
Nikolay Amiantov 969aec30b6 bazel-remote: mark as broken 2019-07-25 17:40:46 +02:00
Frederik Rietdijk dcea5637d8
Merge pull request #64982 from NixOS/staging-next
Staging next
2019-07-25 15:48:30 +02:00
Profpatsch fdee6f4fae bazel: disable dm-sonnet downstream test 2019-07-25 13:27:45 +02:00
Profpatsch 63e0b8b3f9 bazel: execute dm-sonnet test only on linux 2019-07-25 13:27:45 +02:00
Timo Kaufmann e7e70b7073 bazel: add fixed output test case
Feels like a horrible hack, but it should make sure that downstream
hashes are preserved between bazel versions.
2019-07-25 13:27:45 +02:00
Frederik Rietdijk 34eebf6844 Merge master into staging-next 2019-07-25 11:52:18 +02:00
Frederik Rietdijk 3d00d8e4ee pythonPackages.pyyaml_3: init , instead of multiple pyyaml overrides
Temporary attribute until we can get rid of it everywhere.

This was triggered due to the libyaml 0.2.2 incompatibilty requiring
patches and still not building.
2019-07-25 11:51:55 +02:00
Kevin Rauscher d6b6015d34 bloop: get closer to standard bloop packaging 2019-07-24 21:42:40 +02:00
Kevin Rauscher 3bdd3b158a bloop: refactor derivation to use subderivations
This change prevents accidentally using cached version of dependencies
when updating the version
2019-07-24 21:42:40 +02:00
Kevin Rauscher 0f4da4a501 bloop: 1.2.5 -> 1.3.2 2019-07-24 21:42:40 +02:00
Lefteris Kritikos 6d25177ca8 bazel-buildtools: 0.22.0 -> 0.28.0 2019-07-24 18:57:52 +02:00
Joachim F b4522d230e
Merge pull request #58640 from andrewchambers/redo-apenwarr
redo-apenwarr: init at unstable-2019-06-21
2019-07-23 17:03:57 +00:00
Nick Novitski 7136e0d0a6 bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
Andrew Chambers 386b7d814d redo-apenwarr: init at unstable-2019-06-21 2019-07-19 15:00:27 +12:00
Nikolay Amiantov 4dad0ae560 buildBazelPackage: cleanup hacks and enforce them for all builds
Timestamp verification skip is no longer needed (not sure why). Generally we
better off always using the environment hack for all packages because that
ensures all NIX_* flags are correctly applied.

One possible improvement in future is to filter only NIX_* variables to
passthru in Bazel.
2019-07-17 10:40:38 +03:00
Wael Nasreddine c4813515ca
bazel: drop absolute Python path (#64903)
Without this Bazel always picks Python 3 which breaks Python 2 packages.
Strangely enough just dropping this patch works, with all `bazel.tests`
passing.
2019-07-16 20:17:27 -07:00
Wael Nasreddine f182b83181
Merge pull request #64633 from guibou/bazel_0.28
bazel: 0.27.0 -> 0.28.0
2019-07-16 11:20:06 -07:00
Guillaume Bouchard 950da6263f bazel: 0.27.0 -> 0.28.0 2019-07-16 17:43:18 +02:00
Nikolay Amiantov bd98f3521c bazel: drop absolute Python path
Without this Bazel always picks Python 3 which breaks Python 2 packages.
Strangely enough just dropping this patch works, with all `bazel.tests`
passing.
2019-07-16 15:40:03 +03:00
Guillaume Bouchard d363da72cc bazel: Use --distdir for prefetched repositories
--distdir is now used in the installCheckPhase for prefetched
  repositories. That's simpler, more robust and easier to extend in
  the future.

Note that `name` argument of fetchurl was removed because it changed
the basename of the generated file and bazel uses this basename for
its cache behavior.
2019-07-12 22:32:01 +02:00
xrelkd 5236c81af4 mage: 1.7.1 -> 1.8.0 (#64591) 2019-07-11 20:58:26 -07:00
Ryan Mulligan 508ae42a0f treewide: fix redirect URLs 2019-07-10 12:52:51 -07:00
Daiderd Jordan ed27ba064c
cmake: update ApplicationServices patch 2019-07-08 21:48:19 +02:00
Vladimír Čunát 0746c4dbb4
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
2019-07-06 13:44:40 +02:00
xbreak 98d9a74223 wafHook: Refactored wafHook to use callPackage (#64250)
This is to enable custom wafHook with custom waf via the override
system.
2019-07-03 15:20:28 -04:00
Frederik Rietdijk 25a77b7210 Merge staging-next into staging 2019-07-03 08:59:42 +02:00
Tobias Mayer d87c843b6f Integrate review suggestions 2019-07-03 08:50:18 +02:00
Tobias Mayer 2608669904 cmake: 3.13.4 -> 3.14.5 2019-07-03 08:50:18 +02:00
Wael Nasreddine 7f69cab8a6
bazel: add a test asserting java and java proto (#63927) 2019-07-01 21:18:02 -07:00
worldofpeace 3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
Wael Nasreddine c49b7f64d1
bazel: fix the compilation of .proto on Darwin (#63879)
On Darwin, the last argument to GCC is coming up as an empty string.
This is breaking the build of proto_library targets. However, I was not
able to reproduce with the example cpp project[0].

This commit patches the cc_wrapper of Bazel that gets installed on
Darwin to remove the last argument if it's an empty string. This is
not a probem on Linux.

[0]: https://github.com/bazelbuild/examples/tree/master/cpp-tutorial/stage3
2019-06-29 11:07:21 -07:00
Jan Tojnar 41c575b6fc
meson: use plain buildtype
This should allow us to inherit optimization/striping from stdenv
2019-06-25 18:24:51 +02:00
Jan Tojnar 0fd5abb213
meson: do not download wraps 2019-06-25 18:24:51 +02:00
Jan Tojnar e529ec3263
meson: enable auto_features by default
We disabled them by default when they were introduced in

https://github.com/NixOS/nixpkgs/pull/42994

but enabling them probably makes more sense:

https://github.com/NixOS/nixpkgs/pull/54398
https://github.com/NixOS/nixpkgs/pull/63491
2019-06-25 18:24:51 +02:00
Jan Tojnar 07d1d3ed68
Merge branch 'master' into staging 2019-06-25 18:06:43 +02:00
Peter Hoeg e3afc85cba
Merge pull request #63725 from peterhoeg/u/crystal
crystal: init at 0.29.0
2019-06-25 12:59:56 +08:00
Peter Hoeg 24dc219de9 shards: 0.8.1 -> 0.9.0 2019-06-25 11:56:44 +08:00
Guillaume Bouchard d086d45952 Fix source url for java tools on darwin 2019-06-24 11:41:43 +02:00
Guillaume Bouchard 27d4ce7ce0 bazel: Full switch to python3 2019-06-22 21:46:50 +02:00
Guillaume Bouchard 7fed6eabcf bazel: restore installCheckPhase
All the dependencies of this phase are prefetched and provided to the
bazel environment using --override_repository.
2019-06-22 21:46:50 +02:00
Guillaume Bouchard ba327a54b6 bazel: 0.26.1 -> 0.27.0
- Fixs for newly introduced bin/bash hardcoded reference
- Bazel now references `remote_java_tools_xxx` which contains prebuilt
  binaries. We prefetch them, fix them, and force bazel to use the
  fixed repository.

It also closes #63096
2019-06-22 21:46:50 +02:00
Mario Rodas de3935898f
Merge pull request #63298 from r-ryantm/auto-update/mill
mill: 0.4.0 -> 0.4.1
2019-06-19 07:33:50 -05:00
Jan Tojnar 9e9cf6a75c
meson: 0.49.1 → 0.50.1 (#57767)
meson: 0.49.1 → 0.50.1
2019-06-19 14:01:51 +02:00
Profpatsch 8ce4463d4a bazel: add update script to update srcDeps from WORKSPACE file 2019-06-18 17:47:01 +02:00
R. RyanTM 08bb1b5612
buck: 2019.05.22.01 -> 2019.06.17.01
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/buck/versions
2019-06-17 23:50:19 -05:00
Jan Tojnar 8de795e22f
meson: 0.49.1 → 0.50.1 2019-06-18 03:26:46 +02:00
xbreak 2b51328002 waf: Added support for optional extra tools (#63042)
The list of tools `withTools` are included as extra tools when building
waf.

Example:

    mywaf = callPackage ../development/tools/build-managers/waf {
      python = python3;
      withTools = [ "doxygen" ];
    };
2019-06-17 10:23:52 -04:00
R. RyanTM 7598c1182b mill: 0.4.0 -> 0.4.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mill/versions
2019-06-17 01:21:11 -07:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Austin Seipp ccee4117be bmake: fix version/url, fix tests, remove unneeded deps
As noted by @jameysharp in #63181.

Signed-off-by: Austin Seipp <as@fastly.com>
2019-06-16 14:26:49 -05:00
Austin Seipp ebb3f4d428 bmake: init at 20121212
Signed-off-by: Austin Seipp <as@fastly.com>
2019-06-15 22:46:14 -07:00
Wael Nasreddine bad7bc44db bazel: fix nix-hacks.patch with the latest version of Bazel (#63052)
* bazel: add a failing test for nix-hacks

* fix the patch
2019-06-13 16:12:37 +02:00
Wael M. Nasreddine f41667a774 bazel: 0.26.0 -> 0.26.1 2019-06-12 18:35:51 +02:00
Profpatsch cc627366cd
Merge pull request #62336 from groodt/bazel-0.26.0
bazel: 0.24.0 -> 0.26.0
2019-06-12 14:55:49 +02:00
Profpatsch 5d238e45de bazel: run the tests on all supported platforms 2019-06-12 14:09:42 +02:00
Profpatsch 629c050b5d bazel.tests: prebuild the bazel self-extraction to speed up test
Factor out the common parts of tests & cache the bazel
self-extraction (ugh) to a common store path.
2019-06-12 14:09:42 +02:00
Profpatsch 44f97b56d9 bazel: move the python test to `py_binary`
`py_test` tries to download unnecessary dependencies at runtime. We
can just as well run it to check the assertion.

Upstream issue: https://github.com/bazelbuild/bazel/issues/8575
2019-06-12 14:09:42 +02:00
Greg Roodt dd2a0f6c4a bazel: 0.24.0 -> 0.26.0 2019-06-12 14:09:42 +02:00
Franz Pletz fdd75fc6f1
Merge pull request #53712 from liff/bear/fix-wrapper-detection
bear: fix wrapper detection patch by checking result of find_executable
2019-06-11 22:55:38 +00:00
Graham Christensen 11d1932f11
Merge pull request #62626 from ankhers/update_rebar3
rebar3: 3.10.0 -> 3.11.1
2019-06-11 12:11:54 -04:00
Vladimír Čunát 576af17187
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1523575
2019-06-05 11:06:44 +02:00
R. RyanTM 741d20c900 qbs: 1.13.0 -> 1.13.1 (#62549)
* qbs: 1.13.0 -> 1.13.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qbs/versions

* qbs: add meta.homepage
2019-06-04 17:02:45 +02:00
Justin Wood ece38ce9fb rebar3: 3.10.0 -> 3.11.1 2019-06-03 13:55:43 -04:00
Matthew Bauer f64d21da21
Merge pull request #56834 from matthewbauer/v8-update
v8: 5.4.232 -> 7.4.255
2019-06-03 13:34:04 -04:00
Vladimír Čunát c4724fb7bc
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1523028
2019-06-03 10:01:25 +02:00
Mario Rodas 99997f1bc2
Merge pull request #62367 from r-ryantm/auto-update/buck
buck: 2019.05.06.01 -> 2019.05.22.01
2019-06-01 05:05:15 -05:00
R. RyanTM 42a90ac4b8 buck: 2019.05.06.01 -> 2019.05.22.01
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/buck/versions
2019-06-01 01:14:13 -07:00
Matthew Bauer 8c131d6930
Merge pull request #58182 from status-im/fix-conan
conan: fix pluginbase version requirement
2019-05-31 21:50:19 -04:00
Karol Chmist 285dddba9f mill: 0.3.6 -> 0.4.0 (#62214) 2019-05-31 17:50:37 -04:00
Samuel Dionne-Riel 9bc34e38ae
Merge pull request #62178 from samueldr/fix/meson-systemd-cross
Enables systemd-boot for ARM + fixes meson cpu families
2019-05-28 23:18:37 -04:00
Samuel Dionne-Riel 418c3e1123 meson: Adds more binaries, needed for systemd-boot 2019-05-28 19:26:57 -04:00
Samuel Dionne-Riel 858076ef56 meson: fix cpu_family for aarch64
As documented, it should be `aarch64` for AArch64.

 * https://mesonbuild.com/Reference-tables.html#cpu-families

```
 $ nix eval '((import <nixpkgs> {}).pkgsCross.aarch64-multiplatform.stdenv.targetPlatform.parsed.cpu.family)'
"arm"
```

The lookup table will ensure that, at any point, meson does not pick the
wrong family.
2019-05-28 19:26:56 -04:00
Frederik Rietdijk b2ab860db3 Merge master into staging-next 2019-05-25 12:38:00 +02:00
Vladimír Čunát 2a3bb2f8ac
bear.meta.maintainers: remove myself
I don't really use it anymore, thanks to meson+ninja.
2019-05-21 12:49:08 +02:00
R. RyanTM 3071160766 bear: 2.3.13 -> 2.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/bear/versions
2019-05-20 21:57:05 -07:00
Frederik Rietdijk f0a4305e0a Merge staging-next into staging 2019-05-14 10:24:46 +02:00
R. RyanTM 656fed287d waf: 2.0.14 -> 2.0.15
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/waf/versions
2019-05-13 21:49:02 +02:00
Mario Rodas 09e08100ca
Merge pull request #61272 from r-ryantm/auto-update/buck
buck: 2019.01.10.01 -> 2019.05.06.01
2019-05-12 16:10:59 -05:00
Matthew Bauer 4fb6ccbe61
Merge pull request #61112 from matthewbauer/fix-bazel-llvm
bazel: use llvm6 on darwin
2019-05-12 15:22:01 -04:00
Spencer Baugh 4b8803dae6 switch users of "gnupg1" to plain "gnupg"
gnupg is gnupg 2.2. gnupg1 is also gnupg 2.2, just with a few extra
symlinks in the bin directory. None of these packages need those
symlinks, and it's confusing for them to say they're depending on
"gnupg1", so switch their dep to plain "gnupg".
2019-05-12 20:08:50 +02:00
R. RyanTM 7dabb6028d buck: 2019.01.10.01 -> 2019.05.06.01
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/buck/versions
2019-05-10 23:54:01 -07:00
Matthew Bauer 81a9b46ee8 bazel: use llvm6 on darwin
https://hydra.nixos.org/build/92942635
2019-05-07 19:43:46 -04:00
Frederik Rietdijk 0196d8f11c Merge master into staging-next 2019-05-07 09:00:06 +02:00
R. RyanTM 1330269c15 rebar3: 3.9.1 -> 3.10.0 (#60765)
* rebar3: 3.9.1 -> 3.10.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/rebar3/versions

* rebar3: don't use fetchurl
for mutable GitHub archives
+ parse_trans 3.3.0 hash has changed
2019-05-04 18:28:51 +02:00
Frederik Rietdijk 193b899af2 Merge master into staging-next 2019-05-04 17:34:04 +02:00
Alyssa Ross bf72529e36
Merge pull request #60507 from manveru/update-drake
drake: use bundlerApp
2019-05-04 13:19:12 +00:00
Alyssa Ross 182a621ba6
Merge pull request #60512 from manveru/rake-update
rake: 12.3.1 -> 12.3.2, use bundlerApp
2019-05-04 13:17:21 +00:00
Frederik Rietdijk 0f10b72b5f Merge master into staging-next 2019-05-03 19:56:31 +02:00
Renaud 2a3ce66ae8
Merge pull request #60755 from r-ryantm/auto-update/qbs
qbs: 1.12.2 -> 1.13.0
2019-05-03 19:26:45 +02:00
R. RyanTM 942a86de9f qbs: 1.12.2 -> 1.13.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/qbs/versions
2019-05-02 05:18:50 -07:00
Frederik Rietdijk 155c9d8e18 Merge master into staging-next 2019-05-02 08:43:14 +02:00
Mario Rodas b34a9064b7
buck: fix build 2019-05-01 01:13:47 -05:00
Michael Fellinger ceffda781f rake: 12.3.1 -> 12.3.2, use bundlerApp 2019-04-30 18:04:35 +02:00
Michael Fellinger 90ec6a32ba drake: use bundlerApp 2019-04-30 17:50:25 +02:00
Frederik Rietdijk 883232c00d Merge master into staging-next 2019-04-27 07:01:38 +02:00
Matthew Bauer 87944c3125
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
2019-04-26 22:20:03 -04:00
Matthew Bauer b1de8cf480 treewide: disable tests on darwin
- tthsum
- python-papis
- python-sqlalchemy-migrate
- python-xlib
- dub
2019-04-26 21:55:05 -04:00
Matthew Bauer eaadbdf1c3 cmake: don’t use cf-private
cf-private is not necessary here. cmake just needs the CoreFoundation
framework to be used. swift-corefoundation seems to work fine in this case.

/cc @lnl7
2019-04-26 21:54:49 -04:00
Jan Tojnar 89a150355b
Merge branch 'master' into staging 2019-04-26 16:35:54 +02:00
Tim Steinbach 5d2775156b
sbt-extras: 2019-01-30 -> 2019-04-05 2019-04-25 08:05:07 -04:00
Matthew Bauer 84d00355e8 Merge remote-tracking branch 'NixOS/master' into staging 2019-04-23 22:00:42 -04:00
Mario Rodas 9c4d8bcee7
doit: fix darwin build 2019-04-23 04:21:00 -05:00
Graham Christensen 8803fb8918
waf: make reproducible 2019-04-22 11:08:15 -04:00
Frederik Rietdijk bae32a9f5c Merge staging-next into staging 2019-04-16 18:54:15 +02:00
R. RyanTM b76226f8d7 maven: 3.6.0 -> 3.6.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-maven/versions
2019-04-16 18:48:18 +02:00
Matthew Bauer f475aeaf29
Merge pull request #59535 from matthewbauer/homepage-fixes
treewide: update homepages to https where available
2019-04-15 20:47:30 -04:00
Matthew Bauer 290a5d916e treewide: update homepages to https where available
Based on "problems" from repology:

https://repology.org/repository/nix_unstable/problems

Mostly simple changes to reflect redirects.
2019-04-15 10:10:05 -04:00
Dmitry Kalinkin aa111a2b7e
Merge pull request #59197 from ThomasMader/dlang-update
Dlang update (ldc: 1.14.0 -> 1.15.0, dmd: 2.084.1 -> 2.085.1, dtools: 2.084.1 -> 2.085.1, dub: 1.13.0 -> 1.14.0)
2019-04-13 19:51:16 -04:00
Dmitry Kalinkin 59c81160e7
Merge pull request #58504 from symphorien/static-proot
Static proot, wafHook cross compilation
2019-04-13 12:04:32 -04:00
Thomas Mader dceae4927c dub: 1.13.0 -> 1.14.0 2019-04-11 23:03:18 +02:00
Mario Rodas bcfc8ce784
buck: 2017.10.01.01 -> 2019.01.10.01 2019-04-11 08:10:00 -05:00
Matthew Bauer e7f57503e0 v8: 5.4.232 -> 7.4.255 2019-04-11 00:25:12 -04:00
Robert Schütz 2d29d97838
Merge pull request #57688 from dotlambda/pyyaml-5.1
python.pkgs.pyyaml: 3.13 -> 5.1
2019-04-10 10:53:14 +02:00
Matthew Bauer a79a8f29bc waf: use wafConfigureFlags for waf flags
This avoids the potential conflict between autoconf flags and the waf
flags. There is some overlap between the two but waf errors when it
doesn’t recognize the flag.
2019-04-09 23:44:37 -04:00
Frederik Rietdijk d108b49168 Merge master into staging-next 2019-04-09 16:38:35 +02:00
R. RyanTM 8cf2baa408 rebar3: 3.9.0 -> 3.9.1 (#58864)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rebar3/versions
2019-04-07 16:30:40 +02:00
Vladimír Čunát 526c4292ae
Merge branch 'staging-next'
This iteration was long, about five weeks (2fcb11a2), I think.
Darwin: it's missing a few thousand binaries and there's a make-netbsd
regression, but I suppose these aren't merge blockers.
2019-04-06 13:20:53 +02:00
Jan Tojnar 103bf0cf1d
meson: 0.49.1 → 0.49.2 2019-04-05 12:13:58 +02:00
Jan Tojnar cb1a20499a
Merge branch 'master' into staging 2019-04-05 11:37:15 +02:00
Robert Schütz f328510af6 conan: pin pyyaml to 3.13
Upstream requires
    PyYAML>=3.11, <3.14.0
2019-04-03 16:25:02 +02:00
Robert Schütz 244fcfc85c conan: pin pluginbase to 0.7
Upstream requires
    pluginbase>=0.5, < 1.0
2019-04-03 16:15:23 +02:00
Vladimír Čunát 2771375d6e
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1512490
2019-04-02 20:56:53 +02:00
Daiderd Jordan 2e2ab461b7
Merge pull request #58147 from groodt/greg/bazel-0.23.2
bazel: 0.22.0 -> 0.24.0
2019-04-02 08:38:39 +02:00
Greg Roodt 92e5745383 gradle: 5.0 -> 5.3.1 (#58528) 2019-04-01 20:59:17 +02:00
Greg Roodt d019fd8c8a bazel: 0.22.0 -> 0.24.0 2019-03-31 13:46:53 +11:00
Silvan Mosberger 555734eded bazel: Fix PATH escaping 2019-03-29 20:31:04 +01:00
Symphorien Gibol 3d60a00c63 wafHook: cross compilation support
for this to work, wafHook must be in nativeBuildInputs.
2019-03-28 20:06:25 +01:00
Symphorien Gibol 1001d0034c wafHook: ignore configurePlatforms
waf does support --build and --host, but the only effect of these
options is an error message telling to use --cross-compile instead.
So we ignore these flags.
2019-03-28 19:59:16 +01:00
Symphorien Gibol f23a21514c wafHook: ignore --disable-static and such options
These options are forcefully added by pkgsStatic but are not understood
by waf.
2019-03-28 18:33:08 +01:00
Symphorien Gibol f075de5c25 wafHook: let derivations use an existing waf in a non-standard location
this is necessary for talloc
2019-03-28 18:32:29 +01:00
Michael Weiss 8939a5da89
scons: 3.0.4 -> 3.0.5
Announcement:
https://scons.org/scons-305-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.5/src/CHANGES.txt
2019-03-27 11:12:30 +01:00
Pedro Pombeiro ca2e283a28
conan: fix pluginbase version requirement 2019-03-23 19:23:28 +01:00
Wael M. Nasreddine 5af0780492
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (693 commits)
  buildGoModule: use go_1_12 instead of go_1_11 (#58103)
  gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
  signal-desktop: 1.22.0 -> 1.23.0
  added missing semicolon to documentation
  terminus_font_ttf: 4.46.0 -> 4.47.0
  buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
  dav1d: init at 0.2.1
  dropbox-cli: 2018.11.28 -> 2019.02.14
  atlassian-confluence: 6.14.1 -> 6.14.2
  maintainers: update email for dywedir
  python.pkgs.hglib: use patch to specify hg path (#57926)
  chkrootkit: 0.52 -> 0.53
  radare2-cutter: 1.7.2 -> 1.8.0
  autorandr: 1.7 -> 1.8
  pythonPackages.pyhepmc: fix build
  llvm-polly/clang-polly: use latest llvm
  apulse: 0.1.11.1 -> 0.1.12, cleanup
  factorio: experimental 0.17.14 → 0.17.16 (#58000)
  sequeler: 0.6.7 -> 0.6.8
  nasc: 0.5.1 -> 0.5.2
  ...
2019-03-21 21:01:25 -07:00
Vladimír Čunát 04066403ae
Merge branch 'master' into staging-next
Lots of rebuilds from master, apparently.
Hydra nixpkgs: ?compare=1509577
2019-03-14 19:54:49 +01:00
Matthew Bauer 37eba81c7b
Merge pull request #56391 from matthewbauer/cmake-treewide
Add more CMake flags
2019-03-11 12:43:46 -04:00
Uri Baghin 130d987ab1 bazel-remote: init at 2019-01-12 2019-03-11 11:10:59 +01:00
Vladimír Čunát bf47162c26
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1508887
2019-03-10 08:04:21 +01:00
Matthew Bauer 91f0c848f4 cmake: set BUILD_TESTING=OFF when doCheck is false
This means we can avoid building test suites that will never be run.
2019-03-09 14:32:55 -05:00
Aaron Bull Schaefer 1b3b781d60 bazel-buildtools: unstable -> 0.22.0 2019-03-07 20:37:23 -08:00
Frederik Rietdijk 35e73c9dd5 Merge staging into staging-next 2019-03-03 09:35:42 +01:00
Herwig Hochleitner 025c2abd08 leiningen: 2.9.0 -> 2.9.1
(cherry picked from commit 80021b41e74ac9a3b63ac5b27ddc16f785a5b7f1)
2019-03-02 06:37:52 +01:00
Frederik Rietdijk 205e0fc5bd Merge staging-next into staging 2019-03-01 09:22:21 +01:00
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jörg Thalheim dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
Vladimír Čunát c010fc9222
Merge branch 'staging-next' into staging 2019-02-26 09:30:26 +01:00
Matthew Bauer 73061742af Merge remote-tracking branch 'NixOS/master' into staging 2019-02-24 18:54:32 -05:00
Daiderd Jordan cb8e6f73f5
cmake: add cf-private on darwin 2019-02-24 11:32:47 +01:00
Daiderd Jordan c8aaadcc9d
cmake: disable ApplicationServices and CoreServices on darwin 2019-02-24 11:30:48 +01:00
Benjamin Hipple 9953a68c80 waf: 2.0.13 -> 2.0.14 2019-02-24 10:28:36 +01:00
Vladimír Čunát 71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Dmitry Kalinkin f96d4d555b
Merge pull request #55998 from ThomasMader/dlang-update
Dlang update
2019-02-22 02:29:41 -05:00
Vladimír Čunát 052e34a66f
Merge #56059: cmake: 3.12.1 -> 3.13.4 (into staging) 2019-02-22 07:23:08 +01:00
Thomas Mader 0e88d17fb1 dub: Disable network tests because they add impurities 2019-02-22 07:22:11 +01:00
Frederik Rietdijk 5871da418f Merge staging into python-unstable 2019-02-21 08:02:10 +01:00
Matthew Bauer ae3e8355ab
Merge pull request #56021 from illegalprime/fix/cmake-cross
cmake: add ability to cross-compile cmake
2019-02-19 22:34:15 -05:00
Sam Stites 9b38f6f09f
bump cmake to 3.13.4 2019-02-19 13:21:30 -05:00
Matthew Bauer b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Michael Eden cbbde55382 cmake: add ability to cross-compile cmake 2019-02-18 17:41:03 -05:00
Frederik Rietdijk 815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Carlos Morera de la Chica 9c406336f1 bazel: fix bash completion 2019-02-18 11:34:35 +01:00
Ryan Mulligan 0a0f0b355b
Merge pull request #55714 from mpisanko/leiningen-2.9.0
upgrade leiningen to latest (2.9.0)
2019-02-17 14:20:26 -08:00
Michal Pisanko e53ea1fb01 leiningen: 2.8.3 -> 2.9.0 2019-02-18 08:12:39 +11:00
Ryan Mulligan a954ca52e5
Merge pull request #55035 from uri-canva/bazel-deps
bazel-deps: 2018-11-01 -> 2019-02-01
2019-02-17 06:49:31 -08:00
Frederik Rietdijk 9dc262c659 pants: mark as broken 2019-02-17 14:40:55 +01:00
Frederik Rietdijk fd48a94b62 Merge staging-next into staging 2019-02-16 09:30:46 +01:00
Frederik Rietdijk 6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
R. RyanTM 7c860b5fd8 conan: 1.11.2 -> 1.12.0 (#55335)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/conan/versions
2019-02-14 21:53:05 +01:00
Will Dietz 0f14c9cd8f ninja: patch to fix w/musl, see upstream issue 2019-02-11 22:41:45 -06:00
Vladimír Čunát c40f211499
Merge branch 'staging-next'
It's not completely without regressions, but ATM it seems to bring more
upsides than downsides and the iteration is too long already.
2019-02-10 14:20:49 +01:00
Matthew Bauer 5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Silvan Mosberger 18d059a4ac
Merge pull request #54115 from k32/master
rebar3: 3.6.1 -> 3.9.0
2019-02-09 17:29:59 +01:00
Vladimír Čunát 7f9e3b8206
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
worldofpeace 3abe344987
ninja: Add comment explaining the consistent ID patch
Co-Authored-By: grahamc <graham@grahamc.com>
2019-02-07 18:26:51 -05:00
Graham Christensen 21cdf28a83
ninja: make reproducible
See https://github.com/ninja-build/ninja/pull/1529
2019-02-07 18:04:59 -05:00
k32 d4b243905f rebar3: 3.6.1 -> 3.9.0
Remove hermetic patch (make it compatible with the upstream)
(Mostly) eliminate the need for hex package registry
2019-02-06 19:45:40 +01:00
Tim Steinbach c7fda39fc2
sbt-extras: 2018-12-04 -> 2019-01-30 2019-02-06 08:53:41 -05:00
Franz Pletz 97507ffc8b
Merge pull request #55046 from FlorianFranzen/cmake_no_pkg_reg
cmake: disable package registry
2019-02-03 08:32:43 +00:00
Vladimír Čunát bd9f835bf6
Merge branch 'master' into staging-next
Larger rebuild, probably mainly haskell.
Hydra nixpkgs: ?compare=1503325
2019-02-02 17:13:11 +01:00
Vladyslav M c7e1e48657
Merge pull request #54773 from r-ryantm/auto-update/mill
mill: 0.3.5 -> 0.3.6
2019-02-02 12:32:14 +02:00
Will Dietz b6e50b3a3c
Merge pull request #55008 from dtzWill/update/ninja-1.9.0
ninja: 1.8.2 -> 1.9.0
2019-02-02 00:58:59 -06:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
Uri Baghin 2b2854e522 bazel-deps: 2018-11-01 -> 2019-02-01 2019-02-01 17:30:36 +11:00
Will Dietz d4cd52e503 ninja: 1.8.2 -> 1.9.0
https://groups.google.com/forum/#!topic/ninja-build/nY5Kb7zUvcg
2019-01-31 12:25:13 -06:00
Florian Franzen e0e4577c0f cmake: disable package registry 2019-01-31 10:17:55 +01:00
Kévin Rauscher e925ec27ba bloop: 1.2.3 -> 1.2.5 (#54427) 2019-01-31 01:20:55 +02:00
Félix Baylac-Jacqué a5aca72f93 bazel: 0.21.0 -> 0.22.0 2019-01-30 14:57:32 +01:00
Philip Patsch 5c6892e1a2 bazel: fix java toolchain regression
By changing the default toolchain to JDK8, we broke the default Java
toolchain, which assumes JDK9.

Instead, set `host_java_toolchain` manually for our build of bazel,
and set `java_toolchain` to run the java tests with the build JDK as
well.

Fixes https://github.com/NixOS/nixpkgs/issues/54289
2019-01-29 14:03:54 +01:00
R. RyanTM 0f490eab3e mill: 0.3.5 -> 0.3.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mill/versions
2019-01-28 01:04:08 -08:00
Will Dietz 5aaf597df3 meson: 0.49.0 -> 0.49.1
https://groups.google.com/d/msg/mesonbuild/xRXQatmXIwo/-2lqsOIXGAAJ

https://github.com/mesonbuild/meson/milestone/33
2019-01-27 15:28:01 -06:00
Matthew Bauer 92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Robin Palotai 566539ff55 Add test and docs. 2019-01-26 22:22:34 +01:00
Robin Palotai d3199ddaa7 Add gzip and gnutar to default bazel-bash tools. These are often used by rules, mostly due to Bazel's one-output rule. 2019-01-26 22:22:34 +01:00
Michael Weiss f561acc48e
scons.src: Update the hash (tarball was modified)
Unfortunately the tarball was modified for the official release and
"nix-store -r --check $(nix-instantiate -A scons.src)" did not catch
this (not sure why ATM).

Thanks @pbogdan for noticing this :)
2019-01-23 21:21:46 +01:00
Michael Weiss c2b8270fb8
Merge pull request #54461 from primeos/scons
scons: 3.0.3 -> 3.0.4
2019-01-23 19:05:44 +01:00
Michael Weiss 32e7f391fc
scons: 3.0.3 -> 3.0.4
Announcement:
https://scons.org/scons-304-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.4/src/CHANGES.txt

There where no regressions and no deprecations in this release (at least
it does not break any additional builds in nixpkgs).
2019-01-23 18:46:53 +01:00
Frederik Rietdijk 01efca4a54
Merge pull request #54462 from dotlambda/python-pkgs-remove
pythonPackages: remove some packages representing outdated versions
2019-01-23 09:38:40 +01:00
Profpatsch 88fa235e63 bazel: camel-case python_bin_path 2019-01-22 21:28:24 +01:00
Philip Patsch 25cd44063f bazel: add python to the runtime closure 2019-01-22 21:28:24 +01:00
Vladimír Čunát 3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Robert Schütz 8c57113e14 python.pkgs.argparse: remove
argparse is part of stdlib in 2.7 and 3.2+
2019-01-22 12:43:07 +01:00
Linus Heckemann 4c651d1647 bam: 0.4.0 -> 0.5.1, fix licence 2019-01-21 11:34:28 +01:00
Frederik Rietdijk ca2edf79f7 Merge master into staging-next 2019-01-20 18:22:17 +01:00
Jan Tojnar ef14a225bb
Merge pull request #54007 from jtojnar/darwin-gsettings
Darwin GSettings support
2019-01-20 13:53:47 +01:00
Léo Gaspard cf8383810e gn: use python2 as gn is incompatible with python3 2019-01-19 14:17:22 +01:00
Robin Palotai 68436aec2c Add awk as a default tool for Bazel shell commands.
Apparently
e292e0452f/bazel/gflags.bzl (L8)
assumes it should be accessible. Normally we could ask them to fix, but
I would expect awk to be a commonly assumed.

The rough search
https://github.com/search?q=filename%3ABUILD+genrule+awk&type=Code
brings ~1K hits.
2019-01-19 11:07:00 +01:00
Frederik Rietdijk f8b45e2d84 Merge staging-next into staging 2019-01-19 09:24:01 +01:00
Kevin Rauscher 26e2eb3a9d bloop: 1.2.1 -> 1.2.3 2019-01-18 09:29:41 +01:00
Frederik Rietdijk 9cfae76fc5 Merge staging-next into staging 2019-01-17 09:21:29 +01:00
Jörg Thalheim 2eaadfa5be
conan: fix distro package version 2019-01-16 12:23:59 +00:00
Jan Tojnar 2f4e167156
meson: Fix linking ObjC objects on Darwin
https://github.com/NixOS/nixpkgs/pull/54007#issuecomment-454693658
2019-01-16 13:21:40 +01:00
Jörg Thalheim fd5b4eeb19
Merge pull request #53380 from HaoZeke/updateConan
conan: 1.6.0 -> 1.11.2
2019-01-16 08:15:14 +00:00
Orivej Desh 052db93d8f bazel: fix patches after #53988 2019-01-16 00:54:56 +00:00
Félix Baylac-Jacqué 57004738b1 bazel: fix python stub paths.
Since the 0.21 upgrade, the host `$PATH` is not forwarded anymore by
default to the sandboxes in charge to realize Bazel actions. This
default change broke the `py_binary` rule among other things.

Every python binary is wrapped in a stub in charge to setup the
execution environment. Currently, this stub's shebang points to a
`/usr/bin/env python` which cannot be resolved with the current
`$PATH`.
This results in breaking any build pipeline requiring the use of
python at some point. On top of the incorrect shebang, the stub
template is unable to find the actual python binary using
`SearchPath`.

This PR fixes those two things by re-writing the stub template shebang
to the actual python binary and by substituting the faulty default
python binary lookup to the right one.
2019-01-15 19:25:24 +01:00
Frederik Rietdijk 42d276c6b8 Merge staging-next into staging 2019-01-15 16:59:03 +01:00
Kévin Rauscher d6fc1163e8 bloop: 1.1.2 -> 1.2.1 (#53093) 2019-01-13 23:17:16 +01:00
Frederik Rietdijk bb9581cd88 Merge staging-next into staging 2019-01-13 14:46:43 +01:00
volth a4faf59aa1 ninja: re2c is not for building docs
ninja sources include re2c's output files, so unless we change the sources by applying a patch, re2c is not even launched
anyway, it is not relevant to building docs
2019-01-13 13:42:06 +01:00
Michael Weiss 768d876394
scons: Remove version 2.5.1 2019-01-12 10:44:33 +01:00
Jörg Thalheim 831ffbdc96
Merge pull request #53737 from dpetranek/update-leiningen
leiningen: 2.8.1 -> 2.8.3
2019-01-11 12:06:36 +00:00
Dmitry Kalinkin 9fac2254b2
Merge pull request #53666 from ThomasMader/dlang-update
dmd: 2.083.1 -> 2.084.0, dub: 1.12.1 -> 1.13.0, dtools: 2.083.1 -> 2.084.0, Literate: 2018-12-23 -> 2019-01-08
2019-01-10 13:54:44 -05:00
Profpatsch 9e9fec640e bazel: 0.20.0 -> 0.21.0
0.21 removed the bundled openjdk-distribution. Instead, tries to fetch
the “right” distribution on-the-fly when building.
So we need to provide our own openjdk.

According to
https://github.com/bazelbuild/bazel/issues/6865#issuecomment-447261288
we should set `--host_javabase="@local_jdk//:jdk` if we want to do
that. This uses the jdk that is currently in the environment, which is
openjdk 8 in our case. 0.21 defaulted to a toolchain for JDK9, which
we don’t package in nixpkgs, so we use the JDK8 toolchain.

This commit also replaces the line-number-based sed invocations with
something more stable.
2019-01-10 18:46:25 +01:00
Will Dietz 7e31406886 bazel: greatly reduce time spent substituting, be smart which files
Files inspected: 2756 -> 40
Total size of inspected files: 20M -> 1016K
2019-01-10 18:46:25 +01:00
dpetranek 7c19fba9f6 leiningen: 2.8.1 -> 2.8.3 2019-01-10 01:04:21 -06:00
Olli Helenius 4cb889f166 bear: fix wrapper detection patch by checking result of find_executable
With the wrapper detection patch, if a build invokes an executable that cannot
be found in PATH by `find_executable`, bear will fail with an `AttributeError`
in `os.path.realpath`.

This can happen if the build invokes some project-local tool or command, like
`./build-something`.

Instead of calling using the result of `find_executable` directly, first check
whether the executable was found and fall back to original Bear behavior if
it was not.
2019-01-09 23:00:16 +02:00
HaoZeke efe4a6d205
conan: 1.6.0 -> 1.11.2 2019-01-09 19:33:29 +05:30
Thomas Mader 5041439421 dub: 1.12.1 -> 1.13.0 2019-01-09 08:05:51 +01:00
Will Dietz e69d494033 scons: 3.0.2 -> 3.0.3
https://scons.org/scons-303-is-available.html

cc e1d9854816
2019-01-08 21:34:55 -06:00
Michael Weiss a684ae6e53
scons: Remove version 3.0.0 2019-01-06 20:31:16 +01:00
Michael Weiss d376ffe767
scons: Add version 3.0.2
"SCons release 3.0.2 now available from the download page at
SourceForge. This release should be used instead of 3.0.1. This release
fixes several issues. This release supports Python versions 2.7.* as
well as 3.5+." [0]

Details can be found in the changelog [1].

I'll update the default after running additional tests.

[0]: https://scons.org/scons-302-is-available.html
[1]: https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.2/src/CHANGES.txt
2019-01-06 20:31:16 +01:00
Frederik Rietdijk 092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
xeji 6056319934
Merge pull request #52964 from ThomasMader/dlang-update
Dlang update 2018-12
2019-01-01 23:49:46 +01:00
Tim Steinbach 711a74c65a
sbt: 1.2.7 -> 1.2.8 2019-01-01 12:38:06 -05:00
Frederik Rietdijk 070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Dmitry Bogatov d77bab14ab tup: 0.7.5 -> 0.7.8 2018-12-29 13:04:54 +01:00
Thomas Mader 0bee7282c1 dub: 1.10.0 -> 1.12.1 2018-12-27 13:40:51 +01:00
Jan Tojnar c0d2f92459
cmake: use multiple outputs for GNUInstallDirs
CMake contains a module for more granular installation directories:

https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html

Let’s set the paths so that projects using the module can be more
easily split into multiple outputs.
2018-12-25 20:51:31 +01:00
Jan Tojnar ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Mathieu Boespflug 53e8258a45 bazel: fix sandbox execution
Bazel runs actions in a sandbox by default on Darwin and Linux.
However, the sandboxing was always and *silently* disabled previously,
because a Bazel feature test was always failing. The feature test
involved running `/bin/true` inside a sandbox. But on NixOS,
`/bin/true` does not exist...
2018-12-20 15:18:34 +01:00
Frederik Rietdijk 9ab61ab8e2 Merge staging-next into staging 2018-12-19 09:00:36 +01:00
Frederik Rietdijk 826ab7026e Merge master into staging-next 2018-12-18 09:22:17 +01:00
Maximilian Bosch b72dc8c2f2
Merge pull request #52189 from r-ryantm/auto-update/apache-maven
maven: 3.5.4 -> 3.6.0
2018-12-18 00:59:30 +01:00
Renaud df1ec28ac9
Merge pull request #52076 from r-ryantm/auto-update/qbs
qbs: 1.12.1 -> 1.12.2
2018-12-17 17:59:51 +01:00
Jan Tojnar aead6e12f9
Merge remote-tracking branch 'upstream/master' into staging 2018-12-16 22:55:06 +01:00
Dmitry Kalinkin 468a1d7aba
Merge pull request #49601 from dtzWill/update/gn-20181031
gn: 20180830 -> 20181031
2018-12-15 09:35:10 -05:00
Kevin Rauscher 297535be8e bloop: 1.1.1 -> 1.1.2 2018-12-15 13:11:12 +01:00
R. RyanTM ff294a7162 maven: 3.5.4 -> 3.6.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/apache-maven/versions
2018-12-15 00:51:43 -08:00
R. RyanTM b98926d55a qbs: 1.12.1 -> 1.12.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qbs/versions
2018-12-14 08:14:10 -08:00
Jörg Thalheim 2874bacdec
Merge pull request #52045 from r-ryantm/auto-update/redo
redo: 1.3 -> 1.4
2018-12-14 13:49:56 +00:00
R. RyanTM df42e8a636 redo: 1.3 -> 1.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/redo/versions
2018-12-14 05:24:37 -08:00
Mathieu Boespflug 6f5014e0ae bazel: 0.18.0 -> 0.20.0 2018-12-14 11:02:25 +01:00
Mathieu Boespflug 463498e3fa bazel: Don't perform the checkPhase, since it's redundant with installCheckPhase.
This change is going to be required when upgrading to Bazel 0.20.0,
because in the checkPhase we're not wrapping the Bazel binary yet to
set some necessary default arguments.
2018-12-14 11:02:25 +01:00
Jan Tojnar 414ea0a10e
meson: 0.48.2 → 0.49.0 2018-12-12 00:22:02 +01:00
Tim Steinbach 475d653afd
sbt-extras: 2018-09-27 -> 2018-12-04 2018-12-10 12:56:39 -05:00
Frederik Rietdijk 747aa4cc93 Merge staging-next into staging 2018-12-07 15:31:52 +01:00
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
Benjamin Hipple 72c059fad6 waf: 2.0.10 -> 2.0.13 2018-12-06 00:14:53 +00: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
Matthew Bauer f1a111bbc5
Merge pull request #51408 from matthewbauer/disable-subsecond-gnumake
gnumake: disable subsecond mtime on darwin
2018-12-03 08:32:59 -06:00
Matthew Bauer 26de2d1780 gnumake: disable subsecond mtime on darwin
gnumake can support subsecond mtimes if it is available. But Darwin
doesn’t support setting subsecond mtimes until 10.13! So we can just
disable this check to avoid the issue where most of our built tools
use seconds but make uses nanoseconds. Might fix some parallel issues
along the way.

Fixes #51221
2018-12-03 08:31:57 -06: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
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
Tim Steinbach 795488491c
sbt: 1.2.1 -> 1.2.3 2018-09-15 09:57:34 -04:00
Michael Raskin 3aeb6066e7
Merge pull request #46328 from YorikSar/gn
gn: 20180423 -> 20180830
2018-09-14 05:48:04 +00:00
Uli Baum 1df2560dde Merge branch 'master' into staging-next 2018-09-13 10:08:53 +02:00
xeji 82a49eb8d2
Merge pull request #46355 from xeji/p/nant-drop
nant, boo, banshee: remove
2018-09-12 23:25:37 +02:00
Maximilian Bosch 46d1166b80 pants: fix build (#46545)
See https://hydra.nixos.org/build/80727495

`pants' works with requests==2.19 to build successfully and `nixpkgs' currently uses `requests==2.19.1`.
Patching the version constraint in `setup.py' accordingly fixes the problem.

Addresses #45960
2018-09-11 23:22:17 +02:00
Wael M. Nasreddine d24f81b825
bazel: 0.16.0 -> 0.16.1 2018-09-10 21:34:41 -07:00
Jörg Thalheim 2d4dcefd9e
Merge pull request #46465 from uri-canva/bazel-jdk10
bazel: add bazel_jdk10 variant
2018-09-10 16:27:01 +01:00
Uri Baghin d1818ad6b1 bazel: add bazel_jdk10 variant 2018-09-10 23:33:21 +10:00
Jan Malakhovski b7bd0561be Merge branch 'master' into staging 2018-09-08 22:08:32 +00:00
Uli Baum dc84de59d1 nant: remove
- our version is from 2015
- it doesn't build
- upstream project is dead, last release 2012, last commit Oct 2016.
- used by only 1 nixpkgs package: `boo`, marked broken since 2016.
2018-09-08 10:23:23 +02:00
Yuriy Taraday 55d8a539ad gn: 20180423 -> 20180830
gn sources have been moved into separate repository which greatly
simplify build process.
2018-09-07 22:04:22 +04:00
R. RyanTM 79ba556020 bear: 2.3.12 -> 2.3.13 (#46308)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bear/versions
2018-09-07 17:48:26 +02:00
Vladimír Čunát 2d6179d1e8
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
2018-09-01 17:38:18 +02:00
Uli Baum 8aa09a2887 cmake_2_8: fix build, restore search-path.patch
cmake 3.12 update in #44910 modified search-path.patch
and broke cmake 2.8. This restores the previous version
of the patch as search-path-2.8.patch
2018-08-31 01:04:44 +02:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Vladimír Čunát b71b222b4c
Merge #44910: cmake: 3.11.2 -> 3.12.1 2018-08-30 16:04:52 +02:00
Philip Patsch 91a876e06f bazel: add upstream patch of perl replacement 2018-08-28 16:12:53 +02:00
Jörg Thalheim ff9a2297ac
Merge pull request #45467 from ktf/init-alibuild
alibuild: init at 1.5.3
2018-08-28 08:50:18 +01:00
Tim Steinbach 33b5cfb4ea
gradle: 4.9 -> 4.10 2018-08-27 18:06:01 -04:00
regnat 98edb207cd bazel: 0.15.2 -> 0.16.0 2018-08-27 13:14:55 +02:00
Timo Kaufmann 83aebe1933
Merge pull request #45615 from r-ryantm/auto-update/apache-maven
maven: 3.5.3 -> 3.5.4
2018-08-26 20:10:00 +02:00
R. RyanTM df126e2adf maven: 3.5.3 -> 3.5.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-maven/versions.
2018-08-24 16:54:21 -07:00
Giulio Eulisse d895f47d68
alibuild: init at 1.5.3 2018-08-24 10:35:32 +02:00
Uri Baghin 487773fb0b bazel-deps: update to 2018-08-16 (#45499) 2018-08-23 15:45:39 +02:00
Profpatsch ec3c3c824e bazel: substitute the perl path for bash completions 2018-08-21 20:12:23 +02:00
Profpatsch c53e004257 bazel: distinguish darwin patches from generic patches
The '' + '' somewhere in the middle is easily missed and extremely
inelegant.

Also removes unnecessary `stdenv` qualifiers from calls to `lib`.
2018-08-21 20:12:23 +02:00
Vladimír Čunát 209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Wael M. Nasreddine 9c5b7cc5d1 bazel: patch //tools/bash/runfiles/runfiles.bash to include defaultShellPath in PATH
closes #43955
2018-08-17 10:51:03 +02:00
Jörg Thalheim 890c6d407d
Merge pull request #44904 from ThomasMader/dlang-update
Dlang update
2018-08-16 08:06:55 +02:00
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Uri Baghin 8c802d42ad bazel: fix darwin build on hydra 2018-08-13 08:32:27 +02:00
Andrew Childs 68ac282f8e cmake: patch internal libuv to remove dependency on macOS Frameworks 2018-08-13 11:05:54 +09:00
Andrew Childs e8144a30bb cmake: remove additional versions 2018-08-13 11:05:54 +09:00
Andrew Childs 32cc3eb899 cmake: 3.11.2 -> 3.12.1 2018-08-13 11:05:54 +09:00
Vladimír Čunát 00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Thomas Mader c685f15dc2 dub: 1.8.1 -> 1.10.0 2018-08-11 16:53:00 +02:00
Pascal Wittmann a34579e01e
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/tools/networking/network-manager/fortisslvpn.nix
2018-08-11 09:36:34 +02:00
Frederik Rietdijk 7d09b2912b
Merge pull request #44832 from bhipple/u/waf
waf: 2.0.6 -> 2.0.10
2018-08-10 08:31:09 +02:00
Silvan Mosberger 2583123523
remake: fix build with glibc2.27
Same fix as applied for gnumake in 519f0b8db2
2018-08-09 22:23:04 +02:00
Benjamin Hipple 32b11f423d waf: 2.0.6 -> 2.0.10
This commit also swaps the build tool to use python3 internally (which waf fully
supports and prefers) and swaps the src to be downloaded from gitlab. The waf.io
site only keeps source tarballs of the latest version, so once a new waf comes
out we can no longer reproduce older versions.

We need the ensureNewerSources hook to avoid this error, in both `python2` and `python3`:

    ValueError: ZIP does not support timestamps before 1980
2018-08-09 14:51:28 -04:00
Frederik Rietdijk d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Pascal Wittmann af8cd3c74e
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2018-08-09 13:10:27 +02:00
adisbladis b8e25d2ce3
Merge pull request #44809 from r-ryantm/auto-update/buildbot-worker
buildbot-worker: 1.2.0 -> 1.3.0
2018-08-09 13:54:39 +08:00
Jörg Thalheim 210af8681e
Merge pull request #44807 from r-ryantm/auto-update/bear
bear: 2.3.11 -> 2.3.12
2018-08-09 06:10:07 +01:00
R. RyanTM 3aa6f292f2 buildbot-worker: 1.2.0 -> 1.3.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-08-08 20:32:19 -07:00
R. RyanTM ab5e09bb36 bear: 2.3.11 -> 2.3.12
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bear/versions.
2018-08-08 20:26:21 -07:00
Uli Baum 33b71398fc bazel_0_4: mark as broken
build has failed since 2018-04-29
2018-08-07 16:53:36 +02:00
Tim Steinbach 47e51aad09
sbt: 1.2.0 -> 1.2.1 2018-08-07 08:35:57 -04:00
Matthew Bauer e62996f65c cmake: add bsd3 license 2018-08-06 10:15:55 -04:00
Pascal Wittmann 80b5d9e3d3
rebar3: add license
see issue #43716
2018-08-06 12:24:38 +02:00
Pascal Wittmann d84ce36fb6
rebar: add license
see issue #43716
2018-08-06 12:22:59 +02:00
John Ericson 34da7e2ce2 treewide: Remove stdenv.isCross
I *want* cross-specific overrides to be verbose, so I rather not have
this shorthand. This makes the syntactic overhead more proportional to
the maintainence cost. Hopefully this pushes people towards fewer
conditionals and more abstractions.
2018-08-02 15:01:58 -04:00
Tim Steinbach 85d23b0b55
sbt: 1.1.6 -> 1.2.0 2018-07-30 14:38:54 -04:00
Frederik Rietdijk 8db716d9f3 Merge master into staging-next 2018-07-28 12:31:35 +02:00
Benjamin Staffin 28e11a0b6b
bazel: fix bash completion, halve build time (#44097)
This finally fixes the build to avoid having to completely rebuild
bazel from source a second time just to generate the bash completion
script!

It also makes completion actually _work_ for bash users by
correcting the name of the installed script.
2018-07-27 14:45:43 -04:00
Benjamin Staffin 9cbe75b269
bazel: 0.15.1 -> 0.15.2 (#44094) 2018-07-27 14:43:15 -04:00
Frederik Rietdijk f59e6f4037 Merge master into staging 2018-07-26 16:18:53 +02:00
Robert Schütz a576b2ea64 conan: 1.5.2 -> 1.6.0 2018-07-26 12:43:17 +02:00
Frederik Rietdijk 099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Frederik Rietdijk ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Kevin Rauscher 1493a45f4b bloop: 1.0.0-M11 -> 1.0.0 2018-07-21 10:47:32 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Pascal Wittmann 4d1fd3775d
buck: adhere to version schema convention
see issue #43717
2018-07-20 22:53:05 +02:00
Pascal Wittmann ba893d4e49
bazel-buildtools: add version to name
see issue #43717
2018-07-20 22:50:48 +02:00
Tim Steinbach a4d5583a85
gradle: 4.8.1 -> 4.9 2018-07-20 08:13:10 -04:00
Frederik Rietdijk 8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Mathieu Boespflug c27f686a4b bazel: Set a sensible strict action environment.
Bazel either reuses the `PATH` from the client, or sets a hardcoded
one. The former mode in problematic for build hermeticity. But the
latter is crippled on NixOS, because the hardcoded value is
`/bin:/usr/bin`. So we set the hardcoded value to match what
`customBash` provides. This has the effect of aligning the
environments for `ctx.actions.run` and `ctx.actions.run_shell`, which
were previously distinct (bug).
2018-07-19 09:51:09 +02:00
Mathieu Boespflug 5ab07a8041 bazel: make more tools available in customBash. 2018-07-19 09:51:09 +02:00
Profpatsch 75942f96b3 bazel: 0.15 -> 0.15.1 2018-07-17 10:12:39 +02:00
Mathieu Boespflug 62f3bf7509 bazel: make the build --sandbox compatible by building extra deps separately. 2018-07-17 10:12:39 +02:00
Mathieu Boespflug d23e72ebf7 bazel: 0.13.0 -> 0.15.0
Upgrade to latest Bazel.
2018-07-17 10:12:39 +02:00
Frederik Rietdijk 12949bf84a Merge master into staging 2018-07-17 10:05:50 +02:00
Frederik Rietdijk 1ae2f10642 Merge staging-next into master 2018-07-17 10:04:59 +02:00
Pascal Wittmann 2d9a6023c4
doit: add myself (pSub) as maintainer 2018-07-16 22:17:38 +02:00
Frederik Rietdijk 6d339e5863 Merge staging-next into staging 2018-07-16 17:14:44 +02:00
Frederik Rietdijk 3c09808160 Merge master into staging-next 2018-07-16 07:43:37 +02:00
Pascal Wittmann 4a35e7ef1d
Merge pull request #43503 from volth/bazel-private-tmp
bazel: use per-user tmp directory to avoid conflict with other builders
2018-07-15 22:22:47 +02:00
Robert Schütz 18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
xeji fbcb86966d
Merge pull request #43430 from tazjin/rebar3-3.6.1
rebar3: 3.4.3 -> 3.6.1
2018-07-14 21:10:11 +02:00
Vincent Ambo 0cf4c90469 rebar3: 3.4.3 -> 3.6.1
Updates rebar3 to version 3.6.1, which amongst other things introduces
support for rebar3 on Erlang/OTP 21.

Changes made:

* rebar3 and dependencies updated to new versions
* rebar3 hermeticity patch updated to apply against new version
* hex package registry snapshot updated
2018-07-14 20:05:53 +02:00
Vladimír Čunát 0f01215203
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
2018-07-14 18:15:30 +02:00
Herwig Hochleitner a6f0ff33b5 Revert "cask: init"
This reverts commit 5bede1a252.

This commit never actually wrapped cask, so it can be safely removed.

see https://github.com/NixOS/nixpkgs/pull/42419
2018-07-14 14:18:57 +02:00
Benjamin Andresen e805874891 cask: fix incorrect exec 2018-07-14 14:07:23 +02:00
volth 2a7aa43c16 bazel: use per-user tmp directory to avoid conflict with other builders 2018-07-13 23:35:28 +00:00
Frederik Rietdijk 3e31d23d99 Merge master into staging 2018-07-13 19:34:19 +02:00
Jan Tojnar 0a7741110c
Merge pull request #42994 from r-ryantm/auto-update/meson
meson: 0.46.1 -> 0.47.0
2018-07-13 17:25:09 +02:00
Profpatsch adbd3ead27 Revert "bazel: fix darwin build on hydra" 2018-07-13 14:15:37 +02:00
R. RyanTM b4d9f481f5 conan: 1.5.1 -> 1.5.2 (#43354)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/conan/versions.
2018-07-11 18:34:17 +02:00
Frederik Rietdijk f8701caafc Merge master into staging 2018-07-10 15:51:20 +02:00