Commit Graph

294365 Commits

Author SHA1 Message Date
github-actions[bot] 7a5873a0dd
Merge release-21.05 into staging-next-21.05 2021-09-03 00:02:58 +00:00
adisbladis 2fe9d531d0
Merge pull request #136494 from NixOS/backport-136228-to-release-21.05
[Backport release-21.05] qt5.qt3d: init module
2021-09-02 17:11:13 -05:00
adisbladis ed77a24bb5 qt5.qt3d: init module
(cherry picked from commit a7432ad3115c153a901cd49da24e7b766cce1e21)
2021-09-02 19:11:00 +00:00
github-actions[bot] eb8ef5940d
Merge release-21.05 into staging-next-21.05 2021-09-02 18:02:28 +00:00
Michael Weiss 6bfe71f2a4
Revert "chromium: 92.0.4515.159 -> 93.0.4577.63"
This reverts commit acf91fbac7.
Reason: I didn't pay enough attention, this lacks additional backports,
sorry!
2021-09-02 17:55:10 +02:00
Michael Weiss ea2023628b
Merge pull request #136386 from NixOS/backport-136373-to-release-21.05
[Backport release-21.05] chromium: 92.0.4515.159 -> 93.0.4577.63
2021-09-02 17:53:25 +02:00
Anderson Torres ec1c2a06cb
Merge pull request #136424 from NixOS/backport-136382-to-release-21.05
[Backport release-21.05] palemoon: 29.4.0.1 -> 29.4.0.2
2021-09-02 10:21:00 -03:00
github-actions[bot] 453a47f57e
Merge release-21.05 into staging-next-21.05 2021-09-02 12:02:17 +00:00
Maximilian Bosch 796e823083
Merge pull request #134492 from NixOS/backport-134335-to-release-21.05
[Backport release-21.05] element-{web,desktop}: 1.7.34 -> 1.8.1
2021-09-02 13:44:14 +02:00
Martin Weinelt b642e782d8
Merge pull request #136458 from mweinelt/21.05/fix-httplib2 2021-09-02 13:22:16 +02:00
Robert Schütz 32d97638ed python3Packages.httplib2: fix tests
(cherry picked from commit f019d3adb27c2754f1c122ea945aa51ea4347819)
2021-09-02 13:02:12 +02:00
Martin Weinelt 8db3d39036
Merge pull request #136450 from LeSuisse/mosquitto-2.0.12-21.05 2021-09-02 13:00:35 +02:00
Thomas Gerbet 476832f9ba mosquitto: 2.0.11 -> 2.0.12
https://github.com/eclipse/mosquitto/blob/v2.0.12/ChangeLog.txt
(cherry picked from commit d4c75580c18c78bdf81810dc73aab76e10754190)
2021-09-02 10:56:25 +02:00
Thomas Gerbet 24caf232b7 mosquitto: 2.0.10 -> 2.0.11
Fixes CVE-2021-34431.

https://github.com/eclipse/mosquitto/blob/v2.0.11/ChangeLog.txt
(cherry picked from commit ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe)
2021-09-02 10:56:21 +02:00
github-actions[bot] c836f35b5a
Merge release-21.05 into staging-next-21.05 2021-09-02 00:02:55 +00:00
OPNA2608 5feba0ecf7 palemoon: 29.4.0.1 -> 29.4.0.2
(cherry picked from commit 080b1486041d214754cf25f4f1e94e05cba36184)
2021-09-01 23:37:42 +00:00
Vladimír Čunát 3e09410da0
Merge branch 'staging-next-21.05' into release-21.05
There's not even half of all binaries yet, but let's move this forward
and get the -small channel going with secure openssl.
2021-09-01 22:48:45 +02:00
Pavol Rusnak abd8e8f9fb
Merge pull request #136099 from prusnak/electron-21.05
[21.05] electron_12: 12.0.17 -> 12.0.18
2021-09-01 22:47:55 +02:00
Martin Weinelt 71be98642c
Merge pull request #136342 from mweinelt/21.05/firefox 2021-09-01 21:01:06 +02:00
Michael Weiss acf91fbac7 chromium: 92.0.4515.159 -> 93.0.4577.63
https://chromereleases.googleblog.com/2021/08/stable-channel-update-for-desktop_31.html

