Commit Graph

7592 Commits

Author SHA1 Message Date
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
Nikodem Rabuliński
b9c45ec6b8
build-support/fetchpijul: Enable strictDeps 2023-12-06 18:40:07 +01:00
Nikodem Rabuliński
bf3fb8a255
build-support/fetchpijul: Add cacert dependency and set impureEnvVars 2023-12-06 18:40:07 +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
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
github-actions[bot]
dc5d7b29e6
Merge staging-next into staging 2023-12-05 00:02:52 +00: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
Andreas Stührk
4084ee0cd5 make-initrd-ng: fix reproducibility problems
The previous find invocation didn't match the root directory, so the
root directory's access and modification time wasn't set to a
deterministic value and the build time leaked into the output.

`make-initrd` replaced `cpio` with `bsdtar` in #165892 because the
former includes the number of hardlinks in the created archive, which
depends on the filesystem (and can also be influenced by `nix-store
--optimise`). The same problem applies to `make-initrd-ng`, so this
commit replaces `cpio` with `libarchive`'s `bsdtar`.
2023-12-04 19:23:06 +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
K900
09d4abf0ca fetchurl/mirrors: add cdn.download.kde.org as default KDE mirror 2023-12-03 14:48:56 +03: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
github-actions[bot]
e019e7cdb1
Merge staging-next into staging 2023-11-29 12:01:23 +00:00
Reinis Muiznieks
02dd7c7bb3 prefetch-npm-deps: add support for npm alias schema in version spec 2023-11-29 13:14:59 +02:00
Sandro Jäckel
edfc8acaaf prefer-remote-fetch: add more fetchers which prefer local builds 2023-11-29 10:25:20 +01:00
Martin Weinelt
18100dc6c2 Merge remote-tracking branch 'origin/staging-next' into staging 2023-11-28 23:32:19 +01:00
markuskowa
438139ccb2
Merge pull request #216060 from Stunkymonkey/build-support-release-deprecate-phases
build-support/release: deprecate phases
2023-11-28 14:47:13 +01:00
github-actions[bot]
ad369759ce
Merge staging-next into staging 2023-11-28 00:02:41 +00:00
Will Fancher
092305cd72
Merge pull request #269442 from r-ryantm/auto-update/makeInitrdNGTool
makeInitrdNGTool: 0.1.0 -> 0.1.0
2023-11-27 16:43:43 -05:00
Colin
3a55403cf4 fetchFromGitLab: passthru owner and repo
this makes the output more consistent with `fetchFromGitHub`.
2023-11-27 10:10:17 +00:00
github-actions[bot]
d5776afdf5
Merge staging-next into staging 2023-11-27 00:02:41 +00:00
Nikolay Korotkiy
1a0ebc9b6a
Merge pull request #269677 from sikmir/vmtools
vmTools: update debian versions
2023-11-27 02:47:06 +04:00
Lily Foster
25596bd419
Merge pull request #257337 from lorenzleutgeb/yarn-file
prefetch-yarn-deps: Fix handling of scoped packages
2023-11-26 16:49:33 -05:00
Thiago Kenji Okada
ddf0003c57
Merge pull request #269479 from jcf/remove-more-graalvm-references
Remove more GraalVM references
2023-11-26 21:29:05 +00:00
github-actions[bot]
e5bb78518f
Merge staging-next into staging 2023-11-26 18:01:24 +00:00
ivan770
b00ec384d4 replace-secret: add mainProgram 2023-11-26 16:27:42 +02:00
James Conroy-Finn
56aedbd477
Move reference removal logic into build support 2023-11-26 11:23:15 +00:00
Ryan Lahfa
8af101ec22
Merge pull request #267125 from baloo/baloo/buildfhsenv/fixup-etc 2023-11-26 02:33:50 +01:00
Felix Buehler
f20a95a86a build-support/release: deprecate phases 2023-11-25 21:00:17 +01:00
github-actions[bot]
d578170670
Merge staging-next into staging 2023-11-25 00:02:35 +00:00
Thiago Kenji Okada
9a525f854f
Merge pull request #269522 from diegobfernandez/non4k-aarch64-graalvm-support
buildGraalvmNativeImage: Set maximum page size to 64K on aarch64-linux
2023-11-24 18:18:36 +00:00
Nikolay Korotkiy
7ec994050c
vmTools: update debian versions 2023-11-24 20:59:42 +04:00
Lily Foster
09081aa859
fetchNpmDeps: add test case where empty default lockfile packages is needed 2023-11-23 20:52:00 -05:00
Lily Foster
77571a847f
prefetch-npm-deps: use default value when lockfile has no deps 2023-11-23 20:51:59 -05:00
Lily Foster
daec4bf734
prefetch-npm-deps: instrument some logging 2023-11-23 20:51:58 -05:00
Lily Foster
81ed58b0fe
prefetch-npm-deps: make cargo happy 2023-11-23 20:51:22 -05:00
Lily Foster
ba656ad84e
prefetch-npm-deps: bump deps 2023-11-23 20:51:14 -05:00
Diego B. Fernandez
8ac4d38ad9 buildGraalvmNativeImage: Set maximum page size to 64K on aarch64-linux 2023-11-23 23:47:23 +01:00
github-actions[bot]
79027ec35d
Merge staging-next into staging 2023-11-23 18:01:20 +00:00
Nick Cao
a68bc4feaf
Merge pull request #266296 from yayayayaka/element-1.11.48
element-{web,desktop}: 1.11.47 -> 1.11.50
2023-11-23 09:27:14 -05:00
R. Ryantm
8c15911d79 makeInitrdNGTool: 0.1.0 -> 0.1.0 2023-11-23 13:26:47 +00:00
Janik
8e2c9abca8
Merge pull request #243458 from lilyinstarlight/fix/prefetch-npm-deps-error-when-no-cached-deps 2023-11-23 13:55:03 +01:00
github-actions[bot]
5b50965f04
Merge staging-next into staging 2023-11-23 06:01:34 +00:00
Silvan Mosberger
bf01ec00a0
Merge pull request #250949 from ShamrockLee/apptainer-localstatedir
apptainer, singularity: use self-contained LOCALSTATEDIR by default
2023-11-23 01:37:54 +01:00
Sandro Jäckel
f16843cb31
fetch-yarn-deps: fix missing cert when fetching packages
Found while updating element-web
2023-11-22 21:25:36 +01:00
Lily Foster
8e3009d95c
buildNpmPackage: add forceEmptyCache option 2023-11-22 15:18:49 -05:00
Lily Foster
05dc145e80
fetchNpmDeps: add forceEmptyCache option 2023-11-22 15:18:39 -05:00
Lily Foster
ec51a56dfc
prefetch-npm-deps: detect and error out when generating an empty cache 2023-11-22 15:18:16 -05:00
github-actions[bot]
55dfa1c1ce
Merge staging-next into staging 2023-11-22 18:01:38 +00:00
Lorenz Leutgeb
29cf6a0422 prefetch-yarn-deps: Fix access to .resolved
... and simplify `prefetchYarnDeps`
2023-11-22 18:03:48 +01:00
Lorenz Leutgeb
3843224a55 prefetch-yarn-deps: Fix parsing of scoped packages 2023-11-22 18:03:06 +01:00
Brian Leung
d1579a08ec emacs: remove backwards-compatibility aliases 2023-11-22 09:25:50 -03:00
Francesco Gazzetta
c034d14c41 fetchfossil: support SRI hashes 2023-11-22 09:47:57 +01:00
github-actions[bot]
96c0d0e833
Merge staging-next into staging 2023-11-22 00:02:48 +00:00
Felix Bühler
752fa8a3ac
Merge pull request #269061 from lilyinstarlight/fix/prefetch-yarn-deps-certs
prefetch-yarn-deps: add cacert to provide certificates during fetches
2023-11-21 23:31:57 +01:00
Lily Foster
ab99231a36
prefetch-yarn-deps: add cacert to provide certificates during fetches
Ideally fetch-yarn-deps could do like some other fetchers and support
using SSL_CERT_FILE if it exists and also only verify integrity on FOD
hash unless using an empty/test hash.

