Philip Taron
be245de559
Merge pull request #333262 from nbraud/doc/runCommandWith
...
nixpkgs-manual: Document `runCommandWith`, refactor `runCommand{,CC,Local}`
2024-08-19 12:29:58 -07:00
nicoo
80e3fd91a9
doc/build-helpers: document runCommandWith
...
Co-authored-by: Johannes Kirschbauer <hsjobeki+github@gmail.com>
2024-08-19 19:16:42 +00:00
Sandro Jäckel
0505523e98
compress-drv: correct comment
2024-08-19 13:19:27 +02:00
Sandro Jäckel
0654f81d56
compress-drv: carry pname, version forward
...
This is required to overwrite to use a compressed version of nextcloud in services.nextcloud.package because the module accesses version
2024-08-19 13:17:05 +02:00
Sandro Jäckel
4cc5dee048
compress-drv: allow passing extra arguments to find
...
This is useful for eg. nextcloud to prevent compressing thousands of
later unused files which are actually not used by the web server.
2024-08-19 13:15:55 +02:00
Sandro Jäckel
0ca4bfa700
compress-drv: add zstd
2024-08-19 13:15:54 +02:00
Sandro Jäckel
9581a2bdca
compress-drv: misc cleanup
2024-08-19 13:15:54 +02:00
Sandro Jäckel
6449d32b0a
compress-drv: add htm, otf formats to default
2024-08-19 13:15:46 +02:00
Sandro Jäckel
7ebbf27832
compress-drv: sort formats
2024-08-19 13:15:46 +02:00
Philip Taron
bd346e9f29
Merge pull request #335575 from felschr/make-startupitem-extra-args-fix
...
make-startupitem: fix {prepend,append}ExtraArgs for Exec without arguments
2024-08-18 19:56:39 -07:00
Motiejus Jakštys
1bd350449a
gitea: fix passthru.data-compressed
...
Fixes two bugs:
- pass a forgotten `{}` to `compressDrv`.
- remove incorrect usage of `lndir` in `compressDrv`. I added a brief
comment on why, see [this comment][1] for more details.
Tested with:
```
$ nix build .#legacyPackages.x86_64-linux.gitea.passthru.data-compressed
$ ls -lh result/public/assets/licenses.txt*
lrwxrwxrwx 1 root root 90 Jan 1 1970 result/public/assets/licenses.txt -> /nix/store/p21irsr57hckd3x3ym18aa0cr9zmm3an-gitea-1.22.1-data/./public/assets/licenses.txt
-r--r--r-- 1 root root 30K Jan 1 1970 result/public/assets/licenses.txt.br
-r--r--r-- 1 root root 82K Jan 1 1970 result/public/assets/licenses.txt.gz
```
[1]: https://github.com/NixOS/nixpkgs/pull/332752#discussion_r1721043286
2024-08-18 22:47:03 +03:00
Philip Taron
661aa513a1
writers: remove with statements from aliases
2024-08-18 06:31:14 -07:00
Philip Taron
c406a6ed33
fetchsvn: remove with statements
2024-08-18 06:31:14 -07:00
Felix Schröter
498d662662
make-startupitem: fix {prepend,append}ExtraArgs for Exec without arguments
2024-08-18 12:28:06 +02:00
Philip Taron
bc0fb46cd2
Merge pull request #334995 from pbsds/fix-test-version-1723771306
2024-08-17 07:53:03 -07:00
Philip Taron
cd7b95ee37
Merge pull request #333236 from nbraud/testers/runCommand
...
testers.runCommand: init
2024-08-16 18:07:41 -07:00
Peder Bergebakken Sundt
ecb342fd4e
testers.testVersion: ignore echoed store paths
...
Fixes the error mode where the test always passes if the store path of the binary is echoed by the test command.
2024-08-16 20:16:44 +02:00
Someone
10ce447aea
Merge pull request #333843 from ShamrockLee/singularity-tools-fixes2
...
singularity-tools: miscellaneous fixes (2nd round)
2024-08-15 17:29:01 +00:00
Yueh-Shun Li
c2eb0aa56e
singularity-tools: don't preserve store content ownership
...
Don't preserve store content ownership to prepare for unprivileged-build
workflow.
2024-08-15 21:33:18 +08:00
Yueh-Shun Li
c229d14f50
singularity-tools: proper line looping with while-read
2024-08-15 21:33:06 +08:00
Yueh-Shun Li
5396a84b1d
singularity-tools: string-interpolate and and quote members in contents
...
String-interpolation converts path objects inside `contents` into store
paths to ensure they are properly included in the result image.
See tests.trivial-builders.references for the necessity of
string-interpolation.
Quote each string-interpolated content member to accomodates spaces
inside.
2024-08-15 20:09:56 +08: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
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
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
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
Yueh-Shun Li
7487a6207d
singularity-tools: quote shell variables
2024-08-11 13:22:39 +08:00
Yueh-Shun Li
4be1e115d6
singularity-tools: rename the VM mountpoint as "workspace"
2024-08-11 13:22:39 +08:00
Yueh-Shun Li
a7b54b36c5
singularity-tools: create VM disk image outside $out
...
Place the VM disk image in a local directory "disk-image" instead of
"$out", so that we don't have to delete it to reserve "$out" for the
container image.
2024-08-11 13:22:39 +08:00
Yueh-Shun Li
e8360a61bc
singularity-tools: make extensible
2024-08-11 13:22:39 +08:00
Yueh-Shun Li
3ca6a8c60e
singularity-tools: add bashInteractive and runScript into layerClosure
2024-08-11 13:22:02 +08: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
