Commit Graph

2383 Commits

Author SHA1 Message Date
Sandro
dfa58ab147
Merge pull request #134288 from fufexan/arpa2cm 2021-08-16 15:43:34 +02:00
Andreas Rammhold
f680248169
scons: use python2 for all scons versions <4
While refactoring this file in a previous PR I accideintially ported
scons 3.0.1 to Python3 which doesn't work. Only Scons >=4 supports
Python3.
2021-08-16 15:18:38 +02:00
Mihai Fufezan
569a0b6063
arpa2cm: 0.5 -> 0.9.0 2021-08-16 09:20:34 +03:00
github-actions[bot]
4dfde9ac8e
Merge staging-next into staging 2021-08-15 18:01:33 +00:00
Ilan Joselevich
faf977b292 maven: 3.8.1 -> 3.8.2 2021-08-15 12:17:08 +03:00
Andreas Rammhold
218df5159c
sconsPackages: expose the python version used with scons
This allows users of scons to pick the correct version of python.
Previously we had issues with some build systems not picking the right
python3 version when adding additional python modules to the build
environment. A famous example of this is mongodb where additional python
modules are required to run the scons build.

This is change doesn't introduce rebuilds (to the best of my knowledge)
as it only adds a passthru argument and changes how we pass the python
version around.
2021-08-14 13:27:15 +02:00
Tobias Mayer
4aac491f18 cmake: Fix on darwin-arm64
Adds the SystemConfiguration framework to buildInputs unless we're
bootstrapping.

For the bootstrap version, we revert
31f631a142
instead so CMake builds without SystemConfiguration.
2021-08-12 11:26:13 +02:00
tobim
12da67f0c6 cmake: 3.21.0 -> 3.21.1 2021-08-12 11:26:13 +02:00
Tobias Mayer
3c7fbeaf4a Revert "Revert "cmake: 3.19.7 -> 3.21.0""
This reverts commit bd57a30d1b.
2021-08-11 14:31:11 +02:00
github-actions[bot]
c47bdfa71a
Merge staging-next into staging 2021-08-08 06:01:51 +00:00
Artturi
fcc7cd5554
Merge pull request #132165 from corngood/msbuild 2021-08-08 08:23:32 +03:00
Vladimír Čunát
8ab6ba6b1c
Merge branch 'staging-next' into staging 2021-08-06 09:14:57 +02:00
JesusMtnez
a752a1c897
sbt: 1.5.4 -> 1.5.5 2021-08-05 05:19:45 +02:00
zimbatm
59091b7787
gradle_7: 7.1 -> 7.1.1 2021-08-04 18:06:18 +02:00
zimbatm
8c0d0fcf86
gradle: fmt 2021-08-04 18:06:18 +02:00
github-actions[bot]
2427da39ca
Merge staging-next into staging 2021-08-03 18:01:44 +00:00
sternenseemann
c3c4ef859a gprbuild, xmlada: init at 21.0.0
GPRbuild is a multi language build system developed by AdaCore which
is mostly used for build Ada-related projects using GNAT.

Since GPRbuild is used to build itself and its dependency library
XML/Ada we first build a bootstrap version of it using the provided
bash build script bootstrap.sh as the gprbuild-boot derivation.
gprbuild-boot is then used to build xmlada and the proper gprbuild
derivation.

GPRbuild has its own search path mechanism via GPR_PROJECT_PATH which
we address via a setupHook. It currently works quite similar to the
pkg-config one: It accumulates all inputs into GPR_PROJECT_PATH,
GPR_PROJECT_PATH_FOR_BUILD etc. However this is quite limited at the
moment as we don't have a gprbuild wrapper yet which understands the
_FOR_BUILD suffix. However, we'll need to address this in the future
as it is currently basically impossible to test since the distinction
only affects cross-compilation, but it is not possible to build a GNAT
cross-compiler in nixpkgs at the moment (I'm working on changing that,
however).

Another issue we had to solve was GPRbuild not finding the right GNAT
via its gprconfig tool: GPRbuild has a knowledge base with compiler
definitions which run some checks and collect info about binaries
which are in PATH. In the end the first compiler in PATH that supports
the desired language is selected.