But this should keep at least the same semantics as before the recent
Node.js change to stop using the built-in certificate store in favor of
the system one (which does not exist by default in the build sandbox).
2023-11-21 16:24:57 -05:00
Jan Tojnar
bc41b2db3d makeHardcodeGsettingsPatch: Support applying patches
This is useful for replacing code that cannot be easily handled by the generator,
such as the tentative settings constructor in e-d-s.
2023-11-21 08:42:47 +01:00
Jan Tojnar
6f695f3d92 makeHardcodeGsettingsPatch: Improve docs
- Describe arguments and usage in more detail.
- Use finalAttrs in example.
- Use schema id, not path.
- Schema id is not what is replaced.
2023-11-21 08:42:47 +01:00
Aaron Jheng
97f4fac2ed
nix-template-rpm: remove 2023-11-20 15:10:03 +00:00
github-actions[bot]
07e4594bf9
Merge staging-next into staging 2023-11-20 00:02:50 +00:00
Robert Hensing
2834c0cf2a
Merge pull request #268458 from Mic92/dockertools
nixos/dockerTools: fixup proot/fakeroot code (fixes dockertools nixos test)
2023-11-19 21:50:16 +01:00
github-actions[bot]
bb547494d0
Merge staging-next into staging 2023-11-19 18:01:21 +00:00
Ryan Lahfa
7e869d89ee
Merge pull request #266787 from tvbeat/cargo-manifest-links 2023-11-19 16:14:58 +01:00
Jörg Thalheim
4911915512 nixos/dockerTools: fixup proot/fakeroot code
Not sure how this ever worked but tar was trying to archive /proc and /sys, which failed to work.
Since this is never useful for containers to do, we exclude this now in the proot case.
Also fakeroot is not needed when proot is used as it provideds the same feature.
We now cleanly seperate those cases as both are kind of hacks and it's more likely
that the combination will just trigger new bugs.
2023-11-19 08:30:27 +01:00
Nicolas Benes
cf00f9c2ea fetchgitlab: add option to force fetchgit 2023-11-18 13:14:08 +01:00
Nicolas Benes
a838881cda fetchgitlab: add option for sparse checkout 2023-11-18 13:14:08 +01:00
Nicolas Benes
9375cf2008 fetchgitlab: make args more similar to fetchgithub 2023-11-18 13:14:08 +01:00
K900
b852b4fa5a autoPatchelfHook: fix arguments parsing 2023-11-17 20:46:13 +03:00
midchildan
79459354cb buildNpmPackages: add missing deependencies 2023-11-17 07:58:58 +00:00
Maciej Krüger
f67b20cad6
Merge pull request #263939 from hacker1024/fix/dart-fod-wrapper 2023-11-17 05:00:37 +01:00
Weijia Wang
b1044bdc9d
Merge pull request #258184 from mdarocha/dotnet-fixes
buildDotnetModule small improvements
2023-11-16 23:41:25 +01:00
Vladimír Čunát
a7a8f8253d
Merge #263535: staging-next 2023-10-26 2023-11-16 22:06:22 +01:00
Felix Bühler
05a19f48a9
Merge pull request #267778 from lilyinstarlight/fix/yay-more-fixup-yarn-lock-stuff
prefetch-yarn-deps: re-add git hash for fixup
2023-11-16 21:06:38 +01:00
github-actions[bot]
dba5c9ef4e
Merge master into staging-next 2023-11-16 18:01:17 +00:00
Thiago Kenji Okada
d0e729bc26
Merge pull request #267861 from thiagokokada/graalvm-fixes
buildGraalvmNativeImage: fix Unicode issue by setting encoding explicitly
2023-11-16 13:48:13 +00:00
github-actions[bot]
301fcc69ba
Merge master into staging-next 2023-11-16 12:01:02 +00:00
happysalada
7fb490674f buildNpmPackage: allow passing npmDeps 2023-11-16 11:57:48 +00:00
Thiago Kenji Okada
ca662df7bf buildGraalvmNativeImage: fix Unicode issue by setting encoding explicitly
Remove the old workaround where we set it by LC_ALL, that does not seem
to be working anymore.

