Commit Graph

7921 Commits

Author SHA1 Message Date
David McFarland
f17d1f9302
Merge pull request #313514 from tie/dotnet-cross-split
buildDotnetModule: fix cross-compilation and remove dotnet-test-sdk
2024-05-23 14:05:46 -03:00
Pol Dellaiera
a18047b6ad
Merge pull request #312231 from drupol/build-support/php/init-composer-with-plugin
build-support/php: init new builder `php.buildComposerWithPlugin`, refactor `php.packages.composer`, etc
2024-05-23 12:03:42 +02:00
Ivan Trubach
cfd1bd6141 buildDotnetModule: remove unnecessary callPackage calls
This change removes no-op callPackage calls and reformats the file with
nixpkgs-fmt.
2024-05-22 03:12:30 +03:00
Ivan Trubach
0e64e645c9 buildDotnetModule: fix cross-compilation and remove dotnet-test-sdk
This change fixes cross-compilation for .NET packages (that are not
using .sln as project files). See relevant comment in the change list
for more details.

In addition to that, it removes dotnet-test-sdk that appears to be
broken, that is, dotnet --list-sdks does not recognize SDKs from PATH,
and when propagated from the check hook it was shadowed by inputs from
preceding hooks.

Note that dotnet-test-sdk used to work when it was introduced in PR
144062, but PR 155257 probably overlooked this case. However, currently
it is not used in Nixpkgs and I think dotnetCorePackages.combinePackages
should cover the intended use case for dotnet-test-sdk.
2024-05-22 03:08:42 +03:00
K900
ca2605c4e2
Merge pull request #312241 from tpwrules/bwrap-better-display
buildFHSEnvBubblewrap: allow more varied $DISPLAY syntax
2024-05-21 22:52:24 +03:00
Audrey Dutcher
718b237d0b bintools: Add dynamic loader path for FreeBSD native 2024-05-21 08:20:45 +02:00
Audrey Dutcher
8073fc75a8 bintools: Add an assertion which produces better error messages 2024-05-21 08:20:45 +02:00
Robert Hensing
28df2298ff
Merge pull request #311069 from nbraud/fix-307770
testers.hasPkgConfigModules: fix bug in `versionCheck` handling
2024-05-21 00:13:09 +02:00
Ivan Trubach
7877140075 buildDotnetModule: do not run dotnet command using env
There should be no reason to use env here:

1. In places where it is used to run dotnet with environment variables,
   the same can be done with shell syntax.

   For example, `env "FOO=$bar" baz` is equivalent to `FOO="$bar" baz`.

2. Otherwise, it just unnecessarily forces PATH lookup for dotnet
   command. In addition to that, some dotnet invocations did not use
   env.