We want GPRbuild to discover our wrapped GNAT since the unwrapped one
is incapable of producing working binaries since it won't find the
crt*.o objects distributed with libc. GPRbuild however needs to find
the Ada runtime distributed with GNAT which is not part of the wrapper
derivation, so it will skip the wrapper and select the unwrapped GNAT.
Symlinking the unwrapped's lib directory into the wrapper fixes this
problem, but breaks linking in some cases (e. g. when linking against
OMP from gcc, the runtime variant will shadow the problem dynamic lib
from buildInputs). Additionally it uses gnatls as an indicator it has
found GNAT which is not part of the wrapper.

The solution we opted to adopt here is to install a custom compiler
description into gprbuild's knowledge base which properly detects the
nixpkgs GNAT wrapper: It uses gnatmake to detect GNAT instead of
gnatls and discovers the runtime via a symlink we add to
`$out/nix-support`. This additional definition is enough to properly
detect GNAT, since the plain wrapped gcc detection works out of the
box. It may, however, be necessary to add special definitions for
other languages in the future where gprbuild also needs to discover
the runtime.

One future improvement would be to install libgpr into a separate
output or split it into a separate derivation (which would require to
link gprbuild statically always since otherwise we end up with a
cyclical dependency).
2021-08-03 14:58:49 +02:00
Sandro
65989410c7
Merge pull request #132034 from SuperSandro2000/cmake
cmake: format
2021-08-02 08:23:28 +00:00
David McFarland
3672c0a33f msbuild: 16.8 -> 16.10.1 2021-07-30 17:10:03 -03:00
Sandro Jäckel
9e3ca9d8ee
cmake: format, cleanup 2021-07-30 14:35:01 +02:00
David
c160267002 rebar3: apply tmpdir patch from upstream 2021-07-30 21:24:57 +09:00
Frederik Rietdijk
bd57a30d1b Revert "cmake: 3.19.7 -> 3.21.0"
cmake on darwin now depends on the SystemConfiguration framework.
Support for this has not yet been added to our bootstrapping.

We need to decide how to go further. As this is blocking staging-next
it is reverted.

This reverts commit 29bbaa1489.
2021-07-30 10:21:40 +02:00
Tobias Mayer
29bbaa1489 cmake: 3.19.7 -> 3.21.0
Also removing a comment that instructs maintainers to cross-check
the hash with one that is posted upstream, because as @lilyball
reasoned:

