Commit graph

2296 commits

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