1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

1497 commits

Author SHA1 Message Date
Rickard Nilsson 225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +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
Frederik Rietdijk 8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Wael Nasreddine b3668d68a2
bazel: 0.28.0 -> 0.28.1 (#66402) 2019-08-09 17:30:06 -07:00
Frederik Rietdijk 9bd78cb048 Merge master into staging-next 2019-08-09 14:00:27 +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
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 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