Commit Graph

294303 Commits

Author SHA1 Message Date
Robert Scott efedf9a09e Revert "[Backport staging-21.05] ffmpeg, ffmpeg-full: enable basic tests" 2021-08-29 20:24:06 +01:00
Vladimír Čunát a936d2f6ab
Merge #135990: openssl: 1.1.1k -> 1.1.1l (into staging-next-21.05) 2021-08-29 18:24:44 +02:00
github-actions[bot] 4a34132b64
Merge release-21.05 into staging-next-21.05 2021-08-29 12:02:20 +00:00
Maximilian Bosch 7fc63651a2
Merge pull request #136067 from NixOS/backport-135946-to-release-21.05
[Backport release-21.05] nixos/nextcloud: remove invalid `--database-table-prefix` option
2021-08-29 11:40:17 +02:00
Jörg Thalheim 5faf4632f7
Merge pull request #136017 from Atemu/backport/update/linux_zen
[Backport release-21.05] linux_zen
2021-08-29 08:30:14 +01:00
Maximilian Bosch 0db1a5ee44 nixos/nextcloud: remove invalid `--database-table-prefix` option
This doesn't work anymore and thus breaks the installation leaving a
broken `/var/lib/nextcloud`.

It isn't a big deal since we set this value in the override config
before, so the correct table-prefix is still used. In order to confirm
that, I decided to add a custom prefix to the basic test.

(cherry picked from commit eaeb4fe04ee5a5ffae4f7dc03d3f072d59d80337)
2021-08-28 22:04:40 +00:00
github-actions[bot] d0559018de
Merge release-21.05 into staging-next-21.05 2021-08-28 18:01:58 +00:00
talyz 698186588f gitlab: Enable puma's systemd notify support
(cherry picked from commit 3dd17ae22f17fb2f5f3bcf99437fe899d727beac)
2021-08-28 16:03:12 +02:00
talyz 2572e2550a gitlab: 14.1.2 -> 14.2.1
(cherry picked from commit 99387372d5af951fa7ab1cad970b7bef83b6b91c)
2021-08-28 16:03:12 +02:00
Jörg Thalheim 846fa972d5 linux_zen: 5.13.12-zen1 -> 5.13.13-zen1
(cherry picked from commit 093349c14ef3b8985154d878d793a3b7a7292eff)
2021-08-28 09:13:04 +02:00
Jörg Thalheim c07d3055ca linux_zen: 5.13.10-zen1 -> 5.13.12-zen1
(cherry picked from commit 5e6958fa75696085384f60f7d10f9b4c03822565)
2021-08-28 09:12:42 +02:00
github-actions[bot] e01e42f38e
Merge release-21.05 into staging-next-21.05 2021-08-28 06:02:46 +00:00
Artturi 7d46ea4c96
Merge pull request #135991 from NixOS/backport-135952-to-release-21.05
[Backport release-21.05] vintagestory: init at 1.15.5
2021-08-28 04:20:44 +03:00
Artturin 861412d485 vintagestory: init at 1.15.5
(cherry picked from commit 176705c2953c17d6f7c703745d926c053e59e9f1)
2021-08-28 00:47:49 +00:00
Martin Weinelt 3d0d142b75 openssl: 1.1.1k -> 1.1.1l
(cherry picked from commit 174868d4fa8452c0dc7ebcaf5548376351fa280a)
2021-08-28 00:31:58 +00:00
github-actions[bot] cb4c3defc4
Merge release-21.05 into staging-next-21.05 2021-08-28 00:02:56 +00:00
Maximilian Bosch 15be51fdaa
Merge pull request #135933 from NixOS/backport-135844-to-release-21.05
[Backport release-21.05] Kernels 2021-08-26
2021-08-28 00:12:14 +02:00
Pavol Rusnak 0b2bfa8948
Merge pull request #135927 from prusnak/electron-21.05
[21.05] Electron updates
2021-08-27 23:18:28 +02:00
adisbladis 0fcc42d48c
Merge pull request #135940 from TredwellGit/release-21.05_go-ethereum
[Urgent] [Backport release-21.05] go-ethereum: 1.10.6 -> 1.10.8
2021-08-27 13:51:21 -05:00
github-actions[bot] 9addd9a877
Merge release-21.05 into staging-next-21.05 2021-08-27 18:02:29 +00:00
TredwellGit 8be58bdd5b go-ethereum: 1.10.6 -> 1.10.8
https://www.coindesk.com/tech/2021/08/27/ethereum-faces-chain-split-as-node-operators-fail-to-update-geth-hotfix/