"I'm not really sure what the benefit of comparing the hash is; if the
download is tampered with, the hash is served from the same site and
would presumably be tampered with as well, and the download is done over
https and declares its Content-Length so there's no risk of truncation
(which would cause the file to fail to unpack anyway)"
2021-07-29 10:52:18 +02:00
github-actions[bot]
3087a2d2e9
Merge staging-next into staging 2021-07-21 12:02:00 +00:00
Sandro
5b4522838c
Merge pull request #130874 from SuperSandro2000/SuperSandro2000-patch-1
cmake: don't use meta.homepage in fetchurl
2021-07-21 13:12:27 +02:00
github-actions[bot]
94a7cf0dcd
Merge staging-next into staging 2021-07-21 00:02:24 +00:00
Sandro
f32f7553c5
cmake: don't use meta.homepage in fetchurl 2021-07-20 23:57:01 +02:00
Vladimír Čunát
586a9e6bff
Merge #129506: 'staging-next' branch 2021-07-20 22:07:53 +02:00
Jonathan Ringer
1916bd8717 mill: 0.9.8 -> 0.9.9
Use the `${version}-assembly` artifact, which avoids
having to download it using the release script
2021-07-20 13:07:35 -07:00
Ben Siraphob
4ce8c34049 treewide: remove unnecessary enableParallelBuilding when using qmake 2021-07-20 10:32:58 +07:00
github-actions[bot]
f2eada4ab8
Merge master into staging-next 2021-07-18 06:01:33 +00:00
github-actions[bot]
382fdc7ad3
Merge master into staging-next 2021-07-18 00:01:24 +00:00
Felix Buehler
87316d778b various: cleanup of "inherit version;" 2021-07-18 00:19:24 +02:00
Sandro
a314be4b4d
Merge pull request #130439 from LeSuisse/ant-CVE-2021-36373-CVE-2021-36374 2021-07-18 00:15:04 +02:00
Sandro Jäckel
ad1e9c3a27
gnumake: remove ? null from inputs 2021-07-17 21:20:21 +02:00
Thomas Gerbet
1e1e536488 apacheAnt_1_9: 1.9.15 -> 1.9.16
Fixes CVE-2021-36373 and CVE-2021-36374.
2021-07-17 11:13:06 +02:00
Thomas Gerbet
c83fdf9a36 ant: 1.10.9 -> 1.10.11
Fixes CVE-2021-36373 and CVE-2021-36374.
2021-07-17 11:11:08 +02:00
github-actions[bot]
f0bb8c9a78
Merge master into staging-next 2021-07-14 18:01:12 +00:00
Tomek Mańko
d75b67bfa4 rebar3: skip failing tests on M1 chip 2021-07-15 02:34:04 +09:00
github-actions[bot]
958dc88d65
Merge master into staging-next 2021-07-08 12:01:23 +00:00
Sandro
76ba43e445
Merge pull request #127743 from Artturin/fix-cmake-gui
cmake: add wrapQtAppsHook
2021-07-08 11:12:31 +02:00
Vladimír Čunát
7c25c1fd88
Merge branch 'glibc-2.33' into staging 2021-07-06 16:17:13 +02:00
Maximilian Bosch
3f5336e15b
gnumake42: fix build w/glibc-2.33 2021-07-06 16:02:34 +02:00
github-actions[bot]
2a0536535d
Merge staging-next into staging 2021-07-06 06:01:39 +00:00
Sandro
3f7ea1d7d5
Merge pull request #129370 from Anduh/boot-update-homepage 2021-07-06 02:21:30 +02:00
github-actions[bot]
3ddb8d5a79
Merge staging-next into staging 2021-07-06 00:02:03 +00:00
Sandro
b0977358e1
Merge pull request #128882 from liff/gradle/v7.1 2021-07-05 23:27:24 +02:00
Andreas J
108521d406
update homepage link 2021-07-05 23:36:42 +03:00
Sandro
5daf2b8e90
Merge pull request #126993 from Stunkymonkey/2pname&name 2021-07-05 18:51:19 +02:00
github-actions[bot]
b194783294
Merge staging-next into staging 2021-07-05 00:02:23 +00:00
Guillaume Girol
8148ffc930
Merge pull request #129263 from ck3d/redo-c-0.3
redo-c: 0.2 -> 0.3
2021-07-04 18:38:12 +00:00
sternenseemann
2019f82e3e bmake: enable ksh test on non musl platforms
bmake runs the ksh test if /bin/ksh exists. This is never a good
indication on platforms where we can sandbox and causes problems on
darwin where this path may exist, but never would be in PATH.

We solve this problem by always enabling the test and adding ksh to
checkInputs.

ksh doesn't seem to compile with musl, so we disable it on that
platform.
2021-07-04 20:20:42 +02:00
sternenseemann
32c42d37ab bmake: test musl build
Since we do some additional patching to make it work with musl, we
should also test that, so we can _keep_ it working.
2021-07-04 20:20:42 +02:00
sternenseemann
30200ce8e1 bmake: 20210420 -> 20210621 2021-07-04 20:20:42 +02:00
Christian Kögler
b07b9e81bc redo: Set CFLAGS only if not defined 2021-07-04 19:39:05 +02:00
github-actions[bot]
5a31e44bd3
Merge staging-next into staging 2021-07-04 12:01:40 +00:00
Robert Schütz
a5de6179cb
Merge pull request #129137 from bjornfor/fix-conan
conan: fix build after python3Packages updates
2021-07-04 13:12:03 +02:00
Christian Kögler
8f34bdf93a redo-c: 0.2 -> 0.3 2021-07-04 10:25:37 +02:00
github-actions[bot]
c852543c1f
Merge staging-next into staging 2021-07-04 06:01:43 +00:00
Sandro
8723bd8119
Merge pull request #129122 from dotlambda/dateutil-alias 2021-07-04 02:53:34 +02:00
Bjørn Forsman
9b16b5e381 conan: fix build after python3Packages updates
conan needs jinja2<3 and six<=1.15.0. Adding six to packageOverrides
results in this build error:

  $ nix-build -A conan
  ...
  Found duplicated packages in closure for dependency 'six':
    six 1.16.0 (/nix/store/zn4haxpv5j9ilccvw7vxxwbfb84vhl5i-python3.8-six-1.16.0/lib/python3.8/site-packages)
    six 1.15.0 (/nix/store/8nkfc88xal8g91hfjsxq93b6pfydq2d7-python3.8-six-1.15.0/lib/python3.8/site-packages)

