Commit Graph

16140 Commits

Author SHA1 Message Date
Alyssa Ross
e07182012b
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/pint/default.nix
2021-12-17 05:50:06 +00:00
github-actions[bot]
7d786912ce
Merge master into staging-next 2021-12-17 00:01:56 +00:00
Maximilian Bosch
fb0091f094
Merge pull request #150975 from NixOS/revert-150065-workaround-issue-144811
Revert "nixos-rebuild: switch to tmpDir during rebuilds"
2021-12-16 23:15:04 +01:00
Dmitry Kalinkin
889227a048
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
Thiago Kenji Okada
e6ca3fc976 Revert "nixos-rebuild: switch to tmpDir during rebuilds"
This seems to break
`boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages`
causing it to use `linuxPackages`.
2021-12-16 14:47:07 -03:00
Jörg Thalheim
257c321cb2
Merge pull request #150958 from Mic92/zen
linux_zen: 5.15.6-zen2 -> 5.15.8-zen1
2021-12-16 17:27:22 +00:00
Bobby Rong
79a85e0c64
Merge pull request #150512 from hmenke/sof
sof-firmware: 1.9.2 -> 1.9.3
2021-12-16 20:50:55 +08:00
Jörg Thalheim
6942ed7b84 linux_zen: 5.15.6-zen2 -> 5.15.8-zen1 2021-12-16 12:52:56 +01:00
github-actions[bot]
3e2d1c1e65
Merge staging-next into staging 2021-12-15 18:01:52 +00:00
github-actions[bot]
1e85228aa6
Merge master into staging-next 2021-12-15 18:01:15 +00:00
Thiago Kenji Okada
d95c81133f
Merge pull request #150065 from thiagokokada/workaround-issue-144811
nixos-rebuild: switch to tmpDir during rebuilds
2021-12-15 12:01:31 -03:00
github-actions[bot]
83750a4f3d
Merge staging-next into staging 2021-12-14 18:01:49 +00:00
github-actions[bot]
dfda17d6ba
Merge master into staging-next 2021-12-14 18:01:09 +00:00
Dmitry Kalinkin
33967b375a
Merge pull request #150508 from illustris/sssd
sssd: 2.6.0 -> 2.6.1, fix broken build
2021-12-14 10:31:21 -05:00
illustris
434985c90b sssd: link NixOS module tests 2021-12-14 19:46:21 +05:30
illustris
580952d787 sssd: 2.6.0 -> 2.6.1, fix broken build
python2Packages.ldap fails to build since https://github.com/NixOS/nixpkgs/pull/149010
This PR drops python2 bindings for sssd.
2021-12-14 19:46:12 +05:30
github-actions[bot]
75e029e297
Merge staging-next into staging 2021-12-14 00:02:27 +00:00
github-actions[bot]
420df1e082
Merge master into staging-next 2021-12-14 00:01:45 +00:00
Bernardo Meurer
f40283cf62
Merge pull request #149837 from helsinki-systems/feat/redo-activation-script-restarting
nixos/switch-to-configuration: Add a massive test and do a slight refactor
2021-12-13 11:37:20 -08:00
github-actions[bot]
1a2b61419f
Merge staging-next into staging 2021-12-13 18:01:54 +00:00
github-actions[bot]
784572e7cf
Merge master into staging-next 2021-12-13 18:01:18 +00:00
Jörg Thalheim
afa3c99cd5
Merge pull request #148593 from veehaitch/sgx-psw
sgx-psw: init package and module
2021-12-13 14:16:26 +00:00
github-actions[bot]
60c2e603bb
Merge staging-next into staging 2021-12-13 12:02:07 +00:00
Martin Weinelt
423119b70b
Merge branch 'master' into staging-next 2021-12-13 12:20:07 +01:00
Janne Heß
271a0da71b
Merge pull request #150300 from r-ryantm/auto-update/cifs-utils 2021-12-13 12:07:13 +01:00
Henri Menke
c802431094
sof-firmware: 1.9.2 -> 1.9.3 2021-12-13 09:55:40 +01:00
Fabian Affolter
ee16149972 cpuid: 20211129 -> 20211210 2021-12-12 23:33:47 +01:00
Janne Heß
150ef522a0
Merge pull request #150207 from r-ryantm/auto-update/cryptsetup 2021-12-12 20:13:00 +01:00
R. Ryantm
8af5d6c825 cifs-utils: 6.13 -> 6.14 2021-12-11 20:35:11 +00:00
Dmitry Kalinkin
07a8ae0c5a
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/libraries/log4cplus/default.nix
2021-12-11 14:01:19 -05:00
Dmitry Kalinkin
b6b59334bb
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/celery/default.nix
	pkgs/development/python-modules/kombu/default.nix
