Commit Graph

8629 Commits

Author SHA1 Message Date
K900
dee94df6f2 Merge remote-tracking branch 'origin/master' into staging-next 2024-10-24 09:28:51 +03:00
Philip Taron
eee954a451
trivial: make symlinkJoin support pname+version alone (#344645) 2024-10-23 14:09:11 -07:00
Philip Taron
db44da13e1
fetchurl: enable TLS verification when NIX_SSL_CERT_FILE is set (#350222) 2024-10-23 14:07:17 -07:00
Philip Taron
c73098dfbb
nix-prefetch-git: fix error in home folder cleanup (#350683) 2024-10-23 13:03:47 -07:00
piegames
ad8d051645
treewide: Fix indentation in strings (#350296) 2024-10-23 21:44:22 +02:00
thomasjm
4f13c7cc7b nix-prefetch-git: fix error in home folder cleanup 2024-10-23 03:24:02 -07:00
piegames
68927918d0 treewide: Fix indentation in strings
The indentation stripping semantics of strings are fairly bad and have a
few gotchas where the resulting string has not the intended indentation.
This commit fixes most if not all such instances in Nixpkgs.

I tried to strive a balance between keeping the diff small and
reformatting/refactoring the code to look better. In general,
reformatting should be left to Nixfmt.

Note that this causes a lot of rebuilds by design. All changes need to
be thoroughly vetted and reviewed for correctness. There is no automatic
way to prove correctness.

List of files to fix generated by running
https://gerrit.lix.systems/c/lix/+/2092 on Nixpkgs and looking at the
warnings.
2024-10-22 21:36:42 +02:00
github-actions[bot]
5a11b86f67
Merge master into staging-next 2024-10-22 18:04:37 +00:00
adisbladis
174ae77ad8
nodejs/importNpmLock: init source overrides option (#338973) 2024-10-22 17:51:32 +00:00
Thomas Gerbet
f829274128 fetchurl: enable TLS verification when NIX_SSL_CERT_FILE is set
This is a follow-up to a169553f7e.
In most cases it should allow the TLS verification to be enabled.
It also makes the behavior of `fetchurl` more consistent with other fetchers
like `fetchgit`.

Ideally we would always fallback on `cacert` but I am not sure how to build
`cacert` during bootstrap without making an unmaintainable mess.
2024-10-22 14:58:54 +02:00
github-actions[bot]
f2d7c5202d
Merge master into staging-next 2024-10-21 18:04:46 +00:00
github-actions[bot]
8164a7aa6d
Merge master into staging-next 2024-10-21 00:14:52 +00:00
qbisi
0c5883bbce mpiCheckPhaseHook: add parameters to bypass errors in sandbox 2024-10-21 07:20:30 +08:00
K900
05624e48e2 substituteAll: validate arguments
So no one can repeat my mistakes.
2024-10-20 18:55:15 +03:00
github-actions[bot]
d0c2de8c22
Merge master into staging-next 2024-10-19 00:14:00 +00:00
Fernando Rodrigues
d175e88817
xen: switch to seabios-qemu, use absolute path to firmware
Related: #342692
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
2024-10-18 15:53:57 +00:00
github-actions[bot]
275a4ece4b
Merge master into staging-next 2024-10-18 00:14:07 +00:00
Julius Michaelis
c4c95cac81 Revert "buildRustPackage: disable cargo-auditable on pkgsStatic aarch64"
This reverts commit 0eed8836c5.
2024-10-17 22:17:39 +02:00
Julius Michaelis
88c41d8a91 Revert "rust: allow linker to be different from compiler"
This reverts commit b8076b893e.
2024-10-17 22:17:39 +02:00
Julius Michaelis
351899cd4b Revert "rust: use lld on pkgsStatic aarch64"
This reverts commit 48a6213611.
2024-10-17 22:17:39 +02:00
github-actions[bot]
7c78a608b4
Merge master into staging-next 2024-10-17 18:04:30 +00:00
Emily
88a7f67e86
xen: make the EFI build mandatory, fix XSA 462 description (#347810) 2024-10-17 15:51:17 +01:00
K900
a7b40b71cd freetype, pixman: restore flatten include hack for now, but better 2024-10-17 15:24:31 +03:00
Johannes Kirschbauer
34b7d209bb
nodejs/importNpmLock: init source overrides option 2024-10-17 12:00:45 +02:00
github-actions[bot]
775bea0160
Merge master into staging-next 2024-10-16 18:04:52 +00:00
K900
50d782b1ff buildFHSEnv: don't include /var
This mostly prevents random junk from leaking into fhsenvs,
but also fixes Steam not having a /var anymore.
2024-10-16 19:32:21 +03:00
Randy Eckenrode
4340a5addb
bintools-wrapper: ensure Swift auto-linked libraries can be found
While the Swift wrapper should take care of this, not everything that
links these libraries goes through the wrapper.
2024-10-15 12:36:07 -04:00
github-actions[bot]
31b11f1926
Merge staging-next into staging 2024-10-15 00:14:36 +00:00
Tristan Ross
959200a01e
{clang-sierraHack{,-stdenv},tests.macOSSierraShared}: drop (#346730) 2024-10-14 11:11:56 -07:00
github-actions[bot]
55382a65b9
Merge staging-next into staging 2024-10-14 06:05:43 +00:00
Paul Meyer
7e823e977e
docs: improve go builder comments in module.nix (#341561) 2024-10-14 07:39:53 +02:00
Artturin
af98420eb3
cc-wrapper: Use getExe for expand-response-params (#341607) 2024-10-13 21:05:11 +03:00
Emily
d9bac064aa
git: fix darwin to linux cross-compilation (#348010) 2024-10-12 23:03:23 +01:00
Simon Žlender
d5bb004558 deterministic-uname: use forPlatform for FreeBSD 2024-10-12 18:42:17 +02:00
Jörg Thalheim
a808f823bb
Merge branch 'master' into docs/improve-go-builder 2024-10-12 13:16:51 +02:00
github-actions[bot]
d363932842
Merge staging-next into staging 2024-10-12 06:04:59 +00:00
github-actions[bot]
ee37a18a92
Merge master into staging-next 2024-10-12 06:04:26 +00:00
Tristan Ross
299a94a7ed
buildDartApplication: include dart SDK builder by default (#343337) 2024-10-11 20:56:17 -04:00
Fernando Rodrigues
aaa4953b20
xen: fix XSA 462 description formatting
The newlines break the markdown quote in the longDescription.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
2024-10-11 16:47:23 +00:00
Gabriel Nützi
9a6d7cc9f7
module.nix aktualisieren
Co-authored-by: Wael Nasreddine <wael.nasreddine@gmail.com>
2024-10-11 12:00:13 +02:00
Emily
5f8188ec86
libredirect: fixes for new Darwin SDK (#347012) 2024-10-11 01:57:20 +01:00
Fernando Rodrigues
cf648c09cc
xen: make the EFI build mandatory
As binutils-efi no longer exists, there's no longer any reason to have
the withEFI flag. All supported builds should also build xen.efi.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
2024-10-10 21:47:32 +00:00
Randy Eckenrode
826edbf719
{bintools,cc}-wrapper: fix static builds on Darwin
Without this change, all Darwin platforms mangle to the same suffix
salt. That is normally not an issue because build = host should mean a
non-cross build, but it causes issues on Darwin with static builds
because `DEVELOPER_DIR_FOR_BUILD` and `DEVELOPER_DIR` will refer to
different SDKs but mangle to the same `DEVELOPER_DIR` with suffix salt.

The fix is to mangle static builds differently from non-static ones on
Darwin, which allows building for a static Darwin target on a
same-architecture Darwin host. This fix is applied only to Dariwn
because the issue does not appear to affect other platforms.
2024-10-10 16:23:00 -04:00
Randy Eckenrode
51755b0c00
{bintools,cc}-wrapper: use a fallback SDK when DEVELOPER_DIR is not set
It is unusual to invoke a wrapped compiler without setting
`DEVELOPER_DIR`, but it can happen when a user adds a compiler to their
installed packages or when a package intentionally invokes the compiler
without an environment (such as the GHC binary packages).
2024-10-10 16:22:59 -04:00
Randy Eckenrode
97d75cb619
{bintools,cc}-wrapper: set up Darwin SDK paths
Some compilers may know to check these paths when `SDKROOT` is set, but
it’s not assumed they do. `SDKROOT` is instead derived from the
`DEVELOPER_DIR`, and `NIX_CFLAGS_COMPILE` is set up with the sysroot and
necessary framework and include search paths.
2024-10-10 16:22:59 -04:00
Randy Eckenrode
9167e4fbcd
libredirect: update for new Darwin SDK on aarch64-darwin
The location of `libSystem.tbd` depends on the SDK, making it
effectively dynamic. It must be located relative to the `SDKROOT`
instead of to `clang.libc`.
2024-10-10 01:07:26 -04:00
Randy Eckenrode
4ebdf0442f
libredirect: fix install name on aarch64-darwin
The install name should be the full path. This matches x86_64-darwin.
2024-10-10 01:07:26 -04:00
github-actions[bot]
7bcc9dd470
Merge staging-next into staging 2024-10-09 12:07:41 +00:00
github-actions[bot]
0b14a71873
Merge master into staging-next 2024-10-09 12:06:03 +00:00
r-vdp
995ee2fa2c
nuget-to-nix: add meta.mainProgram 2024-10-09 12:33:27 +02:00