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
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
David McFarland
7f2de09531
Merge pull request #331398 from MattSturgeon/dotnet-finalAttrs
...
buildDotnetModule: add `finalAttrs` support
2024-08-07 22:06:07 -03: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
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
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
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
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
Yueh-Shun Li
912bf66199
singularity-tools.buildIname: use nativeBuildInputs and strictDeps
2024-08-05 08:24:55 +08:00
Yueh-Shun Li
99b7831572
singularity-tools.buildImage: use .sif instead of .img as image name suffix
2024-08-05 08:24:54 +08:00
Yueh-Shun Li
fd956cc3a9
singularity-tools: name sandboxed meta directory .singularity.d
...
Name the directory inside SIF (the SquashFS image) ".singularity.d"
instead of ".${projectName}.d" for compatibility across Apptainer and
Singularity.
2024-08-05 08:24:54 +08:00
Someone
976c81ad91
Merge pull request #332168 from ShamrockLee/singularity-tools-format
...
singularity-tools: format expression
2024-08-05 02:58:21 +03:00
Motiejus Jakštys
bbd0655ae8
add compressDrv and compressDrvWeb
...
*compressDrv* compresses files in a given derivation.
*compressDrvWeb* compresses a derivation for a loosely-defined
pre-compressed "web server" usage.
This intends to replace the `passthru.data-compressed` derivations that
have accumulated in nixpkgs with something more reusable.
2024-08-04 10:10:16 +03:00
Yueh-Shun Li
d17eef519d
singularity-tools: rearrarnge the input parameters
2024-08-04 13:38:47 +08:00
Yueh-Shun Li
bcece72177
singularity-tools: format with nixfmt-rfc-style (Nix RFC 166)
2024-08-04 13:24:18 +08:00
Aleksana
85bcad4a96
Merge pull request #304583 from rayanpiro/sparse-protocol
...
rustPlatform.importCargoLock: Adding sparse protocol
2024-08-03 21:23:13 +08:00
Jörg Thalheim
b475b0c767
Merge pull request #331712 from Mic92/fix-netboot
...
Fix netboot
2024-08-02 12:34:54 +02:00
Jörg Thalheim
3de4714572
make-initrd-ng: also print json itself if it fails to parse
...
The current error message is hard to debug because the error is in the
nix store:
> Error: failed to parse JSON in
"/build/.attr-1s42g1c76fxb77skzq0b4wdhcrg8jmzb54czmxvh1qm7psgsbcni"
>
> Caused by:
> missing field `source` at line 1 column 102
>
> Location:
> src/main.rs:329:10
2024-08-02 10:24:34 +02:00
Matt Sturgeon
77a13aa9ad
buildDotnetModule: format with nixfmt
2024-08-01 13:58:28 +01:00
Robert Schütz
2c1d58e90c
nextcloudPackages: update
...
We no longer use fetchzip because nc4nix no longer unpacks the tarball
before computing the hash.
2024-08-01 04:13:25 -07:00
David McFarland
ebd3b37e6b
Merge pull request #327651 from corngood/dotnet-unpacked-packages
...
dotnet: use unpacked packages in store
2024-07-31 20:20:13 -03:00
David McFarland
d3ca5027fa
dotnet: use unpacked nuget packages
2024-07-31 00:47:14 -03:00
Guillaume Girol
19178a0b4b
Merge pull request #329652 from dragano/expose-appimage-var
...
appimage-run: Expose $APPIMAGE
2024-07-30 23:17:18 +02:00
David McFarland
7402aa90cf
buildDotnetModule: fix typo
2024-07-30 12:16:45 -03:00
David McFarland
b87ddc0dd5
nuget-to-nix: catch errors from process substitution
2024-07-30 12:16:45 -03:00
David McFarland
0c1f3e6c93
buildDotnetModule: remove nugetDeps from derivation args
...
This allows fetch-deps to work even when the deps file is missing.
2024-07-30 12:16:45 -03:00
Matthieu Coudron
ca1657217d
streamLayeredImage: add dynamic tagging of docker image ( #329425 )
...
* streamLayeredImage: self-document the script
'podman load' doesn't let me override the name/tag from the image.
This name and tag is dynamic and in a CI environment so I would like to
be able to adjust the tag dynamically.
Since the image is streamed by stream_layered_image.py, there is no need
to stick with the nix-hardcoded image name/tag: the python script can
accept another name
I've added argparse to expose the feature. It has the added benefit of
adding `--help` support to the script, which makes its usage
self-explanatory.
* blackified file
2024-07-29 19:45:58 +02:00
Robert Hensing
c38f9ee113
Merge pull request #324789 from NixOS/devShellTools-env
...
`devShellTools`: add environment functions
2024-07-29 10:00:40 +02:00
Jörg Thalheim
5356420466
treewide: remove unused with statements from maintainer lists
...
$ find -type f -name '*.nix' -print0 | xargs -P "$(nproc)" -0 sed -i \
-e 's!with lib.maintainers; \[ *\];![ ];!' \
-e 's!with maintainers; \[ *\];![ ];!'
2024-07-29 10:06:20 +08:00
Robert Hensing
b5389e2ae9
nixosTests.docker-tools-nix-shell: Enable on aarch64-linux
...
The docker-tools test, where this originates, was not run on aarch64-linux, but this is an artifact of its age more so than anything else.
Co-authored-by: Ivan Trubach <mr.trubach@icloud.com>
2024-07-29 00:23:05 +02:00
Robert Hensing
32c9e3193c
tests.devShellTools: Fix release.nix / ofborg eval
2024-07-28 23:19:58 +02:00
Robert Hensing
b3561f17f6
devShellTools.unstructuredDerivationInputEnv: Support older Nix
2024-07-28 23:19:58 +02:00
Robert Hensing
412601690e
build-support/docker/default.nix: Refer to docs and tests
...
This removes redundant inline docs, because
- users should consult the better docs in the manual,
- contributors should add to the manual, not the inline comments
2024-07-28 23:19:58 +02:00
Robert Hensing
6881d9b181
nixosTests.docker-tools-nix-shell: Extract
...
These tests should run as part of the `tests.devShellTools` suite,
and they're a significant portion of the general docker tools test
duration.
2024-07-28 23:19:56 +02:00
Robert Hensing
1cf3103bca
devShellTools.unstructuredDerivationInputEnv: Match passAsFile basename
2024-07-28 23:17:18 +02:00
Robert Hensing
7237aa700f
devShellTools: Docs, fix args env
2024-07-28 23:17:18 +02:00
Robert Hensing
bde2e05c70
devShellTools.unstructuredDerivationInputEnv: Skip args
2024-07-28 23:17:18 +02:00