2021-12-11 13:15:49 -05:00
Jörg Thalheim
444503997b
Merge pull request #150256 from r-ryantm/auto-update/brillo
brillo: 1.4.9 -> 1.4.10
2021-12-11 15:13:40 +00:00
R. Ryantm
6ac74b47e2 brillo: 1.4.9 -> 1.4.10 2021-12-11 14:35:26 +00:00
github-actions[bot]
a875f4053e
Merge master into staging-next 2021-12-11 12:01:07 +00:00
R. Ryantm
be3f2d7f5d erofs-utils: 1.3 -> 1.4 2021-12-11 09:22:43 +00:00
R. Ryantm
4ed0620c9a cryptsetup: 2.4.1 -> 2.4.2 2021-12-11 08:37:09 +00:00
github-actions[bot]
4620f3d0e3
Merge master into staging-next 2021-12-11 06:01:15 +00:00
Bobby Rong
60eef9e3d1
Merge pull request #150152 from r-ryantm/auto-update/fswebcam
fswebcam: fix src url
2021-12-11 12:01:46 +08:00
R. Ryantm
19a86aab13
fswebcam: fix src url 2021-12-11 11:33:46 +08:00
github-actions[bot]
cc51bd619c
Merge master into staging-next 2021-12-10 18:01:06 +00:00
Thiago Kenji Okada
f88bd76fcd nixos-rebuild: switch to tmpDir during rebuilds
This is a workaround for issue #144811 until this issue is either fixed
on nix itself.
2021-12-10 10:50:46 -03:00
Mario Rodas
d0d209fd59
Merge pull request #149878 from r-ryantm/auto-update/mcelog
mcelog: 178 -> 179
2021-12-10 08:24:17 -05:00
github-actions[bot]
0f2bb5a63f
Merge master into staging-next 2021-12-10 12:01:12 +00:00
Maximilian Bosch
1b899b5ee4
Merge pull request #149516 from alyssais/util-linux-debug
util-linux: add debug output
2021-12-10 12:57:24 +01:00
Mario Rodas
d83cd99072
Merge pull request #149909 from r-ryantm/auto-update/lxcfs
lxcfs: 4.0.9 -> 4.0.11
2021-12-10 06:40:36 -05:00
Vincent Haupert
d6cc0ad96e nixosTests.aesmd: init 2021-12-10 10:18:31 +01:00
Vincent Haupert
92c24a12a7 sgx-sdk, sgx-psw: add debug argument 2021-12-10 10:04:02 +01:00
Vincent Haupert
dd79220bca sgx-psw: init at 2.14.100.2
Co-authored-by: Alex Zero <joseph@marsden.space>
2021-12-10 10:04:02 +01:00
Vincent Haupert
f5fcb87723 sgx-sdk: create sgx dir and move 2021-12-10 10:04:02 +01:00
Jörg Thalheim
6cf571148b
Merge pull request #148399 from Mic92/zen
linux_zen: 5.15.5-zen1 -> 5.15.6-zen2
2021-12-10 06:30:57 +00:00