Commit Graph

16251 Commits

Author SHA1 Message Date
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 b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6, reversing
changes made to 5b6c2380adb4c4ddb0f87152cef0016333ea5a4d.
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 5280cdee8d6c3ec3155150c703ccd50d038b2cdb.
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