github-actions[bot]
688ae1bcd3
Merge staging-next into staging
2024-08-15 12:02:43 +00:00
Markus Kowalewski
b909e2c80d
Merge pull request #333444 from markuskowa/fix-mpi-check-hook
...
mpiCheckPhaseHook: update to use openmpi-5 compatible parameters
2024-08-15 11:34:51 +02:00
github-actions[bot]
78a583fbf0
Merge staging-next into staging
2024-08-15 06:01:41 +00:00
lassulus
4b3c31b884
Merge pull request #334776 from aos/aos/update-writepy3-example
...
fix: Update writePython3Bin docs
2024-08-15 07:42:45 +02:00
Aos Dabbagh
55e4114fb3
fix: Update writePython3Bin docs
...
Was trying out the recommended example for `writePython3Bin` and it
failed with:
```
Traceback (most recent call last):
File "/nix/store/gcmhfm7mslpndjasfhvs66f1ca24vxim-test_py3/bin/test_py3", line 4, in <module>
y = yaml.load("""
TypeError: load() missing 1 required positional argument: 'Loader'
```
Looks like `yaml.load(input)` was deprecated in 5.1: https://msg.pyyaml.org/load
`nixos-24.05` uses `6.0.1` so we're in the clear.
2024-08-15 00:57:39 -04:00
squalus
0a3ed67ff6
autoPatchelfHook: add keep_libc flag ( #332617 )
...
* autoPatchelfHook: add keep_libc flag
- Add keep_libc flag to disable the default libc handling. Intended
to be used by systemd.
- Add autoPatchelfFlags to autoPatchelfHook for passing arguments to
the autoPatchelf script
This reverts part of the change made in #307068 / 80be926Fixes #332533
2024-08-14 02:54:27 -04:00
github-actions[bot]
1582d7624e
Merge staging-next into staging
2024-08-14 06:01:31 +00:00
github-actions[bot]
261f1edcbd
Merge master into staging-next
2024-08-14 06:01:07 +00:00
adisbladis
bed19bdf39
fetchPypiLegacy: Pass cacert to enable TLS verification when username/password is used
...
The intent was for TLS verification to be enabled when transfering credentials only, and normally disabled for long-term reproducibility.
See https://github.com/nix-community/poetry2nix/issues/1740
2024-08-14 13:22:31 +12:00
adisbladis
e5d7d560f8
Merge pull request #334059 from adisbladis/fetchpypilegacy-netrc-pureeval
...
fetchPypiLegacy: pass NETRC via impureEnvVars if inPureEval
2024-08-14 13:16:46 +12:00
adisbladis
482a26382f
fetchPypiLegacy: pass NETRC via impureEnvVars if inPureEval
...
Co-authored-by: Matthew Croughan <matt@croughan.sh>
2024-08-14 11:58:15 +12:00
Someone
ccaaa9ca53
Merge pull request #318614 from wolfgangwalther/structured-attrs-setup-hooks
...
treewide: support structuredAttrs in setup hooks
2024-08-13 19:29:36 +00:00
Martin Weinelt
0906206d42
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/top-level/python-packages.nix
2024-08-13 13:21:03 +02:00
adisbladis
14e1662fa6
Merge pull request #334136 from hsjobeki/importNpmLock/opts
...
importNpmLock: init fetcherOps per package
2024-08-13 20:59:12 +12:00
Johannes Kirschbauer
3ed5055f0f
importNpmLock: init fetcherOps per package
2024-08-13 09:38:37 +02:00
Markus Kowalewski
b898495c9a
mpiCheckPhaseHook: update to use openmpi-5 compatible parameters
2024-08-12 21:45:24 +02:00
github-actions[bot]
62f43c3094
Merge master into staging-next
2024-08-12 18:02:11 +00:00
Philip Taron
7fbfc53b54
Merge pull request #334176 from philiptaron/pr-333270/follow-up
...
pkgs.writers: improve documentation on {makeScriptWriter,makeScriptWriterBin}
2024-08-12 09:16:24 -07:00
Alyssa Ross
6f95189f88
wrapBintoolsWith: add s390(x)-linux dynamic linkers
...
This fixes autoPatchElfHook for these platforms.
2024-08-12 17:52:03 +02:00
Philip Taron
989f10d419
pkgs.writers: improve documentation on {makeScriptWriter,makeScriptWriterBin}
2024-08-12 08:42:11 -07:00
adisbladis
2a9ab9c1e0
fetchPypiLegacy: Reformat with nixfmt
2024-08-12 17:05:37 +12:00
github-actions[bot]
45080a9559
Merge master into staging-next
2024-08-10 18:01:08 +00:00
Pol Dellaiera
c4e73af4dd
Merge pull request #284161 from felschr/make-startupitem-extra-args
...
make-startupitem: add `prependExtraArgs` and `appendExtraArgs`
2024-08-10 18:39:01 +02:00
Jörg Thalheim
7a3ae61af1
Merge pull request #333270 from hsjobeki/doc/writers
...
Pkgs.writers: improve and document {makeScriptWriter,makeScriptWriterBin}
2024-08-10 18:48:21 +03:00
Someone
a3a5fb4bbc
Merge pull request #332437 from ShamrockLee/singularity-tools-fixes
...
singularity-tools: miscellaneous fixes
2024-08-10 13:44:11 +00:00
github-actions[bot]
68894e5504
Merge master into staging-next
2024-08-10 00:02:11 +00:00
Sandro Jäckel
f4e18f55ef
fetch-npm-deps: be less noisy
...
Before every package in node_modules was printed. Lets be a bit more
quiet and drop that.
2024-08-09 15:08:33 -04:00
Johannes Kirschbauer
85a8d22290
Pkgs.writers: document {makeScriptWriter,makeScriptWriterBin}
2024-08-09 14:13:02 +02:00
Yueh-Shun Li
a1318915d3
singularity-tools: deprecate build helpers mkLayer and shellScript
...
Deprecate singularity-tools.mkLayer and singularity-tools.shellScript,
for they are no longer related to image building.
Use writers.writeBash instead of singularity-tools.shellScript.
2024-08-09 09:15:52 +00:00
Yueh-Shun Li
d3692ddf54
singularity-tools: drop override argument storeDir
2024-08-09 09:09:52 +00:00
Yueh-Shun Li
c2fa248bca
singularity-tools: fix singularity run with bashInteractive
2024-08-09 09:07:46 +00:00
github-actions[bot]
d240a34ea6
Merge master into staging-next
2024-08-08 06:01:15 +00:00
David McFarland
7f2de09531
Merge pull request #331398 from MattSturgeon/dotnet-finalAttrs
...
buildDotnetModule: add `finalAttrs` support
2024-08-07 22:06:07 -03:00
github-actions[bot]
3c3dab7679
Merge master into staging-next
2024-08-08 00:02:33 +00:00
Philip Taron
b0b3172fb4
replaceVars: init
2024-08-07 07:27:50 -07:00
Matt Sturgeon
79d26048de
buildDotnetModule: add finalAttrs support
...
Allow users to pass arguments to `buildDotnetModule` in the form:
```nix
buildDotnetModule (finalAttrs: {
# Args
})
```
Exposing the behaviour of the underlying `mkDerivation` and allowing
packages to be defined in a recursive way that works correctly even when
the package is overridden, e.g. using `overrideAttrs`.
Added some simple test cases that piggyback on the existing
`structured-attrs` test.
2024-08-06 16:33:49 +01:00
github-actions[bot]
3b5460f093
Merge staging-next into staging
2024-08-06 00:02:48 +00:00
Philip Taron
fcefb0a17c
Merge pull request #332558 from motiejus/compressDrv
...
compressDrv: get rid of unneeded extra params
2024-08-05 14:58:06 -07:00
Philip Taron
1e6e7faa18
Merge pull request #332466 from hsjobeki/doc/compressDrv
...
Doc: pkgs{compressDrv,compressDrvWeb} improve clarity
2024-08-05 14:56:30 -07:00
Motiejus Jakštys
6b70cde244
compressDrv: get rid of unneeded extra params
...
This is a leftover from the original versions of #292324 . Reduces the
API surface to not accept accidental arguments.
2024-08-05 23:26:17 +03:00
github-actions[bot]
cf88251824
Merge staging-next into staging
2024-08-05 18:01:40 +00:00
Marcus Ramberg
8e931f3330
Merge pull request #332462 from bolives-hax/bootstrap-tools-cross-add-s390x
...
Bootstrap tools cross add s390x
2024-08-05 18:41:17 +02:00
Johannes Kirschbauer
782c1eabe2
Docs: pkgs{compressDrv,compressDrvWeb} improve clarity
2024-08-05 14:16:54 +02:00
github-actions[bot]
b4c408518b
Merge staging-next into staging
2024-08-05 12:01:48 +00:00
Maximilian Bosch
d8446a5095
Merge pull request #332226 from dotlambda/nextcloud
...
fetchNextcloudApp: use fetchurl by default
2024-08-05 11:37:14 +00:00
Robert Schütz
da8b0f0621
fetchNextcloudApp: use fetchurl by default
2024-08-05 03:53:38 -07:00
bl0v3
bdb500ace1
bintools-wrapper: add dynamicLinker for s390x
2024-08-05 12:30:26 +02:00
Vladimír Čunát
d4720e9c1e
Merge branch 'staging-next' into staging
...
There was a nontrivial conflict in pkgs/stdenv/linux/bootstrap-tools*
(reorganizing code vs. modifying it) I hope I really got it right.
2024-08-05 11:05:55 +02:00
Yueh-Shun Li
ae8017ec0b
singularity-tools: move defaultSingularity let-in to the top
2024-08-05 08:24:56 +08:00
Yueh-Shun Li
41061c6754
singularity-tools.buildImage: remove gawk from nativeBuildInputs
2024-08-05 08:24:55 +08:00
