mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 19:26:02 +00:00
Code Issues Wiki Activity
270785 commits 182 branches 125 tags 7.8 GiB
Commit graph

2074 commits

Author SHA1 Message Date
Frederik Rietdijk cee7df4846 Merge staging-next into staging 2020-07-30 18:28:15 +02:00
Matthew Bauer 1a3b07cf8e Merge commit 'b53902f535f2c63d71e916b9de22dbcfeec9d99e' into staging 2020-07-29 18:24:08 -05:00
Matthew Bauer 22f82fc8ca Revert "Merge pull request #94090 from sikmir/fix-cmake-hook" 
This reverts commit e36b1d4ad1, reversing
changes made to c2ea7318be.

Should go to staging.
 2020-07-29 18:20:56 -05:00
Matthew Bauer e36b1d4ad1
Merge pull request #94090 from sikmir/fix-cmake-hook 
cmake: fix CMAKE_FIND_FRAMEWORK
 2020-07-29 18:19:57 -05:00
Vladimír Čunát 60d89e5793
Merge branch 'master' into staging 2020-07-29 18:40:28 +02:00
Kevin Rauscher df6e489c4b Bloop: adapt derivation to darwin 2020-07-28 11:36:42 -07:00
Kevin Rauscher 147cab1ee5 Bloop: 1.4.1 -> 1.4.3 2020-07-28 11:36:42 -07:00
Karol Chmist 58f609160c Bloop: rework bloop packaging 
* Include all completions
* Update derivation to make it similar to archlinux packaging
 2020-07-28 11:36:42 -07:00
