Commit Graph

1214 Commits

Author SHA1 Message Date
Yueh-Shun Li
662cf493f0 tests.overriding: format with nixfmt-rfc-style 2024-12-19 22:30:30 +08:00
K900
7661b4ac55 Merge remote-tracking branch 'origin/staging-next' into staging 2024-12-19 12:47:54 +03:00
github-actions[bot]
dd1d7cff2b Merge master into staging-next 2024-12-18 18:04:46 +00:00
GGG
1cd9516969 treewide: migrate nix-based dotnet lockfiles to JSON 2024-12-17 19:49:03 -03:00
Matt Sturgeon
bccae9e7c0 addNuGetDeps: support loading JSON lockfiles
In addition to loading nix lockfiles
2024-12-17 19:46:36 -03:00
Philip Taron
8f78cb0e66 replaceVarsWith: fix checkPhase with dir set (#365347) 2024-12-15 19:10:57 -08:00
Wolfgang Walther
321bd31b60 replaceVarsWith: fix checkPhase with dir set 2024-12-15 12:21:52 +01:00
github-actions[bot]
8c5656aa89 Merge master into staging-next 2024-12-15 00:17:27 +00:00
sternenseemann
a0a35b6c24 Fix cross eval issues (#362546) 2024-12-14 22:14:52 +01:00
Artturin
653b3558ee tests-stdenv-gcc-stageCompare: Fail gracefullyier
Don't fail with a missing attribute error, so the error can be handled.
2024-12-10 23:49:29 +02:00
Silvan Mosberger
667d42c00d treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev 57b193d8dd
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:27:17 +01:00
Silvan Mosberger
4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Silvan Mosberger
84d4f874c2 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev 78e9caf153
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:23:58 +01:00
github-actions[bot]
171c0c7ed6 Merge master into staging-next 2024-12-07 00:15:17 +00:00
js6pak
895b69405c dotnet: make wrappers usable as DOTNET_ROOT
This simplifies the code a bit and makes it possible to use dotnetCorePackages.combinePackages as dotnet-runtime again.
Partial revert of ddd08e404f.
2024-12-06 10:01:59 -04:00
github-actions[bot]
0597be32bd Merge master into staging-next 2024-12-06 12:05:59 +00:00
Yueh-Shun Li
226b370423 tests.overriding: simplify implementation with lib.concatMapStringAttrsSep 2024-12-06 11:02:27 +08:00
Wolfgang Walther
56b09628e3 stdenv: support multi-char separators in concatStringsSep
One prominent use-case for this is pytestCheckHook. This will help
making it work with structuredAttrs in the future.
2024-11-30 16:38:02 +01:00
github-actions[bot]
cc12ba514b Merge staging-next into staging 2024-11-25 06:05:47 +00:00
Dmitry Kalinkin
6b3731b732 texlive: 2023-final -> 2024.20241027 (#351790) 2024-11-24 20:26:39 -05:00
Philip Taron
cd02253be0 replaceVars: allow exemptions (#357395) 2024-11-24 12:36:13 -08:00
Wolfgang Walther
2d64877f63 replaceVars: allow exemptions
replaceVars has a checkPhase to confirm that no left-over @...@ patterns
remain. Since it's not possible to use "placeholder" with replaceVars,
the substitution of some patterns must be delayed to a later step.

By passing "null" for those keys explicitly, replaceVars can make an
exemption *just for this case*, but keep checking all other references.
2024-11-24 17:08:06 +01:00
github-actions[bot]
468547492b Merge staging-next into staging 2024-11-22 18:05:01 +00:00
Emily
e3d26a1815 cudaPackages_10{,_0,_1,_2}: drop 2024-11-21 23:09:53 +00:00
Emily
9031f2db8b Merge staging-next into staging 2024-11-21 03:49:12 +00:00
Jörg Thalheim
6d2d99ef57 Parallel GH actions workflow for Nixpkgs eval (#356023) 2024-11-20 19:49:18 +01:00
Silvan Mosberger
fbbe972898 Parallel GH actions workflow for Nixpkgs eval
Motivated by ofborg struggling [1] and its evaluations taking too long,
inspired by Jörg's initial PR [2]
and Adam's previous attempt to parallelise Nixpkgs evaluation [3],
this PR contains initial work to relief ofborg from its evaluation duty
by using GitHub Actions to evaluate Nixpkgs.

For now this doesn't take care of all of what ofborg does, such as
requesting appropriate reviewers or labeling mass rebuilds, but this can
be follow-up work.

[1]: https://discourse.nixos.org/t/infrastructure-announcement-the-future-of-ofborg-your-help-needed/56025?u=infinisil
[2]: https://github.com/NixOS/nixpkgs/pull/352808
[3]: https://github.com/NixOS/nixpkgs/pull/269403

Co-Authored-By: Jörg Thalheim <joerg@thalheim.io>
Co-Authored-By: Adam Joseph <adam@westernsemico.com>
2024-11-20 10:35:56 +01:00
Dmitry Kalinkin
7cd5f8cda0 texlive: 2023-final -> 2024.20241027 2024-11-19 16:26:16 -05:00
Emily
302bcdf85d Revert "tests.cc-wrapper.default: reduce rebuild amount from 429 to 319"
Now that we use a trivial shell script, this only adds two trivial
builds to the closure.

This reverts commit 5f2d5d77da.
2024-11-19 15:43:55 +00:00
David McFarland
b0d941edb4 dotnet: november 2024 upgrades and infrastructure changes (#355753) 2024-11-18 20:20:45 -04:00
David McFarland
42d69ab59a dotnet: move dotnet_root to $out/share/dotnet 2024-11-17 14:19:23 -04:00
David McFarland
ddd08e404f dotnet: split setup hooks into wrapper for runtime/sdk 2024-11-17 14:19:22 -04:00
Wolfgang Walther
ec3a49b987 pkgs/test/simple: remove unused builder.sh
Oversight in a133a74c89.
2024-11-15 20:10:27 +01:00
github-actions[bot]
fe71abdc48 Merge staging-next into staging 2024-11-04 12:06:38 +00:00
Doron Behar
b83db93b6b libtinfo: init at 6.4 (#285347) 2024-11-04 09:11:05 +02:00
Doron Behar
c3b147d34a tests.buildFHSEnv.libtinfo: simplify using libtinfo 2024-11-03 01:08:36 +02:00
Maximilian Bosch
aaeeef5b6c stdenv: fix custom hardening settings when using __structuredAttrs = true;
Replaces / Closes #353131

A while ago `postgresql` switched to using structured attrs[1]. In the
PR it was reported that this made postgresql notably slower when
importing SQL dumps[2].

After a bit of debugging it turned out that the hardening was entirely
missing and the following combination of settings was the culprit:

    hardeningEnable = [ "pie" ];
    __structuredAttrs = true;

I.e. the combination of custom hardening settings and structured attrs.

What happened here is that internally the default and enabled hardening
flags get written into `NIX_HARDENING_ENABLE`. However, the value is a list
and the setting is not in the `env` section. This means that in the
structured-attrs case we get something like

    declare -ax NIX_HARDENING_ENABLE=([0]="bindnow" [1]="format" [2]="fortify" [3]="fortify3" [4]="pic" [5]="relro" [6]="stackprotector" [7]="strictoverflow" [8]="zerocallusedregs" [9]="pie")

i.e. an actual array rather than a string with all hardening flags being
space-separated which is what the hardening code of the cc-wrapper
expects[3].

This only happens if `hardeningEnable` or `hardeningDisable` are
explicitly set by a derivation: if none of those are set,
`NIX_HARDENING_ENABLE` won't be set by `stdenv.mkDerivation` and the
default hardening flags are configured by the setup hook of the
cc-wrapper[4].

In other words, this _only_ applies to derivations that have both custom
hardening settings _and_ `__structuredAttrs = true;`.

All values of `NIX_HARDENING_ENABLE` are well-known, so we don't have to
worry about escaping issues. Just forcing it to a string by
concatenating the list everytime solves the issue without additional
issues like eval errors when inheriting `env` from a structuredAttrs
derivation[5]. The price we're paying is a full rebuild.

[1] https://github.com/NixOS/nixpkgs/pull/294504
[2] https://github.com/NixOS/nixpkgs/pull/294504#issuecomment-2451482522
[3] cf3e5d3744/pkgs/build-support/cc-wrapper/add-hardening.sh (L9)
[4] cf3e5d3744/pkgs/build-support/cc-wrapper/setup-hook.sh (L114)
[5] 1e84a7fb95
2024-11-02 22:30:01 +01:00
github-actions[bot]
6e6e33bd99 Merge staging-next into staging 2024-11-01 18:05:02 +00:00
Philip Taron
8d9fcbc47a tests/srcOnly: init (#347548) 2024-11-01 09:13:09 -07:00
github-actions[bot]
336ffcf0e4 Merge staging-next into staging 2024-10-31 18:04:59 +00:00
Artturin
e99719836d tests.cc-wrapper.default: reduce rebuild amount from 429 to 319 (#351768) 2024-10-31 19:48:51 +02:00
github-actions[bot]
8f11852505 Merge staging-next into staging 2024-10-30 18:05:08 +00:00
Tristan Ross
fb01d572b5 release-lib: build packages without meta.platforms on all platforms (#351919) 2024-10-30 09:35:04 -07:00
Emily
9f36206578 tests.build-environment-info: add more information
The user information would have helped diagnose the empty GECOS issue
we had with the Hydra Darwin builders recently and the OS information
seems generally nice to have.
2024-10-29 19:42:46 +00:00
Emily
f594f608dc tests.nixos-functions: don’t omit derivations on non‐Linux
Hydra can handle packages that `throw` but not attributes that
disappear depending on platform, and it seems okay for evaluation to
fail here for non‐Linux platforms.
2024-10-29 19:42:46 +00:00
github-actions[bot]
0ad7ce5327 Merge staging-next into staging 2024-10-29 00:14:56 +00:00
Philip Taron
9a18caa5cd bintools-wrapper: fix late‐bound command references (#351531) 2024-10-28 07:05:32 -07:00
Philip Taron
b37bbeb14f tests.cc-wrapper.supported: remove obsolete Darwin conditionals (#351535) 2024-10-28 07:05:03 -07:00
github-actions[bot]
ca29a063ab Merge staging-next into staging 2024-10-28 06:05:39 +00:00
Emily
298b92814b tests.build-environment-info: init
We just had a marathon session trying to fix `ulimit -n` on Hydra and
have no easy way to test that it worked.
2024-10-28 02:03:31 +00:00