Commit Graph

294914 Commits

Author SHA1 Message Date
Artturin ada8a1c0f0 onlyoffice: wrap correctly and force xcb since onlyoffice doesn't
support wayland

(cherry picked from commit c75c37de7ef775bd9eb2fb4402d0ebb31e378668)
2021-09-28 17:52:55 +00:00
Linus Heckemann 4e2a251552
Merge pull request #139666 from Ma27/backport-rnix-lsp
[21.05] rnix-lsp: 0.1.0 -> 0.2.1
2021-09-28 18:05:20 +02:00
Maximilian Bosch bc787aef50
Merge pull request #139705 from NixOS/backport-139444-to-release-21.05
[Backport release-21.05] wiki-js: 2.5.214 -> 2.5.219
2021-09-28 14:18:23 +02:00
Jörg Thalheim 96bf839ef6
Merge pull request #139697 from oxalica/bp/fix/to-rust-target
[21.05] fix toRustTarget for windows
2021-09-28 09:37:55 +01:00
Maximilian Bosch 1cd12e483a wiki-js: 2.5.214 -> 2.5.219
ChangeLog: https://github.com/Requarks/wiki/releases/tag/2.5.219
(cherry picked from commit e12d71e71b85bfd297ddf5f639511ff892e8fcae)
2021-09-28 07:38:14 +00:00
Maximilian Bosch ce6b39b6be
Merge pull request #139238 from Ma27/backport-hedgedoc
[21.05] hedgedoc: 1.8.2 -> 1.9.0, fixes CVE-2021-39175
2021-09-28 09:33:57 +02:00
Robin Stumm c9049f71dd
rust.toRustTarget: fix for windows
change vendor from "w64" to "pc"
broken since 91718534f1