As the changes in six-1.16.0 look harmless, work around the above issue
by allowing conan to use six-1.16.0.
2021-07-03 20:45:13 +02:00
github-actions[bot]
0957b61eaa
Merge staging-next into staging 2021-07-03 18:01:40 +00:00
Jörg Thalheim
65f0732422
Merge pull request #128988 from KireinaHoro/master
mill: 0.9.6 -> 0.9.8
2021-07-03 13:48:29 +01:00
github-actions[bot]
eaa5839643
Merge staging-next into staging 2021-07-03 12:01:53 +00:00
Robert Schütz
1ec5651913 treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil 2021-07-03 13:45:57 +02:00
Daniël de Kok
017aa88470 Remove danieldk as a maintainer for some packages
- AMD GPU packages: AMD removed support for the RX5x0 GPUs from ROCm, so
  I cannot test these packages anymore.
- A small number of GUI packages: I switched back to macOS on the
  desktop for work reasons, so I cannot easily test these.
- broot: I took over maintainership from someone else, but do not really
  use broot.
2021-07-03 12:14:20 +02:00
KireinaHoro
330f8a1629 mill: 0.9.6 -> 0.9.8 2021-07-02 19:56:39 +08:00
Olli Helenius
ce426ba28d gradle: 7.0 -> 7.1 2021-07-01 15:01:43 +03:00
Felix Buehler
3c12e95ad1 development: /s/name/pname&version/ 2021-06-30 09:45:11 +02:00
github-actions[bot]
ff0a0c28da
Merge staging-next into staging 2021-06-29 00:10:57 +00:00
Ryan Mulligan
e87001bbc0
Merge pull request #128321 from r-ryantm/auto-update/bear
bear: 3.0.12 -> 3.0.13
2021-06-28 12:38:44 -07:00
github-actions[bot]
1bce4703aa
Merge staging-next into staging 2021-06-28 18:12:05 +00:00
Jörg Thalheim
41902c2f7d
Merge pull request #120501 from Mic92/gnumake
gnumake: use sh instead of /bin/sh by default
2021-06-28 07:19:00 +01:00
R. RyanTM
ada25b1a98 bear: 3.0.12 -> 3.0.13 2021-06-27 14:52:45 +00:00
R. RyanTM
db961ec5bc bazel-remote: 2.1.0 -> 2.1.1 2021-06-24 05:12:00 +00:00
Sandro
3d544b4d5b
Merge pull request #127713 from musfay/qbs-1.19.1
qbs: 1.18.0 -> 1.19.1
2021-06-22 15:08:34 +02:00
Artturin
ac01728725 cmake: add wrapQtAppsHook 2021-06-22 06:06:27 +03:00
Mustafa Çalışkan
5beb11788a qbs: 1.18.0 -> 1.19.1 2021-06-21 21:58:25 +03:00
R. RyanTM
818201e4b5 bazel-remote: 2.0.1 -> 2.1.0 2021-06-17 17:21:34 +02:00
Sandro
df4ffccc5c
Merge pull request #126863 from alyssais/bear
bear: 3.0.9 -> 3.0.12
2021-06-16 03:33:22 +02:00
Sandro
f7521e2abd
Merge pull request #126059 from timbertson/gup
gup: 0.7.0 -> 0.8.0
2021-06-15 16:50:11 +02:00
JesusMtnez
43d1855378
sbt: 1.5.3 -> 1.5.4 2021-06-15 06:12:50 +02:00
Alyssa Ross
5d08999385
bear: 3.0.9 -> 3.0.12
Fixes: https://github.com/NixOS/nixpkgs/pull/117413
2021-06-14 18:12:02 +00:00
Tim Cuthbertson
9012ed2a80
reuse version variable
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-11 21:49:20 +10:00
Alyssa Ross
4de8cbfb16 bmake.passthru.setupHook: set some defaults
These are all read from the environment by the default bmake
stdlib (e.g. <bsd.prog.mk>, <bsd.own.mk>).  Some of the default
values (like building cat pages instead of man pages, or stripping
binaries when installing) don't really make sense for Nixpkgs, so we
override them here for every build using bmake.

