Commit Graph

7948 Commits

Author SHA1 Message Date
github-actions[bot]
4ace29447c
Merge master into staging-next 2024-06-07 00:02:15 +00:00
Atemu
10b7b6a403
Merge pull request #310385 from szlend/cross-deterministic-uname
deterministic-uname: overridable platform
2024-06-06 21:09:43 +02:00
github-actions[bot]
c987c730bb
Merge master into staging-next 2024-06-03 00:02:20 +00:00
Someone
9f48aac218
Merge pull request #306716 from ShamrockLee/apptainer-default-path-substitution
apptainer, singularity: refactor defaultPath substitution
2024-06-02 22:33:55 +00:00
github-actions[bot]
738e64a2f9
Merge master into staging-next 2024-06-01 00:02:18 +00:00
Lin Jian
7f5aedecb5
melpaBuild: add files parameter to specify :files of recipe 2024-06-01 02:29:59 +08:00
Lin Jian
6c9f79c133
melpaBuild: add doc and default value for recipe 2024-06-01 02:22:28 +08:00
Lin Jian
428dfcb007
melpaBuild: add doc and default value for commit 2024-06-01 02:16:28 +08:00
Alyssa Ross
f82a1d12eb Revert "make-binary-wrapper: add cc to propagatedBuildInputs"
This reverts commit 0c34636a56.

Seems to be causing some weird side effects. pkgsMusl.systemd no
longer builds:

Command line: `clang /run/user/1008/tmp.WuVNjgdfHT/source/build/meson-private/tmpdd3qc57v/testfile.c -o /run/user/1008/tmp.WuVNjgdfHT/source/build/meson-private/tmpdd3qc57v/output.obj -c -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -std=gnu11` -> 1
stderr:
clang: error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument]
2024-05-27 21:56:47 +02:00
sternenseemann
affa8f75ec Reapply "srcOnly: reflink if possible and preserve attributes"
This reverts commit 610ee378fc.

Reason for reapply: The change was alright, just went to the wrong
branch.
2024-05-27 13:41:36 +02:00
github-actions[bot]
c67f226431
Merge staging-next into staging 2024-05-27 06:02:17 +00:00
sternenseemann
610ee378fc Revert "srcOnly: reflink if possible and preserve attributes"
This reverts commit 7173eb87b8.

Reason for revert: This causes too big a rebuild for master (since GHC
uses srcOnly). This went unnoticed due to a stale ofborg rebuild count.
2024-05-27 02:11:54 +02:00
github-actions[bot]
7b88bc39ef
Merge staging-next into staging 2024-05-27 00:02:54 +00:00
Robert Hensing
e0c43a96d2
testers.lycheeLinkCheck: init (#298665)
* testers.lycheeLinkCheck: init

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2024-05-27 01:14:19 +02:00
sternenseemann
7173eb87b8 srcOnly: reflink if possible and preserve attributes
This matches how the default unpackPhase would copy from a store path
into the build directory, so it seems wise to match this here. On file
systems that support reflinks, this should improve performance as well.
2024-05-26 22:06:10 +02:00
John Ericson
e897cae4da
Merge pull request #311794 from rhelmot/freebsd-minimal3/make-binary-wrapper
make-binary-wrapper: add cc to propagatedBuildInputs
2024-05-26 11:50:45 -04:00
Simon Žlender
2ed51a3ff0 deterministic-uname: Overridable platform
Some packages rely on `uname` to configure the host target which breaks cross-compilation.
We can have more control over the evaluation of `uname` by placing `deterministic-uname` into the package's `nativeBuildInputs`.
However the current `deterministic-uname` is hardcoded to `buildPlatform`.

This PR introduces a build argument `forPlatform` to `deterministic-uname` which allows you to override the platform it reports.

Example:
```nix
deterministic-uname.override { forPlatform = stdenv.hostPlatform; }
```
2024-05-25 23:34:31 +03:00
Thomas Watson
4d6d293fad setup-hooks/strip: uniqify files by inode number before stripping
https://github.com/NixOS/nixpkgs/pull/246164 but for hardlinks.

Mesa, among other packages, has binaries that are linked together and
can end up corrupted when the same binary is stripped through two
different names.

To resolve this, print out the device and inode number before each file
name, sort/uniq based on that, then cut it back out before stripping.

The symlink resolution logic is removed as the same file accessed
through two different links in `$paths` will necessarily have the same
numbers. File/directory within the paths listed in `$paths` are
correctly not (and were never) processed due to the `-type f` predicate
and (implied) `-P` option to `find`.
2024-05-24 16:53:14 -05:00
github-actions[bot]
7655996362
Merge staging-next into staging 2024-05-23 18:02:28 +00:00
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
github-actions[bot]
044fbf6429
Merge staging-next into staging 2024-05-23 12:02:05 +00: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
github-actions[bot]
949e5b9d89
Merge staging-next into staging 2024-05-22 00:02:35 +00: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
github-actions[bot]
a3599a93ae
Merge staging-next into staging 2024-05-21 12:01:47 +00: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
github-actions[bot]
af402f7b70
Merge staging-next into staging 2024-05-21 00:02:42 +00: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
Alyssa Ross
4816a73bb5 rustPlatform: --frozen -> --offline
--frozen is stricter than we need in Nixpkgs.  If a Cargo.lock is
slightly wrong, or (in my use case) if building a subproject that is
not a member of the top-level workspace, but the correct Cargo.lock
can be entirely resolved from the existing top-level Cargo.lock, it
should be deterministic, and shouldn't cause any problems, to let
cargo generate the new Cargo.lock.  This should result in less need to
bother upstreams about fixing their Cargo.lock files in cases where
they could have been automatically fixed.
2024-05-18 11:18:59 +02:00
Artemis Tosini
0c34636a56 make-binary-wrapper: add cc to propagatedBuildInputs
Adding cc to propagatedBuildInputs makes derivations with
makeBinaryWrapper in nativeBuildInputs run the cc-wrapper
setup hook. This isn't an issue for derivations using
stdenv, as the cc setup hook is already run by default.
However, derivations that are made with stdenvNoCC, e.g.
because they're made with runCommand, will not run the
cc-wrapper setup hook without this change.

For some reason the FreeBSD native compiler will not work
correctly without the setup hook.
2024-05-17 12:52:49 -07: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
Audrey Dutcher
5a1987d381 deterministic-uname: add support for FreeBSD 2024-05-14 15:30:46 -07: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