Commit Graph

3580 Commits

Author SHA1 Message Date
Jakub Kozłowski
ecfbff960a
bloop: 1.5.12 -> 1.5.13 2023-12-07 22:49:59 +01:00
Peder Bergebakken Sundt
4442ad0d64
Merge pull request #266987 from linsui/ant19
apacheAnt_1_9: remove
2023-12-07 08:47:13 +01:00
Nick Cao
bc9c6e60a3
Merge pull request #272306 from NixOS/bloop-1512
bloop: 1.5.11 -> 1.5.12
2023-12-06 09:48:59 -05:00
Rick van Schijndel
ba75066821
Merge pull request #271362 from pbsds/rm-dead-patches
treewide: remove unreferenced patch files
2023-12-06 03:28:15 +01:00
Jakub Kozłowski
75fa7ac0da
bloop: 1.5.11 -> 1.5.12 2023-12-05 18:23:47 +01:00
Peder Bergebakken Sundt
f41aba3739 treewide: remove unreferenced patch files
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'`
2023-12-01 06:11:20 +01:00
Robert Schütz
79fb03cbd4 corrosion: 0.4.4 -> 0.4.5
Diff: https://github.com/corrosion-rs/corrosion/compare/v0.4.4...v0.4.5

Changelog: https://github.com/corrosion-rs/corrosion/blob/v0.4.5/RELEASES.md
2023-11-30 17:24:16 -08:00
tarc
a233133b1a conan: add xcrun to nativeCheckInputs on darwin
Add xcbuild.xcrun dependency to nativeCheckInputs of the conan package to fix a building failure on Darwin.

Fixes #271115
2023-11-30 21:18:37 +01:00
Arnout Engelen
3ff7fb4d94
Merge pull request #267433 from raboof/maven-buildMavenPackage-improved-offline
maven: improve buildMavenPackage offline mode
2023-11-29 19:58:01 +01:00
Peder Bergebakken Sundt
130183a87b
Merge pull request #269140 from r-ryantm/auto-update/mill
mill: 0.11.5 -> 0.11.6
2023-11-27 04:28:07 +01:00
Antoine
14caf2eb45 conan: 2.0.5 -> 2.0.14
Changelog: https://github.com/conan-io/conan/releases/tag/2.0.14
2023-11-24 20:47:33 +01:00
Uri Baghin
c3c2fe4867
Merge pull request #269481 from boltzmannrain/bazel_5_clang16
bazel_5: fix CLang 16 Werror-s on darwin
2023-11-24 21:44:50 +08:00
Dmitry Ivankov
746e394638 bazel_4: fix CLang 16 Werror-s on darwin
Fixing `bazel_4` after #234710

Error example
https://hydra.nixos.org/build/241174862/nixlog/1
```
Execution platform: //:default_host_platform
third_party/zlib/gzwrite.c:89:20: error: call to undeclared function 'write'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
            writ = write(state->fd, strm->next_in, put);
                   ^
```

Similar to #269481 and #269297
2023-11-23 20:39:38 +01:00
Dmitry Ivankov
781538c5ed bazel_5: fix CLang 16 Werror-s on darwin
Fixing `bazel_5` after #234710

Error example
https://hydra.nixos.org/build/241240612/nixlog/1
```
external/com_google_absl/absl/meta/type_traits.h:560:8: error: builtin __has_trivial_assign is deprecated; use __is_trivially_assignable instead [-Werror,-Wdeprecated-builtins]
      (__has_trivial_assign(ExtentsRemoved) || !kIsCopyOrMoveAssignable) &&
```