Eventually I'd like to unify the bmake setupHook and the NetBSD make
setupHook, but not today.
2021-06-09 12:44:43 +00:00
Sandro
26923b2f5c
Merge pull request #125337 from wentasah/cmake-more-docs 2021-06-09 14:32:22 +02:00
David
00ee61b3cc rebar3: add checkPhase 2021-06-09 12:14:12 +09:00
David
ae2f75ef89 rebar3WithPlugins: add ability to ignore dependencies 2021-06-09 12:14:12 +09:00
Timothy Klim
8582f4cd83 sbt: 1.5.1 -> 1.5.3 2021-06-08 14:13:31 -04:00
Tim Cuthbertson
e3cf1c63ef gup: 0.7.0 -> 0.8.0 2021-06-07 22:03:08 +10:00
Michal Sojka
498b5e578a cmake: Add man and info outputs
By default, the cmake derivation contains the documentation in .rst
format. This format is not well suited for interactive use. Therefore,
we add both man and info outputs and convert the documentation to
these formats using Sphinx.

These formats are enabled by default only in cmake versions for
interactive use (ncurses, Qt), because using Sphinx in the basic
version leads to circular dependency (infinite recursion). Namely,
Sphinx has imagemagick in its checkInputs and imagemagick has several
transitive dependencies, which have cmake in nativeBuildInputs.
2021-06-06 21:49:41 +02:00
Sandro
3bb27749ab
Merge pull request #123895 from dmivankov/bazel_4.1.0 2021-06-01 17:59:08 +02:00
Jörg Thalheim
4542b54abd
Merge pull request #125071 from sternenseemann/bmake
bmake: 20200902 -> 20210420
2021-06-01 08:11:16 +02:00
sternenseemann
10f8f08267 bmake: 20200902 -> 20210420
* Fix varmod-localtime test by setting TZ to an absolute path to the
  appropriate file in TZDIR. This avoids having an extra patch for musl
  which doesn't support TZDIR at all.
* Move tests into checkPhase by applying patch from alpine
* Fix build with musl by disabling deptgt-delete_on_error test (which I
  haven't debugged myself, just copied this from alpine) and fixing a
  test which fails due to differing output from strerror(3) between musl
  and glibc. Also we need to add a shebang to install-sh, otherwise it
  won't be executed in pkgsMusl.
2021-05-31 13:39:35 +02:00
Michael Weiss
3f3f5a0d5d
scons: Remove myself as maintainer
I'm not using it anymore but it would be great if we could find a new
maintainer as SCons is a build tool on which a few other packages
depend.
2021-05-30 15:22:55 +02:00
Andrew Childs
976ee287c8 bmake: fix build on darwin 2021-05-29 01:12:23 +02:00
David
d706be982a rebar3: 3.16.0 -> 3.16.1 2021-05-24 15:33:02 -05:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Vladimír Čunát
7f651d15e2
Merge #122696: cmakeWithQt4Gui: drop 2021-05-22 16:10:27 +02:00
Dmitry Ivankov
a15204fcc0 bazel_4: 4.0.0 -> 4.1.0
https://github.com/bazelbuild/bazel/releases/tag/4.1.0

other minor changes:
- grep for /bin/ rather than /bin for blanket substitute
- invoke {pre,post}{Build,Install} hooks
2021-05-22 09:51:22 +02:00