github-actions[bot]
c4fe2133de
Merge staging-next into staging
2023-02-15 06:01:44 +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]
58cfebde3e
Merge staging-next into staging
2023-02-15 00:02:50 +00:00
Bob van der Linden
e3a10a12c7
rustPlatform.cargoSetupHook: improve cargoHash instructions
...
Currently cargo-setup-hook instructs the builder upon cargoSha256 or
cargoHash being out-of-date compared to the Cargo.lock file.
The instructions can be simplified a bit, because nowadays it is fine to
keep a hash empty, instead of filling it with
`0000000000000000000000000000000000000000000000000000`.
Nix nowadays outputs SRI hashes, which should usually be placed in
`cargoHash` instead of `cargoSha256`, but the instructions are still
only referring to `cargoSha256`.
Lastly, the output of Nix doesn't include `got: sha256: ` anymore, as it
now outputs `got: sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=`.
It would be nice to make it clear that the trailing `=` is important as
well, so the full example SRI hash is mentioned.
2023-02-14 16:14:08 -05: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
Felix Buehler
cdb39a86e0
treewide: use optionalString
2023-02-13 21:52:34 +01:00
github-actions[bot]
f60ea3cf39
Merge staging-next into staging
2023-02-13 18:01:55 +00: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
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
Artturi
aaa9ea8ec6
Merge pull request #208537 from Artturin/makesetuphooksupportstrictdeps
2023-02-10 20:08:32 +02: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]
87e315024e
Merge staging-next into staging
2023-02-09 18:01:44 +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]
bece38afcc
Merge staging-next into staging
2023-02-09 00:02:56 +00: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
Artturin
680309fc9c
add docs for makeSetupHook
2023-02-07 21:02:02 +02:00
Artturin
8f171925b3
makeSetupHook: deprecate deps argument
2023-02-07 21:02:02 +02:00
Artturin
4e3dcf364e
treewide: makeSetupHook deps -> propagatedBuildInputs
2023-02-07 21:02:00 +02:00
Artturin
8be7ab60b1
wrapGAppsHook: make it work with strictDeps
...
remove unused input
add test for GDK_PIXBUF_MODULE_FILE
run tests with strictDeps
if the tests work with strictDeps then they work with non strictDeps
2023-02-07 21:00:18 +02:00
Artturin
9a9c42e19f
makeSetupHook: support depsTargetTargetPropagated
2023-02-07 21:00:18 +02: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]
99cce0e1f1
Merge staging-next into staging
2023-02-07 06:02:00 +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 46ee37ca1dhttps://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]
d3648def80
Merge staging-next into staging
2023-02-07 00:02:46 +00: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
zowoq
421acf1022
buildGo{Module,Package}: respect nix hardening flags when setting buildmode
2023-02-07 06:20:57 +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
John Ericson
6d0b3086f7
Merge pull request #214304 from obsidiansystems/pkg-config-meta
...
meta.pkgConfigModules: Init convention
2023-02-06 11:44:29 -05:00
github-actions[bot]
51cb32c692
Merge master into staging-next
2023-02-05 18:01:22 +00:00
milahu
d1bb936cf7
symlinkJoin: print warning when keeping existing file
2023-02-05 09:58:20 +01:00
github-actions[bot]
cb231fb28d
Merge master into staging-next
2023-02-05 06:01:18 +00:00
Robert Schütz
f402501c2c
Merge pull request #213485 from dotlambda/opentsdb-2.4.1
...
opentsdb: 2.4.0 -> 2.4.1
2023-02-04 19:09:01 -08:00
Vladimír Čunát
d0d8c15bad
Merge branch 'master' into staging-next
...
pkgs/development/web/nodejs/v18.nix conflict:
the fetched patch was already included in this release.
2023-02-03 23:02:19 +01:00
John Ericson
6e4a1b18d9
meta.pkgConfigModules: Init convention
...
See docs.
Follow-up work:
- Existing packages should be converted
- `defaultPkgConfigPackages` should assert on `meta.pkgConfigModules`
and let `tests.pkg-config` alone test the build results.
CC @sternenseemann
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-02-03 09:37:31 -05:00