Similar to #269297, and remaining `bazel_4` is WIP for another PR
2023-11-23 20:23:50 +01:00
Dmitry Ivankov
ed175a635e bazel_6: fix CLang 16 Werror-s on darwin
bazel_6 https://hydra.nixos.org/build/241090720/nixlog/1
```
external/upb/upb/upb.c:228:25: error: defining a type within '__builtin_offsetof' is a Clang extension [-Werror,-Wgnu-offsetof-extensions]
  n = UPB_ALIGN_DOWN(n, UPB_ALIGN_OF(upb_Arena));
                        ^~~~~~~~~~~~~~~~~~~~~~~
```
bazel_6 https://hydra.nixos.org/build/241127779/nixlog/1
```
In file included from external/com_google_absl/absl/algorithm/container.h:55:
external/com_google_absl/absl/meta/type_traits.h:560:8: error: builtin __has_trivial_assign is deprecated; use __is_trivially_assignable instead [-Werror,-Wdeprecated-builtins]
      (__has_trivial_assign(ExtentsRemoved) || !kIsCopyOrMoveAssignable) &&
       ^
```

Note: `bazel_5` and `bazel_4` require more work, for some reason extra
`-Wall` in combination with `-Werror` sneaks in and overrides `-Wno-`
settings, haven't managed yet to debug where exactly are the last
flags (last one wins) come from there.

ZHF: #265948
2023-11-22 22:53:47 +01:00
sternenseemann
5c2215595f gprbuild: 23.0.0 -> 24.0.0 2023-11-22 17:23:33 +01:00
R. Ryantm
de04f54d51 mill: 0.11.5 -> 0.11.6 2023-11-22 08:39:43 +00:00
Uri Baghin
8c47608edd
Merge pull request #268614 from boltzmannrain/bazel_darwin_bash_binary
bazel_6: fix: make patched bash a native binary
2023-11-22 14:51:39 +08:00
Fabián Heredia Montiel
46060f7083
Merge pull request #259824 from spacefrogg/goredo-2.0
goredo: 1.31.0 -> 2.4.0
2023-11-21 23:28:50 +00:00
Dmitry Ivankov
dd85449211
Update pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
Co-authored-by: Uri Baghin <uri@canva.com>
2023-11-20 02:13:23 +01:00
Dmitry Ivankov
7377bba1c7 bazel_6: fix: make patched bash a native binary
https://hydra.nixos.org/build/240805256/nixlog/1
https://hydra.nixos.org/build/240805170/nixlog/2
Failure is a bit obscured but long story short, a script within
bazel gets custom nixpkgs shebang which in turn makes shell run
in POSIX-compatible mode. Bazel expects bash in non-POSIX mode
and osx-specific script starts to fail due to `set -e` and subshell
interaction differences in those modes (sub-shells and functions
suddently start inheriting `set -e` and fail to produce desired
output). More debug info is available in #267670

Shell scripts aren't guaranteed to work as interpreters in shebang.
In particular thin shell wrappers aren't shebang-ready on MacOS.
It may work sometimes depending on what exactly would try to execute
a script with such shebang, but generally it's not guaranteed to work.
See #124556

Bash wrapper was introduced in #266847 and so far seems like the
issue only affects darwin builds: hydra failure is in osx-specific
script, also shebang issue is usually darwin-specific.

Let's wrap it as a native binary to make it shebang-compatible.

The wrapper is only currently added to `bazel_6` so no need for
changes in other versions.

ZHF: #265948
2023-11-20 02:02:39 +01:00
Uri Baghin
2939fc295a
Merge pull request #267856 from marsam/update-bazel-buildtools
bazel-buildtools: 6.3.3 -> 6.4.0
2023-11-17 06:35:01 +08:00
Mario Rodas
9db924e702 bazel-buildtools: 6.3.3 -> 6.4.0
Diff: https://github.com/bazelbuild/buildtools/compare/v6.3.3...v6.4.0

Changelog: https://github.com/bazelbuild/buildtools/releases/tag/v6.4.0
2023-11-16 04:20:00 +00:00
Arnout Engelen
3ac1c95cfa
maven: improve buildMavenPackage offline mode
The maven `dependency:go-offline` plugin has various issues
(see https://issues.apache.org/jira/browse/MDEP-204 and other
issues in that tracker), which the dedicated plugin from
https://github.com/qaware/go-offline-maven-plugin largely
fixes. I have confirmed that for an application I'm packaging
outside of nixpkgs, dependency-track, this indeed makes the
build work while it didn't with `dependency:go-offline`.