2024-05-20 03:02:23 +03:00
Pol Dellaiera
450e9396fd
php.packages.composer: do not use buildComposerProject
I decided to avoid the use of `buildComposerProject because it requires `composer-local-repo-plugin` which is going to be refactored.
2024-05-19 22:10:03 +02:00
Pol Dellaiera
6bad2e219e
build-support/php: use php.packages.composer-local-repo-plugin 2024-05-19 22:10:03 +02:00
Pol Dellaiera
bd92bef332
php.buildComposerWithPlugin: init new builder 2024-05-19 22:10:02 +02:00
Pol Dellaiera
b258b44a5d
build-support/php: add composerGlobal variable
This doesn't change anything to the existing workflow
2024-05-17 10:25:02 +02:00
Thomas Watson
dd99084843 buildFHSEnvBubblewrap: allow more varied $DISPLAY syntax
The $DISPLAY variable has a format of [host]:num[.screen]. Previously,
the number would only be extracted properly if it had the form :num.
Allow all forms but correctly discard the unused parts.
2024-05-16 10:14:07 -05:00
Atemu
b4047a0455
Merge pull request #279260 from SuperSamus/multiPkgs-false-remove
treewide: remove `multiArch=false` and wrong usage of `extraPkgs`
2024-05-14 09:59:43 +02:00
Martino Fontana
1ee25e4d13 wrapAppImage: default extraPkgs to pkgs: [ ]
Sane default in preparation for the next commit.
2024-05-13 20:32:47 +02:00
Pol Dellaiera
7325d7ec2d
Merge pull request #310325 from patka-123/php-default-updatescript2
buildsupport/php: add passthru.updateScript
2024-05-13 14:08:52 +02:00
nicoo
bf4d46e338 fixup! testers.hasPkgConfigModules: don't display on ignored version mismatches 2024-05-12 20:48:09 +00:00
nicoo
43efaaaae8 testers.hasPkgConfigModules: don't display on ignored version mismatches 2024-05-12 14:12:41 +00:00
nicoo
4af3b807fc testers.hasPkgConfigModules: fix versionCheck conditional
Broke tests, as the version check was effectively always enabled:
  https://github.com/NixOS/nixpkgs/pull/307770#issuecomment-2102586718
2024-05-12 13:49:32 +00:00
nicoo
1d4d9facbc tests.testers.hasPkgConfigModules: test the versionCheck parameter
Shell script is currently buggy and effectively ignores the value, always enforcing version match:
  https://github.com/NixOS/nixpkgs/pull/307770#issuecomment-2102586718
2024-05-12 13:49:32 +00:00
github-actions[bot]
42828a757c
Merge master into staging-next 2024-05-11 18:01:23 +00:00
Ryan Lahfa
f16f9410d0
Merge pull request #310453 from RaitoBezarius/lix-preps
build-support/meson: explicitly use ambiant CMake during cross compilation
2024-05-11 15:24:44 +02:00
github-actions[bot]
12da532fe3
Merge master into staging-next 2024-05-11 12:01:09 +00:00
Raito Bezarius
d4c673a92b build-support/meson: explicitly use ambiant CMake during cross compilation
Thanks to Qyriad, it was found out that Nixpkgs was unable to cross
compile when CMake was needed at cross compilation time with Meson
because Meson refuse to use the ambiant CMake.

A simple fix is to always provide the ambiant CMake and trust the
packager to pass the right CMake, otherwise the rest of the build would
probably fail in mysterious ways.

An example of package that required this fix is the Lix, a Nix
implementation, that uses `toml11` discovered via CMake during the Meson
configure phase.

Co-authored-by: Qyriad <qyriad@qyriad.me>
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2024-05-11 13:32:14 +02:00
Jan Tojnar
4be4408157 Merge branch 'master' into staging-next
; Conflicts:
;	maintainers/scripts/luarocks-packages.csv
;	pkgs/development/lua-modules/generated-packages.nix
2024-05-11 12:47:40 +02:00
K900
f80228a805 build-support/rust: rewrite workspace dependency inheritance
This fixes at least one bug with default-features, and also
just aligns us more with what Cargo actually does.

Also some Python style fixes and a bit less mutating state.
2024-05-10 20:55:39 +03:00
Pol Dellaiera
c7578123cf
Merge pull request #310528 from alyssais/buildRustPackage-platforms
buildRustPackage: add new supported platforms
2024-05-10 10:50:42 +02:00
Alyssa Ross
6d4a14504e
buildRustPackage: add new supported platforms
The new NetBSD platforms have appeared since last time I updated this
list, but it looks like I just missed the MIPS linux ones last time.
2024-05-10 10:18:20 +02:00
Patka
8cd73735dc
buildsupport/php: add passthru.updateScript
PHP packages where upstream provides a lock file can be automatically updated with the standard updateScript
2024-05-09 14:42:27 +02:00
github-actions[bot]
8d97a60dd1
Merge master into staging-next 2024-05-08 18:01:26 +00:00
Atemu
6d5fc9c5d9
Merge pull request #305582 from TomaSajt/dub-to-nix-git-deps
dub-to-nix,buildDubPackage: allow git-type dependencies
2024-05-08 16:34:21 +02:00
Linus Heckemann
a10842c7f0
Merge pull request #302300 from Ma27/kernel-zstd
linux kernel: prefer zstd where possible
2024-05-08 15:17:45 +02:00
TomaSajt
eaab342480
dub-to-nix,buildDubPackage: allow git-type dependencies 2024-05-08 14:01:35 +02:00
github-actions[bot]
9b1eee6539
Merge master into staging-next 2024-05-07 18:01:11 +00:00
Pol Dellaiera
3d155494e4
build-support/php: reorganize files
Pave the way for having multiple versions in the future
2024-05-07 11:18:34 +02:00
github-actions[bot]
b05583e319
Merge master into staging-next 2024-05-06 12:01:18 +00:00
Randy Eckenrode
318a6a6b52
Merge pull request #290684 from corngood/dotnet-darwin
dotnet: fix dotnet executables in darwin sandbox
2024-05-06 07:57:02 -04:00
github-actions[bot]
041bd1cdf7
Merge master into staging-next 2024-05-05 18:00:54 +00:00
Pol Dellaiera
4d2dad358d
build-support/php: remove obsolete parameters 2024-05-05 19:51:01 +02:00
Pol Dellaiera
31bdcac6a0
build-support/php: add missing binding 2024-05-05 18:51:03 +02:00
Pol Dellaiera
d8f509a470
build-support/php: composer, add meta.mainProgram 2024-05-05 18:51:03 +02:00
Pol Dellaiera
409e640cef
build-support/php: use lib.getExe 2024-05-05 18:51:03 +02:00
Pol Dellaiera
b5855e4e66
build-support/php: move environment variables under env attribute 2024-05-05 18:51:03 +02:00
Pol Dellaiera
6ca2dfeaec
build-support/php: remove obsolete parameters 2024-05-05 18:45:27 +02:00
Jan Tojnar
100509c030 Merge branch 'staging-next' into staging
Conflicts in luaPackages.luarocks-nix:

- 8b563cd9f9 switched to the new version format (prefixed by 0 since there was no relevant last tag in the branch).
  bc4f6fa543 bumped version and switched to the new version format. But the tag used is not part of the branch the commit comes from (master).

  Used the new version but replaced the tag prefix with 0.

- b73ec84b9e removed meta (it is already set in the overridden luarocks). But that would cause the update script to try to update the overridden luarocks (as did the previously used old.meta).
  bf311d950e modified meta to fix the update script properly.

  Kept the meta from the latter since it allows update script to work.
2024-05-05 14:50:32 +02:00
David McFarland
26c3d6878a dotnet: fix dotnet executables in darwin sandbox
This fixes:

    Could not load ICU data. UErrorCode: 2

We're using a hook instead of a wrapper because various things like to
reference the unwrapped dotnet executable.
2024-05-04 19:14:39 -03:00
Pol Dellaiera
75ae762133
workflows/check-nix-format: enforce for build-support/php 2024-05-04 23:06:24 +02:00
github-actions[bot]
63659f437f
Merge staging-next into staging 2024-05-04 00:02:40 +00:00
nicoo
a817fdac5f
Merge #307770: add optional version check in testers.hasPkgConfigModules 2024-05-03 20:18:56 +00:00