Maximilian Bosch
de100f17c3
Merge pull request #217663 from lheckemann/mkshell-preferlocalbuild
...
mkShell: set preferLocalBuild by default
2023-02-24 07:49:14 +01:00
Artturin
f9fdf2d402
treewide: move NIX_CFLAGS_COMPILE to the env attrset
...
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Linus Heckemann
c4b83df38a
mkShell: set preferLocalBuild by default
...
Before this change, `nix develop` would often result in all the
shell's dependencies being copied to a remote builder, only for the
remote builder to run a trivial derivation build. This change makes
`nix develop` much faster on systems with remote builders configured.
2023-02-22 11:53:51 +01:00
Will Fancher
bb7cd63150
Merge pull request #215381 from lilyinstarlight/fix/make-initrd-ng-wrapped-executables
...
make-initrd-ng: support wrapped executables
2023-02-20 14:11:48 -05:00
Lily Foster
d01bc6f9cb
make-initrd-ng: document wrapped file behavior
2023-02-20 07:02:55 -05:00
Lily Foster
4df8f9a2f8
make-initrd-ng: support wrapped executables
2023-02-20 07:02:55 -05:00
Jörg Thalheim
d69bb82f56
Merge pull request #217256 from helsinki-systems/deb-closure-quote-urls
...
build-support/vm/deb/deb-closure: quote generated urls
2023-02-20 09:35:54 +01:00
Yureka
20539ac23d
prefetch-npm-deps: add nix to PATH
...
Fixes "No such file or directory" error when running prefetch-npm-deps
in its default mode (print hashes, for update scripts etc),
in an environment that doesn't have a `nix` binary (for `nix hash`).
2023-02-20 01:20:56 -05:00
ajs124
3f8ad50f9a
build-support/vm/deb/deb-closure: quote generated urls
...
otherwise, eval fails when the experimental no-url-literals feature is activated
unquoted urls are discouraged after https://github.com/NixOS/rfcs/pull/45
2023-02-20 01:38:31 +01:00
sternenseemann
bbe6402eca
Merge remote-tracking branch 'origin/master' into haskell-updates
2023-02-18 21:56:57 +01:00
Naïm Favier
5de1815be9
Merge pull request #215990 from ncfavier/agda-tests
...
agda: fix passthru
2023-02-18 16:04:39 +01:00
Thiago Kenji Okada
aea640a73b
buildGraalvmNativeImage: allow overriding attributes
...
Remove the previous function closure, that would make it difficult to
access the inner derivation attributes.
Fix issue #216787 .
2023-02-18 12:38:09 +00:00
github-actions[bot]
f442a49be3
Merge master into haskell-updates
2023-02-17 00:14:22 +00:00
superherointj
0eae5c0532
Merge pull request #205156 from yu-re-ka/musl-runinlinuxvm
...
runInLinuxVM: fix on musl
2023-02-16 12:24:34 -03:00
John Ericson
35d6d3d7b5
Merge pull request #216555 from jordanisaacs/rust-vendor
...
build-support/rust/lib: Add `toTargetVendor`
2023-02-16 09:33:06 -05:00
K900
31b278c0a4
Merge pull request #215837 from K900/fhsenv-x11-socket-permissions
...
buildFHSUserEnv: fix permissions on /tmp/.X11-unix
2023-02-16 12:25:04 +03:00
Jordan Isaacs
66dccd88b8
build-support/rust/lib: Add toTargetVendor
...
Used in cases where you need to get the vendor of a target. Such as when
you need to perform dependency resolution outside of Cargo (eg in
Kolloch's crate2nix).
2023-02-15 20:37:45 -05:00
github-actions[bot]
dd816c8cfd
Merge master into haskell-updates
2023-02-16 00:13:54 +00:00
John Ericson
179bff391b
Merge pull request #216360 from Stunkymonkey/use-optionals
...
treewide: use lib.optionals
2023-02-14 21:54:13 -05:00
github-actions[bot]
b56ce2853a
Merge master into haskell-updates
2023-02-15 00:14:20 +00:00
Nikolay Korotkiy
8cf41cf4ef
Merge pull request #215713 from sikmir/vmtools
...
vmTools: update debian versions
2023-02-14 23:33:34 +04:00
Felix Buehler
bc3d5934d7
treewide: use lib.optionals
2023-02-14 19:11:59 +01:00
Ingo Blechschmidt
168d9a5f1e
agda: 2.6.2.2 -> 2.6.3
2023-02-14 14:45:39 +01:00
Felix Buehler
cdb39a86e0
treewide: use optionalString
2023-02-13 21:52:34 +01:00
Vladimír Čunát
f1f9ae6a3b
Merge #214010 : staging-next 2023-02-01
2023-02-13 15:42:23 +01:00
Thiago Kenji Okada
04019089fd
Merge pull request #215583 from thiagokokada/graalvm-ce-refactor
...
graalvm*-ce: refactor, 22.3.0 -> 22.3.1
2023-02-13 14:39:15 +00:00
Thiago Kenji Okada
d2e047f112
graalvm-ce: add it to all-packages pointing to graalvm11-ce
2023-02-12 19:08:44 +00:00
Naïm Favier
65e774e2a4
agda: fix passthru
...
The current `//` override to `agda.passthru.tests` is non-recursive so
it destroys everything else under `passthru`, and furthermore does not
go through `mkDerivation` so that we end up with different values for
`agda.tests` and `agda.passthru.tests`.
Fix it by moving the `allPackages` test to the definition of
`withPackages`.
2023-02-12 14:44:16 +01:00
K900
9788650f52
buildFHSUserEnv: fix permissions on /tmp/.X11-unix
...
This is kinda cursed, but it makes things like `steam-run gamescope` work OOTB.
2023-02-11 17:33:06 +03:00
Thiago Kenji Okada
6704d4f4e4
bbin: inherit graalvmDrv from babashka
2023-02-11 14:03:22 +00:00
Nikolay Korotkiy
4ed059d041
vmTools: update debian versions
2023-02-10 21:39:15 +03:00
Thiago Kenji Okada
256195c07a
native-image-installable-svm: init at 22.3.0
...
Also refactor the buildGraalvm derivation, allowing it to compose with
the other products.
2023-02-09 21:42:39 +00:00
github-actions[bot]
b5d4dad2b8
Merge master into staging-next
2023-02-09 18:01:11 +00:00
Robert Hensing
1991c40759
Merge pull request #194345 from codedownio/binary-cache
...
Introduce mkBinaryCache function
2023-02-09 15:25:16 +01:00
github-actions[bot]
1f23f5ae02
Merge master into staging-next
2023-02-09 00:02:26 +00:00
Justin Bedő
f2ab8c706d
Merge pull request #158486 from ShamrockLee/singularity-apptainer
...
singularity: fix defaultPath and reflect upstream changes
2023-02-08 23:47:32 +00:00
Vladimír Čunát
1e42908aa7
Merge branch 'master' into staging-next
2023-02-08 21:50:23 +01:00
Thiago Kenji Okada
9630f025c6
Merge pull request #215093 from thiagokokada/graalvm-native-compile-fix-libs
...
graalvm*-ce: wrap native-image to pass -H:CLibraryPath, misc improvements
2023-02-08 16:56:39 +00:00
Yueh-Shun Li
50788d2fb0
apptainer, singularity: fix defaultPath and reflect upstream changes
...
Upstream changes:
singularity 3.8.7 (the legacy) -> apptainer 1.1.3 (the renamed) / singularity 3.10.4 (Sylabs's fork)
Build process:
* Share between different sources
* Fix the sed regexp to make defaultPath patch work
* allowGoReference is now true
* Provied input parameter removeCompat (default to false)
that removes the compatible "*singularity*" symbolic links
and related autocompletion files when projectName != "singularity"
* Change localstatedir to /var/lib
* Format with nixpkgs-fmt
* Fix the defaultPath patching
and use it instead of the `<executable> path` config directive
deprecated in Apptainer
* Provide dependencies for new functionalities such as
squashfuse (unprivileged squashfs mount)
* Provide an attribute `defaultPathInputs` to override
prefix of container runtime default PATH
NixOS module programs.singularity:
* Allow users to specify packages
* Place related directories to /var/lib
* Format with nixpkgs-fmt
singularity-tools:
* Allow users to specify packages
* Place related directories to /var/lib when building images in VM
2023-02-08 18:03:11 +08:00
Yueh-Shun Li
b33d6407cc
singularity-tool: format expression
2023-02-08 17:42:03 +08:00
Tom McLaughlin
d1a2a16a3a
Introduce mkBinaryCache function
2023-02-07 16:16:07 -08:00
Thiago Kenji Okada
afb99ad5d4
graalvm*-ce: wrap native-image to pass -H:CLibraryPath, misc improvements
...
Fixes issue #214922 by not adding C libraries to the default library
path of GraalVM. This should reduce the closure size of native compiled
binaries in nixpkgs again, e.g.:
Before:
```
$ ldd ./result/bin/bb
linux-vdso.so.1 (0x00007fff2669b000)
libstdc++.so.6 => /nix/store/qbgfsaviwqi2p6jr7an1g2754sv3xqhn-gcc-11.3.0-lib/lib/libstdc++.so.6 (0x00007f77fc0cf000)
libm.so.6 => /nix/store/l7vp7c9z03dspbmss3gq5wdwx5c6ifcq-graalvm11-ce-22.3.0/lib/svm/clibraries/linux-amd64/libm.so.6 (0x00007f77fbfef000)
libpthread.so.0 => /nix/store/l7vp7c9z03dspbmss3gq5wdwx5c6ifcq-graalvm11-ce-22.3.0/lib/svm/clibraries/linux-amd64/libpthread.so.0 (0x00007f77fbfea000)
libdl.so.2 => /nix/store/l7vp7c9z03dspbmss3gq5wdwx5c6ifcq-graalvm11-ce-22.3.0/lib/svm/clibraries/linux-amd64/libdl.so.2 (0x00007f77fbfe5000)
librt.so.1 => /nix/store/l7vp7c9z03dspbmss3gq5wdwx5c6ifcq-graalvm11-ce-22.3.0/lib/svm/clibraries/linux-amd64/librt.so.1 (0x00007f77fbfde000)
libc.so.6 => /nix/store/l7vp7c9z03dspbmss3gq5wdwx5c6ifcq-graalvm11-ce-22.3.0/lib/svm/clibraries/linux-amd64/libc.so.6 (0x00007f77fbdd5000)
/nix/store/c35hf8g5b9vksadym9dbjrd6p2y11m8h-glibc-2.35-224/lib/ld-linux-x86-64.so.2 => /nix/store/9xfad3b5z4y00mzmk2wnn4900q0qmxns-glibc-2.35-224/lib64/ld-linux-x86-64.so.2 (0x00007f77fc2e7000)
libgcc_s.so.1 => /nix/store/qbgfsaviwqi2p6jr7an1g2754sv3xqhn-gcc-11.3.0-lib/lib/libgcc_s.so.1 (0x00007f77fbdbb000)
```
After:
```
$ ldd ./result/bin/bb
linux-vdso.so.1 (0x00007fffdfd4e000)
libstdc++.so.6 => /nix/store/qbgfsaviwqi2p6jr7an1g2754sv3xqhn-gcc-11.3.0-lib/lib/libstdc++.so.6 (0x00007fc3a5658000)
libm.so.6 => /nix/store/c35hf8g5b9vksadym9dbjrd6p2y11m8h-glibc-2.35-224/lib/libm.so.6 (0x00007fc3a5578000)
libpthread.so.0 => /nix/store/c35hf8g5b9vksadym9dbjrd6p2y11m8h-glibc-2.35-224/lib/libpthread.so.0 (0x00007fc3a5573000)
libdl.so.2 => /nix/store/c35hf8g5b9vksadym9dbjrd6p2y11m8h-glibc-2.35-224/lib/libdl.so.2 (0x00007fc3a556e000)
librt.so.1 => /nix/store/c35hf8g5b9vksadym9dbjrd6p2y11m8h-glibc-2.35-224/lib/librt.so.1 (0x00007fc3a5569000)
libc.so.6 => /nix/store/c35hf8g5b9vksadym9dbjrd6p2y11m8h-glibc-2.35-224/lib/libc.so.6 (0x00007fc3a535e000)
/nix/store/c35hf8g5b9vksadym9dbjrd6p2y11m8h-glibc-2.35-224/lib/ld-linux-x86-64.so.2 => /nix/store/9xfad3b5z4y00mzmk2wnn4900q0qmxns-glibc-2.35-224/lib64/ld-linux-x86-64.so.2 (0x00007fc3a5870000)
libgcc_s.so.1 => /nix/store/qbgfsaviwqi2p6jr7an1g2754sv3xqhn-gcc-11.3.0-lib/lib/libgcc_s.so.1 (0x00007fc3a5344000)
```
Also improves the installCheckPhase to include more tests and improve
the old onest .
2023-02-07 17:00:13 +00:00
github-actions[bot]
41e5bd55d5
Merge master into staging-next
2023-02-07 06:01:28 +00:00
Winter
e2b092fc52
Revert "rustPlatform.bindgenHook: use the same clang/libclang as rustc"
...
This reverts commit 46ee37ca1d
, as it breaks
anything that uses libcxx on Darwin, as well as cross-compilation to at
least armv6l.
As there's no clear solution at this time, reverting it is the best
option, as this only reduces build time closure size (something we can
arguably live with).
https://github.com/NixOS/nixpkgs/pull/207352#issuecomment-1418363441
https://github.com/NixOS/nixpkgs/pull/207352#issuecomment-1420124250
2023-02-07 00:04:19 -05:00
figsoda
42d1d60a92
Merge pull request #206773 from SuperSandro2000/cleanup-unused-bindings
...
treewide: cleanup some unused bindings
2023-02-06 20:07:50 -05:00
Sandro Jäckel
50e0012f9d
treewide: cleanup some unused bindings
2023-02-07 01:36:15 +01:00
github-actions[bot]
b30088fc3f
Merge master into staging-next
2023-02-07 00:02:12 +00:00
zowoq
3feeedb5e2
buildGoModule: make the vendor fetcher error if it is empty
2023-02-07 06:23:39 +10:00
Noah Fontes
07c6e6b2b8
libredirect: fix build on musl libc
...
musl doesn't yet provide a wrapper for the statx syscall, so don't
bother wrapping it here unless it's actually available.
2023-02-06 10:18:52 -08:00
github-actions[bot]
f876e1f1e9
Merge master into staging-next
2023-02-06 18:01:37 +00:00