Jonathan Ringer
e379e3d4bb
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-01-24 23:49:19 -08:00
github-actions[bot]
bbbd0a92af
Merge master into staging-next
2022-01-25 00:02:13 +00:00
Guillaume Girol
1b1fe46bb1
Merge pull request #156314 from B4dM4n/nixos-tests-missing
...
nixos/tests: add missing tests
2022-01-24 19:32:15 +00:00
github-actions[bot]
a45818989a
Merge master into staging-next
2022-01-24 18:01:03 +00:00
Alyssa Ross
1a60dd2adc
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/cupy/default.nix
pkgs/development/python-modules/staticjinja/default.nix
2022-01-24 15:39:34 +00:00
Alyssa Ross
2f14e11f3a
cryptsetup: don't look at targetPlatform
...
targetPlatform refers to the platform the program being compiled will
produce binaries for, which only makes sense for things like
compilers, not cryptsetup. The correct platform to look at to check
static support is hostPlatform, which refers to the architecture the
program being compiled will run on.
2022-01-24 15:11:46 +01:00
Yurii Matsiuk
4c8a08d231
tuigreet: 0.7.1 -> 0.7.2
2022-01-24 14:40:02 +01:00
github-actions[bot]
6fee71d339
Merge master into staging-next
2022-01-24 12:01:16 +00:00
Patrick Hilhorst
4ed7bed68d
Merge branch 'master' into nixos-tests-missing
2022-01-24 12:05:30 +01:00
Linus Heckemann
6fcdb32754
Merge pull request #156304 from lheckemann/rtl8189es
...
linuxPackages.rtl8189es: init at 2020-10-03
2022-01-24 09:43:29 +01:00
github-actions[bot]
11cced7438
Merge master into staging-next
2022-01-24 00:01:45 +00:00
Fabian Möller
4329d79dba
nixos/tests: link tests to their packages
2022-01-23 21:08:10 +01:00
Felix Bühler
9ea6af42ad
Merge pull request #156178 from Stunkymonkey/treewide-pname-version-7
...
treewide: rename name to pname&version
2022-01-23 20:48:42 +01:00
Dmitry Kalinkin
d3ec14f6cb
darwin.text_cmds: fix build
2022-01-23 08:18:46 -05:00
markuskowa
c6d51e2760
Merge pull request #149893 from r-ryantm/auto-update/libpsm2
...
libpsm2: 11.2.185 -> 11.2.203
2022-01-23 13:21:17 +01:00
Linus Heckemann
1b94b6c8cc
rtl8189es: init at 2020-10-03
...
Co-Authored-By: Linus Heckemann <git@sphalerite.org>
2022-01-23 12:55:16 +01:00
github-actions[bot]
591c66a4e3
Merge master into staging-next
2022-01-23 06:00:56 +00:00
Sandro
626d29f986
Merge pull request #155714 from QuantMint/bump-scons-ffado
2022-01-23 05:22:12 +01:00
Bernardo Meurer
103a25f1f2
Merge pull request #147482 from FlorianFranzen/bluez-experimental
...
bluez5: add experimental variant
2022-01-23 03:18:41 +00:00
github-actions[bot]
f865a2ca89
Merge staging-next into staging
2022-01-22 18:01:38 +00:00
Felix Buehler
027d353491
treewide: rename name to pname&version
2022-01-22 18:13:29 +01:00
Martin Weinelt
1518fb9e18
Merge pull request #156167 from bobby285271/fwupd
2022-01-22 15:32:06 +01:00
Bobby Rong
edf5e394d3
fwupd: fix aarch64 build
...
The following changes are introduced in 1.5.6 and the plugin_synaptics option no longer exist:
a75ef53eaf
2022-01-22 22:26:57 +08:00
github-actions[bot]
71b7ebbd7a
Merge staging-next into staging
2022-01-22 06:02:00 +00:00
github-actions[bot]
bc45bc6d10
Merge master into staging-next
2022-01-22 06:01:28 +00:00
Jan Tojnar
6631973f45
Merge pull request #155261 from ius/udisks2-cross
...
udisks: move util-linux to buildInputs
2022-01-22 03:52:43 +01:00
github-actions[bot]
9ad21425f0
Merge staging-next into staging
2022-01-21 06:02:00 +00:00
github-actions[bot]
69b5682348
Merge master into staging-next
2022-01-21 06:01:27 +00:00
Maximilian Bosch
8858896dde
Merge pull request #155929 from TredwellGit/linux
...
Kernels 2022-01-20
2022-01-21 01:48:34 +01:00
github-actions[bot]
233e4a0c95
Merge staging-next into staging
2022-01-21 00:03:13 +00:00
github-actions[bot]
fc3ddb8979
Merge master into staging-next
2022-01-21 00:01:42 +00:00
TredwellGit
89cc4c1ee6
linux: 5.4.172 -> 5.4.173
2022-01-20 19:29:58 +00:00
TredwellGit
581019ba48
linux: 5.16.1 -> 5.16.2
2022-01-20 19:29:51 +00:00
TredwellGit
fea530a537
linux: 5.15.15 -> 5.15.16
2022-01-20 19:29:44 +00:00
TredwellGit
6c1f8548a2
linux: 5.10.92 -> 5.10.93
2022-01-20 19:29:36 +00:00
Vladimír Čunát
9e07c1de65
wpa_supplicant_gui: fixup build after update in PR #155266
2022-01-20 18:12:47 +01:00
github-actions[bot]
d0a1972091
Merge staging-next into staging
2022-01-20 06:01:39 +00:00
github-actions[bot]
360ff20100
Merge master into staging-next
2022-01-20 06:01:09 +00:00
Sandro
d0169cc94c
Merge pull request #155567 from wentasah/kernelshark-2.1
2022-01-20 03:16:01 +01:00
github-actions[bot]
d586d95ff8
Merge staging-next into staging
2022-01-20 00:02:21 +00:00
github-actions[bot]
b74b591fbe
Merge master into staging-next
2022-01-20 00:01:46 +00:00
Andreas Rammhold
31e5b8dc21
Remove myself from maintainers
...
I don't have time and energy to deal with all of this anymore.
2022-01-20 00:24:52 +01:00
7c6f434c
ddf6a38b15
Merge pull request #155704 from reedriley/firejail
...
firejail: minor improvements and apparmor support
2022-01-19 22:30:34 +00:00
QuantMint
bcff7661cf
ffado: bump scons
2022-01-19 21:02:09 +01:00
Reed Riley
b2445ca613
firejail: add apparmor support
2022-01-19 13:35:19 -05:00
Reed Riley
e0bc22ad7b
firejail: improve local profile customization support
2022-01-19 11:14:28 -05:00
Reed Riley
881972bfa6
firejail: remove deprecated flag, see: 4909fa7efc
2022-01-19 10:56:39 -05:00
github-actions[bot]
dbcf9973e0
Merge staging-next into staging
2022-01-19 12:01:58 +00:00
github-actions[bot]
28abf69ffd
Merge master into staging-next
2022-01-19 12:01:24 +00:00
Sandro
c392f1e9cb
Merge pull request #155606 from SuperSandro2000/Lunarequest/master
2022-01-19 12:37:32 +01:00
