Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh
detection
...
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into
builtins.derivation {
builder = stdenv.shell;
args = [ "-e" builder ];
}
This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].
Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:
* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
(see previous commit for more context), so prefer the environment
variable if possible.
* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
can happen.
* If neither applies, it can be assumed that `__structuredAttrs` is
turned off and thus nothing needs to be done.
[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
it can point to a wrong location on older Nix versions with a bug in
`__structuredAttrs`.
2023-10-04 18:36:57 +02:00
Florian Klink
1550a58e14
Merge pull request #258373 from misuzu/systemd-fix
...
systemd: fix RuntimeError issue when building for armv7l and riscv64
2023-10-04 16:50:42 +03:00
github-actions[bot]
2dc3af6ef9
Merge staging-next into staging
2023-10-04 12:01:34 +00:00
github-actions[bot]
c7a3c2d71b
Merge master into staging-next
2023-10-04 12:01:01 +00:00
Mario Rodas
b7750daf11
Merge pull request #258761 from trofi/linuxHeaders-revert-sockaddr_ll-flex
...
linuxHeaders: revert accidental `struct sockaddr_ll` size change
2023-10-04 06:38:30 -05:00
misuzu
7646ffb8bd
systemd: fix RuntimeError issue when building for armv7l and riscv64
2023-10-04 11:40:55 +03:00
Franz Pletz
d082876654
Merge pull request #258561 from helsinki-systems/upd/conntrack-tools
2023-10-04 10:22:48 +02:00
Jörg Thalheim
98b8e0dee9
bcachefs: revert using json to hold bcachefs commits/hashes
...
The json appearantly contained the wrong checksum and we don't have a way to generate this
2023-10-03 22:00:26 +01:00
Daniel Hill
1048867fe0
bcachefs: fix version not showing correctly
...
buildLinux doesn't provide argsOverride by default.
Prior to 663caaa
, a default kernel was replaced with a direct invocation
to buildLinux, this broke the use of argsOverride, in 663caaa
, the use
of argsOverride was removed, and then later the invocation of buildLinux
was replaced with vanilla linux kernel that required argsOverride
which then rebroke things again.
Recommend either: put argsOverride inside buildLinux, or replace it with
something less confusing to maintainers.
2023-10-03 22:00:26 +01:00
Daniel Hill
d6bf8b47ec
bcachefs: 2023-06-28 -> 2023-09-29
...
Includes prep work for mainline bcachefs release.
2023-10-03 22:00:26 +01:00
Daniel Hill
6c1a24a6ea
bcachefs: Add YellowOnion as maintainer
2023-10-03 22:00:26 +01:00
Daniel Hill
e10bb1082a
bcachefs: enable ftrace for upstream bug reports
2023-10-03 22:00:26 +01:00
Sergei Trofimovich
fad90186f9
linuxHeaders: revert accidental struct sockaddr_ll
size change
...
`linux-6.5` introduced regression in it's headers by breaking `udp2raw`.
`udp2raw` relied on the fixed size of `struct sockaddr_ll`:
https://github.com/NixOS/nixpkgs/pull/252587#issuecomment-1744427473
Let's revert the API change until it's fixed upstream.
2023-10-03 09:33:40 +01:00
github-actions[bot]
ddcb79e61a
Merge staging-next into staging
2023-10-03 00:02:55 +00:00
Martin Weinelt
9d0b02be98
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/python-ndn/default.nix
2023-10-02 23:59:00 +02:00
Alyssa Ross
73b01822c4
linux/update-mainline.py: log to stderr
2023-10-02 20:21:45 +00:00
github-actions[bot]
a3a27f01d5
Merge staging-next into staging
2023-10-02 18:01:40 +00:00
github-actions[bot]
23a7292114
Merge master into staging-next
2023-10-02 18:01:04 +00:00
markuskowa
1af7a07ae9
Merge pull request #258214 from markuskowa/split-rdma-core
...
rdma-core: split outputs -> out, man, dev
2023-10-02 17:30:40 +02:00
Weijia Wang
ccdb43a66a
Merge branch 'master' into staging-next
2023-10-02 14:49:01 +02:00
Ryan Lahfa
061e2b87d3
Merge pull request #258543 from alyssais/linux-6.6-rc4
...
linux_testing: 6.6-rc3 -> 6.6-rc4 (plus some rt updates)
2023-10-02 13:31:02 +02:00
Weijia Wang
fce0535495
Merge pull request #258282 from r-ryantm/auto-update/usbrelay
...
usbrelay: 1.2 -> 1.2.1
2023-10-02 13:07:27 +02:00
ajs124
6adef23159
conntrack-tools: 1.4.7 -> 1.4.8
...
https://lists.netfilter.org/pipermail/netfilter-announce/2023/000253.html
2023-10-02 12:49:49 +02:00
Alyssa Ross
1bf420fb6f
linux-rt_5_4: 5.4.254-rt85 -> 5.4.257-rt87
2023-10-02 08:23:52 +00:00
Alyssa Ross
a012fd2df1
linux-rt_5_15: 5.15.129-rt67 -> 5.15.133-rt69
2023-10-02 08:23:51 +00:00
Alyssa Ross
d928e497d5
linux-rt_5_10: 5.10.180-rt89 -> 5.10.194-rt95
2023-10-02 08:23:49 +00:00
Alyssa Ross
e4301a7b8e
linux_testing: 6.6-rc3 -> 6.6-rc4
2023-10-02 08:23:42 +00:00
Pol Dellaiera
5dea4f1dbf
Merge pull request #258414 from khaneliman/yabai
...
yabai: 5.0.8 -> 5.0.9
2023-10-01 22:25:35 +02:00
github-actions[bot]
b2d4e648c6
Merge staging-next into staging
2023-10-01 18:01:36 +00:00
github-actions[bot]
708561b6ea
Merge master into staging-next
2023-10-01 18:01:08 +00:00
Austin Horstman
3a50c2dac5
yabai: 5.0.8 -> 5.0.9
2023-10-01 09:25:05 -05:00
Nick Cao
c2c61e5dbc
Merge pull request #258360 from FliegendeWurst/raspberrypi-eeprom-awk
...
raspberrypi-eeprom: add awk to wrapper
2023-10-01 10:21:30 -04:00
Nick Cao
14a2eeca9e
Merge pull request #258398 from zzzsyyy/update/xanmod
...
linux_xanmod: add zzzsy as maintainer
2023-10-01 10:16:11 -04:00
Alyssa Ross
d4a1009f5a
Merge remote-tracking branch 'origin/master' into staging-next
2023-10-01 13:53:00 +00:00
zzzsyyy
4158c91f7b
linux_xanmod: add zzzsy as maintainer
2023-10-01 20:57:35 +08:00
Atemu
4d0322e03d
Merge pull request #257822 from zzzsyyy/update/xanmod
...
linux_xanmod, linux_xanmod_latest: 2023-09-28
2023-10-01 14:49:52 +02:00
FliegendeWurst
636f8ab841
raspberrypi-eeprom: add awk to wrapper
2023-10-01 10:32:19 +02:00
Jerry Starke
e37f793f66
linuxKernel.kernels.linux_lqx: 6.5.5-lqx1 -> 6.5.5-lqx2
2023-10-01 05:57:15 +02:00
R. Ryantm
cf9ee8abc5
usbrelay: 1.2 -> 1.2.1
2023-09-30 21:41:10 +00:00
Markus Kowalewski
476626b622
rdma-core: split outputs -> out, man, dev
2023-09-30 21:10:53 +02:00
Artturi
425ddf147e
Merge pull request #245965 from amjoseph-nixpkgs/pr/linux/kernel/repick2
...
linux.configfile: remove unused kernelTarget attr
2023-09-30 10:49:01 +03:00
Artturi
45e88c4cb4
Merge pull request #245968 from amjoseph-nixpkgs/pr/linux/kernel/repick4
...
linuxManualConfig: fix inaccurate FIXME comment
2023-09-30 10:48:00 +03:00
github-actions[bot]
6b41a98c6c
Merge master into staging-next
2023-09-30 00:01:53 +00:00
Ryan Lahfa
f427e60ce5
Merge pull request #257755 from adamcstephens/zfs/2.1.13
2023-09-29 22:43:05 +02:00
github-actions[bot]
50751b0602
Merge master into staging-next
2023-09-29 18:00:55 +00:00
Yureka
ed895961d1
systemd: fix build on musl ( #257928 )
2023-09-29 16:42:41 +02:00
github-actions[bot]
6fe9af917e
Merge master into staging-next
2023-09-29 06:01:05 +00:00
R. Ryantm
f65ef7fff4
alsa-utils: 1.2.9 -> 1.2.10
2023-09-28 22:21:12 -03:00
github-actions[bot]
e0e21b78ec
Merge master into staging-next
2023-09-29 00:02:21 +00:00
Weijia Wang
072ba03656
Merge pull request #256218 from r-ryantm/auto-update/udisks2
...
udisks2: 2.10.0 -> 2.10.1
2023-09-29 00:06:55 +02:00