Commit Graph
2240 Commits
Author SHA1 Message Date
Vladimír Čunát e978eb5986 gnumake42: bring this version back
This is almost a revert of commit 0cfe9f3a (PR #86293).  Version 4.3
https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
brought some incompatibilities, so this will be useful for shorter-term
workarounds.
2020-07-06 10:55:32 +02:00
Jan Tojnar cfe7e12d38 Revert "cmake: only set output paths with multiple outputs"
This reverts commit be1b22538a.

The commit broke Qt modules using CMake because they disable setOutputFlags.

There is no need to have these flags limited to multiple output derivations since it
should just work. If it does not, it is a bug that should be fixed as per
https://github.com/jtojnar/cmake-snips#assuming-cmake_install_dir-is-relative-path
Likewise, having a variable to disable passing the flags is also unnecessary,
since CMake, unlike some configure scripts, ignores unknown flags. And if a person
does not like the values, they can just override them by passing the offending
flag with a different value to cmakeFlags.
2020-07-05 19:01:53 +02:00
Jan Tojnar 4bca7dfb27 Merge branch 'master' into staging-next 2020-07-04 23:59:32 +02:00
Ludovic Claude 6eeb612a9b gradle: 5.6.4 -> 6.5.1
Co-authored-by: Daniël de Kok <me@github.danieldk.eu>
Use https for all urls
fix version for native library
pin gradle for jd-gui
2020-07-04 14:56:12 -07:00
Vladimír Čunát e1206a2129 Merge master into staging-next
This brings thousands of rebuilds.
Hydra nixpkgs: ?compare=1597944
2020-07-04 09:15:27 +02:00
R. RyanTM 2d6d3db7e2 bmake: 20200606 -> 20200629 2020-07-03 01:07:55 +00:00
Chuck 0cfe9f3ae2 gnumake: 4.2.1 -> 4.3 2020-07-02 17:44:47 +02:00
Frederik Rietdijk c33ca7c5ce Merge staging-next into staging 2020-07-02 17:14:53 +02:00
Claudio Bley cda852a528 bazel: 3.3.0 -> 3.3.1 2020-07-01 23:23:33 +02:00
Drew Risinger 2396eb646d conan: 1.25.0 -> 1.27.0
Switch to fetching source from GitHub vs PyPi, which will enable running
packaging tests in the future.
2020-07-01 12:45:39 -07:00
Drew Risinger ea5a79c4a3 conan: enable pythonPackages.six > 1.14.0 2020-07-01 12:45:39 -07:00
R. RyanTM 58cbd5ba85 sbt: 1.3.12 -> 1.3.13 2020-06-30 14:57:54 +00:00
Alyssa Ross be1b22538a cmake: only set output paths with multiple outputs
This brings cmake inline with the behaviour used for configure
scripts, defined in multiple-outputs.sh.  It's important because
that setup hook will only set shareDocName if multiple outputs are in
use (and setOutputFlags hasn't been disabled).  So previously,
CMAKE_INSTALL_DOCDIR would be set to $out/share/doc for single-output
derivations, instead of $out/share/doc/$shareDocName, which would
result in collisions.

Since this hook now uses the setOutputFlags variable, I had to remove
the empty assignment of it added in
a714284d8b.

Fixes: https://github.com/NixOS/nixpkgs/issues/82304
2020-06-29 13:56:27 +00:00
Frederik Rietdijk bef20b38ef Merge master into staging-next 2020-06-25 13:48:05 +02:00
Frederik Rietdijk 16287a8cb8 Merge master into staging-next 2020-06-24 19:04:03 +02:00
Claudio Bley 388038ff98 bazel-buildtools: 3.2.1 -> 3.3.0 2020-06-24 17:02:23 +02:00
Claudio Bley 21a21a4224 bazel: 3.2.0 -> 3.3.0 2020-06-23 15:29:38 +02:00
Frederik Rietdijk 9c5e7367d1 Merge master into staging-next 2020-06-20 07:38:17 +02:00
Ryan Mulligan be707e4cc5 Merge pull request #89644 from r-ryantm/auto-update/mill
mill: 0.7.1 -> 0.7.3
2020-06-19 16:45:24 -07:00
R. RyanTM 9757111825 cmake: 3.17.2 -> 3.17.3 2020-06-19 10:54:01 +02:00
Claudio Bley 9836a30422 bazel-buildtools: 3.2.0 -> 3.2.1 2020-06-17 11:11:41 +02:00
Tim Steinbach 04509f6847 Merge pull request #99277 from NeQuissimus/sbt-extras_2020-09-24
sbt-extras: 2020-06-01 -> 2020-09-24
2020-10-05 09:25:06 -04:00
Claudio Bley e92691b93d sbt: 1.3.13 -> 1.4.0
* remove broken piccolo.link
* add symlink to native `sbtn` client executable to `bin`
2020-10-05 12:04:13 +02:00
Tim Steinbach 6865ad9ce8 sbt-extras: 2020-06-01 -> 2020-09-24 2020-10-01 09:39:36 -04:00
R. RyanTM 4fbf2d1b1b bmake: 20200506 -> 20200606 2020-06-16 10:40:27 -05:00
Emery Hemingway de20ec04f9 tup: fix setup hook location 2020-06-13 11:03:55 +05:30
Emery Hemingway 3065ab3a92 tup: add setupHook 2020-06-13 10:56:20 +05:30
Emery Hemingway 896959cf66 tup: 0.7.8 -> 0.7.9 2020-06-13 10:55:22 +05:30
Frederik Rietdijk dc33419285 Merge master into staging-next 2020-06-08 12:06:12 +02:00
R. RyanTM 2280532945 sbt: 1.3.10 -> 1.3.12 2020-06-06 17:59:00 +00:00
R. RyanTM 845f0a5e44 mill: 0.7.1 -> 0.7.3 2020-06-06 12:45:44 +00:00
Frederik Rietdijk f9af74e75a meson: fix hash after incorrect merge 2020-06-04 17:53:31 +02:00
Frederik Rietdijk 08900c0554 Merge master into staging-next 2020-06-04 15:25:54 +02:00
Mario Rodas a1cae93d18 Merge pull request #89357 from avdv/bazel-buildtools-3
bazel-buildtools: 2.2.1 -> 3.2.0
2020-06-04 03:28:23 -05:00
Daiderd Jordan 7b3a2963d1 treewide: replace base64 encoded hashes 2020-06-03 18:35:19 +02:00
Claudio Bley cd712e625e bazel-buildtools: 2.2.1 -> 3.2.0 2020-06-03 09:37:32 +02:00
contrun 99b5c0bcbe sbt-extras: 2019-10-21 -> 2020-06-01 (#89289) 2020-06-01 08:46:15 +00:00
Florian Klink 98ed9c35c9 Merge pull request #89137 from bhipple/fix/colormake
colormake: use fetchFromGitHub
2020-05-31 16:12:49 +02:00
Benjamin Hipple a25bdf1742 colormake: use fetchFromGitHub
Verified the sha256 does not change.
2020-05-29 20:00:56 -04:00
Frederik Rietdijk 36d9eeb9c7 Merge staging-next into staging 2020-05-29 17:06:01 +02:00
Claudio Bley 7172514b72 bazel: 3.1.0 -> 3.2.0 2020-05-29 15:22:35 +02:00
Claudio Bley 1c5386fa1d bazel: Make bazel_3 the default version
* drop bazel_2
* update hashes of fetch derivations that use `buildBazelPackage`
2020-05-29 08:52:17 +02:00
Claudio Bley c456288170 bazel_3: init at 3.1.0 2020-05-29 08:52:17 +02:00
Frederik Rietdijk 03de4c02fb Merge staging-next into staging 2020-05-28 22:05:36 +02:00
R. RyanTM 3a389d6f6f mill: 0.6.2 -> 0.7.1 2020-05-27 13:48:20 -07:00
Frederik Rietdijk 8a77c900dd Merge staging-next into staging 2020-05-23 10:25:19 +02:00
Mario Rodas 91d1b07d5e Merge pull request #88253 from r-ryantm/auto-update/bmake
bmake: 20200402 -> 20200506
2020-05-23 00:33:53 -05:00
Orivej Desh 16d7f7edae Merge branch 'master' into staging 2020-05-22 09:13:23 +00:00
R. RyanTM 61999ffd0e bmake: 20200402 -> 20200506 2020-05-20 06:56:22 +00:00
Thomas Tuegel 694d80b170 Merge pull request #87704 from veprbl/pr/cmake_32bit_workaround
pkgsi686Linux.cmake: compile with _FILE_OFFSET_BITS=64 for 32-bit targets
2020-05-19 06:13:58 -05:00