Fixes #260161.
2023-11-16 10:13:46 +00:00
Lily Foster
d02eb2d0e5
prefetch-yarn-deps: re-add git hash for fixup 2023-11-15 21:02:52 -05:00
Martin Weinelt
3c336a1647
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/libraries/gdcm/default.nix
2023-11-14 13:16:34 +01:00
Aaron Jheng
c3104c4cad buildGoModule: deprecate vendorSha256 attribute 2023-11-14 09:37:22 +01:00
github-actions[bot]
772c3bbbf5
Merge master into staging-next 2023-11-14 00:02:14 +00:00
Janik
582f1e7321
Merge pull request #254420 from lilyinstarlight/fix/npm-pack-pls-😭
npmHooks.npmInstallHook: avoid script output in npm pack command
2023-11-13 22:43:57 +01:00
Valentin Gagarin
0530d6bd04 doc: add explanatory code comment 2023-11-13 20:59:33 +01:00
Arthur Gautier
233ca3d9ac buildFHSenv: fixup /etc permissions
when bubblewraps tries to link all the required files in etc from the
host to the fhs environment, it will re-create the /etc directory.
It will do so with `0700` permissions. This causes permissions issues
with non-root programs when they need to access configuration in the
environment /etc.

By mounting /etc as a tmpfs early, bwrap will make the directory `0755`
as expected.
2023-11-12 17:02:53 -08:00
Weijia Wang
74d102ce50 Merge branch 'master' into staging-next 2023-11-12 19:45:20 +01:00
SharzyL
b186e2d76e nix-prefetch-git: make it quiet
Some programs (e.g. nvfetcher) parse the output of nix-prefetch-git as
JSON. However, there is a pushd/popd command in nix-prefetch-git that
outputs the directory name, breaking the structure of the result JSON.
We suppressed it with `>/dev/null`.

