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]
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
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]
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]
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
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]
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
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
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]
b1ae965cda
Merge master into staging-next
2023-10-10 18:00:56 +00:00
Tim Windelschmidt
19c5b4307d
dockerTools: create /tmp in rootLayer
2023-10-09 22:15:41 +02: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
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]
0b4a97a07f
Merge master into staging-next
2023-10-08 12:01:23 +00:00
Doron Behar
d090cd9af4
Merge pull request #258384 from doronbehar/buildNpmPackage-makeWrapperArgs
...
buildNpmPackage: support makeWrapperArgs
2023-10-08 12:38:33 +03:00
Fabián Heredia Montiel
7f16b623fc
Merge remote-tracking branch 'origin/master' into staging-next
2023-10-08 00:18:22 -06:00
Sandro Jäckel
d09cd1d7d1
fetchgit: use $NIX_BUILD_TOP instead of hardcoding /build/
...
Co-authored-by: Bjørn Forsman <133602+bjornfor@users.noreply.github.com>
2023-10-08 00:10:59 +02:00
Lily Foster
57087b8346
Merge pull request #255984 from SuperSandro2000/patch-1
...
build-npm-package: give a hint when npm prune fails
2023-10-07 17:51:52 -04:00
Sandro
30992a8c51
buildNpmPackage: give a hint when npm prune fails
...
Co-authored-by: Lily Foster <lily@lily.flowers>
2023-10-07 21:53:56 +02:00
Doron Behar
fc96f6d0fd
buildNpmPackage: support makeWrapperArgs
2023-10-07 14:09:05 +03:00
Jan Tojnar
76a7aa445a
Merge branch 'master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/xdot/default.nix
between 2f244e3647
and 1a9a257cf7
2023-10-06 23:18:00 +02:00
Elis Hirwing
f0987a05a9
php.packages.composer: Make sure that both composers use the same version
...
So in php we have a bootstrapping composer (that lives in
composer-phar.nix) that downloads the binary distribution of composer
to be able to bootstrap and build a composer built from source.
However, it's desirable to keep composer updated at all time, and this
includes the phar one that isn't used by users directly. So this makes
sure we don't "forget" about the phar one since it now borrows the
version from the source version. However, then it also made sense to
move the hash for the phar to the same file as the source
composer. Then we can control the full upgrade life cycle of both the
phar and source versions of composer from the same file.
2023-10-06 20:09:48 +02:00
Elis Hirwing
13441fc1f5
Merge pull request #259349 from NixOS/php/bump-composer-2-6-5
...
phpPackages.composer: 2.6.4 -> 2.6.5
2023-10-06 19:51:30 +02:00
Bjørn Forsman
55e30da2eb
buildFHSEnvBubblewrap: preserve pname, version
...
It's useful to have access to these attributes from packages built with
buildFHSEnvBubblewrap, and it reduces the difference between FHS and
non-FHS packages.
'name' is already handled by runCommandLocal.
2023-10-06 19:37:39 +02:00
Pol Dellaiera
3360cb0bb0
phpPackages.composer: 2.6.4 -> 2.6.5
2023-10-06 10:30:07 +02:00
github-actions[bot]
ca639e401e
Merge master into staging-next
2023-10-05 18:01:05 +00:00
Sandro Jäckel
025a028c47
fetchgit: fix private fetching via netrc
...
This fixes a regression introduced in https://github.com/NixOS/nixpkgs/pull/256628
which broke fetching with private = true through a netrc file.
Tested locally with a really special github enterprise.
2023-10-05 13:54:00 +00:00
Vladimír Čunát
fa7835846a
Merge branch 'master' into staging-next
2023-10-04 22:40:54 +02:00
Pol Dellaiera
2b12e3efe3
php.buildComposerProject: improve workflow in case of missing composer.lock
file
2023-10-04 15:12:08 +02:00
Yureka
dd104a90a8
php.buildComposerProject: warn about outdated vendorHash
2023-10-04 15:12:08 +02:00
Yureka
7d2c531f28
php.buildComposerProject: don't allow use without lockfile
2023-10-04 15:12:08 +02:00
Alyssa Ross
1cbe5c3e8b
rust.toRustTargetForUseInEnvVars: support custom targets
...
> If using a target spec JSON file, the <triple> value is the filename
> stem. For example --target foo/bar.json would match [target.bar].
- https://doc.rust-lang.org/cargo/reference/config.html#target
I've also exposed toRustTargetSpecShort as a public function, because
it's useful to be able to know what the target subdirectory will be.
2023-10-03 12:30:04 +00:00