Commit Graph

7296 Commits

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