Commit Graph

3711 Commits

Author SHA1 Message Date
Guillaume Maudoux
207fb75488 bazel_7: darwin (sandbox) fixes 2023-12-13 22:48:28 +01:00
Guillaume Maudoux
7dd831bac7 bazel_7: rename protobuf test lockfile, part 2 2023-12-13 22:48:28 +01:00
Guillaume Maudoux
0c13686697 bazel_7: rename protobuf test lockfile 2023-12-13 22:48:27 +01:00
Guillaume Maudoux
a4cf97e415 bazel_7: cleanup unused files 2023-12-13 22:48:27 +01:00
Guillaume Maudoux
058102dd42 bazel_7: cleanup protobuf tests 2023-12-13 22:48:27 +01:00
Guillaume Maudoux
90bfff1396 bazel_7: cleanup changes made to common patches 2023-12-13 22:48:27 +01:00
Guillaume Maudoux
5151e14e2c bazel_7: cleanup changes made to common tests 2023-12-13 22:48:27 +01:00
Guillaume Maudoux
05ecc09b57 Bump to 7.0.0rc2 2023-12-13 22:48:27 +01:00
Guillaume Maudoux
622804ab5d Add 7.0.0rc2, but some patches need an update 2023-12-13 22:48:27 +01:00
Guillaume Maudoux
be69c186cc Rework repository_cache, lockfile generation, and protobuf tests as a whole 2023-12-13 22:48:27 +01:00
Guillaume Maudoux
229bce1095 bazel_7: Cleanup patchPhase 2023-12-13 22:48:26 +01:00
Guillaume Maudoux
7051773ca8 bazel_7: Separate test deps (without binaries) 2023-12-13 22:48:26 +01:00
Guillaume Maudoux
b09a742323 bazel_7: Filter bzlmod dependencies by name predicate 2023-12-13 22:48:26 +01:00
Guillaume Maudoux
022befe8ae Get bazel building on all major platforms, with tests 2023-12-13 22:48:26 +01:00
Guillaume Maudoux
30cbfd470d bazel_7: More refactors 2023-12-13 22:48:26 +01:00
Guillaume Maudoux
9b820d98a6 bazel_7: refactor and comment 2023-12-13 22:48:26 +01:00
Guillaume Maudoux
d1f60e013b bazel_7: split tests for clarity 2023-12-13 22:48:26 +01:00
Guillaume Maudoux
03f458b351 bazel_7: restrict USER hack to darwin 2023-12-13 22:48:25 +01:00
Guillaume Maudoux
e0a1a73c41 bazel_7: Simplify callBazelTest 2023-12-13 22:48:25 +01:00
Guillaume Maudoux
78dd0bafa6 bazel_7: init at 7.0.0-pre.20230917.3 2023-12-13 22:48:25 +01:00
Guillaume Maudoux
8cc99ed595 bazel_7: start by copying bazel_6 2023-12-13 22:48:25 +01:00
github-actions[bot]
688991ba84
Merge staging-next into staging 2023-12-13 12:01:48 +00:00
Olli Helenius
2e3bbf451b gradle: use SRI hashes 2023-12-13 06:57:34 +00:00
Olli Helenius
b3ff745b7b gradle: 8.4 -> 8.5 2023-12-13 06:57:34 +00:00
Anderson Torres
70b907a496 scons_4_5_2: use github instead of sourceforge direct link 2023-12-08 19:52:22 -03:00
Anderson Torres
2d13423feb scons_4_1_0: use github instead of sourceforge direct link 2023-12-08 19:52:22 -03:00
Anderson Torres
5448caf947 scons_3_1_2: use github instead of sourceforge direct link 2023-12-08 19:52:22 -03:00
Dmitry Kalinkin
025a278148 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/tools/networking/ofono/default.nix
2023-12-08 12:27:28 -05:00
Jakub Kozłowski
ecfbff960a
bloop: 1.5.12 -> 1.5.13 2023-12-07 22:49:59 +01:00
Adam Joseph
6de0b4ce3f gn: apply disable-warnings-if-gcc13 2023-12-07 09:11:37 +00: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
github-actions[bot]
9dd6711ca2
Merge staging-next into staging 2023-11-02 12:01:48 +00:00
github-actions[bot]
677e25fcd2
Merge master into staging-next 2023-11-02 12:01:08 +00:00
R. Ryantm
447001c4b7 moon: 1.15.0 -> 1.16.0 2023-11-02 04:22:21 +00:00
github-actions[bot]
1fcad910ec
Merge staging-next into staging 2023-10-31 00:03:02 +00:00
github-actions[bot]
135430eb60
Merge master into staging-next 2023-10-31 00:02:27 +00:00
Uri Baghin
b4c72e070b
Merge pull request #264317 from avdv/fix-bazel-python-bin-path-tests
bazel_6: Fix `pythonBinPath` and `pythonBinPathWithNixHacks` tests
2023-10-31 07:08:50 +08:00
Anderson Torres
30020455fd meson: migrate to by-name 2023-10-30 16:32:56 -03:00
github-actions[bot]
131c49a7c6
Merge staging-next into staging 2023-10-30 18:01:38 +00:00
github-actions[bot]
931938d1df
Merge master into staging-next 2023-10-30 18:01:02 +00:00
Claudio Bley
c871ce0f51 bazel_6: Fix pythonBinPath and pythonBinPathWithNixHacks tests
The tests started to fail after the repo-wide python 3.10 -> 3.11 update.

