Commit Graph

7417 Commits

Author SHA1 Message Date
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
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
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
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