(cherry picked from commit d89c29deb8ae6baa96443caa3857c2039b3ab86d)
2021-09-28 14:23:36 +08:00
Maximilian Bosch 9c28f1f958
rnix-lsp: 0.1.0 -> 0.2.1
ChangeLog: https://github.com/nix-community/rnix-lsp/blob/v0.2.1/CHANGELOG.md#v021---2021-09-23
(cherry picked from commit 3bcfecc268071364a6a781ef1b2ad6a6655c7d57)
2021-09-27 23:32:50 +02:00
Kim Lindberger 1224e4bec7
Merge pull request #139629 from NixOS/backport-139201-to-release-21.05
[Backport release-21.05] discourse: 2.7.7 -> 2.7.8, update plugins
2021-09-27 16:31:06 +02:00
talyz ec588badc4 discourse: Enable jhead, which is no longer marked vulnerable
(cherry picked from commit ed8c4e01d985d115f8821106318afc65fc7eaf5f)
2021-09-27 13:37:42 +00:00
talyz e93c033a3b discourse.plugins.discourse-yearly-review: Update
(cherry picked from commit e4ed6b5929d56328e79ad8792568790f6c077251)
2021-09-27 13:37:41 +00:00
talyz df8becc53f discourse.plugins.discourse-spoiler-alert: Update
(cherry picked from commit 957eaf8237a44f6849716739d35057b7ceaba84c)
2021-09-27 13:37:40 +00:00
talyz 61fab89e08 discourse.plugins.discourse-solved: Update
(cherry picked from commit fd084acb95f3e80a80405924e44002e2e4f6dd0e)
2021-09-27 13:37:40 +00:00
talyz cb35abb6c1 discourse.plugins.discourse-math: Update
(cherry picked from commit b1aa7efd36d1e8c9df8f97602038b98533f84cf9)
2021-09-27 13:37:39 +00:00
talyz 9c26876e2b discourse.plugins.discourse-github: Update
(cherry picked from commit 97034cfa1c3b455f1114fea8d302925014dd4bd8)
2021-09-27 13:37:38 +00:00
talyz 125bceeb25 discourse.plugins.discourse-checklist: Update
(cherry picked from commit d583001723e9ad4588c5b54c9f27c111758fe105)
2021-09-27 13:37:38 +00:00
talyz 394d86a424 discourse.plugins.discourse-canned-replies: Update
(cherry picked from commit 1e62b64b9036a3e9332b60c838f658ee35fa0a5a)
2021-09-27 13:37:37 +00:00
talyz 1d1a2bbf2b discourse.plugins.discourse-calendar: Update
(cherry picked from commit d62ea8705b22c8163fcbc6dcb7c70a42e7e745fe)
2021-09-27 13:37:36 +00:00
talyz cb502f9b10 discourse: 2.7.7 -> 2.7.8
(cherry picked from commit 73e8eb91c122699e5ede88980f7c7ef727b29896)
2021-09-27 13:37:35 +00:00
Maximilian Bosch 99749136f9
Merge pull request #139615 from NixOS/backport-139551-to-release-21.05
[Backport release-21.05] Kernels 2021-09-26
2021-09-27 14:17:16 +02:00
TredwellGit 74d0889655 linux/hardened/patches/5.4: 5.4.147-hardened1 -> 5.4.148-hardened1
(cherry picked from commit bb21f231cf1556318346f7476a2ae4cc234c2cd6)
2021-09-27 09:57:32 +00:00
TredwellGit 4b3fd66a5b linux/hardened/patches/5.14: 5.14.6-hardened1 -> 5.14.7-hardened1
(cherry picked from commit 5b71d92f9ad21a39b8ed957b1d5d54ecb5536da6)
2021-09-27 09:57:32 +00:00
TredwellGit 1febaecabb linux/hardened/patches/5.10: 5.10.67-hardened1 -> 5.10.68-hardened1
(cherry picked from commit 34fe5d827ca5a1cee89b5abfde73a540977f3722)
2021-09-27 09:57:31 +00:00
TredwellGit 8a0a9f3597 linux/hardened/patches/4.19: 4.19.206-hardened1 -> 4.19.207-hardened1
(cherry picked from commit b754a3c355b21bd2d4503d0f1b5b7c98448e5496)
2021-09-27 09:57:30 +00:00
TredwellGit 422b30ce66 linux/hardened/patches/4.14: 4.14.246-hardened1 -> 4.14.247-hardened1
(cherry picked from commit 7b29a72e545ee913dbdb07b8379d7d7ccd08b173)
2021-09-27 09:57:29 +00:00
TredwellGit 7da735d204 linux: 5.4.148 -> 5.4.149
(cherry picked from commit fa3a7105266abd6f9302d8864dbd60283204a314)
2021-09-27 09:57:29 +00:00
TredwellGit eaccf16f05 linux: 5.14.7 -> 5.14.8
(cherry picked from commit 10fee833c9220242961d9f7b7d3a82c0a3a1a407)
2021-09-27 09:57:28 +00:00
TredwellGit 27e5593772 linux: 5.10.68 -> 5.10.69
(cherry picked from commit bba95d376306c37e535e3ab5555ac2f9279afaa5)
2021-09-27 09:57:27 +00:00
TredwellGit 05e033d6f1 linux: 4.9.283 -> 4.9.284
(cherry picked from commit bb9a54d5ee3c1d28e64ff0a05cd0960a4313cf93)
2021-09-27 09:57:26 +00:00
TredwellGit d1df9958b6 linux: 4.4.284 -> 4.4.285
(cherry picked from commit bae26c4e05ddb2cf032e875c4a8d2ba06e44e4c0)
2021-09-27 09:57:25 +00:00
TredwellGit 6195899398 linux: 4.19.207 -> 4.19.208
(cherry picked from commit 7fad98993cd0da2f14ea30e895f168c7eebfba40)
2021-09-27 09:57:24 +00:00
TredwellGit a560026ecd linux: 4.14.247 -> 4.14.248
(cherry picked from commit b0f3a99f00efe85145a5c537a2d25865e3f39a53)
2021-09-27 09:57:24 +00:00
Maximilian Bosch 78822fca19
Merge pull request #138949 from NixOS/backport-138925-to-release-21.05
[Backport release-21.05] Kernels 2021-09-22
2021-09-27 11:52:39 +02:00
Artturi 8e1306519d
Merge pull request #139490 from NixOS/backport-137563-to-release-21.05
[Backport release-21.05] jitsi-meet: 1.0.5056 -> 1.0.5307
2021-09-27 03:19:19 +03:00
Artturi c02b9cd15e
Merge pull request #139487 from NixOS/backport-137559-to-release-21.05
[Backport release-21.05] jicofo: 1.0-756 -> 1.0-798
2021-09-27 03:18:58 +03:00
Artturi c94bf92a45
Merge pull request #139488 from NixOS/backport-137568-to-release-21.05
[Backport release-21.05] jitsi-videobridge: 2.1-508-gb24f756c -> 2.1-551-g2ad6eb0b
2021-09-27 03:18:42 +03:00
Robert Scott 7baaef39fe
Merge pull request #139575 from NixOS/backport-124297-to-release-21.05
[Backport release-21.05] lief: 0.11.4 -> 0.11.5
2021-09-27 00:00:01 +01:00
Martin Weinelt ac914045db
Merge pull request #137022 from Flakebi/salt-backport 2021-09-27 00:26:34 +02:00
R. RyanTM 0352b72f3c lief: 0.11.4 -> 0.11.5
(cherry picked from commit 9d396b5600b018f84e90e56c61dfaef1b149e330)
2021-09-26 21:54:38 +00:00
Michael Weiss 8d943dfce6
Merge pull request #139539 from NixOS/backport-139415-to-release-21.05
[Backport release-21.05] ungoogled-chromium: 94.0.4606.54 -> 94.0.4606.61
2021-09-26 18:49:48 +02:00
Michael Weiss d604d3ee9c ungoogled-chromium: 94.0.4606.54 -> 94.0.4606.61
(cherry picked from commit d66e4eea8550cc10d2f579b4e821639d44deae01)
2021-09-26 14:40:22 +00:00
Doron Behar e7eebf5fc3
Merge pull request #139481 from hrhino/backport/128077 2021-09-26 12:39:30 +00:00
Fabián Heredia Montiel fd8a7fd07d nvidia_x11: 470.57.02 → 470.63.01
(cherry picked from commit ff0dfaaee0975cc0deb118f51120e281eccc6497)