Passingly fixes a mixuse of tab and spaces.
2023-11-12 15:20:16 +01:00
github-actions[bot]
33248a2caf
Merge master into staging-next 2023-11-12 00:02:14 +00:00
Elliot Cameron
3a99d1b642 nix-prefetch-git: respect NETRC
This script needs to support being run both as part of a `fetchgit`
derivation and as a standalone, command-line tool.

The use of `$NIX_BUILD_TOP` only works when used in `fetchgit` but not when
invoked as a standalone tool. Instead we try to respect `$NETRC` so that
the command-line invocation behaves more like standard tools and the
`fetchgit` derivation can explicitly set `$NETRC` when `netrcPhase` is used
to avoid all ambiguity.
2023-11-11 19:34:54 +01:00
Luka Blaskovic
8ffe19c099 build-rust-crate: set CARGO_MANIFEST_LINKS if links is set 2023-11-11 06:29:50 +00:00
github-actions[bot]
e8096ee1e1
Merge staging-next into staging 2023-11-10 18:01:34 +00:00
Alyssa Ross
afabc4a15d
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	pkgs/development/libraries/SDL2/default.nix
2023-11-10 15:18:19 +01:00
github-actions[bot]
2fe90802da
Merge master into haskell-updates 2023-11-10 00:12:24 +00:00
github-actions[bot]
6a669d1ab2
Merge staging-next into staging 2023-11-09 18:01:27 +00:00
github-actions[bot]
e112f9b8bb
Merge master into staging-next 2023-11-09 18:00:56 +00:00
Yt
5aaeafbe26
buildNpmPackage: make nodejs overridable (#265171)
* buildNpmPackage: allow nodejs to be passed as argument

* Update doc/languages-frameworks/javascript.section.md

Co-authored-by: Lily Foster <lily@lily.flowers>

---------

Co-authored-by: Lily Foster <lily@lily.flowers>
2023-11-09 16:19:24 +00:00
Alyssa Ross
e3e57b8f18 lib.systems: elaborate Rust metadata
We need this stuff to be available in lib so make-derivation.nix can
access it to construct the Meson cross file.

This has a couple of other advantages:

 - It makes Rust less special.  Now figuring out what Rust calls a
   platform is the same as figuring out what Linux or QEMU call it.

 - We can unify the schema used to define Rust targets, and the schema
   used to access those values later.  Just like you can set "config"
   or "system" in a platform definition, and then access those same
   keys on the elaborated platform, you can now set "rustcTarget" in
   your crossSystem, and then access "stdenv.hostPlatform.rustcTarget"
   in your code.

"rustcTarget", "rustcTargetSpec", "cargoShortTarget", and
"cargoEnvVarTarget" have the "rustc" and "cargo" prefixes because
these are not exposed to code by the compiler, and are not
standardized.  The arch/os/etc. variables are all named to match the
forms in the Rust target spec JSON.

The new rust.target-family only takes a list, since we don't need to
worry about backwards compatibility when that name is used.

The old APIs are all still functional with no warning for now, so that
it's possible for external code to use a single API on both 23.05 and
23.11.  We can introduce the warnings once 23.05 is EOL, and make them
hard errors when 23.11 is EOL.
2023-11-09 10:02:24 +01:00
github-actions[bot]
fecd99b105
Merge staging-next into staging 2023-11-09 06:01:40 +00:00
github-actions[bot]
4aad65bfdb
Merge master into staging-next 2023-11-09 06:01:11 +00:00
Shogo Takata
d6e1c7cae6
fetchgit: shallow clone for submodules (#254172) 2023-11-09 04:32:13 +02:00
github-actions[bot]
d0018c61ff
Merge staging-next into staging 2023-11-07 18:01:28 +00:00
Maximilian Bosch
be31242d37
Merge pull request #265414 from lheckemann/fix-empty-closureInfo
closureInfo: handle empty path set explicitly
2023-11-07 17:18:10 +01:00
Weijia Wang
8012034692 Merge branch 'staging-next' into staging 2023-11-07 03:41:49 +01:00
github-actions[bot]
8541e5ab09
Merge master into haskell-updates 2023-11-07 00:12:32 +00:00
github-actions[bot]
38bc2a577e
Merge master into staging-next 2023-11-07 00:02:31 +00:00
Artturi
59ff987fed
Merge pull request #264684 from ShamrockLee/shellcheck-minimal 2023-11-06 23:19:00 +02:00
Weijia Wang
32da89a1a1 Merge branch 'master' into staging-next 2023-11-06 14:33:18 +01:00
K900
fa40d6457a nix-prefetch-git: download submodules with --progress 2023-11-05 20:49:03 +03:00
Linus Heckemann
bdd23d10b2 closureInfo: handle empty path set explicitly
Arguably, this is a bug in Nix's structuredAttrs: without
structuredAttrs, exportReferencesGraph with an empty path set would
still result in information being provided. With structuredAttrs, no
info is provided for an empty path set.

Nevertheless, we need to be able to build even if Nix has the bug, so
work around it by checking for an empty path set and handling it
explicitly.
2023-11-04 09:54:41 +01:00
github-actions[bot]
0f196bb1eb
Merge master into haskell-updates 2023-11-01 00:13:02 +00:00
Yueh-Shun Li
409f95731e shellcheck-minimal: init
Expose the minimal and stripped shellcheck package used by writeShellApplication.
2023-11-01 06:23:04 +08:00
github-actions[bot]
f190372f1f
Merge staging-next into staging 2023-10-31 12:01:49 +00:00
github-actions[bot]
2fd5f8dd7a
Merge master into staging-next 2023-10-31 12:01:11 +00:00
Ryan Lahfa
b10994c38c
Merge pull request #220429 from amjoseph-nixpkgs/pr/build-rust-crate/cross/linker 2023-10-31 12:12:17 +01:00
Naïm Favier
29a23fb4f9
Merge pull request #262814 from ncfavier/agda-updates
Agda 2.6.4 updates
2023-10-29 20:53:55 +01:00
Artturi
a42eddb8dd
Merge pull request #202575 from Cloudef/darwin-include-so-files 2023-10-28 22:02:49 +03:00
github-actions[bot]
519b7ea0c3
Merge master into staging-next 2023-10-28 12:01:19 +00:00
hacker1024
bc82281e01 buildDartApplication: Generate Dart wrapper with symlinkJoin 2023-10-28 21:52:36 +11:00
Eirik Wittersø
2fd6af1929 fetchFromBittorrent: Rename to fetchtorrent 2023-10-28 11:32:10 +01:00
Jari Vetoniemi
0c73f39dab darwin: fix also .so names in darwin
Darwin does not actually require `*.dylib` extension, and some ports of
unix software may still simply compile and install these as `*.so` files.

Include `*.so` in the find in this case.

Co-authored-by: Artturi <Artturin@artturin.com>
Co-authored-by: toonn <toonn@toonn.io>
2023-10-28 00:00:52 +02:00
Vladimír Čunát
d811555465
Merge branch 'staging' into staging-next 2023-10-26 10:36:50 +02:00
Atemu
e2d06c5695
Merge pull request #263201 from LunNova/lunnova/build-fhs-env-no-usr-lib
build-fhsenv-bubblewrap: remove /usr/lib and /usr/lib32 from LD_LIBRARY_PATH
2023-10-25 19:03:08 +02:00
Naïm Favier
6c2b227d34
agdaPackages.*: support literate Typst files 2023-10-24 20:34:05 +02:00
Robert Hensing
c1dc59dc8c
Merge pull request #263096 from hercules-ci/clean-up-data-writers
Clean up data writers
2023-10-24 16:18:17 +02:00
Luna Nova
a9600ce894
build-fhsenv-bubblewrap: remove /usr/lib and /usr/lib32 from LD_LIBRARY_PATH
See https://github.com/NixOS/nixpkgs/issues/262775
2023-10-24 07:13:33 -07:00
Robert Hensing
a6622bf00a writers/test: Refactor
It now also checks the executable bit.
2023-10-24 11:17:38 +02:00
Robert Hensing
e64f987fd6 writers.makeDataWriter: Deprecate 2023-10-24 11:17:38 +02:00
Robert Hensing
79130267d3 writers/data.nix: Remove duplicate implementations 2023-10-24 11:17:38 +02:00
Pol Dellaiera
8ecf5abf79
Merge pull request #262388 from drupol/php/build-support/make-validation-non-blocking
build-support/php: make validation check a non blocking process
2023-10-24 08:41:49 +02:00
Robert Scott
25920d8de2
Merge pull request #253194 from risicle/ris-nix-hardening-enable-fortify3-imply-fortify
cc-wrapper: ensure `NIX_HARDENING_ENABLE` `fortify3` implies `fortify` too
2023-10-23 19:23:02 +01:00
github-actions[bot]
2c2c0379b7
Merge staging-next into staging 2023-10-23 12:02:04 +00:00
Adam Joseph
4fc0e33698 buildRustPackage: add isMips64n32 to badPlatforms
Rust is not yet able to target the n32 ABI on mips64.

Let's add `isMips64n32` to the `meta.badPlatforms` of all
derivations created by buildRustPackage.

I use this to automatically detect which packages on my system can
be built for n32 (almost all of them) and build those using n32, and
the few packages (mainly those that depend on boost or rust) that
can't for n64.
2023-10-23 08:38:25 +00:00
Adam Joseph
3bd3809d0e buildRustCrate: add isMips64n32 to badPlatforms
Rust is not yet able to target the n32 ABI on mips64.

Let's add `isMips64n32` to the `meta.badPlatforms` of all
derivations created by buildRustCrate.

I use this to automatically detect which packages on my system can
be built for n32 (almost all of them) and build those using n32, and
the few packages (mainly those that depend on boost or rust) that
can't for n64.
2023-10-23 08:38:25 +00:00
github-actions[bot]
9f5438ccdf
Merge staging-next into staging 2023-10-23 06:01:38 +00:00
Adam Joseph
0b2036cad0 cc-wrapper: fix -mtune= validation, add ARM, add fallbacks
Before this commit, cc-wrapper/default.nix was using
`isGccArchSupported` to validate `-mtune=` values.  This has two
problems:

- On x86, `-mtune=` can take the same values as `-march`, plus two
  additional values `generic` and `intel` which are not valid for
  `-march`.

- On ARM, `-mtune=` does not take the same values as `-march=`;
  instead it takes the same values as `-mcpu`.

This commit fixes these two problems by adding a new
`isGccTuneSupported` function.  For `isx86` this returns `true` for
the two special values and otherwise defers to `isGccArchSupported`.

This commit also adds support for `-mtune=` on Aarch64.

Unfortunately on Aarch64, Clang does not accept as wide a variety of
`-mtune=` values as Gcc does.  In particular, Clang does not tune
for big.LITTLE mixed-model chips like the very popular RK3399, which
is targeted using `-march=cortex-a72.cortex-a53` in gcc.

To address this problem, this commit also adds a function
`findBestTuneApproximation` which can be used to map
clang-unsupported tunings like `cortex-a72.cortex-a53` to
less-precise tunings like `cortex-a53`.

The work which led to this commit arose because we now have
packages, like `crosvm`, which use *both* `clang` *and* `gcc`.
Previously I had been using `overrideAttrs` to set
`NIX_CFLAGS_COMPILE` on a package-by-package basis based on which
compiler that package used.  Since we now have packages which use
*both* compilers, this strategy no longer works.

I briefly considered splitting `NIX_CFLAGS_COMPILE` into
`NIX_CFLAGS_COMPILE_GCC` and `NIX_CFLAGS_COMPILE_CLANG`, but since
`NIX_CFLAGS_COMPILE` is sort of a hack to begin with I figured that
adding the logic to `cc-wrapper` would be preferable.
2023-10-23 01:31:21 +00:00
github-actions[bot]
4312247c19
Merge staging-next into staging 2023-10-22 12:01:52 +00:00
Artturi
41222ebcf2
Merge pull request #262675 from Artturin/addcomment
expand-response-params: explain what a "response file" is
2023-10-22 10:57:11 +03:00
Artturin
bd8d94aa69 expand-response-params: explain what a "response file" is
Co-authored-by: Adam Joseph <adam@westernsemico.com>
2023-10-22 08:57:24 +03:00
github-actions[bot]
09fabcdc4e
Merge staging-next into staging 2023-10-22 00:03:08 +00:00
github-actions[bot]
1cf369a0dd
Merge master into staging-next 2023-10-22 00:02:31 +00:00
Maciej Krüger
b465d339b3
Merge pull request #231483 from hacker1024/feature/flutter-on-dart
buildFlutterApplication: Wrap buildDartApplication
2023-10-21 23:42:02 +02:00
hacker1024
98a7a5edd3 dartHooks.dartFixupHook: Add trailing newline 2023-10-22 00:42:07 +11:00
hacker1024
2addb67a14 buildFlutterApplication: Wrap buildDartApplication 2023-10-22 00:31:58 +11:00
hacker1024
becdfbe17c buildDartApplication: Recognise extraWrapProgramArgs 2023-10-22 00:14:42 +11:00
github-actions[bot]
682b6995b4
Merge staging-next into staging 2023-10-21 12:01:45 +00:00
github-actions[bot]
0c34dab04f
Merge master into staging-next 2023-10-21 12:01:08 +00:00
hacker1024
5391c0204e buildDartApplication: Allow passing a sdkSetupScript 2023-10-21 22:37:01 +11:00
hacker1024
6298ac2774 buildDartApplication: Use package override mechanism from buildFlutterApplication
This allows Dart applications to benefit from the package override system, which is useful for things like FFI dependencies.
2023-10-21 22:30:23 +11:00
nikstur
6958acea7e
Merge pull request #262179 from ElvishJerricco/systemd-stage-1-specific-fs-packages
systemd-stage-1: Use specific fs packages
2023-10-21 13:25:42 +02:00
hacker1024
234b63b0f0 buildDartApplication: Allow supplying runtime dependencies 2023-10-21 22:22:02 +11:00
hacker1024
64c638bfc0 fetchDartDeps: Disable install phase in depsListDrv 2023-10-21 22:13:12 +11:00
hacker1024
eeb3936722 buildDartApplication: Format with nixpkgs-fmt 2023-10-21 21:54:21 +11:00
Pol Dellaiera
46a7c4cade
build-support/php: add composerStrictValidation attribute
Set to `true` by default
2023-10-21 11:15:51 +02:00
github-actions[bot]
613d60266a
Merge staging-next into staging 2023-10-21 00:02:49 +00:00
github-actions[bot]
fb3e2499b7
Merge master into staging-next 2023-10-21 00:02:17 +00:00
Pol Dellaiera
921e3c16cc
build-support/php: add colors in case of errors 2023-10-20 23:39:53 +02:00
Artturin
4b0c265153 fetchdocker: fix missing lib 2023-10-20 12:45:52 +03:00
Will Fancher
18013cc71e systemd-stage-1: Use specific fs packages 2023-10-19 21:13:22 -04:00
github-actions[bot]
024144542b
Merge staging-next into staging 2023-10-19 18:01:22 +00:00
github-actions[bot]
0bcaa2f556
Merge master into staging-next 2023-10-19 18:00:54 +00:00
Thiago Kenji Okada
a00733f592
Merge pull request #261115 from con-f-use/master
writeShellApplication: exclude shell checks
2023-10-19 18:37:37 +01:00
github-actions[bot]
fe1d100fb0
Merge staging-next into staging 2023-10-19 12:01:37 +00:00
github-actions[bot]
25bcfa6c2f
Merge master into staging-next 2023-10-19 12:01:00 +00:00
Gabriel Volpe
4a2788ea2a
appimageTools.extract: add postExtract option (#261190) 2023-10-19 08:23:57 +00:00
github-actions[bot]
c12ce83e4e
Merge staging-next into staging 2023-10-18 18:01:38 +00:00
github-actions[bot]
de8dd334ab
Merge master into staging-next 2023-10-18 18:01:05 +00:00
matthewcroughan
b289b43bf8 fetchFromBittorrent: init
Adds a basic FOD Fetcher for Bittorrent that uses Transmission as a client

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-10-18 14:07:42 +01:00
github-actions[bot]
07245b90f3
Merge staging-next into staging 2023-10-18 00:02:49 +00:00
github-actions[bot]
35eee590be
Merge master into staging-next 2023-10-18 00:02:17 +00:00
Pol Dellaiera
614182f9e0
Merge pull request #261582 from NixOS/php/build-support/fix-diff-and-env-vars
php/build-support: fix `diff` command and env. variables
2023-10-17 21:19:55 +02:00
github-actions[bot]
c99731d9ac
Merge staging-next into staging 2023-10-17 18:01:44 +00:00
mdarocha
d016404ccd buildDotnetModule: parse version before passing it to dotnet
This avoids problems when the Nix version attribute does not fit the
format required by .NET
2023-10-17 18:59:52 +02:00
Alyssa Ross
acf111d42b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/flask-wtf/default.nix
	pkgs/development/python-modules/unstructured-inference/default.nix
	pkgs/development/python-modules/unstructured/default.nix
	pkgs/development/python-modules/velbus-aio/default.nix
2023-10-17 13:05:40 +00:00
Lorenz Leutgeb
e7076170f0 build-support/php: phpDrv in nativeBuildInputs
Fixes NixOS/nixpkgs#261500
2023-10-17 12:50:37 +02:00
Pol Dellaiera
839498d572
php/build-support: fix usage of environment variables 2023-10-17 08:48:58 +02:00
Pol Dellaiera
207d5b4910
php/build-support: fix usage of diff condition
Remove double brackets and replace `diff` with `cmp`
2023-10-17 08:48:12 +02:00
github-actions[bot]
97d0182583
Merge staging-next into staging 2023-10-17 06:01:51 +00:00
github-actions[bot]
c61915bc96
Merge master into staging-next 2023-10-17 06:01:22 +00:00
Elis Hirwing
ccaba16b29
Merge pull request #261088 from NixOS/build-support/php/remove-autoloader-prefix
build-support/php: remove obsolete autoloader-suffix
2023-10-17 07:36:13 +02:00
Elis Hirwing
54952f4668
Merge pull request #261413 from yu-re-ka/composer-vcs-repos
build-support/php: fix support of vcs repositories
2023-10-17 07:29:41 +02:00
Pol Dellaiera
e34034b7a6
build-support/php: add doInstallCheck 2023-10-16 22:07:52 +02:00
Pol Dellaiera
12741f2c30 build-support/php: add installCheckPhase 2023-10-16 17:13:34 +02:00
Yureka
21488e65a7 build-support/php: fix support of vcs repositories 2023-10-16 15:35:20 +02:00
github-actions[bot]
de49fc16bc
Merge staging-next into staging 2023-10-16 12:01:54 +00:00
github-actions[bot]
cb4734193d
Merge master into staging-next 2023-10-16 12:01:25 +00:00
Domen Kožar
3c6cf39435
Merge pull request #249733 from Aleksanaa/nix-prefetch-git
nix-prefetch-git: fix make_deterministic_repo in submodules
2023-10-16 11:12:11 +01:00
con-f-use
0f3fa9e6ef writeShellApplication: exclude shell checks 2023-10-15 12:10:50 +02:00
Pol Dellaiera
ba24c3880f
build-support/php: remove obsolete autoloader-suffix
Since https://github.com/composer/composer/pull/11663, the composer output is stable and reproducible, therefore, that prefix is now obsolete.
2023-10-14 18:00:57 +02:00
github-actions[bot]
80ddbc41e6
Merge staging-next into staging 2023-10-12 18:01:34 +00:00
github-actions[bot]
176015fc74
Merge master into staging-next 2023-10-12 18:01:06 +00:00
Weijia Wang
093f098d26
Merge pull request #260011 from lilyinstarlight/fix/prefetch-npm-deps-network-error-recovery
prefetch-npm-deps: read url bodies within the retry loop
2023-10-12 19:58:20 +02:00
github-actions[bot]
4da0322a88
Merge staging-next into staging 2023-10-12 12:02:01 +00:00
Moritz Heidkamp
7db47744f5 buildGraalvmNativeImage: build with "-march=compatibility" by default
This is necessary for compatibility with all targets supported by nixpkgs.
2023-10-12 11:42:56 +02:00
Alyssa Ross
1bb67a90ba
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/bambi/default.nix
	pkgs/development/python-modules/jaxopt/default.nix
2023-10-12 09:08:12 +00:00
github-actions[bot]
7909827752
Merge staging-next into staging 2023-10-12 00:02:50 +00:00
Alyssa Ross
7262026f0f
rustPlatform.cargoSetupHook: fix platform check (#260068)
Cargo will never need to link for the target platform — that'd be for
the package being built to do at runtime.  Cargo should know about the
build and host linkers.

This fixes e.g. pkgsCross.musl64.fd from x86_64-linux.

Fixes: 67a4f828b4 ("rust: hooks: fix cross compilation")
2023-10-11 23:36:56 +02:00
R. Ryantm
3876a545ed makeInitrdNGTool: 0.1.0 -> 0.1.0 2023-10-11 02:44:30 +00:00
Lily Foster
554e2412e0
prefetch-npm-deps: read url bodies within the retry loop 2023-10-10 19:40:43 -04:00
github-actions[bot]
0cf0d9af7e
Merge staging-next into staging 2023-10-10 18:01:26 +00:00
github-actions[bot]
b1ae965cda
Merge master into staging-next 2023-10-10 18:00:56 +00:00
Alyssa Ross
c11cb00a1e rustc: 1.72.1 -> 1.73.0
This upgrade unfortunately removes MIPS support, as it has been
dropped to Tier 3[1] and so bootstrap tarballs are no longer provided.

It looks like it was dropped due to multiple codegen bugs, and lack of
maintenance, so bringing it back would probably involve engaging with
Rust/LLVM upstream on those.

[1]: https://github.com/rust-lang/compiler-team/issues/648
2023-10-10 14:42:30 +00:00
Tim Windelschmidt
19c5b4307d dockerTools: create /tmp in rootLayer 2023-10-09 22:15:41 +02:00
github-actions[bot]
e1565d6a86
Merge staging-next into staging 2023-10-09 18:01:36 +00:00
github-actions[bot]
75d4639be3
Merge master into staging-next 2023-10-09 18:00:59 +00:00
Lily Foster
a6df5a7719
prefetch-npm-deps: bump deps 2023-10-09 11:37:16 -04:00
Pol Dellaiera
043a094c3b php.buildComposerProject: add missing COMPOSER_ROOT_VERSION env var.
This is mostly required for vimeo/psalm
It doesn't harm anything to add it anyway
2023-10-09 10:16:23 +02:00
github-actions[bot]
6215da7844
Merge staging-next into staging 2023-10-08 18:01:27 +00:00
Fabián Heredia Montiel
2f0e87732c Merge remote-tracking branch 'origin/master' into staging-next 2023-10-08 10:14:51 -06:00
Guillaume Girol
344a502055
Merge pull request #255900 from bouk/bouk/strip-exclude-rlib
build-rust-crate: add stripExclude for .rlib
2023-10-08 13:48:41 +00:00
github-actions[bot]
81871f4c87
Merge staging-next into staging 2023-10-08 12:01:52 +00:00
github-actions[bot]
0b4a97a07f
Merge master into staging-next 2023-10-08 12:01:23 +00:00