Backport of:
https://github.com/NixOS/nixpkgs/pull/127060
https://github.com/NixOS/nixpkgs/pull/133745
https://github.com/NixOS/nixpkgs/pull/135065
https://github.com/NixOS/nixpkgs/pull/135629
2021-08-27 17:42:30 +00:00
TredwellGit e5b4b37c5a linux/hardened/patches/5.4: 5.4.142-hardened1 -> 5.4.143-hardened1
(cherry picked from commit e2fbc79e446ce1695b09da9521e339d6e3e2a5d0)
2021-08-27 16:28:40 +00:00
TredwellGit 53a6232591 linux/hardened/patches/5.13: init at 5.13.13-hardened1
(cherry picked from commit b9f854004e76fd448ca8f41e444593038eaefdff)
2021-08-27 16:28:40 +00:00
TredwellGit e22a87d1d2 linux/hardened/patches/5.10: 5.10.60-hardened1 -> 5.10.61-hardened1
(cherry picked from commit efcb008ba44845e3aec2a3d2d44e53f2ea4dac26)
2021-08-27 16:28:39 +00:00
TredwellGit 5aeb5af282 linux/hardened/patches/4.19: 4.19.204-hardened1 -> 4.19.205-hardened1
(cherry picked from commit 885a18686b2ba40d527b27c12a2e72d3b1ecda19)
2021-08-27 16:28:39 +00:00
TredwellGit 1d1f808935 linux/hardened/patches/4.14: 4.14.244-hardened1 -> 4.14.245-hardened1
(cherry picked from commit d002bb6e6f35cbb4de3df5e41d53906c5d983e2f)
2021-08-27 16:28:38 +00:00
TredwellGit ac519a8f84 linux_latest-libre: 18239 -> 18260
(cherry picked from commit 5b94350a90c86c69d2d8e2bea14dc490d3b219e8)
2021-08-27 16:28:37 +00:00
TredwellGit b137e4f19f linux-rt_5_10: 5.10.56-rt49 -> 5.10.59-rt52
(cherry picked from commit 0adbd0852faa0baf26e4be9e1a23e9819431fcf9)
2021-08-27 16:28:37 +00:00
TredwellGit ceb5fc136c linux: 5.4.142 -> 5.4.143
(cherry picked from commit 48183dde30f12435bc59f92d9de3ca0cbcfddb7c)
2021-08-27 16:28:36 +00:00
TredwellGit 9dfb717fb9 linux: 5.13.12 -> 5.13.13
(cherry picked from commit ca0b7b4e189583f44b0e53eb029dab45e45f03c6)
2021-08-27 16:28:35 +00:00
TredwellGit d3dd950f8c linux: 5.10.60 -> 5.10.61
(cherry picked from commit 78eea2b5d20e33616492242ba82966f9b2609036)
2021-08-27 16:28:35 +00:00
TredwellGit f77576ec34 linux: 4.9.280 -> 4.9.281
(cherry picked from commit 4442d7b8ddd5c826baad3c541d16a317be447e54)
2021-08-27 16:28:34 +00:00
TredwellGit 9f131e8464 linux: 4.4.281 -> 4.4.282
(cherry picked from commit 083c38da7abd7956a3ed47df3b0b2da75d124c0f)
2021-08-27 16:28:34 +00:00
TredwellGit c180aa5608 linux: 4.19.204 -> 4.19.205
(cherry picked from commit 88be0cc40c26eb5152443d0d3f542a1c5aea8954)
2021-08-27 16:28:33 +00:00
TredwellGit c498bc0180 linux: 4.14.244 -> 4.14.245
(cherry picked from commit 637878c8af79298ad8e3d905d95907488f7f1696)
2021-08-27 16:28:32 +00:00
TredwellGit 693e0026be
electron_12: 12.0.16 -> 12.0.17
https://github.com/electron/electron/releases/tag/v12.0.17
(cherry picked from commit 0e6f0724c6dae128fa1e7ffcf34a8b4bc9e51aa6)
2021-08-27 17:38:00 +02:00
TredwellGit f472a05558
electron_11: 11.4.11 -> 11.4.12
https://github.com/electron/electron/releases/tag/v11.4.12
(cherry picked from commit 032baedc9777520ffdeaeac5bc3c378deef275f1)
2021-08-27 17:37:55 +02:00
Michael Weiss 74d017edb6
Merge pull request #135917 from NixOS/backport-135910-to-release-21.05
[Backport release-21.05] signal-desktop: 5.14.0 -> 5.15.0
2021-08-27 16:58:49 +02:00
Michael Weiss 5c71a1080f signal-desktop: 5.14.0 -> 5.15.0
(cherry picked from commit b49afb3fe6096f6b2047dba6730c6f6b6d4c3473)
2021-08-27 14:28:58 +00:00
github-actions[bot] 95b8fd5ac9
Merge release-21.05 into staging-next-21.05 2021-08-27 12:02:18 +00:00
Maximilian Bosch 80cf67ff60
Merge pull request #135896 from NixOS/backport-135773-to-release-21.05
[Backport release-21.05] vorta: 0.7.7 -> 0.7.8
2021-08-27 13:57:11 +02:00
Maximilian Bosch 9541ff65ae vorta: 0.7.7 -> 0.7.8
ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.8
(cherry picked from commit 5ab6a61ada45e9d2299869cbef15a7416de46a06)
2021-08-27 11:13:42 +00:00
Joachim Breitner b720376c7c ocamlPackages.vlq: init at 0.2.1
(cherry picked from commit 91a55816dda6ac8caef47bfa3ff4bcf832ff4b3b)
2021-08-27 10:31:06 +02:00
github-actions[bot] 11914a0a34
Merge release-21.05 into staging-next-21.05 2021-08-26 12:02:16 +00:00
Maximilian Bosch 9d6766c0f0
Merge pull request #135766 from NixOS/backport-135032-to-release-21.05
[Backport release-21.05] tor-browser-bundle-bin: 10.5.2 -> 10.5.5
2021-08-26 13:06:13 +02:00
Lux 1351d271d3 tor-browser-bundle-bin: 10.5.2 -> 10.5.5
(cherry picked from commit bd6f316efa000fd6e8ebc38e599c1fb7efae186f)
2021-08-26 09:42:39 +00:00
github-actions[bot] 98962e17c4
Merge release-21.05 into staging-next-21.05 2021-08-26 00:02:52 +00:00
Martin Weinelt 51a53aea36
Merge pull request #135700 from risicle/ris-icinga2-2.12.6-r21.05
[21.05] icinga2: 2.12.4 -> 2.12.6
2021-08-26 01:56:34 +02:00
Martin Weinelt b199038e38
Merge pull request #135713 from NixOS/backport-135706-to-release-21.05 2021-08-26 01:20:36 +02:00
Janne Heß dacd1104f6 flexoptix-app: 5.9.0 -> 5.11.0 and fixes
This update is required because the autoupdater prevents the app from
running without being updated (which is not possible because it is a
store path).
So this updates the app and patches out the updater (essentially it
never thinks it needs to update, even though it prints on the command
line that it should).

Also fix the desktop item.

(cherry picked from commit 9aa05d18b77b20ecea5046fac4987a5130d9dfef)
2021-08-25 23:00:19 +00:00