Required since the kernel upgrade on 21.05, compilation for the driver
fails on 5.14.

See [this
comment][https://github.com/NixOS/nixpkgs/issues/132840#issuecomment-920847065]
for more details.
2021-09-26 08:53:04 +02:00
Artturi 4ad195e3f4
Merge pull request #139495 from NixOS/backport-139485-to-release-21.05
[Backport release-21.05] libnatpmp: make files in $out/lib executable
2021-09-26 06:45:29 +03:00
Artturin 23ca79f291 libnatpmp: make files in $out/lib executable
Fixes https://github.com/NixOS/nixpkgs/issues/139197

(cherry picked from commit be3bc77e3175f055e634ca1375d7cbdb60facfad)
2021-09-26 02:02:22 +00:00
R. RyanTM 5b2ff56444 jitsi-meet: 1.0.5056 -> 1.0.5307
(cherry picked from commit f7e646df7f6db413aef1dd1cea9495719b893b63)
2021-09-25 23:14:13 +00:00
Maximilian Bosch 36a3756d71
hedgedoc: fix build by re-running `yarn2nix`
Failing Hydra build: https://hydra.nixos.org/build/154209534

(cherry picked from commit 0a2615fe2f52c5743fd3a6cb3bd40558bdf31ee5)
2021-09-26 01:12:44 +02:00
Maximilian Bosch c20fbabd9b
yarn2nix: run `nix-prefetch-git` with `--fetch-submodules`
`pkgs.fetchgit` uses `fetchSubmodules = true;` by default, however
`nix-prefetch-git` doesn't. This means that hashes for a Git repository
with fetched submodules will be wrong in `yarn.nix`.

Considering that this got unnoticed before, it seems as if this case is
an exception to a certain degree.

An exemplary problem is the last `hedgedoc` update[1] where
`js-sequence-diagrams` - a Git repo with submodules - from upstream's
package.json caused a hash mismatch. This got unnoticed because
`nix-build --check` doesn't seem to reveal these issues for fixed-output
derivations.

[1] https://github.com/NixOS/nixpkgs/pull/139238

(cherry picked from commit 46c98ae1327b7d14af1927fda971762e5ee53dfe)
2021-09-26 01:12:43 +02:00
R. RyanTM 6d6a713644 jitsi-videobridge: 2.1-508-gb24f756c -> 2.1-551-g2ad6eb0b
(cherry picked from commit 065abed6de2bef418437a99be9f9232993b8339f)
2021-09-25 22:52:59 +00:00
R. RyanTM 583694193f jicofo: 1.0-756 -> 1.0-798
(cherry picked from commit e35934cc4ff79ce98e3a223feda156795b9485eb)
2021-09-25 22:52:31 +00:00