Jan Tojnar
cc239d848f
Merge commit 'ab24cfb0d3d43d0e8c21604993007dd66a4694ea'
2021-09-24 02:00:38 +02:00
Sandro
078c3bfb54
Merge pull request #139066 from lovesegfault/linux_xanmod-5.14.7
2021-09-23 17:31:48 +02:00
Michael Stone
470466fdbd
sigtool: 4a3719b4 -> 2a13539d ( #138453 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-09-23 17:14:07 +02:00
Sandro
e04c24ca02
Merge pull request #138534 from Stunkymonkey/os-specific-github
2021-09-23 11:22:12 +02:00
github-actions[bot]
194b50aba8
Merge staging-next into staging
2021-09-23 06:01:47 +00:00
Bernardo Meurer
0785430a5e
linuxKernel.kernels.linux_xanmod: 5.14.6 -> 5.14.7
2021-09-22 19:13:04 -07:00
Luke Granger-Brown
759c4c9da1
Merge pull request #139046 from r-burns/nbcompat-take-two
...
[staging-next] netbsd.compat: fix libs by using cctools strip as objcopy
2021-09-23 02:14:37 +01:00
R. RyanTM
a74a864b0f
iotop-c: 1.18 -> 1.19
2021-09-23 00:52:50 +00:00
Ryan Burns
9eb591df10
netbsd.compat: fix libs by using cctools strip as objcopy
...
Reverts d43df749ac
NetBSD makefiles strip local symbols from libs using `OBJCOPY?=objcopy`,
which is missing on macOS. GNU objcopy appears to succeed but produces
broken .a libs which do not link into dependers.
(As this issue does not fail the netbsd.compat build,
downstream netbsd.install is added to passthru.tests.)
Since `OBJCOPY` is only used for stripping, we can:
* skip stripping with the hacky `OBJCOPY=echo`
* use cctools strip, which is invoked in the same way
The latter is obviously preferable if it works.
Indeed, locals are stripped, although it doesn't affect size much.
Comparison:
`OBJCOPY=echo`:
```
$ du -b result/lib/*.a
347784 result/lib/libnbcompat.a
357120 result/lib/libnbcompat_p.a
```
`OBJCOPY=${cctools}/bin/strip`:
```
$ du -b result/lib/*.a
347008 result/lib/libnbcompat.a
357120 result/lib/libnbcompat_p.a
```
2021-09-22 17:42:12 -07:00
github-actions[bot]
c836da689f
Merge staging-next into staging
2021-09-23 00:03:12 +00:00
Luke Granger-Brown
7002c15677
linuxKernel.kernels.linux_5_13_hardened: fix build
...
BTF cannot be enabled at the same time as the RANDSTRUCT GCC plugin, so
we need to mark it as optional. Alas.
2021-09-22 22:26:36 +00:00
github-actions[bot]
42ade1cfa3
Merge staging-next into staging
2021-09-22 18:01:40 +00:00
github-actions[bot]
09a7436fcc
Merge master into staging-next
2021-09-22 18:01:01 +00:00
TredwellGit
3cd2a4032b
linux: 5.4.147 -> 5.4.148
2021-09-22 09:57:22 -04:00
TredwellGit
6e1498613f
linux: 5.14.6 -> 5.14.7
2021-09-22 09:57:22 -04:00
TredwellGit
afc93c11bb
linux: 5.10.67 -> 5.10.68
2021-09-22 09:57:22 -04:00
TredwellGit
217af32349
linux: 4.9.282 -> 4.9.283
2021-09-22 09:57:22 -04:00
TredwellGit
0931ea2be7
linux: 4.4.283 -> 4.4.284
2021-09-22 09:57:22 -04:00
TredwellGit
9eddcf0c15
linux: 4.19.206 -> 4.19.207
2021-09-22 09:57:22 -04:00
TredwellGit
1e54b5a2fc
linux: 4.14.246 -> 4.14.247
2021-09-22 09:57:22 -04:00
TredwellGit
892f937370
firmwareLinuxNonfree: 2021-08-18 -> 2021-09-19
2021-09-22 12:59:03 +00:00
github-actions[bot]
2505488672
Merge staging-next into staging
2021-09-22 12:02:01 +00:00
Alyssa Ross
b898e958da
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
pkgs/os-specific/linux/libfabric/default.nix
pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00
R. RyanTM
8d109b4f1c
sysvinit: 2.99 -> 3.00
2021-09-22 07:13:46 +00:00
R. RyanTM
977b13b1c9
system76-firmware: 1.0.29 -> 1.0.31
2021-09-22 05:47:29 +00:00
Bernardo Meurer
c4f9df268a
Merge pull request #138564 from lovesegfault/linux_xanmod-5.14.6
2021-09-22 04:02:28 +00:00
Sandro
f0955beaff
Merge pull request #107525 from xaverdh/kernel-manual-config-fix
2021-09-21 22:12:11 +02:00
Sandro
7ecc0a0181
Merge pull request #138632 from Atemu/update/linux_lqx
2021-09-21 21:07:08 +02:00
Shamrock Lee
c95fcfc6b3
libfabric: meta.platforms = lib.platforms.all and 1.13.0 -> 1.13.1 ( #138780 )
2021-09-21 21:06:24 +02:00
github-actions[bot]
aff0e5c530
Merge staging-next into staging
2021-09-21 12:02:04 +00:00
github-actions[bot]
fd3d37414d
Merge master into staging-next
2021-09-21 12:01:29 +00:00
Kevin Cox
c8fb668abb
Merge pull request #138773 from LibreCybernetics/update-nvidia
...
nvidia_x11: 470.63.01 → 470.74
2021-09-21 07:23:09 -04:00
Maximilian Bosch
a616d83b06
Merge pull request #138481 from TredwellGit/linux
...
Kernels 2021-09-18
2021-09-21 12:48:44 +02:00
r-burns
d6b683c052
Merge pull request #138740 from trofi/fix-libpsm2-gcc-11
...
libpsm2: disable blanket -Werror (gcc-11 fix)
2021-09-21 00:38:40 -07:00
Atemu
e4809b1143
linux_lqx: 5.13.15 -> 5.14.6
2021-09-21 09:10:01 +02:00
github-actions[bot]
e36b332620
Merge staging-next into staging
2021-09-21 06:01:41 +00:00
github-actions[bot]
fa2601f3b2
Merge master into staging-next
2021-09-21 06:01:04 +00:00
Fabián Heredia Montiel
ae5f12ccc3
nvidia_x11: 470.63.01 → 470.74
2021-09-20 20:51:33 -05:00
Artturi
3b2440afd0
Merge pull request #100120 from unode/cpupower-gui
...
linuxPackages.cpupower-gui: init at 1.0.0
2021-09-21 03:37:10 +03:00
TredwellGit
b8b772a1da
linux/hardened/patches/5.14: 5.14.5-hardened1 -> 5.14.6-hardened1
2021-09-20 21:41:39 +00:00
TredwellGit
a41022ed40
linux/hardened/patches/5.13: 5.13.18-hardened1 -> 5.13.19-hardened1
2021-09-20 21:41:38 +00:00
TredwellGit
4a9ffb82ae
linux/hardened/patches/5.10: 5.10.66-hardened1 -> 5.10.67-hardened1
2021-09-20 21:41:37 +00:00
TredwellGit
3e87ddbf57
linux-rt_5_10: 5.10.59-rt52 -> 5.10.65-rt53
2021-09-20 21:40:48 +00:00
TredwellGit
51b0e44980
linux: 5.14.5 -> 5.14.6
2021-09-20 21:40:12 +00:00
TredwellGit
748679c0d3
linux: 5.13.18 -> 5.13.19
2021-09-20 21:40:00 +00:00
TredwellGit
66760dcbd5
linux: 5.10.66 -> 5.10.67
2021-09-20 21:39:46 +00:00
Sergei Trofimovich
035a6e805f
libpsm2: disable blanket -Werror (gcc-11 fix)
...
Without the change gcc-11 build fails as:
```
$ nix-build -E 'with import ./. {}; libpsm2.override { stdenv = gcc11Stdenv; }
...
/build/source/include/linux-x86_64/sysdep.h:146:9:
error: array subscript 'struct xchg_dummy[0]'
is partly outside array bounds of 'psmi_lock_t[1]'
```
2021-09-20 20:14:47 +01:00
Sergei Trofimovich
6139dd3a1b
libpsm2: whitespace
2021-09-20 20:14:47 +01:00
Jörg Thalheim
3449264436
Revert "linuxPackages.bcc: fix build"
...
This reverts commit 38e5d82d59529e96b55f8a33a954d481d77287a1.
2021-09-20 19:37:19 +01:00
Sergei Trofimovich
f75b03979c
linuxHeaders: 5.12 -> 5.14
2021-09-20 19:37:19 +01:00
github-actions[bot]
4b46e03aa1
Merge staging-next into staging
2021-09-20 18:01:50 +00:00
github-actions[bot]
ecf5e75910
Merge master into staging-next
2021-09-20 18:01:12 +00:00
Bobby Rong
02aa722675
Merge pull request #138571 from baracoder/nvidia-x11-remove-maintainer
...
nvidia_x11: Remove maintainer baracoder
2021-09-20 22:28:29 +08:00
Herman Fries
eaaf989c1c
nvidia_x11: Remove maintainer baracoder
2021-09-19 22:53:16 +02:00
Bernardo Meurer
24a2bad7ec
linuxKernel.kernels.linux_xanmod: 5.14.4 -> 5.14.6
2021-09-19 13:09:01 -07:00
github-actions[bot]
338d8790b9
Merge staging-next into staging
2021-09-19 18:01:52 +00:00
Alyssa Ross
e2bb7997c4
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
nixos/doc/manual/release-notes/rl-2111.section.md
2021-09-19 17:08:00 +00:00
figsoda
8212bd0ed1
Merge pull request #138466 from samuelgrf/mainProgram-multiple-II
...
Add meta.mainProgram to multiple packages
2021-09-19 11:59:16 -04:00
Felix Buehler
997579a42a
v86d: switch to fetchFromGitHub
2021-09-19 17:13:18 +02:00
Felix Buehler
c217af17c8
pflask: switch to fetchFromGitHub
2021-09-19 17:13:18 +02:00
Felix Buehler
056df0bddd
lm-sensors: switch to fetchFromGitHub
2021-09-19 17:13:18 +02:00
Felix Buehler
41d512768f
google-authenticator: switch to fetchFromGitHub
2021-09-19 17:13:18 +02:00
Felix Buehler
2653630f27
bbswitch: switch to fetchFromGitHub
2021-09-19 17:13:17 +02:00
Felix Buehler
3722e4fbcc
afuse: switch to fetchFromGitHub
2021-09-19 17:13:15 +02:00
Michael Raskin
401cd35e1d
Merge pull request #138514 from onny/firejail
...
firejail: Remove symlink check patch
2021-09-19 14:57:17 +00:00
Ryan Burns
d43df749ac
netbsd.compat: fix build on darwin
...
The makefile requires GNU objcopy
2021-09-19 21:58:33 +09:00
Jörg Thalheim
015b98df50
Merge pull request #138465 from r-burns/bcc
...
[staging-next] linuxPackages.bcc: fix build
2021-09-19 12:42:58 +01:00
Jörg Thalheim
d1fda939b3
Merge pull request #138427 from hmenke/zfs
...
zfsUnstable: correct sha256
2021-09-19 11:51:31 +01:00
Jonas Heinrich
defe183dad
firejail: Remove symlink check patch
2021-09-19 11:55:30 +02:00
Ryan Burns
88b8df5c21
linuxPackages.bcc: fix build
...
Use Debian downstream patch to fix compilation against linuxHeaders < 5.14.
Our linux headers exposed by glibc are still at 5.12. We should be able
to remove this patch once our linuxHeaders are bumped to 5.14+.
2021-09-18 16:26:16 -07:00
Samuel Gräfenstein
9d5298933a
zfs: add meta.mainProgram
...
Fix the following error when running `nix run .#zfs`:
error: unable to execute '/nix/store/ns6rifm17r0lp17w8gb4qr5db4cwbkj9-zfs-user-2.1.1/bin/zfs-user': No such file or directory
2021-09-19 00:11:17 +02:00
Florian Klink
accd85b1c4
Merge pull request #138366 from Mindavi/systemd/cross
...
systemd: fix cross-compilation
2021-09-18 18:07:22 +02:00
Henri Menke
a0bbb9e766
zfsUnstable: correct sha256
2021-09-18 16:28:08 +02:00
R. RyanTM
663b56eff0
procdump: 1.1.1 -> 1.2
2021-09-18 12:31:17 +00:00
Rick van Schijndel
eabd03a551
systemd: fix cross-compilation
...
Instead of patching the ld path, it's now specified as meson option
2021-09-18 06:37:20 +02:00
github-actions[bot]
a21275cdae
Merge master into staging-next
2021-09-17 18:01:14 +00:00
ajs124
36e21638f5
linux/hardened/patches/5.4: 5.4.146-hardened1 -> 5.4.147-hardened1
2021-09-17 09:02:31 -04:00
ajs124
9f34448a98
linux/hardened/patches/5.14: 5.14.4-hardened1 -> 5.14.5-hardened1
2021-09-17 09:02:31 -04:00
ajs124
7c04d2e390
linux/hardened/patches/5.13: 5.13.17-hardened1 -> 5.13.18-hardened1
2021-09-17 09:02:31 -04:00
ajs124
031afe4faa
linux/hardened/patches/5.10: 5.10.65-hardened1 -> 5.10.66-hardened1
2021-09-17 09:02:31 -04:00
Luke Granger-Brown
65b8408ce8
Merge remote-tracking branch 'upstream/staging' into staging-next
2021-09-17 12:18:44 +00:00
sternenseemann
29f8f30b37
zfsStable, zfsUnstable: fix eval
2021-09-17 10:05:42 +00:00
github-actions[bot]
2ad7b248e6
Merge staging-next into staging
2021-09-17 00:02:15 +00:00
Bernardo Meurer
f65f925f20
Merge pull request #138168 from NixOS/zfs-2.1.1
...
linuxPackages.zfs: 2.1.0 -> 2.1.1
2021-09-16 23:32:21 +00:00
Sandro
694d075b72
Merge pull request #136965 from Mic92/zen-kernel
2021-09-16 20:44:20 +02:00
Bernardo Meurer
af69a71395
linuxPackages.zfs: 2.1.0 -> 2.1.1
2021-09-16 11:22:57 -07:00
github-actions[bot]
9905c2647a
Merge staging-next into staging
2021-09-16 18:01:40 +00:00
Maximilian Bosch
a3a462734a
Merge pull request #138149 from TredwellGit/linux
...
Kernels 2021-09-16
2021-09-16 18:13:59 +02:00
Bernardo Meurer
b173e70e4d
Merge pull request #138067 from Kranzes/update-xanmod
...
linux_xanmod: 5.14.3 -> 5.14.4
2021-09-16 15:43:00 +00:00
TredwellGit
00c500e9fc
linux/hardened/patches/5.4: 5.4.144-hardened1 -> 5.4.146-hardened1
2021-09-16 14:06:36 +00:00
TredwellGit
60b7113164
linux/hardened/patches/5.14: 5.14.2-hardened1 -> 5.14.4-hardened1
2021-09-16 14:06:35 +00:00
TredwellGit
a8de1dcd2b
linux/hardened/patches/5.13: 5.13.15-hardened1 -> 5.13.17-hardened1
2021-09-16 14:06:34 +00:00
TredwellGit
48e902a2ef
linux/hardened/patches/5.10: 5.10.63-hardened1 -> 5.10.65-hardened1
2021-09-16 14:06:33 +00:00
TredwellGit
100f0569b5
linux: 5.4.145 -> 5.4.147
2021-09-16 14:05:57 +00:00
TredwellGit
4a05e7297c
linux: 5.14.3 -> 5.14.5
2021-09-16 14:05:51 +00:00
TredwellGit
4954336e2b
linux: 5.13.16 -> 5.13.18
2021-09-16 14:05:45 +00:00
TredwellGit
6c829ce083
linux: 5.10.64 -> 5.10.66
2021-09-16 14:05:32 +00:00
github-actions[bot]
85bd312fb6
Merge staging-next into staging
2021-09-16 12:02:04 +00:00
Bobby Rong
0b28945e2f
Merge pull request #135995 from r-ryantm/auto-update/sdparm
...
sdparm: 1.11 -> 1.12
2021-09-16 16:52:53 +08:00
Ilan Joselevich
fcbc01cd2c
linux_xanmod: 5.14.3 -> 5.14.4
2021-09-16 01:21:56 +03:00
Jörg Thalheim
b47f3bd50c
linux_zen: 5.14.1-zen1 -> 5.14.3-zen1
2021-09-15 09:28:27 +02:00
github-actions[bot]
df9a7e8f43
Merge staging-next into staging
2021-09-14 12:01:39 +00:00
github-actions[bot]
6f038e8b11
Merge master into staging-next
2021-09-14 12:01:03 +00:00
github-actions[bot]
697f3593aa
Merge staging-next into staging
2021-09-14 06:02:01 +00:00
github-actions[bot]
38520726fc
Merge master into staging-next
2021-09-14 06:01:28 +00:00
Emily
35a1ca8a0a
darwin.trash: fix on aarch64-darwin
...
None of these clang options should be necessary with the nixpkgs stdenv
infrastructure, and the -arch was breaking Apple Silicon builds.
2021-09-14 03:31:31 +01:00
R. RyanTM
48d6922748
system76-firmware: 1.0.28 -> 1.0.29
2021-09-13 23:38:52 +00:00
Florian Klink
8019c95b55
Merge pull request #131618 from andir/systemdv249
...
systemd v249
2021-09-13 09:39:49 +02:00
github-actions[bot]
12eb8fbbba
Merge staging-next into staging
2021-09-13 06:02:09 +00:00
github-actions[bot]
d6f028d12d
Merge master into staging-next
2021-09-13 06:01:28 +00:00
Ryan Mulligan
43c65852d6
Merge pull request #135996 from r-ryantm/auto-update/smemstat
...
smemstat: 0.02.08 -> 0.02.10
2021-09-12 18:40:07 -07:00
github-actions[bot]
dfd1161f35
Merge staging-next into staging
2021-09-13 00:02:22 +00:00
github-actions[bot]
ac962ee61a
Merge master into staging-next
2021-09-13 00:01:41 +00:00
Andreas Rammhold
64556974b6
systemd: 247.6 -> 249.4
...
This updates systemd to version v249.4 from version v247.6.
Besides the many new features that can be found in the upstream
repository they also introduced a bunch of cleanup which ended up
requiring a few more patches on our side.
a) 0022-core-Handle-lookup-paths-being-symlinks.patch:
The way symlinked units were handled was changed in such that the last
name of a unit file within one of the unit directories
(/run/systemd/system, /etc/systemd/system, ...) is used as the name
for the unit. Unfortunately that code didn't take into account that
the unit directories themselves could already be symlinks and thus
caused all our units to be recognized slightly different.
There is an upstream PR for this new patch:
https://github.com/systemd/systemd/pull/20479
b) The way the APIVFS is setup has been changed in such a way that we
now always have /run. This required a few changes to the
confinement tests which did assert that they didn't exist. Instead of
adding another patch we can just adopt the upstream behavior. An
empty /run doesn't seem harmful.
As part of this work I refactored the confinement test just a little
bit to allow better debugging of test failures. Previously it would
just fail at some point and it wasn't obvious which of the many
commands failed or what the unexpected string was. This should now be
more obvious.
c) Again related to the confinement tests the way a file was tested for
being accessible was optimized. Previously systemd would in some
situations open a file twice during that check. This was reduced to
one operation but required the procfs to be mounted in a units
namespace.
An upstream bug was filed and fixed. We are now carrying the
essential patch to fix that issue until it is backported to a new
release (likely only version 250). The good part about this story is
that upstream systemd now has a test case that looks very similar to
one of our confinement tests. Hopefully that will lead to less
friction in the long run.
https://github.com/systemd/systemd/issues/20514
https://github.com/systemd/systemd/pull/20515
d) Previously we could grep for dlopen( somewhat reliably but now
upstream started using a wrapper around dlopen that is most of the
time used with linebreaks. This makes using grep not ergonomic
anymore.
With this bump we are grepping for anything that looks like a
dynamic library name (in contrast to a dlopen(3) call) and replace
those instead. That seems more robust. Time will tell if this holds.
I tried using coccinelle to patch all those call sites using its
tooling but unfornately it does stumble upon the _cleanup_
annotations that are very common in the systemd code.
e) We now have some machinery for libbpf support in our systemd build.
That being said it doesn't actually work as generating some skeletons
doesn't work just yet. It fails with the below error message and is
disabled by default (in both minimal and the regular build).
> FAILED: src/core/bpf/socket_bind/socket-bind.skel.h
> /build/source/tools/build-bpf-skel.py --clang_exec /nix/store/x1bi2mkapk1m0zq2g02nr018qyjkdn7a-clang-wrapper-12.0.1/bin/clang --llvm_strip_exec /nix/store/zm0kqan9qc77x219yihmmisi9g3sg8ns-llvm-12.0.1/bin/llvm-strip --bpftool_exec /nix/store/l6dg8jlbh8qnqa58mshh3d8r6999dk0p-bpftools-5.13.11/bin/bpftool --arch x86_64 ../src/core/bpf/socket_bind/socket-bind.bpf.c src/core/bpf/socket_bind/socket-bind.skel.h
> libbpf: elf: socket_bind_bpf is not a valid eBPF object file
> Error: failed to open BPF object file: BPF object format invalid
> Traceback (most recent call last):
> File "/build/source/tools/build-bpf-skel.py", line 128, in <module>
> bpf_build(args)
> File "/build/source/tools/build-bpf-skel.py", line 92, in bpf_build
> gen_bpf_skeleton(bpftool_exec=args.bpftool_exec,
> File "/build/source/tools/build-bpf-skel.py", line 63, in gen_bpf_skeleton
> skel = subprocess.check_output(bpftool_args, universal_newlines=True)
> File "/nix/store/81lwy2hfqj4c1943b1x8a0qsivjhdhw9-python3-3.9.6/lib/python3.9/subprocess.py", line 424, in check_output
> return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
> File "/nix/store/81lwy2hfqj4c1943b1x8a0qsivjhdhw9-python3-3.9.6/lib/python3.9/subprocess.py", line 528, in run
> raise CalledProcessError(retcode, process.args,
> subprocess.CalledProcessError: Command '['/nix/store/l6dg8jlbh8qnqa58mshh3d8r6999dk0p-bpftools-5.13.11/bin/bpftool', 'g', 's', '../src/core/bpf/socket_bind/socket-bind.bpf.o']' returned non-zero exit status 255.
> [102/1457] Compiling C object src/journal/libjournal-core.a.p/journald-server.c.oapture output)put)ut)
> ninja: build stopped: subcommand failed.
f) We do now have support for TPM2 based disk encryption in our
systemd build. The actual bits and pieces to make use of that are
missing but there are various ongoing efforts in that direction.
There is also the story about systemd in our initrd to enable this
being used for root volumes. None of this will yet work out of the
box but we can start improving on that front.
g) FIDO2 support was added systemd and consequently we can now use
that. Just with TPM2 there hasn't been any integration work with
NixOS and instead this just adds that capability to work on that.
Co-Authored-By: Jörg Thalheim <joerg@thalheim.io>
2021-09-12 23:45:49 +02:00
Andreas Rammhold
1bfa488b1c
libbpf: 0.1.1 -> 0.4.0
2021-09-12 23:44:14 +02:00
Sandro
1cc2130093
Merge pull request #136503 from Kranzes/update-xanmod
...
linux_xanmod: 5.13.13 -> 5.14.3
2021-09-12 23:05:40 +02:00
Ilan Joselevich
4b0699e5d0
linux_xanmod: 5.13.13 -> 5.14.3
2021-09-12 22:22:51 +03:00
TredwellGit
5698fc0dfc
linux-rt_5_4: 5.4.143-rt63 -> 5.4.143-rt64
2021-09-12 12:38:42 +00:00
TredwellGit
be590b86e2
linux: 5.4.144 -> 5.4.145
2021-09-12 12:38:02 +00:00
TredwellGit
b81ac24356
linux: 5.14.2 -> 5.14.3
2021-09-12 12:37:55 +00:00
TredwellGit
f0878c65eb
linux: 5.13.15 -> 5.13.16
2021-09-12 12:37:47 +00:00
TredwellGit
71348196a0
linux: 5.10.63 -> 5.10.64
2021-09-12 12:37:36 +00:00
github-actions[bot]
7267016c66
Merge staging-next into staging
2021-09-12 12:01:42 +00:00
github-actions[bot]
acd45cb351
Merge master into staging-next
2021-09-12 12:01:10 +00:00
Jörg Thalheim
6fb71e46ca
sysdig: fix linking against libabseil
2021-09-12 10:49:38 +02:00
Sergei Trofimovich
66a68c3a63
kexec-tools: pull upstream fix for -fno-common compiler
...
Fixes build failure against upstream gcc (defaults -fno-common)
2021-09-12 09:09:07 +01:00
Sergei Trofimovich
33472c371d
libsepol: pull upstream fix for -fno-common compiler
...
Fixes build failure against upstream gcc (defaults -fno-common)
2021-09-12 08:39:13 +01:00
github-actions[bot]
8bc930ca39
Merge staging-next into staging
2021-09-12 00:02:23 +00:00
github-actions[bot]
3f2255106a
Merge master into staging-next
2021-09-12 00:01:45 +00:00
Sergei Trofimovich
71890f5995
audit: pull upstream fix for -fno-common compiler
...
Fixes build failure against upstream gcc (defaults -fno-common).
2021-09-11 22:49:10 +01:00
ajs124
e8f9aa9302
Merge pull request #137281 from NeQuissimus/kernels
...
Kernels 2021-09-10
2021-09-11 22:30:04 +02:00
github-actions[bot]
ff5297bcd3
Merge staging-next into staging
2021-09-11 12:01:45 +00:00
Alyssa Ross
56314db098
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
pkgs/development/compilers/ghc/8.10.7.nix
pkgs/development/compilers/ghc/8.8.4.nix
I've removed the isWindows check from useLdGold in ghc, since that should
be covered by the new hasGold check.
2021-09-11 10:49:13 +00:00
Bernardo Meurer
98018cce2c
linuxPackages.bbswitch: use kernel's make flags
...
We should be using whatever makeflags were used to build the kernel
itself, otherwise clang-built kernels cannot use the module.
2021-09-10 14:42:17 -07:00
github-actions[bot]
fa42e187e1
Merge staging-next into staging
2021-09-10 18:01:52 +00:00
Martin Weinelt
d9341eafa2
Merge branch 'master' into staging-next
2021-09-10 15:04:01 +02:00
Tim Steinbach
6a50498b6d
linux: 5.14.1 -> 5.14.2
2021-09-10 08:01:01 -04:00
Tim Steinbach
332100e6e1
linux: 5.13.14 -> 5.13.15
2021-09-10 08:01:01 -04:00
Tim Steinbach
6c41ccc972
linux: 5.10.62 -> 5.10.63
2021-09-10 08:01:01 -04:00
Tim Steinbach
820d68d2dc
linux/hardened/patches/5.14: init at 5.14.2-hardened1
2021-09-10 05:20:10 -04:00
Tim Steinbach
02b5c3b291
linux/hardened/patches/5.13: 5.13.14-hardened1 -> 5.13.15-hardened1
2021-09-10 05:20:09 -04:00
Tim Steinbach
3fe64b3728
linux/hardened/patches/5.10: 5.10.62-hardened1 -> 5.10.63-hardened1
2021-09-10 05:20:08 -04:00
github-actions[bot]
43f3e1bcc6
Merge staging-next into staging
2021-09-10 00:02:06 +00:00
github-actions[bot]
912b8082df
Merge master into staging-next
2021-09-10 00:01:31 +00:00
Timothy DeHerrera
6dbeb3190d
Merge pull request #126544 from jonringer/nixos-rebuild-use-substitutes
...
nixos-rebuild: add --use-substitutes option
2021-09-09 13:53:37 -06:00
Jörg Thalheim
1f4b1d941e
Merge pull request #135939 from Atemu/update/linux_lqx
...
linux_lqx: 5.13.9 -> 5.13.15
2021-09-09 20:26:49 +01:00
Atemu
2938a58f2d
linux_lqx: 5.13.9 -> 5.13.15
2021-09-09 17:50:50 +02:00
github-actions[bot]
b56a4e5e6e
Merge staging-next into staging
2021-09-09 00:02:15 +00:00
github-actions[bot]
8cd1da2362
Merge master into staging-next
2021-09-09 00:01:35 +00:00
Pavol Rusnak
9ceefd7e37
Merge pull request #137088 from bricewge/master
...
maintainers: remove bricewge
2021-09-08 20:15:52 +02:00
github-actions[bot]
a84ab6724a
Merge staging-next into staging
2021-09-08 18:01:37 +00:00
github-actions[bot]
31efc58eb0
Merge master into staging-next
2021-09-08 18:01:03 +00:00
Alyssa Ross
1fb4400c91
linuxPackages.perf-tools: clarify license
2021-09-08 17:17:39 +00:00
Alyssa Ross
5c14c688d2
linuxPackages.bbswitch: add license
2021-09-08 17:17:27 +00:00
github-actions[bot]
888f8e8ac0
Merge staging-next into staging
2021-09-08 12:02:02 +00:00
github-actions[bot]
5ed67a849a
Merge master into staging-next
2021-09-08 12:01:27 +00:00
Brice Waegeneire
a49177e0ce
maintainers: remove bricewge
...
So long, and thanks for all the fish!
2021-09-08 11:56:00 +02:00
Fabian Affolter
6adfc5114d
Merge pull request #136982 from ymatsiuk/upower
...
upower: 0.99.11 -> 0.99.13
2021-09-08 11:53:18 +02:00
github-actions[bot]
350e236585
Merge staging-next into staging
2021-09-08 06:01:57 +00:00
github-actions[bot]
ad1de317ad
Merge master into staging-next
2021-09-08 06:01:19 +00:00
Tim Steinbach
6a6ff4d0d8
linux_latest-libre: 18298 -> 18314
2021-09-07 20:15:06 -04:00
github-actions[bot]
23d1f1e2cf
Merge staging-next into staging
2021-09-08 00:02:21 +00:00
github-actions[bot]
58f8f1f058
Merge master into staging-next
2021-09-08 00:01:42 +00:00
ajs124
73204fed4b
Merge pull request #136944 from lovesegfault/hardened-update
...
linux_{4_14,4_19,5_4,5_10,5_13}_hardened: update patches
2021-09-07 22:56:36 +02:00
Bernardo Meurer
abfa8098ac
linux_5_13_hardened: 5.13.13 -> 5.13.14
2021-09-07 11:30:36 -07:00
Bernardo Meurer
1aba1d891f
linux_5_10_hardened: 5.10.61 -> 5.10.62
2021-09-07 11:30:35 -07:00
Bernardo Meurer
8169d9283e
linux_5_4_hardened: 5.4.143 -> 5.4.144
2021-09-07 11:30:34 -07:00
Bernardo Meurer
1c0e5d13a9
linux_4_19_hardened: 4.19.205 -> 4.19.206
2021-09-07 11:29:21 -07:00
Bernardo Meurer
17681be1d3
linux_4_14_hardened: 4.14.245 -> 4.14.246
2021-09-07 11:28:38 -07:00
Luke Granger-Brown
39ddedbc0b
Merge remote-tracking branch 'upstream/staging' into staging-fix
2021-09-07 16:27:16 +00:00
Luke Granger-Brown
9094826af8
Merge remote-tracking branch 'upstream/staging-next' into staging-fix
2021-09-07 16:23:11 +00:00
Luke Granger-Brown
9501e5d2fd
Merge commit '5b6c2380adb4c4ddb0f87152cef0016333ea5a4d' into staging-fix
2021-09-07 16:21:36 +00:00
Yurii Matsiuk
ea0f9ce763
upower: 0.99.11 -> 0.99.13
2021-09-07 14:40:12 +02:00
github-actions[bot]
c64a09f1ee
Merge staging-next into staging
2021-09-07 12:01:49 +00:00
github-actions[bot]
fbefda3466
Merge master into staging-next
2021-09-07 12:01:13 +00:00
Luke Granger-Brown
9af75b49ec
Merge remote-tracking branch 'upstream/staging-next' into staging
2021-09-07 11:39:35 +00:00
Michael Weiss
ddc8a3a982
Merge pull request #136934 from primeos/fuse3
...
fuse3: 3.10.4 -> 3.10.5
2021-09-07 10:59:54 +02:00
Vladimír Čunát
09f5763784
Merge branch 'master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/pathspec/default.nix
The hashes are equivalent, so it's not a real conflict.
- pkgs/top-level/static.nix
I can't see a solution, deffered redoing this to the later PR:
https://github.com/NixOS/nixpkgs/pull/136849
2021-09-07 08:43:26 +02:00
Jörg Thalheim
da036efe0d
Merge pull request #135871 from abdelq/kmod-29
...
kmod: 27 -> 29
2021-09-07 03:43:00 +01:00
Jörg Thalheim
52b5ba2db5
Merge pull request #136771 from Mindavi/sysklogd/cross
...
sysklogd: support cross-compilation
2021-09-07 03:35:22 +01:00
Michael Weiss
f5a0c96b9a
fuse3: 3.10.4 -> 3.10.5
2021-09-06 23:01:58 +02:00
maxine [they]
2f6c17537d
Merge pull request #136284 from maxeaubrey/ell_0.43_iwd_1.17
...
ell: 0.42 -> 0.43, iwd: 1.16 -> 1.17
2021-09-06 11:26:01 +02:00
maxine [they]
c8472e26dd
Merge pull request #136218 from maxeaubrey/bluez_5.61
...
bluez: 5.60 -> 5.61
2021-09-06 11:25:46 +02:00
github-actions[bot]
79667a59e7
Merge master into staging-next
2021-09-06 00:01:28 +00:00
Jörg Thalheim
89b176219a
Merge pull request #136752 from Mic92/zen-kernel
...
linux_zen: 5.13.13-zen1 -> 5.14.1-zen1
2021-09-05 21:27:40 +01:00
github-actions[bot]
75dc00dbd8
Merge master into staging-next
2021-09-05 18:00:57 +00:00
Jörg Thalheim
87d338542b
Merge pull request #136773 from Mindavi/cramfsprogs/cross
...
cramfsprogs: support cross-compilation
2021-09-05 16:24:07 +01:00
Martin Weinelt
7f732aca66
Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next"
...
This reverts commit b041b2e1b2
, reversing
changes made to 5b6c2380ad
.
2021-09-05 15:02:25 +02:00
Martin Weinelt
b041b2e1b2
Merge remote-tracking branch 'origin/python-unstable' into staging-next
2021-09-05 14:51:26 +02:00
github-actions[bot]
5b6c2380ad
Merge master into staging-next
2021-09-05 12:01:20 +00:00
Fabian Affolter
40e0738df1
Merge pull request #136055 from trofi/update-pax-utils
...
pax-utils: 1.2.8 -> 1.3.3
2021-09-05 11:35:33 +02:00
Fabian Affolter
4dd783a187
pax-utils: clarify license
2021-09-05 11:13:58 +02:00
Rick van Schijndel
b85d91762a
cramfsprogs: support cross-compilation
2021-09-05 10:56:49 +02:00
Rick van Schijndel
780956e7cf
sysklogd: support cross-compilation
2021-09-05 10:47:17 +02:00
Jörg Thalheim
1b4038bddf
linux_zen: 5.13.13-zen1 -> 5.14.1-zen1
2021-09-05 07:55:20 +02:00
John Ericson
4ad0a67799
Merge pull request #136437 from Ericson2314/netbsd-compat-cross
...
netbsd.compat: Fix cross compilation
2021-09-05 00:46:54 -04:00
Sandro
fdf5387c25
Merge pull request #135921 from Stunkymonkey/os-specific-linux-pname-version
...
os-specific/linux: replace name with pname&version
2021-09-05 03:43:50 +02:00
Michael Weiss
6549c72937
Merge pull request #136701 from primeos/iproute2
...
iproute2: 5.13.0 -> 5.14.0
2021-09-05 00:10:28 +02:00
Maximilian Bosch
c1bc5a49b9
Merge pull request #136406 from maxeaubrey/cryptsetup_2.4.0
...
cryptsetup: 2.3.6 -> 2.4.0
2021-09-04 18:01:26 +02:00
Michael Weiss
247aed0528
iproute2: 5.13.0 -> 5.14.0
...
"End of summer sale, get your new iproute2 just in time for fall!
This is a relatively low volume release (maybe because of summer
doldrums)." [0]
[0]: https://lore.kernel.org/netdev/20210831120452.71325cd8@hermes.local/
2021-09-04 17:06:11 +02:00
github-actions[bot]
e750a74632
Merge staging-next into staging
2021-09-04 00:02:10 +00:00
Alyssa Ross
071a7a4583
Merge remote-tracking branch 'nixpkgs/master' into staging-next
2021-09-03 18:23:45 +00:00
Tim Steinbach
395d2eff17
linux_latest-libre: 18268 -> 18298
2021-09-03 12:55:42 -04:00
Tim Steinbach
979c0b77ab
linux-rt_5_4: 5.4.138-rt62 -> 5.4.143-rt63
2021-09-03 12:55:42 -04:00
Tim Steinbach
3221114748
linux: 5.4.143 -> 5.4.144
2021-09-03 12:55:42 -04:00
Tim Steinbach
116141a188
linux: 5.14 -> 5.14.1
2021-09-03 12:55:42 -04:00
Tim Steinbach
ba3f560dc5
linux: 5.13.13 -> 5.13.14
2021-09-03 12:55:42 -04:00
Tim Steinbach
f57a2e0bed
linux: 5.10.61 -> 5.10.62
2021-09-03 12:55:42 -04:00
Tim Steinbach
c57b2db48b
linux: 4.9.281 -> 4.9.282
2021-09-03 12:55:42 -04:00
Tim Steinbach
5ed235352a
linux: 4.4.282 -> 4.4.283
2021-09-03 12:55:42 -04:00
Tim Steinbach
9c8dbd4a1e
linux: 4.19.205 -> 4.19.206
2021-09-03 12:55:42 -04:00
Tim Steinbach
ad44de1d94
linux: 4.14.245 -> 4.14.246
2021-09-03 12:55:42 -04:00
John Ericson
2fdb859716
netbsd: Make hard/soft float match systems settings
2021-09-03 14:20:12 +00:00
John Ericson
ad609d27b5
netbsd.compat: Fix cross compilation
...
Not to netbsd, where it isn't needed, but elsewhere.
A few things going on here:
- Make compat use the "regular" not "host" makefile infra. This,
however, makes more assumptions that the toolchain is BSD-like, and
so we need to compensate for them with the likes of:
- `LORDER=...` and `TSORT=...`
- Move `export INSTALL_*` to install's setup hook so they don't interfere
with coreutils install
- Don't use `DESTDIR` for installing include files, instead set `INCSDIR`.
This is more proper, but doesn't work when `INCSDIR` is set multiple
times, unfortunately, as CLI defs override all other assignments. So
instead set `INCSDIR0` on the CLI, and do some `INCSDIR =
${INCSDIR0}/...` in the relevant packages.
- `INCSDIR` is set just in the NetBSD setup hook because FreeBSD uses
`INCLUDEDIR`.
2021-09-03 14:19:49 +00:00
Graham Christensen
3677d4bc22
kexec-tools: rename from kexectools to match the project name
2021-09-03 10:17:21 -04:00
Alyssa Ross
742750ccfd
linuxPackages.ddcci-driver: 0.3.3 -> 0.4.1
2021-09-03 13:20:34 +00:00
John Ericson
af58c2cc0c
netbsd.compat: Don't configure twice
2021-09-03 03:09:05 +00:00
github-actions[bot]
e89bf40282
Merge staging-next into staging
2021-09-03 00:02:21 +00:00
github-actions[bot]
704a7a86ca
Merge master into staging-next
2021-09-03 00:01:42 +00:00
Bernardo Meurer
ab1d85c0b1
Revert "linuxPackages.zfs: fix m4 script when not using GCC"
...
This reverts commit 5280cdee8d
.
2021-09-02 13:45:53 -07:00
Bernardo Meurer
a12606bef4
linuxPackages.zfs: use the kernel's stdenv when possible
2021-09-02 13:45:52 -07:00
github-actions[bot]
cad67905de
Merge staging-next into staging
2021-09-02 00:02:14 +00:00
github-actions[bot]
ce1d6621cd
Merge master into staging-next
2021-09-02 00:01:38 +00:00
Bernardo Meurer
03f44bd225
Merge pull request #136251 from lovesegfault/zfs-fix-configure
...
linuxPackages.zfs: fix m4 script when not using GCC
2021-09-01 18:15:02 +00:00
Maxine Aubrey
0e6c742620
cryptsetup: 2.3.6 -> 2.4.0
...
- https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.4/v2.4.0-ReleaseNotes
2021-09-01 18:57:13 +02:00
Maxine Aubrey
306f04e43d
iwd: 1.16 -> 1.17
...
- https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=1.17
2021-09-01 18:05:22 +02:00
John Ericson
ba1dbe0173
Merge pull request #129971 from Ericson2314/bsd-source-merge
...
netbsd: Split out path merging from bsd setup hook
2021-09-01 11:21:02 -04:00
github-actions[bot]
af292b1cdd
Merge staging-next into staging
2021-09-01 12:01:50 +00:00
Alyssa Ross
c13cf1e76f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
2021-09-01 07:47:01 +00:00
Abdelhakim Qbaich
ea93044e9e
kmod: fixing darwin.patch
2021-08-31 22:16:27 -07:00
Bernardo Meurer
3e31a8d02f
Merge pull request #136249 from lovesegfault/ddcci-driver-makeflags
...
linuxPackages.ddcci-driver: use kernel's make flags
2021-08-31 23:39:20 +00:00
adisbladis
d521df8494
Merge pull request #136299 from adisbladis/zfs-unstable-2021-08-30
...
zfsUnstable: 2.1.0 -> unstable-2021-08-30
2021-08-31 14:15:50 -05:00
Bernardo Meurer
5abb70031c
Merge pull request #136247 from lovesegfault/nvidia-fixes
2021-08-31 17:57:18 +00:00
adisbladis
19ea42a1f6
zfsUnstable: 2.1.0 -> unstable-2021-08-30
2021-08-31 09:59:20 -05:00
Alyssa Ross
1dfaced689
linuxPackages.xmm7360-pci: mark broken on Linux 5.14
2021-08-31 11:08:55 +00:00
Alyssa Ross
357eacbcd4
linuxPackages.rtw88: mark broken on Linux 5.14
2021-08-31 11:08:55 +00:00
Bernardo Meurer
5280cdee8d
linuxPackages.zfs: fix m4 script when not using GCC
2021-08-30 17:25:19 -07:00
Bernardo Meurer
8afec3d92f
linuxPackages.ddcci-driver: use kernel's make flags
2021-08-30 17:12:05 -07:00
Bernardo Meurer
19e4afc912
linuxPackages.nvidia-x11: use makeFlags in builder.sh
2021-08-30 17:06:12 -07:00
Bernardo Meurer
4a8ab482e0
linuxPackages.nvidia_x11.settings: use makeFlags in preBuild's libXNVCtrl build
2021-08-30 17:06:11 -07:00
Bernardo Meurer
0b63366e6f
linuxPackages.nvidia_x11.settings: pick up nvidia_x11 makeFlags
2021-08-30 17:06:10 -07:00
Bernardo Meurer
fe31fdf43b
linuxPackages.nvidia_x11.persistenced: pick up nvidia_x11 makeFlags
2021-08-30 17:06:09 -07:00
Bernardo Meurer
636e17aab5
linuxPackages.nvidia_x11: apply kernel module makeFlags
2021-08-30 17:06:08 -07:00
Alyssa Ross
7f3a4f6b67
linuxPackages.isgx: 2.11 -> 2.14
2021-08-30 23:17:02 +00:00
Alyssa Ross
3e299737a2
linux_latest-libre: 18260 -> 18268
2021-08-30 20:25:18 +00:00
Alyssa Ross
8bfb576250
linux_latest: 5.13.13 -> 5.14
2021-08-30 20:25:18 +00:00
Fabián Heredia Montiel
ff0dfaaee0
nvidia_x11: 470.57.02 → 470.63.01
2021-08-30 20:24:52 +00:00
Alyssa Ross
7032ab6d61
linuxPackages.isgx: enable parallel building
...
Tested at -j48.
2021-08-30 19:29:45 +00:00
Alyssa Ross
5ad9e2a74b
linuxPackages.akvcam: 1.2.0 -> 1.2.2
...
The qmake-based build didn't seem to work any more, but there's a
Kbuild-based build system available anyway, so let's just switch to
that and save a dependency.
Also clarify license.
2021-08-30 19:20:08 +00:00
Maxine Aubrey
9040a3b1bf
ell: 0.42 -> 0.43
...
- https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.43
2021-08-30 20:22:38 +02:00