github-actions[bot]
49d7c98041
Merge staging-next into staging
2021-01-20 18:53:18 +00:00
Sandro
199ffe40e6
Merge pull request #110140 from holymonson/prepare-apple-sdk
...
darwin.apple-sdk: drop appleSdkVersion
2021-01-20 19:40:51 +01:00
Steven Pease
a128336cf6
Use buildPlatform instead of targetPlatform for unxip instructions
2021-01-20 10:08:03 -08:00
Thomas Gerbet
5858d84658
cifs-utils: missing python3 dependency for smbinfo
...
Since cifs-utils 6.12, smbinfo needs Python to be usable.
Issue introduced in 033208fd46
.
2021-01-20 18:39:42 +01:00
Tim Steinbach
50a5d4c773
linux/hardened/patches/5.4: 5.4.90.a -> 5.4.91.a
2021-01-20 12:36:58 -05:00
Tim Steinbach
3df0e82d66
linux/hardened/patches/5.10: 5.10.8.a -> 5.10.9.a
2021-01-20 12:36:57 -05:00
Tim Steinbach
66c9151443
linux/hardened/patches/4.19: 4.19.168.a -> 4.19.169.a
2021-01-20 12:36:57 -05:00
Tim Steinbach
c74614795b
linux-rt_5_10: 5.10.4-rt22 -> 5.10.8-rt24
2021-01-20 12:36:57 -05:00
Tim Steinbach
3141316d4d
linux: 5.4.90 -> 5.4.91
2021-01-20 12:36:56 -05:00
Tim Steinbach
463f322988
linux: 5.10.8 -> 5.10.9
2021-01-20 12:36:56 -05:00
Tim Steinbach
1118a48175
linux: 4.19.168 -> 4.19.169
2021-01-20 12:36:56 -05:00
Monson Shao
2467f5e4d2
darwin.apple-sdk: drop appleSdkVersion
...
In fact no one is using appleSdkVersion, and stdenv is decoupled with sdk.
2021-01-21 00:26:16 +08:00
Ryan Mulligan
069f9663e6
Merge pull request #110065 from r-ryantm/auto-update/libfabric
...
libfabric: 1.11.1 -> 1.11.2
2021-01-20 07:27:19 -08:00
github-actions[bot]
77750c1f20
Merge staging-next into staging
2021-01-20 12:43:41 +00:00
Atemu
ea051b0417
zen-kernels: 5.10.6 -> 5.10.9
2021-01-20 12:01:57 +01:00
Jörg Thalheim
1f32ecb82d
Merge pull request #110083 from r-ryantm/auto-update/lxcfs
...
lxcfs: 4.0.6 -> 4.0.7
2021-01-20 08:07:18 +00:00
R. RyanTM
dacc16aedd
lxcfs: 4.0.6 -> 4.0.7
2021-01-20 05:15:04 +00:00
Steven Pease
0fdab8d560
Merge branch 'master' into add-newer-xcode-hashes
2021-01-19 20:42:30 -08:00
Steven Pease
d8c1c0dc50
Update to XCode 12.3
2021-01-19 20:41:39 -08:00
R. RyanTM
78a5845e39
libfabric: 1.11.1 -> 1.11.2
2021-01-20 03:04:31 +00:00
Kira Bruneau
9788188273
pkgs/os-specific/windows: fix evaluation after stdenv.lib -> lib
...
Fixes the evaluation of packages in pkgs/os-specific/windows that
weren't updated to include a new lib parameter after the refactor from
stdenv.lib -> lib (#109490 ).
I originally only intended this change to fix
`pkgsCross.mingw32.buildPackages.gcc` & `pkgsCross.mingwW64.buildPackages.gcc`
to support building wine with `mingwSupport`, but I noticed this was
an issue for all updated windows packages. Most of these other
packages fail to build for other reasons.
2021-01-19 21:34:45 -05:00
github-actions[bot]
b27f238893
Merge staging-next into staging
2021-01-20 01:20:12 +00:00
zowoq
31f5dd3f36
treewide: editorconfig fixes
...
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
Thomas Gerbet
033208fd46
cifs-utils: 6.9 -> 6.12
...
This notably fixes CVE-2020-14342.
2021-01-19 21:30:29 +01:00
github-actions[bot]
e064950cb7
Merge staging-next into staging
2021-01-19 18:52:27 +00:00
Sandro
829a060202
Merge pull request #107040 from nagy/dstat-python3
...
dstat: 0.7.3 -> 0.7.4
2021-01-19 17:57:35 +01:00
Sandro
47409af354
Merge pull request #109906 from pjjw/linux-pam-musl-fix
...
linux-pam: remove broken musl pam_exec patch
2021-01-19 15:07:15 +01:00
Jan Tojnar
fc7bd322df
Merge branch 'staging-next' into staging
2021-01-19 13:50:04 +01:00
Mario Rodas
f417ebf945
Merge pull request #109071 from marsam/update-lxc
...
lxc: 4.0.5 -> 4.0.6
2021-01-19 06:54:08 -05:00
Jonathan Ringer
9bb3fccb5b
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
...
continuation of #109595
pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.
python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Peter Woodman
a51b7570d4
linux-pam: remove broken musl pam_exec patch
...
it looks like this build wasn't tested with musl-libc after upgrading to
1.5.1, and has been broken in this configuration since, as the removed
patch does not apply cleanly. the good news is it's been fixed upstream,
rendering it unnecessary.
2021-01-19 02:41:52 -05:00
Peter Woodman
a47a55e433
sysklogd: fix building against musl
...
taking guidance from alpine linux's patch[1], removed a few ifdefs and
fixed up some includes.
[1]: https://git.alpinelinux.org/aports/tree/main/sysklogd/fix-includes.patch
2021-01-18 23:29:12 -05:00
github-actions[bot]
e8a1f18e58
Merge staging-next into staging
2021-01-19 01:18:25 +00:00
Jörg Thalheim
90b88c416d
Merge pull request #81545 from yesbox/ebtables-legacy
...
ebtables: restore legacy commands
2021-01-18 21:01:01 +00:00
Sandro
83ef622cdf
Merge pull request #105647 from r-ryantm/auto-update/fwts
...
fwts: 20.09.00 -> 20.11.00
2021-01-18 20:47:36 +01:00
Jesper Geertsen Jonsson
1cb447c961
ebtables: restore "legacy" commands
...
ebtables 2.0.11 renamed the ebtables commands
from "ebtables*" to "ebtables-legacy-*".
Of course this breaks legacy packages and scripts
that depends on the ebtables commands.
The idea behind this upstream change appears to be that
ebtables-nft replaces ebtables and distributions should
rename either the ebtables-legacy or ebtables-nft commands
to provide the ebtables commands.
For nix a better fit is for packages to specify either the
ebtables or the ebtables-nft package, while both packages
provide the same commands.
This patch restores the ebtables package so it functions again.
2021-01-18 20:27:17 +01:00
github-actions[bot]
9f3193a9ee
Merge staging-next into staging
2021-01-18 18:51:57 +00:00
Tim Steinbach
5d55162e2a
linux/hardened/patches/5.4: 5.4.89.a -> 5.4.90.a
2021-01-18 12:46:32 -05:00
Tim Steinbach
c08ed1556e
linux/hardened/patches/5.10: 5.10.7.a -> 5.10.8.a
2021-01-18 12:46:32 -05:00
Tim Steinbach
25d44d9c82
linux/hardened/patches/4.19: 4.19.167.a -> 4.19.168.a
2021-01-18 12:46:32 -05:00
Tim Steinbach
a108d17cc1
linux/hardened/patches/4.14: 4.14.215.a -> 4.14.216.a
2021-01-18 12:46:31 -05:00
Tim Steinbach
20d6f20083
linux: 5.4.89 -> 5.4.90
2021-01-18 12:46:31 -05:00
Tim Steinbach
370ad71e2a
linux: 5.10.7 -> 5.10.8
2021-01-18 12:46:31 -05:00
Tim Steinbach
44b24624d5
linux: 4.9.251 -> 4.9.252
2021-01-18 12:46:30 -05:00
Tim Steinbach
7c70204558
linux: 4.4.251 -> 4.4.252
2021-01-18 12:46:30 -05:00
Tim Steinbach
2818d367ea
linux: 4.19.167 -> 4.19.168
2021-01-18 12:46:30 -05:00
Tim Steinbach
d15ed07e0a
linux: 4.14.215 -> 4.14.216
2021-01-18 12:46:27 -05:00
Jörg Thalheim
bcc7d46e9c
Merge pull request #109102 from Izorkin/libcap-update
2021-01-18 17:00:05 +00:00
Daniel Nagy
993c9fad7b
dstat: 0.7.3 -> 0.7.4
...
This change also switches dstat to python3. The patches introduced in this
commit are inspired by archlinux[0][1].
[0]:
e688b126c5/trunk/PKGBUILD
[1]: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/dstat&id=e688b126c561e842b459ea1cc88e725f1f2a29cc
2021-01-18 10:50:46 +01:00
Atemu
4a0070fc9f
zen-kernels: refactor suffix
...
Changing it required modifications in multiple places which is error-prone
2021-01-18 10:49:16 +01:00
zowoq
d93966200c
Merge staging-next into staging
2021-01-18 13:03:13 +10:00
github-actions[bot]
b7f20dcd02
Merge master into staging-next
2021-01-18 01:16:03 +00:00
Sandro
961dc12dd3
Merge pull request #106936 from LouisTakePILLz/update-r8125
2021-01-18 01:18:09 +01:00
Jörg Thalheim
57d863b1f0
Merge remote-tracking branch 'upstream/staging-next' into HEAD
2021-01-17 18:09:56 +01:00
Jörg Thalheim
1279bf812c
Merge remote-tracking branch 'upstream/master' into HEAD
2021-01-17 18:08:59 +01:00
Ben Siraphob
16d91ee628
pkgs/os-specific: stdenv.lib -> lib
2021-01-17 23:26:08 +07:00
Guillaume Girol
fab41ed0e6
Merge pull request #101233 from danielfullmer/cross-klibc
...
klibc: fix cross-compilation
2021-01-17 15:54:29 +00:00
Guillaume Girol
3cab73e3c7
klibc: strictDeps = true
2021-01-17 15:30:57 +00:00
Sandro
77edbd623a
Merge pull request #109596 from petabyteboy/feature/alsa-license
...
alsaLib: correct license field
2021-01-17 16:26:55 +01:00
Thomas Gerbet
b08f88f59f
checksec: update permanently redirected homepage URL
2021-01-17 12:46:56 +01:00
Jan Tojnar
643a72b4f1
Merge branch 'staging-next' into staging
2021-01-17 05:52:43 +01:00
Jan Tojnar
e6f926d910
Merge branch 'master' into staging-next
2021-01-17 05:52:23 +01:00
Milan Pässler
b7466c1c58
alsaLib: correct license field
2021-01-17 03:49:59 +01:00
Domen Kožar
bb3e0885d9
Merge pull request #109518 from xaverdh/nixos-rebuild-deps
...
nixos-rebuild: put some important dependencies in PATH
2021-01-16 22:20:07 +01:00
github-actions[bot]
ac253c6eed
Merge staging-next into staging
2021-01-16 18:51:11 +00:00
github-actions[bot]
f46cb85082
Merge master into staging-next
2021-01-16 18:51:05 +00:00
ajs124
2982fa466e
lvm2: 2.03.10 -> 2.03.11
...
https://github.com/lvmteam/lvm2/blob/v2_03_11/WHATS_NEW
[VDO](https://github.com/dm-vdo/vdo ) support is built by default now,
but is disabled in nixpkgs, because it can't find `vdoformat`.
AFAICT the kernel support for that still isn't upstream and it still
seems kind of experimental, so I'd just ignore that for now and add it
once it's either upstream of if anyone actually wants to use it.
2021-01-16 09:07:59 -08:00
Dmitry Kalinkin
eeaca31048
Merge pull request #108651 from holymonson/mark-broken
...
darwin: explicitly mark broken for failed building apple packages
2021-01-16 11:14:24 -05:00
Jörg Thalheim
05ff5799b2
Merge pull request #109107 from Mic92/bcc
...
linuxPackages.bcc: 0.17.0 -> 0.18.0
2021-01-16 15:11:48 +00:00
github-actions[bot]
2445824f40
Merge master into staging-next
2021-01-16 12:40:04 +00:00
Dominik Xaver Hörl
e9abfbde62
nixos-rebuild: put some important dependencies in PATH
2021-01-16 13:24:18 +01:00
Sandro
a9bb54359e
Merge pull request #108099 from siraben/double-quotes-fix
2021-01-16 11:27:58 +01:00
Ben Siraphob
8dd78bb4fb
treewide: fix double quoted strings in meta.description
2021-01-16 11:29:30 +07:00
Domen Kožar
c32f5b22f1
move nixos-rebuild into pkgs
2021-01-15 20:07:38 +01:00
github-actions[bot]
3269d4d3a3
Merge master into staging-next
2021-01-15 18:52:54 +00:00
Jack Kelly
e87245d87d
usbguard: 0.7.8 -> 1.0.0 ( #109296 )
2021-01-15 18:26:47 +01:00
Sandro
51e3b19fc6
Merge pull request #109329 from tu-maurice/beefi-0.1.1
2021-01-15 18:26:24 +01:00
github-actions[bot]
9f69dadafd
Merge master into staging-next
2021-01-15 01:16:33 +00:00
Sandro
22d184ae8d
Merge pull request #108866 from markuskowa/new-targetisns
...
target-isns: init at 0.6.8
2021-01-14 21:06:59 +01:00
Fabián Heredia Montiel
eda8c11e20
nvidia-settings.stable: 460.27.04 -> 460.32.03
2021-01-14 13:47:23 -06:00
tu-maurice
85ec1ece13
beefi: Init at 0.1.1
2021-01-14 20:35:00 +01:00
Jan Tojnar
b813710c04
Merge branch 'master' into staging-next
2021-01-14 02:24:17 +01:00
kraem
e41f385b1c
linux/hardened/patches/5.4: 5.4.88.a -> 5.4.89.a
2021-01-13 14:17:01 -05:00
kraem
e408bd85f0
linux/hardened/patches/5.10: 5.10.6.a -> 5.10.7.a
2021-01-13 14:17:01 -05:00
kraem
2aab392665
linux/hardened/patches/4.19: 4.19.166.a -> 4.19.167.a
2021-01-13 14:17:01 -05:00
kraem
5b687cf099
linux/hardened/patches/4.14: 4.14.214.a -> 4.14.215.a
2021-01-13 14:17:01 -05:00
kraem
305aabb1ac
linux: 5.4.88 -> 5.4.89
2021-01-13 14:17:01 -05:00
kraem
146d17dd60
linux: 5.10.6 -> 5.10.7
2021-01-13 14:17:01 -05:00
kraem
a1f3d24a96
linux: 4.9.250 -> 4.9.251
2021-01-13 14:17:01 -05:00
kraem
290dce1c29
linux: 4.4.250 -> 4.4.251
2021-01-13 14:17:01 -05:00
kraem
f462d8aee4
linux: 4.19.166 -> 4.19.167
2021-01-13 14:17:01 -05:00
kraem
4878fcd3c9
linux: 4.14.214 -> 4.14.215
2021-01-13 14:17:01 -05:00
Monson Shao
b9be1501fe
darwin.libauto: mark broken and drop stdenv.lib
2021-01-14 01:21:59 +08:00
Monson Shao
5f6e6516e0
darwin.hfs: mark broken
2021-01-13 19:05:21 +08:00
github-actions[bot]
f1bb6c74f9
Merge master into staging-next
2021-01-12 12:34:36 +00:00
Jörg Thalheim
dc77fb81a7
linuxPackages.bcc: 0.17.0 -> 0.18.0
2021-01-12 13:08:15 +01:00
Linus Heckemann
97c0e5d8a8
Merge pull request #107181 from lheckemann/generate-config-fix
...
linux: fix generate-config's handling of "no-choice" options
2021-01-12 11:13:58 +01:00
Izorkin
116fb2a610
libcap: use full path to bash
2021-01-12 11:23:32 +03:00
Izorkin
0d9b2c4b16
libcap: 2.44 -> 2.46
2021-01-12 11:15:25 +03:00
Izorkin
e2531f09bc
libcap_ng: 0.8 -> 0.8.2
2021-01-12 11:15:07 +03:00
github-actions[bot]
bfcc20a149
Merge master into staging-next
2021-01-12 06:34:30 +00:00
Jörg Thalheim
231b166b12
Merge pull request #108573 from LumiGuide/fix-armstubs
...
raspberrypi-armstubs: fix native compilation on armv7l
2021-01-12 06:11:46 +00:00
github-actions[bot]
757ad34b82
Merge master into staging-next
2021-01-11 18:42:29 +00:00
Frederik Rietdijk
4f0da4558f
persistenced: fix eval
...
broken by https://github.com/NixOS/nixpkgs/pull/108978
2021-01-11 19:41:09 +01:00
Frederik Rietdijk
e3961ff41f
persistenced: fix eval
...
broken by https://github.com/NixOS/nixpkgs/pull/108978
2021-01-11 19:40:37 +01:00
Frederik Rietdijk
450cb04f16
nixos: hardware.nvidia.package option for selecting nvidia package
...
Make it possible to select a derivation to use. This also moves some
logic that belongs to the derivation back into it.
2021-01-11 13:01:48 -05:00
Tim Steinbach
18b09d883f
linux: 5.11-rc2 -> 5.11-rc3
2021-01-11 11:10:07 -05:00
Tim Steinbach
d91f1b0f47
linux: Optional SECURITY_LOCKDOWN_LSM
...
The option has been removed in the most recent dot releases
2021-01-11 11:09:02 -05:00
Jan Tojnar
2b9372b2ca
Merge branch 'master' into staging-next
2021-01-11 13:36:42 +01:00
Profpatsch
4a7f99d55d
treewide: with stdenv.lib; in meta -> with lib;
...
Part of: https://github.com/NixOS/nixpkgs/issues/108938
meta = with stdenv.lib;
is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.
This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.
The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Mario Rodas
40d00ff005
lxc: 4.0.5 -> 4.0.6
2021-01-11 04:20:00 +00:00
github-actions[bot]
1cce663933
Merge staging-next into staging
2021-01-11 01:02:25 +00:00
github-actions[bot]
36bab113bf
Merge master into staging-next
2021-01-11 01:02:21 +00:00
Atemu
5eedbd86f4
linux_zen: 5.10.1 -> 5.10.6
2021-01-10 15:08:53 -08:00
Atemu
b775e9f474
linux_lqx: 5.10.5 -> 5.10.6
2021-01-10 15:08:53 -08:00
github-actions[bot]
0cba5d2226
Merge staging-next into staging
2021-01-10 06:32:15 +00:00
github-actions[bot]
add2d89082
Merge master into staging-next
2021-01-10 06:32:12 +00:00
Sandro
66dc4881b2
Merge pull request #108708 from raboof/busybox-1.32.0-to-1.32.1
...
busybox: 1.32.0 -> 1.32.1
2021-01-10 02:27:43 +01:00
github-actions[bot]
31f01e4bcc
Merge staging-next into staging
2021-01-10 01:03:39 +00:00
github-actions[bot]
433c7b069c
Merge master into staging-next
2021-01-10 01:03:35 +00:00
Markus Kowalewski
abd767dce9
target-isns: init at 0.6.8
2021-01-09 23:25:39 +01:00
Sandro
9b41aae9a9
Merge pull request #108853 from cpcloud/fix-nvidia-persistenced-hash
...
nvidia_x11.persistenced: fix hash
2021-01-09 23:23:01 +01:00
Tim Steinbach
85449b21bc
linux/hardened/patches/5.4: 5.4.87.a -> 5.4.88.a
2021-01-09 15:26:22 -05:00
Tim Steinbach
0d2b8275a3
linux/hardened/patches/5.10: 5.10.5.a -> 5.10.6.a
2021-01-09 15:26:20 -05:00
Tim Steinbach
bc95f84a5a
linux/hardened/patches/4.19: 4.19.165.a -> 4.19.166.a
2021-01-09 15:26:18 -05:00
Tim Steinbach
ea8bec0e23
linux/hardened/patches/4.14: 4.14.213.a -> 4.14.214.a
2021-01-09 15:26:17 -05:00
Tim Steinbach
6973e51c02
linux-rt_5_10: 5.10.1-rt20 -> 5.10.4-rt22
2021-01-09 15:25:50 -05:00
Tim Steinbach
a9dfa241f4
linux: 5.4.87 -> 5.4.88
2021-01-09 15:24:25 -05:00
Tim Steinbach
25aed143ea
linux: 5.10.5 -> 5.10.6
2021-01-09 15:23:50 -05:00
Tim Steinbach
ab96d91f2e
linux: 4.9.249 -> 4.9.250
2021-01-09 15:23:17 -05:00
Tim Steinbach
c5334d6c47
linux: 4.4.249 -> 4.4.250
2021-01-09 15:22:35 -05:00
Tim Steinbach
5124fff5c6
linux: 4.19.165 -> 4.19.166
2021-01-09 15:22:03 -05:00
Tim Steinbach
ab245e4e63
linux: 4.14.213 -> 4.14.214
2021-01-09 15:08:18 -05:00
Markus Kowalewski
257cbbcd3a
openiscsi: update license to GPL2+
2021-01-09 20:15:34 +01:00
Markus Kowalewski
e0238b7907
openiscsi: 2.1.2 -> 2.1.3
2021-01-09 20:15:34 +01:00
Phillip Cloud
2fbcc11971
nvidia_x11.persistenced: fix hash
2021-01-09 08:20:45 -05:00
Frederik Rietdijk
379ca4ddcf
Merge staging-next into staging
2021-01-09 13:29:53 +01:00
Michael Weiss
8ae8602bf7
Merge branch 'master' into staging-next
...
Manually resolved a conflict in
pkgs/development/libraries/libbladeRF/default.nix.
2021-01-09 12:16:11 +01:00
Sandro
9ffdffc4b0
Merge pull request #108795 from LibreCybernetics/update-nvidia
...
nvidia-x11.stable: 455.45.01 -> 460.32.03
2021-01-09 03:19:03 +01:00
github-actions[bot]
8ec9d0c1b6
Merge staging-next into staging
2021-01-09 01:00:29 +00:00
github-actions[bot]
e251591528
Merge master into staging-next
2021-01-09 01:00:25 +00:00
Kevin Cox
1443eb90cb
Merge pull request #108647 from Atemu/update/linux_lqx
...
linux_lqx: 5.9.16 -> 5.10.5
2021-01-08 16:35:27 -05:00
Fabián Heredia Montiel
92118e8078
nvidia-x11.stable: 455.45.01 -> 460.32.03
2021-01-08 11:14:46 -06:00
Arnout Engelen
ac24eaff9e
busybox: 1.32.0 -> 1.32.1
...
Fixes #108675 , a tty deadlock issue that affected one of the
texinfoInteractive tests.
Co-Authored-By: Sandro <sandro.jaeckel@gmail.com>
2021-01-08 09:42:46 +01:00
github-actions[bot]
18280919d6
Merge staging-next into staging
2021-01-08 06:29:07 +00:00
Vincent Haupert
af8abf141d
kernelPatches: ath driver: allow setting regulatory domain
...
Ports an OpenWRT patch for Atheros wireless drivers (ath*) which allows
the user to change the regulatory domain code to the one which actually
applies.
All Atheros devices have a regulatory domain burned into their EEPROM.
When using a device as AP, this domain is frequently overly restrictive
when compared to the regulation which applies in the country the device
actually operates in; often, this restriction disallows IR on all
channels making it impossible to use the device as an AP at all.
This commit introduces the NixOS config option
networking.wireless.athUserRegulatoryDomain which, if enabled, applies
the patch and sets the kernel config option ATH_USER_REGD.
The original OpenWRT patch targets Linux 5.8.
2021-01-08 02:20:08 +01:00
Jan Tojnar
e6c0c98940
Merge branch 'master' into staging-next
...
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
2021-01-08 02:07:34 +01:00
Tim Steinbach
4312cd74f1
linux-hardened: Track extra version
...
Fixes #108707
2021-01-07 18:23:57 -05:00
Sandro
c5ad2c8cfd
Merge pull request #108267 from MarcFontaine/pcimem
...
pcimem: init at unstable-2018-08-29
2021-01-07 22:12:08 +01:00
github-actions[bot]
9e9902250a
Merge staging-next into staging
2021-01-07 18:40:54 +00:00