This update includes 27 security fixes.

CVEs:
CVE-2021-30606 CVE-2021-30607 CVE-2021-30608 CVE-2021-30609
CVE-2021-30610 CVE-2021-30611 CVE-2021-30612 CVE-2021-30613
CVE-2021-30614 CVE-2021-30615 CVE-2021-30616 CVE-2021-30617
CVE-2021-30618 CVE-2021-30619 CVE-2021-30620 CVE-2021-30621
CVE-2021-30622 CVE-2021-30623 CVE-2021-30624

(cherry picked from commit d04f44f7e8d6f475e91e5539becf156676caff5c)
2021-09-01 13:53:53 +00:00
github-actions[bot] f3307f7b93
Merge release-21.05 into staging-next-21.05 2021-09-01 12:02:24 +00:00
Pascal Bach 110a2c9ebb
Merge pull request #136268 from NixOS/backport-135929-to-release-21.05
[Backport release-21.05] nextcloud22: 22.1.0 -> 22.1.1
2021-09-01 09:24:39 +02:00
github-actions[bot] b6598fc6c3
Merge release-21.05 into staging-next-21.05 2021-09-01 00:02:38 +00:00
Martin Weinelt 441c74d110 firefox-bin: 91.0.1 -> 91.0.2
(cherry picked from commit f6187a43a06b76ffd467646ab49ac0421d50d22c)
2021-08-31 23:54:36 +02:00
Martin Weinelt 8bddec8899 firefox: 91.0.1 -> 91.0.2
(cherry picked from commit 01b534e8884a6a997a1f382297c513d5c8a0d9b9)
2021-08-31 23:54:36 +02:00
Robert Scott df7a756cbc
Merge pull request #136325 from NixOS/backport-136167-to-release-21.05
[Backport release-21.05] grilo: add patch for CVE-2021-39365
2021-08-31 21:48:58 +01:00
Maximilian Bosch 26ca44909e
Merge pull request #136327 from NixOS/backport-135958-to-release-21.05
[Backport release-21.05] nixos/nextcloud: add some notes for `Error: Command "upgrade" is not defined.`
2021-08-31 21:48:51 +02:00
Maximilian Bosch ebd597d2f3 nixos/nextcloud: apply doc fixes suggested by fabaff
Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
(cherry picked from commit 767bb4e4bbb9a8d06d4c3cbc14092902c2465f98)
2021-08-31 18:54:20 +00:00
Maximilian Bosch c19b0bf9de nixos/nextcloud: add some notes for `Error: Command "upgrade" is not defined.`
This error occurs if `nextcloud-occ maintenance:install` fails and the
`upgrade` command is attempted to be executed afterwards.

Due to the nature of the installer we can't do much about it, so I guess
it makes sense to add some notes about it. The other notes in the
`Pitfalls`-section are semantically a list of different topics, so I
changed that accordingly now.

Closes #111175