The offline mode is only used in one place in nixpkgs, for
lemminx. That build still succeeds and the program starts, though
I haven't tested further.
2023-11-14 12:12:18 +01:00
Fabián Heredia Montiel
884449105e Merge remote-tracking branch 'origin/master' into staging-next 2023-11-13 14:31:51 -06:00
R. Ryantm
8e96c7e227 sbt-extras: 2023-09-18 -> 2023-10-24 2023-11-13 14:06:52 +00:00
Weijia Wang
74d102ce50 Merge branch 'master' into staging-next 2023-11-12 19:45:20 +01:00
linsui
63be9fe055 apacheAnt_1_9: remove 2023-11-12 14:56:22 +08:00
Malte Poll
b1dcea4773 bazel: use bash with fallback $PATH consisting of basic shell utils
Second iteration of this change.
First attempt did not ensure `bashWithDefaultShellUtils` is available at runtime.
2023-11-11 13:22:20 +01:00
github-actions[bot]
fb93bf2ad8
Merge staging-next into staging 2023-11-11 12:01:30 +00:00
github-actions[bot]
652204165d
Merge master into staging-next 2023-11-11 12:00:58 +00:00
Bjørn Forsman
7e41495103 Revert "bazel: use bash with fallback $PATH consisting of basic shell utils"
This reverts commit 3576806d7e.

It broke python311.pkgs.jaxlib, see
https://github.com/NixOS/nixpkgs/pull/265041#issuecomment-1806784693.
2023-11-11 12:34:28 +01:00
github-actions[bot]
5f5513224f
Merge staging-next into staging 2023-11-11 00:02:47 +00:00
github-actions[bot]
912311b7fd
Merge master into staging-next 2023-11-11 00:02:21 +00:00
Malte Poll
3576806d7e bazel: use bash with fallback $PATH consisting of basic shell utils 2023-11-11 00:25:53 +01:00
github-actions[bot]
e8096ee1e1
Merge staging-next into staging 2023-11-10 18:01:34 +00:00
Alyssa Ross
afabc4a15d
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	pkgs/development/libraries/SDL2/default.nix
2023-11-10 15:18:19 +01:00
itstarsun
b5e89202d2
muon: add meta.mainProgram 2023-11-10 12:03:48 +00:00
github-actions[bot]
fecd99b105
Merge staging-next into staging 2023-11-09 06:01:40 +00:00
github-actions[bot]
4aad65bfdb
Merge master into staging-next 2023-11-09 06:01:11 +00:00
Weijia Wang
fa1be07c53
Merge pull request #266372 from r-ryantm/auto-update/xmake
xmake: 2.8.3 -> 2.8.5
2023-11-09 05:57:54 +01:00
R. Ryantm
087cc185f6 xmake: 2.8.3 -> 2.8.5 2023-11-09 01:25:54 +00:00
github-actions[bot]
50249cdaf2
Merge staging-next into staging 2023-11-09 00:02:40 +00:00
github-actions[bot]
00a0662a3c
Merge master into staging-next 2023-11-09 00:02:14 +00:00
tali auster
dbc3aaedc0 alire: add meta.mainProgram 2023-11-08 22:49:12 +01:00
Anderson Torres
df5b3a397d scons: cleanup
The generator files are now useless.
2023-11-03 09:02:50 -03:00
Anderson Torres
46ea3e557a scons_4_5_2: detach from sconsPackages 2023-11-03 09:02:50 -03:00
Anderson Torres
e8041600e6 scons_4_1_0: detach from sconsPackages
This is probably a legacy release, since I have found no other package using it.
2023-11-03 09:02:50 -03:00
Anderson Torres
88966bc47e scons_3_1_2: detach from sconsPackages 2023-11-03 09:02:50 -03:00
Anderson Torres
4716413893 scons: move common.nix to make-scons.nix 2023-11-03 09:02:50 -03:00