Karol Chmist 9a6386fd6f Bloop: 1.3.4 -> 1.4.1 2020-07-28 11:36:42 -07:00
Nikolay Korotkiy b53902f535
cmake: fix CMAKE_FIND_FRAMEWORK 2020-07-28 19:05:43 +03:00
Ryan Burns 3a57356721 cmake: 3.17.3 -> 3.18.0 2020-07-26 18:57:06 +02:00
Michael Weiss b9de39c2a1
scons: 4.0.0 -> 4.0.1 (#93415) 2020-07-19 11:41:41 +02:00
Vladimír Čunát 4244b73917
Merge branch 'master' into staging 2020-07-18 17:50:23 +02:00
Michael Weiss 5b14758d31
Merge pull request #92920 from primeos/scons 
scons: 3.1.2 -> 4.0.0
 2020-07-18 13:36:29 +02:00
Michael Weiss d41cd156d0
scons: 3.1.2 -> 4.0.0 2020-07-18 10:48:13 +02:00
Jan Tojnar 7dff6d6681
Merge pull request #93166 from jtojnar/cmake-docdir 2020-07-18 06:51:29 +02:00
Profpatsch 595afc2c3f bazel: use installShellCompletion for completions 2020-07-17 15:38:49 +02:00
Profpatsch a06fda4c5d bazel: add fish completions 
bazel 3.3 adds a first version of completions for fish shell.

Tested manually whether fish is able to load the completions.
 2020-07-17 15:38:49 +02:00
Profpatsch 2ba87b6e79 bazel: use install for completions 
Preserving existing behavior: the bash completion was not executable,
the zsh completion was; according to lukegb the fish completion does
not have to be executable.
 2020-07-17 15:38:49 +02:00
Jan Tojnar 75fdc1ced6
cmake.setupHook: define shareDocName 
The docdir flag needs to include `PROJECT_NAME` according to [GNU guidelines]. We are passing
`-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}` but `$shareDocName` was unset.

The `multiple-outputs.sh` setup hook actually only defines `shareDocName` as a local variable
so it was not available for cmake setup hook. Making it global would be of limited usability,
since it primarily tries to extract the project name from configure script.
Additionally, it would not be set because the setup hook defines `setOutputFlags=`,
preventing the function defining `shareDocName` from running. And lastly, the function
would not run for single-output derivations.

Previously, we tried [not disabling `setOutputFlags`] and passing the directory flags
only for multi-output derivations that do not disable `setOutputFlags` but that meant having
two different branches of code, making it harder to check correctness. The multi-output
one did in fact not work due to aforementioned undefined `shareDocName`. It also broke
derivations that set `setOutputFlags=` like [`qtModule` function does] (probably
because some Qt modules have configure scripts incompatible with `configureFlags` defined
by `multiple-outputs.sh` setup hook). For that reason, it was [reverted], putting us back to start.

Let’s try to extract the project name from CMake in the cmake setup hook.

CMake has a `-L` flag for dumping variables but `PROJECT_NAME` did not seem to be among them
when I tested, so I had to resort to parsing the `CMakeLists.txt` file.

The extraction function is limited, it does not deal with

* project name on different line from the `project(` command opening
    - that will just not get matched so we will fall back to
      using the derivation name
* variable interpolation
    - we will just fall back to using derivation name when the extracted
      `project_name` contains a dollar character
* multiple [`project`] commands
    - The command sets `PROJECT_NAME` variable anew with each call, so the
      last `project` call before `include(GNUInstallDirs)` command will be used
      when the included module would [cache the `CMAKE_INSTALL_DOCDIR` variable].
      We will just take the first discovered `project` command for simplicity.
      Hopefully, there are not many projects that use multiple `project` calls
      before including `GNUInstallDirs`.

In either case, we will have some subdirectory so the conflicts will be minimized.

[GNU guidelines]: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html#index-docdir
[not disabling `setOutputFlags`]: be1b22538a
[`qtModule` function  does]: https://github.com/NixOS/nixpkgs/pull/12740
[reverted]: https://github.com/NixOS/nixpkgs/pull/92298
[`PROJECT_NAME`]: https://cmake.org/cmake/help/v3.18/variable/PROJECT_NAME.html
[`project`]: https://cmake.org/cmake/help/v3.18/command/project.html
[cache the `CMAKE_INSTALL_DOCDIR` variable]: 92e30d576d/Modules/GNUInstallDirs.cmake (L298-L299)
 2020-07-16 04:38:07 +02:00
Daniël de Kok d2754e07bb
Merge pull request #92914 from danieldk/rocm-opencl 
rocm-opencl-icd: init at 3.5.0
 2020-07-15 18:55:53 +02:00
Daniël de Kok 4ba7e9aa8e rocm-cmake: init at 3.5.0 2020-07-13 20:00:20 +02:00
Daniël de Kok 9730290b77
Merge pull request #92939 from RaghavSood/mage/1.10.0 
mage: 1.9.0 -> 1.10.0
 2020-07-13 15:56:40 +02:00
Vladimír Čunát 377324ca6d
Merge branch 'staging-next' (PR #91090) 2020-07-13 07:13:56 +02:00
Jan Tojnar d8ac41f863
meson: 0.54.2 → 0.55.0 
https://mesonbuild.com/Release-notes-for-0-55-0.html
https://github.com/mesonbuild/meson/releases/tag/0.55.0
https://github.com/mesonbuild/meson/compare/0.54.2...0.55.0
 2020-07-12 19:56:33 +02:00
Jan Tojnar c19222143e
meson: clean up 2020-07-12 19:56:24 +02:00
Raghav Sood 881c92f68f
mage: 1.9.0 -> 1.10.0 2020-07-11 16:06:12 +00:00
Frederik Rietdijk ae8eee9c3f Merge master into staging-next 2020-07-11 08:59:54 +02:00
Christian Kögler 30a2f40336 redo-c: Initial 0.2 2020-07-10 00:48:57 +02:00
Mario Rodas a6fad046a8
Merge pull request #92555 from r-ryantm/auto-update/redo-apenwarr 
redo-apenwarr: 0.42a -> 0.42c
 2020-07-07 19:33:19 -05:00
R. RyanTM ed9f1b36b3 mill: 0.7.3 -> 0.7.4 2020-07-07 10:04:15 -07:00
Mario Rodas 005b5770f4
redo-apenwarr: install bash completion 2020-07-07 04:20:00 -05:00
Mario Rodas a12ccb7f3e redo-apenwarr: update meta 2020-07-07 04:20:00 -05:00
R. RyanTM abe8394a5b redo-apenwarr: 0.42a -> 0.42c 2020-07-07 08:01:26 +00:00
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
Jan Tojnar f8a9c6efac
Merge branch 'staging-next' into staging 2020-05-18 21:09:48 +02:00
Jan Tojnar 282cb2f8d6
meson: 0.54.1 → 0.54.2 
https://github.com/mesonbuild/meson/compare/0.54.1...0.54.2
 2020-05-15 16:58:41 +02:00
bessonm 77ec372a3f
maven: Wrap mvnDebug for convenience 2020-05-15 16:56:58 +02:00
Frederik Rietdijk 404fe35d65 Merge staging-next into staging 2020-05-14 09:37:03 +02:00
Colin L Rice d6162dab50
go-modules: Update files to use vendorSha256 2020-05-14 07:22:21 +01:00
Dmitry Kalinkin 467a87ba1d
cmake: compile with _FILE_OFFSET_BITS=64 for 32-bit targets 2020-05-12 18:16:03 -04:00
John Ericson 1ac5398589 *-wrapper; Switch from infixSalt to suffixSalt 
I hate the thing too even though I made it, and rather just get rid of
it. But we can't do that yet. In the meantime, this brings us more
inline with autoconf and will make it slightly easier for me to write a
pkg-config wrapper, which we need.
 2020-05-12 00:44:44 -04:00
Matthew Bauer 43545032af
Merge pull request #87314 from matthewbauer/bazel-flat 
build-bazel-package: switch hash mode to “flat”
 2020-05-11 15:27:48 -05:00
Frederik Rietdijk d20d734bcf Merge master into staging-next 2020-05-11 09:19:26 +02:00
Ryan Mulligan 58d3628af8
Merge pull request #87467 from r-ryantm/auto-update/qbs 
qbs: 1.15.0 -> 1.16.0
 2020-05-10 06:34:41 -07:00
Frederik Rietdijk 303adc7697 Merge master into staging-next 2020-05-10 09:43:48 +02:00
R. RyanTM 254aeb5050 qbs: 1.15.0 -> 1.16.0 2020-05-10 05:13:15 +00:00
Matthew Bauer 2a8d05627b build-bazel-package: switch hash mode to “flat” 
flat hashes can be substituted through hashed-mirrors, while recursive
hashes can’t. This is especially important for Bazel since the bazel
fetch dependencies can come from multiple different methods (git,
http, ftp, etc.). To do this, we create tar archives from the
output/external directory, which is then extracted to build. All of
the Bazel hashes are all updated.
 2020-05-09 13:33:26 -05:00
Jörg Thalheim 887295fd2d
treewide: remove the-kenny from maintainers 
@the-kenny did a good job in the past and is set as maintainer in many package,
however since 2017-2018 he stopped contributing. To create less confusion
in pull requests when people try to request his feedback, I removed him as
maintainer from all packages.
 2020-05-09 10:28:57 +01:00
R. RyanTM 27752d41e6 cmake: 3.17.0 -> 3.17.2 2020-05-08 06:56:59 +02:00
Vladimír Čunát fcc68a43aa
Merge branch 'staging-next' 
The nss update is needed for security update of firefox.
For linux platforms only about 1k aarch64 rebuilds are missing;
the diff on Hydra looks OK.  Darwin needs 20k more rebuilds,
but I don't think we want to wait for that.
 2020-05-07 19:56:25 +02:00
Maximilian Bosch 222196b9d6
Merge pull request #86733 from r-ryantm/auto-update/sbt 
sbt: 1.3.9 -> 1.3.10
 2020-05-06 22:29:27 +02:00
Drew Risinger 4454ca488c conan: 1.24.0 -> 1.25.0 2020-05-06 11:14:32 -07:00
Drew Risinger cae48ccad3 conan: unbreak with deprecation>=2.1 2020-05-06 09:46:18 -07:00
Vladimír Čunát 54eb2d1018
Merge branch 'staging-next' 
Status on Hydra for linuxes seems good enough:
https://hydra.nixos.org/eval/1585703?filter=linux&compare=1585482&full=#tabs-now-fail
 2020-05-06 08:20:05 +02:00
R. RyanTM 989787210f mill: 0.6.1 -> 0.6.2 2020-05-05 19:02:36 -07:00
Jan Tojnar 1a9c35d051
meson: 0.54.0 → 0.54.1 
https://github.com/mesonbuild/meson/compare/0.54.0...0.54.1
 2020-05-05 06:56:55 +02:00
R. RyanTM 4748748f12 bmake: 20200318 -> 20200402 2020-05-04 19:43:52 +00:00
R. RyanTM 638a998c00 sbt: 1.3.9 -> 1.3.10 2020-05-04 07:41:06 +00:00
Frederik Rietdijk 484ee79050 Merge staging-next into staging 2020-05-01 08:57:10 +02:00
Alexey Shmalko 2364d98c60
meson: remove rasendubi from maintainers 
I lagged behind meson changes and I can't provide good reviews or fix
meson issues. I am therefore resigning from meson maintainership.
 2020-04-29 16:52:29 +03:00
John Ericson 38b084f621 meson: Fix cross 
The old `CC=.. CXX= .. meson ...` env var hack I removed in
3c00ca03a2 had a side effect of ensuring
that Meson always had access to a native C compiler, which unforunately
it expects in most cases. Thankfully, that will be fixed soon.
 2020-04-28 22:54:48 -04:00
John Ericson 8245230753 meson: Make target-agnostic 
The cross file is added in the `mkDerivation`. It isn't nice putting
build tool-specific stuff here, but our current architecture gives us
little alternative.
 2020-04-28 10:55:33 -04:00
John Ericson 128b93e061 meson: Patch to ingest env vars like autoconf 
See comment in code and the PR it references,
https://github.com/mesonbuild/meson/pull/6827, for details.

We can remove entries from the cross file because they will be gotten
from env vars now.
 2020-04-28 10:11:41 -04:00
John Ericson 3c00ca03a2 meson: Don't set CC and CXX 
I've since convinced upstream to not use such vars for the build
platform during cross. Finally!
 2020-04-26 16:50:06 -04:00
Frederik Rietdijk 8374a2a0ee Merge master into staging-next 2020-04-22 17:20:20 +02:00
Peter Hoeg 760d56f6ba shards: 0.9.0 -> 0.10.0 2020-04-22 17:30:22 +08:00
R. RyanTM 0293a4b37f waf: 2.0.19 -> 2.0.20 2020-04-21 08:40:14 +02:00
Jan Tojnar 9073a0cb8b meson: 0.53.2 → 0.54.0 
https://mesonbuild.com/Release-notes-for-0-54-0.html
 2020-04-21 08:32:39 +02:00
Vladimír Čunát d96487b9ca
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1582510
 2020-04-18 07:42:26 +02:00
John Ericson 33c2a76c5e Merge remote-tracking branch 'upstream/master' into staging 2020-04-17 18:40:51 -04:00
Michael Fellinger 056778b315
crystal: 0.31 -> 0.34 (#85432) 
* crystal: 0.31 -> 0.34

* crystal: use latest llvm

* crystal: skip tests for 0.33
 2020-04-17 21:04:33 +08:00
Jan Tojnar a04625379a
Merge branch 'master' into staging-next 2020-04-13 18:50:35 +02:00
Jan Tojnar 1ab03c3a76
Merge branch 'master' into staging-next 2020-04-10 12:12:56 +02:00
Mario Rodas 0d995eb6c4
bazel-buildtools: 1.0.0 -> 2.2.1 2020-04-10 04:20:00 -05:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM 7ba55849c5 bmake: 20200212 -> 20200318 2020-04-09 10:18:27 -07:00
Mike Sperber 677b2d818e
bazel_0_26: fix linker flags for darwin (#84614) 
Same as done for bazel_0_29 in d1ee615f1cb48a193bbe194adced53ecb7395d8e:
 2020-04-08 18:48:40 -04:00
Samuel Leathers 72cb7f81fd
Merge pull request #81442 from manveru/bundler-2.1.4 
bundler: 1.17.3 -> 2.1.4
 2020-04-08 12:44:54 -04:00
Profpatsch 955b44b3bd bazel_1: fix test paths 2020-04-08 17:50:32 +02:00
Profpatsch e8b19c09a5 bazel_2: fix test paths 
They did not survive the move into the subdirectory.
 2020-04-08 17:50:32 +02:00
Jonathan Ringer 3583757685 conan: 1.23.0 -> 1.24.0 2020-04-07 10:50:55 -07:00
Michael Fellinger f92600b406
update versions in Gemfile.lock 2020-04-06 15:02:13 +02:00
Frederik Rietdijk edaa972160 Merge staging-next into staging 2020-04-03 21:55:10 +02:00
Frederik Rietdijk 92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
R. RyanTM 1b6d715bdc samurai: 1.0 -> 1.1 2020-04-01 18:58:42 -07:00
R. RyanTM d5526f0d98 sbt: 1.3.8 -> 1.3.9 2020-04-01 16:48:07 -07:00
John Ericson 6bf6ec8a96 Merge remote-tracking branch 'upstream/master' into consistent-bazel-ref 2020-04-01 16:16:30 -04:00
John Ericson 6f94f8fd3f bazel-*: Consistently self reference 
Using `bazel_self` for self-references makes managing bazel versions
easier: their less risk of changing defaults or copy pasted code for no
versions leading to incorrect self-references.
 2020-04-01 16:16:26 -04:00
Daniel Șerbănescu b18e7e5b6a
cmake: 3.16.5 -> 3.17.0 2020-04-01 11:00:43 -05:00
Jan Tojnar 3e0f4e202f
Merge branch 'master' into staging-next 2020-03-31 21:32:15 +02:00
R. RyanTM a90b82dfe9 alibuild: 1.5.4rc3 -> 1.5.5 2020-03-31 09:29:48 -07:00
Ryan Mulligan 97f404147e
Merge pull request #82993 from Synthetica9/homepage-fix2 
treewide: fix redirected urls (again)
 2020-03-30 13:40:46 -07:00
John Ericson 1fa310549c Merge remote-tracking branch 'upstream/master' into add-tensorflow-2 2020-03-30 13:59:16 +00:00
John Ericson d4de62dedd bazel_0_29: init at 0.29.1 
Needed for Tensorflow 2.1
 2020-03-30 04:30:40 +00:00
Frederik Rietdijk a36be028f5 Merge staging-next into staging 2020-03-28 21:15:15 +01:00
Patrick Hilhorst 5b49816cf4
treewide: add quotes to recently-changed urls 
Co-Authored-By: Drew <drewrisinger@users.noreply.github.com>
 2020-03-28 00:05:50 +01:00
Michael Weiss 0950324466 scons: Add passthru.py2 for backward compatibility 
Not all packages build with Python 3, see #75877. The goal is to get rid
of Python 2 but this approach ensures a smoother transition.
 2020-03-27 10:49:52 -07:00
Michael Weiss 4ca37400ac scons: Switch to Python 3 
Reasons:

Python 2.7 will EOL very soon [0]:
DEPRECATION: Python 2.7 will reach the end of its life on January 1st,
2020. Please upgrade your Python as Python 2.7 won't be maintained after
that date. A future version of pip will drop support for Python 2.7.
More details about Python 2 support in pip, can be found at
https://pip.pypa.io/en/latest/development/release-process/#python-2-support

SCons 4.0.0 will drop Python 2.7 Support [1]:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.2/src/CHANGES.txt

[0]: From the SCons build output previous to this commit (i.e. with Python 2.7).
[1]: https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.2/src/CHANGES.txt
 2020-03-27 10:49:52 -07:00
Niklas Hambüchen 0bc0823ff7
Merge pull request #83144 from nh2/conan-1.23.0 
Conan 1.23.0
 2020-03-26 15:55:39 +01:00
Doron Behar 7f2fc686af bear: Use python3 by default 2020-03-26 07:25:15 +01:00
Andreas Rammhold d7673d7889 bazel_0: init at 0.26.0 
(cherry picked from commit 1c0de27df3)
 2020-03-25 11:32:39 -04:00
Janne Heß cfe8e0e1ad pkgs/bazel*: Fix path to update-srcDeps.py 
Otherwise, the -small channel fails on the tarball output.

(cherry picked from commit 0723bf3b72)
 2020-03-25 11:27:15 -04:00
Michael Lingelbach 3fab55793d Add bazel 1.2.1 
(cherry picked from commit 1c4f22a5da)
 2020-03-25 11:27:14 -04:00
Michael Weiss a1b4bfe34f
gn: 20190403 -> 2020-03-09 
This updates gn to the required version for chromiumDev (the recommended
version for the stable release of Chromium isn't sufficient [0]).

[0]: The Chromium build fails during the configuration phase:
ERROR at //mojo/public/tools/bindings/mojom.gni:393:16: Undefined identifier
               "cpp_typemaps",
               ^-------------
 2020-03-24 14:41:11 +01:00
Orivej Desh 1b89aa3f7a Merge branch 'master' into staging 2020-03-23 00:53:16 +00:00
Christian Kögler 4c9bd5d52a redo-apenwarr: 0.42 -> 0.42a; use python3 and fixed building manpage 
Removed dependency to mkdoc, which is only needed to build the webpage.
 2020-03-22 19:11:15 +01:00
Niklas Hambüchen f460e62d9b conan: 1.12.3 -> 1.23.0 
* remove pinned dependencies where nixpkgs provides a version
  in the acceptable range
* disable tests;
  they are no longer in the Pypi archive, see
  https://github.com/conan-io/conan/issues/4563
 2020-03-22 16:34:55 +01:00
Niklas Hambüchen 03d5611ae0 conan: Remove unnecessary patching. 
The pluginbase dependency is now pinned further up with commit

    244fcfc8 - conan: pin pluginbase to 0.7
 2020-03-22 16:03:44 +01:00
Niklas Hambüchen 3a158da8e8 conan: Reformat inputs list 2020-03-22 15:45:49 +01:00
Matthew Bauer 46f8756aee
Merge pull request #79593 from thefloweringash/wafhook-phases 
wafHook: allow overriding phases and disabling of cross flags
 2020-03-22 01:59:41 -04:00
Patrick Hilhorst 9fc5e7e473
treewide: fix redirected urls (again) 
Ran the same script as #78265.
Additionally, manually replaced `http://goodies.xfce.org`
with https.
 2020-03-20 13:36:23 +01:00
Frederik Rietdijk 8fa5eb488b Merge master into staging-next 2020-03-12 11:30:04 +01:00
Jan Tojnar 9c4f24a63e
meson: add jtojnar to maintainers 2020-03-11 13:53:15 +01:00
Thomas Tuegel 65d5cc1499
Merge pull request #81869 from r-ryantm/auto-update/cmake 
cmake: 3.16.4 -> 3.16.5
 2020-03-08 05:32:54 -05:00
R. RyanTM b3793e1181 cmake: 3.16.4 -> 3.16.5 2020-03-06 06:14:36 +00:00
Frederik Rietdijk 188c3a4d03 Merge staging-next into staging 2020-03-06 07:09:30 +01:00
Matthew Bauer dfbe76a681 waf: move binary to $out/bin/ 
Originally this was just the executable, but this breaks nix-shell
usage. Instead, just do a normal directory.

Fixes #79909
 2020-03-06 07:06:01 +01:00
Jan Tojnar 1a44e325d2
Merge branch 'staging-next' into staging 2020-03-04 21:24:05 +01:00
Andreas Rammhold 1c0de27df3
bazel_0: init at 0.26.0 2020-03-04 16:41:17 +01:00
Andreas Rammhold 4c00e6f654 bazel-remote: fix fixed output derivation hash 2020-03-03 14:35:24 +01:00
Andreas Rammhold 846f300511
Merge pull request #80953 from andir/bazel-poison 
buildBazelPackage: poison all the fixed output derivations
 2020-03-03 10:39:05 +01:00
Andreas Rammhold 0ff376c03f
bazel-remote: update fixed output hash 2020-03-03 01:12:27 +01:00
Janne Heß 0723bf3b72 pkgs/bazel*: Fix path to update-srcDeps.py 
Otherwise, the -small channel fails on the tarball output.
 2020-03-02 13:11:14 +01:00
Michael Lingelbach 1c4f22a5da Add bazel 1.2.1 2020-03-02 09:08:47 +01:00
Frederik Rietdijk 21b808cd76 Merge staging-next into staging 2020-02-29 15:29:45 +01:00
Joao Neves 95c91cebf1 bazel: output correct binary name 
From Bazel 2.0.0 onwards, Bazel looks for a binary named
`bazel-${version}-${os_arch}` if the project root contains a
`.bazelversion` file or the USE_BAZEL_VERSION environment
variable is set.

This change ensures we output a binary with the correct name
for the current version and OS/arch combination.
 2020-02-28 12:21:22 +01:00
Joao Neves dd413d4c2d bazel: 2.0.0 -> 2.1.0 2020-02-28 12:21:22 +01:00
Millian Poquet 65336dc3cf
meson: 0.52.1 -> 0.53.2 
https://mesonbuild.com/Release-notes-for-0-53-0.html

https://github.com/mesonbuild/meson/releases/tag/0.53.0
https://github.com/mesonbuild/meson/releases/tag/0.53.1
https://github.com/mesonbuild/meson/releases/tag/0.53.2
 2020-02-28 11:10:06 +01:00
Jan Tojnar ca55015ed8
Revert "meson: 0.52.1 -> 0.53.2" 
This reverts commit d607564d68.

should go to staging
 2020-02-28 11:09:24 +01:00
Jan Tojnar b0dfe1cf63
Merge pull request #80797 from mpoquet/meson-0.52.1-to-0.53.1 
meson: 0.52.1 -> 0.53.1
 2020-02-28 10:28:04 +01:00
Millian Poquet d607564d68
meson: 0.52.1 -> 0.53.2 
https://mesonbuild.com/Release-notes-for-0-53-0.html

https://github.com/mesonbuild/meson/releases/tag/0.53.0
https://github.com/mesonbuild/meson/releases/tag/0.53.1
https://github.com/mesonbuild/meson/releases/tag/0.53.2
 2020-02-27 21:22:54 +01:00
R. RyanTM 0b919c249f
mill: 0.6.0 -> 0.6.1 (#81017) 2020-02-26 12:18:16 -05:00
Daiderd Jordan e4af779056
Merge pull request #80635 from marsam/fix-bazel-darwin 
bazel: fix build on darwin
 2020-02-22 08:52:58 +01:00
Mario Rodas 1fe82110fe
Merge pull request #80627 from marsam/update-bazel-buildtools 
bazel-buildtools: 0.29.0 -> 1.0.0
 2020-02-21 23:44:41 -05:00
Silvan Mosberger e0fc181f5c
Merge pull request #80645 from xfix/cmake_2_8-fix-build 
cmake_2_8: fix build
 2020-02-21 19:38:25 +01:00
Timo Kaufmann ec6bf457bf
Merge pull request #80728 from timokau/maven-jdk-overridable 
maven: make jdk overridable
 2020-02-21 14:49:41 +00:00
Timo Kaufmann 0141cfefbc maven: make jdk overridable 
This makes it possible to use maven with different (newer) jdks.

Fixes #75630
 2020-02-21 14:26:33 +01:00
Konrad Borowski 4bad7d67cd cmake_2_8: fix build 2020-02-20 16:09:14 +01:00
Mario Rodas 572a6672d0
bazel-buildtools: add marsam to maintainers 2020-02-20 04:21:00 -05:00
Mario Rodas d1ee615f1c
bazel: fix linker flags for darwin 2020-02-20 04:20:00 -05:00
Mario Rodas 3dd0593020
bazel-buildtools: 0.29.0 -> 1.0.0 2020-02-20 04:20:00 -05:00
Mario Rodas 82a6834e3b
Merge pull request #80527 from marsam/update-bazel-remote 
bazel-remote: 2020-01-29 -> 1.0.0
 2020-02-19 20:03:47 -05:00
R. RyanTM 24bc04b9d2 bmake: 20181221 -> 20200212 2020-02-19 14:18:49 -06:00
Frederik Rietdijk 0c7143462b Merge master into staging 2020-02-16 08:50:59 +01:00
Mario Rodas 2e651faa3c
bazel-remote: 2020-01-29 -> 1.0.0 2020-02-14 04:20:00 -05:00
Will Dietz 18d9cc22c6
Merge pull request #77140 from dtzWill/feature/samurai 
samurai: init at 1.0
 2020-02-13 00:24:39 -06:00
R. RyanTM f00bda0148 cmake: 3.16.3 -> 3.16.4 2020-02-12 09:07:49 +01:00
Frederik Rietdijk 1a6c3cb06b Merge staging into staging-next 2020-02-11 07:59:53 +01:00
R. RyanTM 40c98652e2 mage: 1.8.0 -> 1.9.0 2020-02-10 13:33:33 +01:00
Tobias Mayer 3a39ea06d2 ninja: 1.9.0 -> 1.10.0 2020-02-09 16:57:56 -06:00
Andrew Childs 03ffda3d1e wafHoook: fix whitespace 2020-02-09 16:13:43 +09:00
Andrew Childs 032d5e7e83 wafHook: make crossFlags optional 
The convention of `--cross-compile` and `--cross-execute` is common
enough that it seems like a reasonable default. However there are
projects like mpv which do not use these flags, and rightfully fails
to configure when passed unexpected flags.
 2020-02-09 16:03:02 +09:00
Andrew Childs c6791b2117 wafHook: allow overriding phases 
This makes the wafHook a lot closer to the structure of standard hooks
like cmake and ninja.
 2020-02-09 16:03:02 +09:00
R. RyanTM 2357a15348 sbt: 1.3.7 -> 1.3.8 2020-02-07 18:35:39 +00:00
Frederik Rietdijk 76a439239e Merge master into staging-next 2020-02-05 10:28:52 +01:00
Uri Baghin 10d1a04b02 bazel-deps: remove 2020-02-04 12:35:47 +11:00
Uri Baghin 3dc9c1b885 bazel-remote: 2019-01-12 -> 2020-01-29 2020-02-04 02:26:15 +01:00
Benjamin Hipple e73fa05f30 waf: 2.0.18 -> 2.0.19 
The patch for sorting files in `tar` is no longer needed, as it has been fixed
upstream: https://gitlab.com/ita1024/waf/-/merge_requests/2227
 2020-02-02 20:07:38 +01:00
Daiderd Jordan 68513e4071
cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv 
This was initially introduced in 92188d9d17,
not clear how relevant this still is but i686 isn't supported anymore so
disable it explicitly.
 2020-01-31 21:52:13 +01:00
Daiderd Jordan b984c227d2
cmake: remove CMAKE_OSX_DEPLOYMENT_TARGET overrides 
We _do_ want minimum versions in our packages.
 2020-01-31 21:52:12 +01:00
Frederik Rietdijk 5cc0468a20 Merge staging into staging-next 2020-01-31 00:16:31 +01:00
Jörg Thalheim 2dfc3e5254
build-rebar3: restore rebar3-nix-bootstrap path (#78418) 
build-rebar3: restore rebar3-nix-bootstrap path
 2020-01-30 14:21:29 +00:00
Yorick van Pelt e8889fe676
rebar3: restore bootstrapper attribute 
partially reverts 8de4654d4b
 2020-01-29 20:17:27 +01:00
R. RyanTM 6e6615dfcc cmake: 3.16.2 -> 3.16.3 2020-01-29 08:57:00 +01:00
Frederik Rietdijk dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
Maximilian Bosch 258d4b3ca4
Merge pull request #78487 from r-ryantm/auto-update/sbt 
sbt: 1.3.5 -> 1.3.7
 2020-01-26 00:26:10 +01:00
R. RyanTM 5d19c3525e sbt: 1.3.5 -> 1.3.7 2020-01-25 22:58:10 +00:00
scalavision de193e105d mill: 0.5.6 -> 0.6.0 2020-01-24 15:01:47 +01:00
Pascal Wittmann 00482247e1
Merge pull request #78200 from r-ryantm/auto-update/icmake 
icmake: 9.02.09 -> 9.03.01
 2020-01-22 08:55:37 +01:00
R. RyanTM aed4be2de3 icmake: 9.02.09 -> 9.03.01 2020-01-21 18:55:15 +00:00
R. RyanTM a98253f848 rebar: 2.5.1 -> 2.6.4 2020-01-17 10:22:22 +00:00
Frederik Rietdijk bc18cc72dd
Merge pull request #77610 from LnL7/darwin-stdenv-python3 
darwin-stdenv: bootstrap with python3
 2020-01-15 09:24:57 +01:00
Daiderd Jordan 587c66c877
ninja: python2 -> python3 2020-01-13 11:13:06 +01:00
Frederik Rietdijk 960f062825 Merge master into staging-next 2020-01-12 09:47:19 +01:00
Mario Rodas b19f27a785
Merge pull request #76328 from r-ryantm/auto-update/mill 
mill: 0.5.3 -> 0.5.6
 2020-01-11 05:20:24 -05:00
Frederik Rietdijk 348eaa280b Merge master into staging-next 2020-01-10 18:32:07 +01:00
Milan Pässler 8337bb607c gradle: remove old versions 2020-01-10 04:21:18 +01:00
Frederik Rietdijk a823616723 Merge master into staging-next 2020-01-07 20:06:22 +01:00
Danju Visvanathan 0a6551f48c bazel: 1.2.1 -> 2.0.0 (#76851) 
* bazel: 1.2.1 -> 2.0.0

* .
 2020-01-07 17:24:54 +01:00
Will Dietz 80f043b738
samurai: init at 1.0 2020-01-06 16:06:32 -06:00
Frederik Rietdijk 8fff915659
Merge pull request #76488 from jtojnar/more-python-cleanups 
Another batch of Python 2 clean-ups
 2020-01-06 12:00:36 +01:00
markuskowa bba84b607e
Merge pull request #76396 from r-ryantm/auto-update/qbs 
qbs: 1.14.1 -> 1.15.0
 2020-01-04 12:03:56 +01:00
Jonathan Ringer d72c4791bc Merge remote-tracking branch 'origin' into staging-next 2019-12-30 14:36:16 -08:00
Tim Steinbach d835f229f4
Merge pull request #76711 from ktor/master 
gradle: 5.6.1 -> 5.6.4
 2019-12-30 13:20:25 -05:00
Jonathan Ringer 446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Pawel Kruszewski 5f182a9eed gradle: 5.6.1 -> 5.6.4 2019-12-30 18:33:21 +01:00
Andrew Childs 63c9e4ee9d meson: add armv5tel cpu family 2019-12-30 17:21:39 +01:00
Robin Gloster a8822b6ec2
gnumake: *Flags are lists 2019-12-30 11:13:41 +01:00
Jan Tojnar c72e388b7f
gn: switch to python 3 2019-12-29 11:21:08 +01:00
Jan Tojnar 4bbc6cc66f
Merge branch 'staging-next' into staging 2019-12-25 05:18:52 +01:00
Tim Steinbach ecbcdc8a4c
Merge pull request #76416 from r-ryantm/auto-update/sbt 
sbt: 1.3.4 -> 1.3.5
 2019-12-24 21:36:46 -05:00
R. RyanTM 23436b5529 sbt: 1.3.4 -> 1.3.5 2019-12-24 07:59:37 -08:00
R. RyanTM 5d33d676eb qbs: 1.14.1 -> 1.15.0 2019-12-24 05:08:43 -08:00
Pascal Wittmann 332dbf1e52
Merge pull request #76281 from r-ryantm/auto-update/icmake 
icmake: 9.02.08 -> 9.02.09
 2019-12-24 08:57:49 +01:00
R. RyanTM 0fa2ab2a74 mill: 0.5.3 -> 0.5.6 2019-12-23 15:31:52 -08:00
R. RyanTM d7cec21555 icmake: 9.02.08 -> 9.02.09 2019-12-23 08:46:51 -08:00
R. RyanTM 5fb48efd99 doit: 0.31.1 -> 0.32.0 2019-12-23 02:33:40 -08:00
Tobias Mayer dfee92cd2e cmake: 3.15.4 -> 3.16.2 2019-12-20 15:59:32 +01:00
Michael Weiss 832cf092c7
scons: 3.1.1 -> 3.1.2 
Announcement:
https://scons.org/scons-312-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.2/src/CHANGES.txt
 2019-12-18 16:10:11 +01:00
Frederik Rietdijk f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00