This is caused by Bazel's py_binary rule setting the [`PYTHONSAFEPATH`][1]
environment variable, which only has an effect for Python >= 3.11.

Setting this variable avoids prepending the current working directory and the
script's directory. The current test code relied on this behavior and thus
failed with:

```
Traceback (most recent call last):
  File "/build/.cache/bazel/_bazel_build/8bcfff1c77854f2a2b07d1413b0fc106/execroot/our_workspace/bazel-out/k8-fastbuild/bin/python/bin.runfiles/our_workspace/python/bin.py", line 6, in <module>
    from lib import foo
ModuleNotFoundError: No module named 'lib'
```

See also [bazelbuild/bazel#7091][2]

[1]: https://docs.python.org/3.11/using/cmdline.html#envvar-PYTHONSAFEPATH
[2]: https://github.com/bazelbuild/bazel/issues/7091
2023-10-30 09:43:28 +01:00
James Earl Douglas
e8221c96c6
scala-cli: 1.0.4 -> 1.0.5 2023-10-29 17:26:01 -07:00
github-actions[bot]
1ca64d6d36
Merge staging-next into staging 2023-10-29 12:01:31 +00:00
github-actions[bot]
571f1df5e4
Merge master into staging-next 2023-10-29 12:00:57 +00:00
Anderson Torres
0f4bc8579f cmake: migrate to by-name 2023-10-28 23:38:57 -03:00
Vladimír Čunát
d811555465
Merge branch 'staging' into staging-next 2023-10-26 10:36:50 +02:00
Claudio Bley
932ee614a4 bazel_6: 6.3.2 -> 6.4.0 2023-10-26 08:28:19 +02:00
Claudio Bley
73654d2367 bazel_6: Remove .bazelversion file in the updater sources 2023-10-26 08:28:19 +02:00
Alyssa Ross
b0678c6c6d meson: 1.2.2 -> 1.2.3 2023-10-24 16:58:13 -03:00
Vladyslav Pekker
82bb62be90 bloop: 1.5.8 -> 1.5.11 2023-10-24 13:30:41 -03:00
R. Ryantm
14019b7268 sbt: 1.9.6 -> 1.9.7 2023-10-23 10:24:37 +00:00
Julian Stecklina
36eff4f431 meson: introduce mesonInstallTags
Projects building with meson are currently installTargets. Map these
to install tags, which are roughly equivalent. This allows projects to
selectively install components.
2023-10-23 01:46:24 +02:00
github-actions[bot]
024144542b
Merge staging-next into staging 2023-10-19 18:01:22 +00:00
github-actions[bot]
0bcaa2f556
Merge master into staging-next 2023-10-19 18:00:54 +00:00
figsoda
21754df096 turtle-build: 0.4.6 -> 0.4.7
Diff: https://github.com/raviqqe/turtle-build/compare/v0.4.6...v0.4.7
2023-10-18 11:01:19 -04:00
github-actions[bot]
12edd19d9d
Merge staging-next into staging 2023-10-16 18:02:05 +00:00
github-actions[bot]
3a75845d38
Merge master into staging-next 2023-10-16 18:01:26 +00:00
Austin Seipp
19bc53adab buck2: unstable-2023-10-01 -> unstable-2023-10-15 2023-10-16 10:12:33 -05:00
github-actions[bot]
80ddbc41e6
Merge staging-next into staging 2023-10-12 18:01:34 +00:00
github-actions[bot]
176015fc74
Merge master into staging-next 2023-10-12 18:01:06 +00:00
Weijia Wang
a8e2dd9d99
Merge pull request #260347 from r-ryantm/auto-update/maven
maven: 3.9.4 -> 3.9.5
2023-10-12 18:04:57 +02:00
OTABI Tomoya
472fc54f01
Merge pull request #260400 from r-ryantm/auto-update/moon
moon: 1.14.3 -> 1.15.0
2023-10-13 00:40:44 +09:00
github-actions[bot]
630f45884e
Merge staging-next into staging 2023-10-11 18:01:37 +00:00
github-actions[bot]
b8d473b6d2
Merge master into staging-next 2023-10-11 18:01:06 +00:00
R. Ryantm
c0cb89a921 moon: 1.14.3 -> 1.15.0 2023-10-11 09:32:47 +00:00
R. Ryantm
edf356bd89 mill: 0.11.4 -> 0.11.5 2023-10-11 05:19:08 +00:00
R. Ryantm
447f9d611d maven: 3.9.4 -> 3.9.5 2023-10-11 03:36:31 +00:00
github-actions[bot]
2e97a3af0d
Merge staging-next into staging 2023-10-11 00:02:39 +00:00
Fabián Heredia Montiel
d676e059d7 Merge remote-tracking branch 'origin/master' into staging-next 2023-10-10 15:07:12 -06:00
Mario Rodas
a74c837813
Merge pull request #258263 from trofi/meson-update
meson: 1.2.1 -> 1.2.2
2023-10-10 08:33:35 -05:00
spacefrogg
9870f4d6f5
goredo: Move to pkgs/by-name 2023-10-10 09:16:06 +02:00
spacefrogg
8d90023173
goredo: 1.31.0 -> 2.1.0 2023-10-10 09:08:11 +02:00
Madoura
575ce47fa4
rocm-related: move all relevant ROCm derivations to rocmPackages
clr: init at 5.7.0 (hipamd, opencl, rocclr merged)
2023-10-09 16:38:51 -05:00
Madoura
37390cd11c
rocm-related: 5.4.X -> 5.7.0
hip-common: 5.4.2 -> 5.7.0

hipblas: 5.4.3 -> 5.7.0

hipcc: 5.4.2 -> 5.7.0

hipcub: 5.4.4 -> 5.7.0

hipfft: 5.4.3 -> 5.7.0

hipfort: 5.6.0 -> 5.7.0

hipify: 5.4.2 -> 5.7.0

hipsolver: 5.4.4 -> 5.7.0

hipsparse: 5.4.4 -> 5.7.0

llvmPackages_rocm.llvm: 5.4.4 -> 5.7.0

migraphx: 5.4.3 -> 5.7.0

clang-ocl: 5.4.2 -> 5.7.0

rccl: 5.4.3 -> 5.7.0

rdc: 5.4.2 -> 5.7.0

rocblas: 5.4.3 -> 5.7.0

rocdbgapi: 5.4.2 -> 5.7.0

rocfft: 5.4.3 -> 5.7.0

miopen: 5.4.2 -> 5.7.0

rocm-comgr: 5.4.4 -> 5.7.0

rocgdb: 5.4.2 -> 5.7.0

rocm-device-libs: 5.4.4 -> 5.7.0

rocalution: 5.4.3 -> 5.7.0

rocm-smi: 5.4.4 -> 5.7.0

rocm-runtime: 5.4.3 -> 5.7.0

rocminfo: 5.4.4 -> 5.7.0

rocm-thunk: 5.4.4 -> 5.7.0

rocprofiler: 5.4.3 -> 5.7.0

rocprim: 5.4.3 -> 5.7.0

rocrand: 5.4.3 -> 5.7.0

rocmlir: 5.4.1 -> 5.7.0

rocr-debug-agent: 5.4.2 -> 5.7.0

rocthrust: 5.4.3 -> 5.7.0

rocsparse: 5.4.3 -> 5.7.0

roctracer: 5.4.3 -> 5.7.0

rocsolver: 5.4.4 -> 5.7.0

tensile: 5.4.2 -> 5.7.0

rocwmma: 5.4.3 -> 5.7.0

rocm-cmake: 5.4.4 -> 5.7.0
2023-10-09 16:38:49 -05:00
Sergei Trofimovich
92c96af1f1 meson: 1.2.1 -> 1.2.2
Applied the bindgen flags revert to restore mesa build. Upstream plans
to revert as well, but it takes a while.

Changes:  https://github.com/mesonbuild/meson/compare/1.2.1...1.2.2
2023-10-09 21:08:33 +01:00
github-actions[bot]
3a91f17abe
Merge staging-next into staging 2023-10-09 12:01:54 +00:00
github-actions[bot]
5903dfbe6d
Merge master into staging-next 2023-10-09 12:01:26 +00:00
Alyssa Ross
10f35ff05d meson.setupHook: prefer meson commands over ninja
Meson now comes with its own set of commands for building, testing,
installing etc., that by default wrap around Ninja.  The reason to
prefer using the Meson commands is that they take additional
options (e.g. setting custom timeouts for tests — my motivation for
this change).

Here, I've modified the Meson setup hook so that Meson's test and
install commands will be used instead of Ninja's when Meson's
configurePhase is used.  This restriction is to avoid starting to run
Meson directly when dealing with custom build systems that wrap around
Meson, like QEMU's.  We don't use meson's compile command, as it just
runs ninja, and that's handled fine by the existing Ninja setup hook.

Naturally the Meson commands don't support entirely the same set of
options that the Ninja ones did, but I checked through Nixpkgs to find
any packages using Meson that used any options that wouldn't be picked
up by this new system.  I only found one, and it was just setting
checkTarget = "test", which is the default value for Ninja and has no
Meson equivalent (because we directly tell Meson to run the tests
rather than going through a generic job system like Ninja).

Link: https://github.com/NixOS/nixpkgs/issues/113829
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2023-10-09 10:21:36 +00:00
Robert Schütz
a30f53308e corrosion: 0.4.3 -> 0.4.4
Diff: https://github.com/corrosion-rs/corrosion/compare/v0.4.3...v0.4.4

Changelog: https://github.com/corrosion-rs/corrosion/blob/v0.4.4/RELEASES.md
2023-10-08 21:30:54 -07:00
Alyssa Ross
182718fecc
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/top-level/linux-kernels.nix
2023-10-07 19:52:18 +00:00
Jan Tojnar
76a7aa445a Merge branch 'master' into staging-next
Conflicts:
- pkgs/development/python-modules/xdot/default.nix
  between 2f244e3647 and 1a9a257cf7
2023-10-06 23:18:00 +02:00
Mario Rodas
031ba4e16f
Merge pull request #259171 from r-ryantm/auto-update/moon
moon: 1.13.4 -> 1.14.3
2023-10-06 08:48:10 -05:00
Mario Rodas
730328a321
Merge pull request #259221 from liff/gradle-7.6.3
gradle_7: 7.6.2 -> 7.6.3
2023-10-06 08:43:38 -05:00
Olli Helenius
9f325a47d3
gradle_7: 7.6.2 -> 7.6.3 2023-10-05 19:53:07 +03:00
Olli Helenius
f7ffd458c0
gradle: 8.3 -> 8.4 2023-10-05 19:07:10 +03:00
R. Ryantm
c5f5e36954 moon: 1.13.4 -> 1.14.3 2023-10-05 11:58:54 +00:00
Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh detection
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into

    builtins.derivation {
      builder = stdenv.shell;
      args = [ "-e" builder ];
    }

This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].

Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:

* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
  Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
  (see previous commit for more context), so prefer the environment
  variable if possible.

* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
  can happen.

* If neither applies, it can be assumed that `__structuredAttrs` is
  turned off and thus nothing needs to be done.

[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
    it can point to a wrong location on older Nix versions with a bug in
    `__structuredAttrs`.
2023-10-04 18:36:57 +02:00
github-actions[bot]
4b71f780ea
Merge master into staging-next 2023-10-04 00:02:21 +00:00
Artturi
12fc4fee4c
Merge pull request #258403 from r-ryantm/auto-update/xmake 2023-10-04 00:33:28 +03:00
Martin Weinelt
e29e5077fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/podcastparser/default.nix
2023-10-03 21:13:27 +02:00
Ryan Lahfa
122ce602c5
Merge pull request #255386 from mdarocha/move-nuget 2023-10-03 15:40:04 +02:00
Alyssa Ross
d4a1009f5a
Merge remote-tracking branch 'origin/master' into staging-next 2023-10-01 13:53:00 +00:00
Austin Seipp
a183e54599 buck2: unstable-2023-09-15 -> unstable-2023-10-01
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2023-10-01 08:33:29 -05:00
R. Ryantm
86737e187f xmake: 2.8.2 -> 2.8.3 2023-10-01 13:07:22 +00:00
github-actions[bot]
bd2b03a095
Merge master into staging-next 2023-09-28 18:00:54 +00:00
R. Ryantm
754c336b99 mill: 0.11.2 -> 0.11.4 2023-09-28 04:19:06 +00:00
mdarocha
30f3705c04 msbuild: fix usage of nuget 2023-09-26 21:20:15 +02:00
github-actions[bot]
aa53f32537
Merge staging-next into staging 2023-09-26 06:01:27 +00:00
Fabián Heredia Montiel
f746934c28
Merge pull request #257102 from spacefrogg/goredo-1.31
goredo: 1.30 -> 1.31
2023-09-25 21:59:15 -06:00
github-actions[bot]
f81d859a24
Merge staging-next into staging 2023-09-26 00:02:46 +00:00
Nick Cao
65a4f673d8
Merge pull request #257187 from r-ryantm/auto-update/sbt-extras
sbt-extras: 2023-09-14 -> 2023-09-18
2023-09-25 14:11:36 -04:00
github-actions[bot]
824eeeec7b
Merge staging-next into staging 2023-09-25 06:01:36 +00:00