Commit Graph

1531 Commits

Author SHA1 Message Date
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