Commit Graph

7417 Commits

Author SHA1 Message Date
github-actions[bot]
782f18b6fe
Merge staging-next into staging 2023-12-19 12:01:35 +00:00
Janne Heß
5eed5416ff
Merge pull request #167670 from messemar/incremental-builds
incremental builds: add derivation override functions
2023-12-19 11:37:15 +01:00
Alyssa Ross
ca8a6d8c19 wrapRustcWith: allow --sysroot to be overridden
It turns out that unlike a normal Unix program, if the --sysroot
option is given more than once, rustc will error rather than using the
last value given.  Therefore, we need to ensure we only add our
default --sysroot argument if one hasn't been given explicitly on the
wrapper's command line.

This fixes cross compilation of rustc.

Closes: https://github.com/NixOS/nixpkgs/issues/271736
Fixes: 8b51cdd3be ("rustc: add a compiler wrapper")
2023-12-19 11:34:02 +01:00
github-actions[bot]
1f30be411f
Merge staging-next into staging 2023-12-19 06:01:17 +00:00
Will Fancher
42b9f21c69
Merge pull request #274743 from r-ryantm/auto-update/makeInitrdNGTool
makeInitrdNGTool: 0.1.0 -> 0.1.0
2023-12-19 00:46:24 -05:00
github-actions[bot]
01cb3d14eb
Merge staging-next into staging 2023-12-17 06:01:23 +00:00
Peder Bergebakken Sundt
adc2612d49
Merge pull request #268304 from panicgh/fetchgitlab-sparse-forcegit
fetchgitlab: add sparseCheckout and forceFetchGit args
2023-12-17 03:34:52 +01:00
github-actions[bot]
cacb3248e1
Merge staging-next into staging 2023-12-17 00:02:54 +00:00
Pol Dellaiera
92960168a5
Merge pull request #274631 from artemist/replace-workspace-lints
rustPlatform.importCargoLock: copy lints from workspace
2023-12-16 19:45:00 +01:00
R. Ryantm
d2ffb24948 makeInitrdNGTool: 0.1.0 -> 0.1.0 2023-12-16 14:58:17 +00:00
github-actions[bot]
0deaf44f3d
Merge staging-next into staging 2023-12-16 12:01:49 +00:00
K900
5eb4128d60 buildFHSEnv: propagate host /etc if nested
This fixes use cases like launching Lutris/Heroic from Steam.
2023-12-16 10:04:09 +03:00
Artemis Tosini
285216aceb
rustPlatform.importCargoLock: copy lints from workspace
Rust 1.74 added support for configuring lints with cargo in a new
"lints" table. This also adds a new possible position to reference the
host workspace.

Fixes #273835
2023-12-16 05:36:59 +00:00
github-actions[bot]
b9dfb3f0ee
Merge staging-next into staging 2023-12-15 06:01:29 +00:00
Sandro Jäckel
bf81cded7d makeNugetSource: symlink files instead of copying them
this reduces the closure size of the resulting derivation drastically
2023-12-15 01:23:21 +00:00
Sandro Jäckel
5ef866783f makeNugetSource: fix meta.description being overwritten, misc cleanup 2023-12-15 01:23:21 +00:00
github-actions[bot]
5ea376a152
Merge staging-next into staging 2023-12-14 12:01:56 +00:00
Jeff Huffman
195248b6c1 buildFHSEnv, steam: isolate steam's /tmp from host
Works around steam's misbehavior: https://github.com/ValveSoftware/steam-for-linux/issues/9121
2023-12-13 23:33:05 -08:00
Jeff Huffman
452b8162ec buildFHSEnv: use symlinks instead of bind mounts for files from host /etc
Closes #247065
2023-12-13 23:33:05 -08:00
github-actions[bot]
bae9ba4ab0
Merge staging-next into staging 2023-12-14 00:02:44 +00:00
Thiago Kenji Okada
ed5b0bccf5 buildGraalvmNativeImage: set NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION 2023-12-13 16:12:04 +00:00
Martin Weinelt
e8dd1cf066 Merge remote-tracking branch 'origin/staging-next' into staging 2023-12-12 14:13:07 +01:00
Martin Messer
a3e0a52de4 checkpointBuilds: add hooks for checkpoint builds 2023-12-12 13:21:01 +01:00
Pol Dellaiera
b9e35d7dc4
Merge pull request #272448 from drupol/php/composer-builder/filter-bat
build-support/php: prevent the creation of symlinks of `bin` ending with `.bat`
2023-12-12 08:11:50 +01:00
adisbladis
6b9f45ae37 python3.pkgs.buildsetupcfg: Remove function from python-packages-base.nix
This function is not, and never have been, used anywhere inside nixpkgs, outside of bootstrapping setupcfg2nix itself.
It was added in https://github.com/NixOS/nixpkgs/pull/38778 by @shlevy.

It has no out-of-tree users on Github either. External breakage is not expected.
2023-12-12 12:21:38 +13:00
Robert Scott
aac4bc376e
Merge pull request #259070 from risicle/ris-cc-default-hardening-flags
mkDerivation, bintools-wrapper: move `defaultHardeningFlags` determination to `bintools-wrapper`
2023-12-10 21:53:41 +00:00
github-actions[bot]
ad1e07c64b
Merge staging-next into staging 2023-12-09 18:01:23 +00:00
github-actions[bot]
7c846b760d
Merge master into staging-next 2023-12-09 18:00:56 +00:00
Robert Scott
1a5bd697ad mkDerivation, bintools-wrapper: move defaultHardeningFlags determination to bintools-wrapper
this makes it a lot easier to create a modified stdenv with a
different set of defaultHardeningFlags and as a bonus allows us
to inject the correct defaultHardeningFlags into toolchain wrapper
scripts, reducing repetition.

