github-actions[bot]
3cdd771820
Merge staging-next into staging
2023-02-23 18:01:49 +00:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00: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
Sergei Trofimovich
3bc81feb0d
Merge pull request #216232 from amjoseph-nixpkgs/pr/cc-wrapper/useCcForLibs
...
cc-wrapper: allow non-clang compilers to use gccForLibs codepath
2023-02-21 19:41:25 +00:00
Adam Joseph
6b6c06e5d7
cc-wrapper: allow non-clang compilers to use gccForLibs codepath
...
cc-wrapper has essentially two separate codepaths: the `gccForLibs`
codepath, used only by non-gcc (i.e. clang) compilers, and the
"other" codepath.
This PR allows non-clang compilers to opt-in to the `gccForLibs`
codepath (off by default). To allow this, a new parameter
`ccForLibs` is exposed, since it would be extremely confusing for
gcc to be able to use `gccForLibs` but not do so by default.
2023-02-20 23:03:44 -08:00
Robert Scott
436b0d9e1f
cc-wrapper: fix inverted logic around fortify & fortify3 mutual exclusion
2023-02-21 00:27:57 +00:00
github-actions[bot]
fc3641aa1e
Merge staging-next into staging
2023-02-21 00:03:04 +00:00
github-actions[bot]
e3e8374b6f
Merge master into staging-next
2023-02-21 00:02:33 +00: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
github-actions[bot]
0a547ad8b7
Merge staging-next into staging
2023-02-20 12:02:08 +00:00
github-actions[bot]
507feca606
Merge master into staging-next
2023-02-20 12:01:32 +00: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
github-actions[bot]
1ce3b0f272
Merge staging-next into staging
2023-02-19 12:02:03 +00:00
github-actions[bot]
85ba84c218
Merge master into staging-next
2023-02-19 12:01:25 +00:00
sternenseemann
bbe6402eca
Merge remote-tracking branch 'origin/master' into haskell-updates
2023-02-18 21:56:57 +01:00
Artturi
cdcca1cdcd
Merge pull request #215715 from Artturin/removegirworkarounds2
2023-02-18 20:12:57 +02:00
github-actions[bot]
0e856cc7de
Merge staging-next into staging
2023-02-18 18:01:58 +00:00
github-actions[bot]
05782cfb75
Merge master into staging-next
2023-02-18 18:01:22 +00:00
Artturi
76844dfcfd
Merge pull request #211187 from Artturin/movetestpatchshenbag
2023-02-18 19:13:17 +02:00
Naïm Favier
5de1815be9
Merge pull request #215990 from ncfavier/agda-tests
...
agda: fix passthru
2023-02-18 16:04:39 +01:00
Sergei Trofimovich
f488b617ab
setup-hooks/reproducible-builds.sh: NIX_OUTPATH_USED_AS_RANDOM_SEED (take 2) ( #216967 )
...
This time the change targets `staging`.
This reverts commit e1f1c7eb79
.
2023-02-18 15:53:42 +01:00
github-actions[bot]
aaa6cd4e04
Merge staging-next into staging
2023-02-18 14:13:15 +00:00
Alyssa Ross
38f0121cce
Merge master (+ 11b095e
revert) into staging-next
...
Conflicts:
pkgs/development/libraries/libvisual/default.nix
2023-02-18 14:04:32 +00: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
Timothy DeHerrera
792907e3bf
patch-shebangs: handle env -S shebangs
...
`env -S` allows one to set more than one argument in a shebang. This
small patch allows the patch-shebangs hook to handle this case
appropriately.
2023-02-17 22:22:26 +02:00
Artturin
2c471e6479
wrapGAppsHook: add gtk3 to depsTargetTargetPropagated
...
for typelibs and girs
2023-02-17 21:38:20 +02:00
Artturin
2168611677
wrapGAppsHook: run tests with strictDeps
...
'nix build -f . "wrapGAppsHook.tests"' pass
2023-02-17 21:34:59 +02:00
Artturin
c4e7fb1036
wrapGAppsHook: move dconf.lib to depsTargetTargetPropagated
...
luckily the lib output does not contain binaries therefore its safe to
remove it from propagatedBuildInputs
2023-02-17 21:32:48 +02:00
Artturi
ee54eb7d21
Merge pull request #216383 from Artturin/bintoolswrappermold
2023-02-17 19:32:06 +02:00
Artturin
b5abc3d090
bintools-wrapper: dont wrap ld if it doesn't exist
...
not all linkers have a ld binary in bin
also note the '${ld:-}' which allows users to set the ld path with a env
var
> '${foo:-val}' $foo, or val if unset (or null)
2023-02-17 04:56:48 +02:00
github-actions[bot]
f442a49be3
Merge master into haskell-updates
2023-02-17 00:14:22 +00:00
Robert Scott
0eedcfc3f4
Merge pull request #212498 from risicle/ris-fortify3
...
hardening flags: add `FORTIFY_SOURCE=3` support
2023-02-16 21:19:30 +00:00
github-actions[bot]
164a7e44c7
Merge master into staging-next
2023-02-16 18:01:12 +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
github-actions[bot]
5c852cc587
Merge master into staging-next
2023-02-16 12:01:36 +00: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
Artturin
3697ddeabe
bintools-wrapper: wrap all 'ld.*'
...
allows using wrapBintoolsWith with all linkers
```
$ nix build ".#binutils"
$ ls ./result/bin/ld*
./result/bin/ld* ./result/bin/ld.bfd* ./result/bin/ld.gold*
$ nix build "nixpkgs#binutils"
$ ls ./result/bin/ld*
./result/bin/ld* ./result/bin/ld.bfd* ./result/bin/ld.gold*
```
2023-02-15 20:51:16 +02:00
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]
b56ce2853a
Merge master into haskell-updates
2023-02-15 00:14:20 +00: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