(cherry picked from commit 561418f996fc015f4db48b1c9b7c31338cb280d9)
2021-08-31 18:54:20 +00:00
Robert Scott 867aab7eed grilo: add patch for CVE-2021-39365
(cherry picked from commit f4153fb02c10e63a6fbb501876f609c8a55f262d)
2021-08-31 18:35:55 +00:00
github-actions[bot] b5d8a72c06
Merge release-21.05 into staging-next-21.05 2021-08-31 18:02:32 +00:00
Jonathan Ringer 977f89b349 stdenv/native: fix bintools import
(cherry picked from commit fa38ff677af719ad8a44e9c70dc6f4fc0c5e09e9)
2021-08-31 10:38:39 -07:00
Maximilian Bosch 4b7e51865e
Merge pull request #136298 from NixOS/backport-136296-to-release-21.05
[Backport release-21.05] matrix-synapse: 1.41.0 -> 1.41.1
2021-08-31 17:43:56 +02:00
Robin Townsend 5b68d15c08 matrix-synapse: 1.41.0 -> 1.41.1
https://github.com/matrix-org/synapse/releases/tag/v1.41.1
(cherry picked from commit 5947c5989979c684d97f7154695e77e2000afbb7)
2021-08-31 14:50:37 +00:00
github-actions[bot] 2f340a6f22
Merge release-21.05 into staging-next-21.05 2021-08-31 12:02:36 +00:00
maxine [they] 60712d4a70
Merge pull request #136219 from maxeaubrey/21.05_vault_1.7.4
[21.05] vault{,-bin}: 1.7.2 -> 1.7.4
2021-08-31 13:06:24 +02:00
Diep Pham 62f9f5688a dcmtk: support darwin platform
(cherry picked from commit 604ad25af49ac679bb28419b35237dcba46bb6d9)
2021-08-31 03:51:53 -04:00
Maximilian Bosch 46d36e4abf nextcloud22: 22.1.0 -> 22.1.1
Changes: https://github.com/nextcloud/server/compare/v22.1.0...v22.1.1
(cherry picked from commit 690712624175de2f5856fcdcf43681792410e609)
2021-08-31 07:34:47 +00:00
Vladimír Čunát cc6a9e8509
Merge #136076: thunderbird*: -> 91.0.3 (into release-21.05) 2021-08-31 09:27:49 +02:00
Jörg Thalheim 95cfdb2449
Merge pull request #136129 from blitz/tuxedo-keyboard-21.05
[21.05] tuxedo-keyboard: 3.0.5 -> 3.0.8
2021-08-31 08:26:01 +01:00
Pavol Rusnak 274de11138 bear: unbreak on aarch64-darwin
we have recent macOS SDK on aarch64-darwin, only x86_64-darwin is broken

(cherry picked from commit 999f55ee01390f5d455662e48067de68ab6260bb)
2021-08-31 03:15:26 -04:00
github-actions[bot] 82dfb51aee
Merge release-21.05 into staging-next-21.05 2021-08-31 00:02:38 +00:00
Niklas Hambüchen d79fc9d53b
Merge pull request #136210 from maxeaubrey/21.05_consul_1.9.9
[21.05] consul: 1.9.8 -> 1.9.9
2021-08-30 20:54:36 +02:00
Maxine Aubrey 7b69f87d91
vault-bin: 1.7.2 -> 1.7.4
- https://github.com/hashicorp/vault/releases/tag/v1.7.3
- https://github.com/hashicorp/vault/releases/tag/v1.7.4
2021-08-30 20:42:34 +02:00
Maxine Aubrey 4780757785
vault: 1.7.2 -> 1.7.4
- https://github.com/hashicorp/vault/releases/tag/v1.7.3
- https://github.com/hashicorp/vault/releases/tag/v1.7.4
2021-08-30 20:42:10 +02:00
github-actions[bot] e7d5ebf374
Merge release-21.05 into staging-next-21.05 2021-08-30 18:02:09 +00:00
Maxine Aubrey 773661d5ea
consul: 1.9.8 -> 1.9.9
- https://github.com/hashicorp/consul/releases/tag/v1.9.9
2021-08-30 19:55:58 +02:00
Stig c94065f916
Merge pull request #134534 from nomeata/backport-133596
[21.05] listadmin: init at 2.73
2021-08-30 14:42:47 +02:00
Vladimír Čunát baf718497f
Merge #136118: ffmpeg*: revert backport of doCheck = true 2021-08-30 12:21:35 +02:00
Julian Stecklina 52269b659e linuxPackages.tuxedo-keyboard: expose all kernel modules
This commit exposes in addition to the tuxedo-keyboard module:

- clevo_acpi
- clevo_wmi
- tuxedo_io

These modules are required to run the Tuxedo Control Center.

(cherry picked from commit 2e6d563067c620d42c9d63911a637793698273eb)
2021-08-30 00:58:37 +02:00