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