Commit Graph

7389 Commits

Author SHA1 Message Date
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
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
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
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
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
Thiago Kenji Okada
ed5b0bccf5 buildGraalvmNativeImage: set NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION 2023-12-13 16:12:04 +00: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
github-actions[bot]
7c846b760d
Merge master into staging-next 2023-12-09 18:00:56 +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
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
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]
4d8ab2a703
Merge master into staging-next 2023-12-05 12:01:22 +00:00
Weijia Wang
9675917c89
Merge pull request #268735 from aaronjheng/nix-template-rpm
nix-template-rpm: remove
2023-12-05 12:21:50 +01:00
Fabián Heredia Montiel
5b8deaceca Merge remote-tracking branch 'origin/master' into staging-next
Fixed conflict in pkgs/applications/graphics/krita/

krita: 5.1.5 -> 5.2.0
7a40fdc288
, and
treewide: use kde mirror everywhere, don't use pname in download urls
aa15f5066d
2023-12-04 17:44:17 -06:00
mdarocha
5b43e78193 buildDotnetModule: fix rare error when evaluation of version fails 2023-12-04 20:24:09 +01:00
Atemu
fd7f5fd9a2
Merge pull request #269475 from jonringer/addhardwarerunpath-mini
addDriverRunpath: init
2023-12-03 22:27:36 +01:00
Robert Scott
a20f062167
Merge pull request #266544 from risicle/ris-trivial-only-bin
trivial-builders: add onlyBin
2023-12-03 17:13:42 +00:00
Jonathan Ringer
c7c1388e82
addDriverRunpath: init 2023-12-03 07:22:51 -08:00
pennae
b2844f89d1 avrlibc: hook up libdir for cc-wrapper
-B must be set to the root directory of avrlibc, otherwise gcc cannot
locate crt objects for some attiny devices. -L trains as set by
bintools-wrapper are not necessary with -B set correctly because gcc
takes care of that, and likewise we can drop the -B train from
cc-wrapper because the one spec is enough.
2023-12-03 21:44:27 +11:00
github-actions[bot]
e1f166b89a
Merge master into staging-next 2023-12-03 06:01:01 +00:00
Janik
b678419eac
Merge pull request #269078 from lilyinstarlight/fix/prefetch-npm-deps-more-bad-lockfiles 2023-12-03 06:53:59 +01:00
Robert Scott
035d1e2cf9 trivial-builders: add onlyBin 2023-12-02 14:47:36 +00:00
github-actions[bot]
df742c9c0e
Merge master into staging-next 2023-12-02 12:01:25 +00:00
7c6f434c
f742f2795a
Merge pull request #271562 from pbsds/fetchtorrent-test-licenses
tests.fetchtorrent: add license
2023-12-02 10:32:26 +00:00
Peder Bergebakken Sundt
4fa591f807 tests.fetchtorrent: add watched-cd license
This marks the tests unfree, shuold be fixed in a follow up.
2023-12-02 02:04:50 +01:00
Peder Bergebakken Sundt
9a16042cc3 fetchtorrent: add meta support 2023-12-02 02:04:40 +01:00
github-actions[bot]
9cca0e4288
Merge master into staging-next 2023-12-01 12:01:16 +00:00
Weijia Wang
6cb7677277
Merge pull request #269141 from fgaz/fetchfossil/sri-hash
fetchfossil: support SRI hashes
2023-12-01 09:57:36 +01:00
Vladimír Čunát
305cd929fd
Merge branch 'staging' into staging-next 2023-12-01 07:33:49 +01:00
Bernardo Meurer
6e086086d7
Merge pull request #188347 from zhaofengli/darwin-uuid 2023-11-30 10:51:28 -03:00
Martino Fontana
beae87d564 appimage-run: add libthai 2023-11-30 12:50:44 +01:00
Alyssa Ross
52a13b8125 separateDebugInfo: use NIX_RUSTFLAGS
Setting RUSTFLAGS causes Cargo to ignore other ways of configuring
flags, including the target-specific RUSTFLAGS options.  This broke
pkgsCross.musl64.crosvm, and was surprising to users.

Fixes: https://github.com/NixOS/nixpkgs/pull/261727
2023-11-30 09:23:06 +00:00
Alyssa Ross
8929ba838f rustc: use the wrapper for fastCross sysroot
This avoids having two layers of wrapper for cross rustc.
2023-11-30 09:23:06 +00:00
Alyssa Ross
8b51cdd3be rustc: add a compiler wrapper
We keep running into situations where we can't get the right
combination of rustc flags through build systems into rustc.
RUSTFLAGS is the only variable supported across build systems, but if
RUSTFLAGS is set, Cargo will ignore all other ways of specifying rustc
flags, including the target-specific ones, which we need to make
dynamic musl builds work.  (This is why pkgsCross.musl64.crosvm is
currently broken — it works if you unset separateDebugInfo, which
causes RUSTFLAGS not to be set.)

So, we need to do the same thing we do for C and C++ compilers, and
add a compiler wrapper so we can inject the flags we need, regardless
of the build system.

Currently the wrapper only supports a single mechanism for injecting
flags — the NIX_RUSTFLAGS environment variable.  As time goes on,
we'll probably want to add additional features, like target-specific
environment variables.
2023-11-30 09:23:06 +00:00
Shamrock Lee
1d56e7909d trivial-builders/test/references-test.sh: lint with ShellCheck 2023-11-30 17:16:05 +08:00
Pol Dellaiera
383cfc350c
Merge pull request #270393 from uninsane/pr-fetchgitlab-extra-attrs
fetchFromGitLab: passthru owner and repo
2023-11-29 20:22:29 +01:00
Alyssa Ross
1557027e33 makeModulesClosure: handle firmware glob patterns
A handful of kernel modules use glob patterns to express their
firmware dependencies.  (`git grep 'MODULE_FIRMWARE.*\*'`)

Previously, we weren't handling these patterns.  Now, we are.
2023-11-29 16:03:16 +01:00