while most hardening flags are arguably more of a compiler thing,
it works better to put them in bintools-wrapper because cc-wrapper
can easily refer to bintools but not vice-versa.

mkDerivation can still easily refer to either when it is constructed.

this also switches fortran-hook.sh to use the same defaults for
NIX_HARDENING_ENABLE as for C. previously NIX_HARDENING_ENABLE
defaults were apparently used to avoid passing problematic flags
to a fortran compiler, but this falls apart as soon as mkDerivation
sets its own NIX_HARDENING_ENABLE - cc.hardeningUnsupportedFlags
is a more appropriate mechanism for this as it actively filters
out flags from being used by the wrapper, so switch to using that
instead.

this is still an imperfect mechanism because it doesn't handle a
compiler which has both langFortran *and* langC very well - applying
the superset of the two's hardeningUnsupportedFlags to either
compiler's invocation. however this is nothing new - cc-wrapper
already poorly handles a langFortran+langC compiler, applying two
setup hooks that have contradictory options.
2023-12-09 16:30:45 +00:00
Robert Hensing
6ac78f1174
Merge pull request #204462 from ShamrockLee/test-references
tests.trivial-builders.references: refactor and move expressions into trivial-builders/test/references
2023-12-09 14:45:20 +01:00
Yueh-Shun Li
7950a226f6
tests.trivial-builders.references: specify as empty set instead of null on non-Linux
Please Nix CI (OfBorg) with empty set instead of null on non-linux platforms,
where NixOS tests are not supported.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-12-09 13:08:10 +08: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
Yueh-Shun Li
9fba2b0fd7 tests.trivial-builders.references: add ShamrockLee as a maintainer 2023-12-08 09:28:47 +00:00
Yueh-Shun Li
1f4e8f3fad tests.trivial-buildrs.references: move expression files into trivial-builders/test/references/ 2023-12-08 09:27:48 +00:00
Yueh-Shun Li
79a1e9d729 tests.trivial-builders.references: refactor expression
Define package `testScriptBin` that contains the substituted test script.
* Add an `installCheckPhase` to check the result script with ShellCheck.
* Passthru as `references.testScriptBin` to run the
  (substituted) test script directly (without VM).
* Drop the logic in build script that detects if
  it is run in the Nix sandbox.
* Inline sample application; drop invoke-*.nix.

Format expressions.
* Format with `nixpkgs-fmt`.
* Use multi-line style of set patterns.

Call the samples with `callPackage`.
* Rename `sample` -> `samples`.
* Take individual packages / build helpers directly from the
  set pattern.
* Define `cleanSamples` to filter out overriders such as `<pkg>.override`.
  added by `callPackage`.

Passthru samples and invocation results for easier debugging.
* Passthru samples, references, directReferences
* Provide tests.trivial-builders.writeStringReferencesToFile with such
  samples argument.
2023-12-07 22:28:30 +00:00
Martin Messer
6db9612204 rename: incremental -> checkpointed builds 2023-12-07 16:56:16 +01:00
Martin Messer
ddfddf4b71 checkpointedBuilds: add comments in the code 2023-12-07 16:55:39 +01:00
Martin Messer
c85d18ff91 checkpointedBuilds: allow dotglob and remove debugging leftover 2023-12-07 16:55:39 +01:00
Martin Messer
cd6c65fe2d checkpointedBuild: consider removing files and make buildartifacts the only output of the prepare step 2023-12-07 16:38:48 +01:00
Martin Messer
1cd6b7fdc3 checkpointedBuilds: rename buildOut to checkpointedBuildArtifacts 2023-12-07 16:38:48 +01:00
Martin Messer
8beb56244d checkpointedBuilds: add usage example based on virtualbox 2023-12-07 16:38:48 +01:00
Martin Messer
3f4e3a862f Checkpointedbuilds: add derivation override functions
One can use this functions to allow incremental builds of derivations
2023-12-07 16:38:48 +01:00
github-actions[bot]
32d842483f
Merge master into staging-next 2023-12-07 06:01:00 +00:00
Peder Bergebakken Sundt
6c8b681c74
Merge pull request #271170 from SuperSamus/appimage-libthai
appimage-run: add libthai
2023-12-07 04:28:39 +01:00
Peder Bergebakken Sundt
17411d69e4
Merge pull request #272113 from mdarocha/build-dotnet-version-fix
buildDotnetModule: fix rare error when evaluation of version fails
2023-12-07 02:55:51 +01:00
Pol Dellaiera
f59d1cf6d6
build-support/php: prevent the creation of symlinks of bin ending with .bat 2023-12-06 11:46:24 +01:00
github-actions[bot]
2622221e95
Merge master into staging-next 2023-12-06 00:02:22 +00:00
Lily Foster
b5ca84b450 npmHooks.npmInstallHook: only overwrite npm cache for npm pack rather than for entire hook 2023-12-05 21:53:59 +01:00
Lily Foster
63fabdebd0
Merge pull request #267912 from reinismu/fetch-npm-deps-fix-bug
prefetch-npm-deps: add support for npm alias schema in version spec
2023-12-05 14:39:04 -05:00
github-actions[bot]
7386ca48e3
Merge staging-next into staging 2023-12-05 12:01:50 +00:00