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
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
nicoo
18dd486bb9
emptyFile: use SRI hash
2024-08-08 20:06:21 +00:00
nicoo
244229a8b6
python3Packages.bork: add test using testers.runCommand
...
This will serve as a “real-world” example, running tests requiring network.
2024-08-08 15:29:15 +00:00
nicoo
d0a96c6eda
testers.runCommand: add, document, and test
2024-08-08 15:29:14 +00:00
nicoo
906598c914
testers: format inputs per RFC166
2024-08-08 13:26:37 +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
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
github-actions[bot]
78947ebef4
Merge staging-next into staging
2024-08-02 12:01:52 +00: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
K900
a4a42b3aec
Merge remote-tracking branch 'origin/staging-next' into staging
2024-08-01 08:57:50 +03: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
K900
4f29b5a16b
Merge remote-tracking branch 'origin/staging-next' into staging
2024-07-31 08:57:17 +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
Randy Eckenrode
9a4c598e0a
Merge pull request #317224 from ju1m/NIX_CFLAGS_COMPILE
...
cc-wrapper: fix -Bprefix to not confuse lib/libc++.so and bin/c++
2024-07-28 20:18:22 -04:00
github-actions[bot]
2b898b30ea
Merge staging-next into staging
2024-07-29 00:03:08 +00: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
Robert Hensing
33aaac17c5
devShellTools.unstructuredDerivationInputEnv: Return attrsOf str
...
... and test it.
2024-07-28 23:17:18 +02:00
Robert Hensing
43df2b50f9
devShellTools.{unstructuredDerivationInputEnv,derivationOutputEnv}: extract
2024-07-28 23:17:18 +02:00
Atemu
142b0dcd96
Merge pull request #330478 from SuperSandro2000/bwrap-no-chroot
...
buildFHSEnv: replace all chroot occurences with generic names
2024-07-28 23:00:08 +02:00
Sandro Jäckel
cd11c4bba3
buildFHSEnv: replace all chroot occurences with generic names
...
Co-authored-by: Atemu <git@atemu.net>
2024-07-28 22:39:35 +02:00
Sandro Jäckel
3bc32efbc8
buildFHSEnv: use relative symlinks
...
If we would add more commands below which I did for debugging purposes,
the symlinks wouldn't be valid.
2024-07-28 21:18:39 +02:00
Julien Moutinho
97c400a0e8
cc-wrapper: fix -Bprefix to not confuse lib/libc++.so and bin/c++
...
Before this commit, `pkgs/build-support/cc-wrapper/add-flags.sh`
was using `-B@out@/bin` instead of `-B@bintools@/bin`
to force `cc` to use `ld-wrapper.sh` when calling `ld`.
That was confusing `cc` when asked to print
the location of a library precisely named `c++`
because `-B` prefixes are also used by `cc` to find libraries,
see https://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#index-B
Indeed, instead of having `cc --print-file-name c++`
failing to found a `c++` library and just returning the given `c++` string
to let a linker resolve it thereafter,
it was finding that `@out@/bin/c++` executable,
mistaking it for a library and returning its absolute path,
forcing the linker to load an executable as a library.
Before this commit:
```console
$ nix run -f . stdenv.cc -- --print-file-name c++
/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/c++
```
After this commit:
```console
$ nix run -f . stdenv.cc -- --print-file-name c++
c++
```
Fixes https://gitlab.haskell.org/ghc/ghc/-/issues/23138#note_567034
where this behavior was breaking GHC on Darwin.
[Confirmed by @414owen](https://github.com/NixOS/nixpkgs/pull/317224#issuecomment-2171276177 ):
> This fixed all our haskell builds on Arm64 darwin, which were trying
> to link in clang++...
2024-07-28 20:55:32 +02:00
Robert Scott
48bde3a189
cc-wrapper: add support for pacret hardening flag on aarch64
2024-07-28 19:27:14 +01:00
tomberek
cc7b011fe1
Merge pull request #318034 from ExpidusOS/feat/zig-cc
...
Add stdenv & CC support for Zig
2024-07-28 14:09:31 -04:00
Emily
8a837af302
Merge pull request #326819 from risicle/ris-shadowstack
...
cc-wrapper: add support for `shadowstack` hardening flag
2024-07-28 19:07:52 +01:00
github-actions[bot]
38b57cc2a9
Merge staging-next into staging
2024-07-28 12:01:38 +00:00
Vladimír Čunát
a5b2fe7374
Merge #328673 : staging-next 2024-07-20
2024-07-28 13:45:55 +02:00
Robert Hensing
4ca52fdf5f
Merge pull request #323613 from CyberShadow/fix-nix-path-without-channels-v2
...
nix-channel: do not set empty nix-path when disabling channels
2024-07-28 13:31:10 +02:00
Tristan Ross
9f589ea3a0
arocc: init at 0-unstable-06-01
2024-07-27 19:43:41 -07:00
Tristan Ross
e9fb54b256
cc-wrapper: add zig
2024-07-27 19:43:40 -07:00
github-actions[bot]
8c2e73a4ed
Merge staging-next into staging
2024-07-26 18:01:39 +00:00
Randy Eckenrode
2c54952847
darwin.apple_sdk.frameworks: remove NIX_COREFOUNDATION_RPATH hook
...
Darwin no longer supports switching between CoreFoundation implementations as of https://github.com/NixOS/nixpkgs/pull/265102 . The setup hook is vestigial and was mostly harmless until https://github.com/NixOS/nixpkgs/pull/329526 was necessitated to fix build failures on staging-next https://github.com/NixOS/nixpkgs/pull/328673 .
The correct fix is to remove the hook. It’s not used by the 11.0 or 12.3 SDKs. This makes the 10.12 SDK a bit more like the other SDKs.
2024-07-26 12:41:45 -04:00
Martin Weinelt
93f4195fe0
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/applications/graphics/seamly2d/default.nix
2024-07-26 18:05:04 +02:00
Sigmanificient
6dd44107ac
treewide: remove unused lib (and other) arguments
2024-07-26 11:18:09 +02:00
tomberek
4f6603762b
Merge pull request #329584 from ExpidusOS/fix/pkgsllvm/xorg/libx11
...
xorg.libX11: fix compiling with llvm
2024-07-25 19:01:06 -04:00
github-actions[bot]
f20ed12f93
Merge master into staging-next
2024-07-25 12:01:18 +00:00
Adam Joseph
9cac7a7475
fetch-yarn-deps: improve diagnostic messages
...
When the hash of an url being fetched does not match the expected value, this
commit will cause fetch-yarn-deps to include the url in the error message to
assist debugging.
2024-07-25 11:37:44 +02:00
Adam Joseph
84a75e9488
fetchYarnDeps: fix broken fetching logic for github releases
...
When a dependency references a github *release* URL, that dependency must be
fetched using https rather than git, since github does not require that
release tarballs have any relationship whatsoever to the git history.
This commit causes them to be fetched using https, not git.
A test case (which fails prior to this commit, and passes afterwards) is included.
2024-07-25 11:37:39 +02:00
