Commit Graph

294163 Commits

Author SHA1 Message Date
Ankit Pandey 66e129b194 captive-browser: fix empty string in interface args
Fixes nmcli being passed an empty string before the interface name,
which would stop captive-browser from starting up.

(cherry picked from commit 910f233fb7120c51cb8cbbaed4fab4caa6e5d751)
2021-08-22 17:44:31 +00:00
Vladimír Čunát 4e749dc0a1
Merge #135245: linux_*_hardened: update (into release-21.05) 2021-08-22 16:29:57 +02:00
ajs124 7e07a7e299 linuxPackages_5_4_hardened: 5.4.141 -> 5.4.142
(cherry picked from commit 565973316564594fe9a572a8a4c48567375c2f19)
2021-08-22 09:49:01 +00:00
ajs124 9690490f18 linuxPackages_5_10_hardened: 5.10.59 -> 5.10.60
(cherry picked from commit 883db296a2603d42074db9118323667e335e186e)
2021-08-22 09:49:01 +00:00
ajs124 9bb174c59e linuxPackages_5_4_hardened: 5.4.139 -> 5.4.141
(cherry picked from commit b9b1fc1b383fb583721474498d3360a56f5501d5)
2021-08-22 09:49:00 +00:00
ajs124 329105e4a9 linuxPackages_5_10_hardened: 5.10.57 -> 5.10.59
(cherry picked from commit 580d4b687ffad6101e23466789a2f97935bc5c40)
2021-08-22 09:49:00 +00:00
ajs124 676c5aa6bf linuxPackages_4_19_hardened: 4.19.202 -> 4.19.204
(cherry picked from commit a438b96c9e52113fef9ec1ac3cd694bb97bb3caf)
2021-08-22 09:48:59 +00:00
ajs124 0cdce1e22b linuxPackages_4_14_hardened: 4.14.243 -> 4.14.244
(cherry picked from commit 1120eafa972180641006d425d6e9e9b76aa4ee3f)
2021-08-22 09:48:59 +00:00
ajs124 6c74fc118a linuxPackages_hardened: fix update.py
this is kind of hack, idk how this worked before, tbh

(cherry picked from commit e82f9673c5ec76b71409b3ec7e5c99043df63976)
2021-08-22 09:48:58 +00:00
Robert Scott 422b95f54f
Merge pull request #135086 from risicle/ris-radare2-CVE-2021-3673
[21.05] radare2: add patch for CVE-2021-3673
2021-08-21 23:38:55 +01:00
Robert Scott 0be4a28183
Merge pull request #135001 from jasonrm/backport/134767-to-21.05
[21.05] mysql80: fix build on darwin
2021-08-21 23:22:06 +01:00
Wael Nasreddine 11e6372341
Merge pull request #135092 from NixOS/backport-134764-to-release-21.05
[Backport release-21.05] onlykey-agent: init at 1.0.2
2021-08-21 12:43:19 -07:00
Kim Lindberger c37b973071
Merge pull request #135096 from NixOS/backport-135090-to-release-21.05
[Backport release-21.05] nomachine-client: 7.4.1 -> 7.6.2
2021-08-21 20:07:03 +02:00
talyz d6e092c25f nomachine-client: 7.4.1 -> 7.6.2
(cherry picked from commit 73bae61cda32b0aa20fd844b45387b8a50de5e20)
2021-08-21 17:58:15 +00:00
Wael M. Nasreddine 5794e35b25 onlykey-agent: init at 1.0.2
(cherry picked from commit 8b8cd493ef8e70cdb97d05ce95ba37e75cdea431)
2021-08-21 17:14:04 +00:00
Robert Scott 12a8c6cdce radare2: add patch for CVE-2021-3673 2021-08-21 17:09:51 +01:00
Maciej Krüger d3fbdb26a2
Merge pull request #135074 from NixOS/backport-134616-to-release-21.05
[Backport release-21.05] Fix Jetbrains on NixOS: Add e2fsprogs
2021-08-21 16:26:52 +02:00
Florian Beeres 9295a53afc Add e2fsprogs to jetbrains
Without this dependency JetBrains editors, on NixOS, will throw errors
about a missing object file:
java.lang.UnsatisfiedLinkError: libe2p.so

(cherry picked from commit 70f3763e146432eca9cf7d792e7d2d12684e1c5f)
2021-08-21 12:36:34 +00:00
Vladimír Čunát 219a77ea26
Merge branch 'staging-21.05' into release-21.05
ffmpeg isn't such a huge rebuild, so let's do this directly.
2021-08-21 09:38:38 +02:00
github-actions[bot] fa539d9341
Merge staging-next-21.05 into staging-21.05 2021-08-21 06:02:59 +00:00
github-actions[bot] e3954ffd47
Merge release-21.05 into staging-next-21.05 2021-08-21 06:02:16 +00:00
Luke Granger-Brown 275cdcb119
Merge pull request #135025 from NixOS/backport-134726-to-staging-21.05
[Backport staging-21.05] ffmpeg, ffmpeg-full: enable basic tests
2021-08-21 04:39:26 +01:00
Zane van Iperen bd84f4a6ed nixos/gitea: init/migrate db in startup script
(cherry picked from commit 99d8d553da44fb065f9cb8bb54e2e93b85417fab)
2021-08-21 12:24:40 +09:00
Zane van Iperen 9d0618433a nixos/gitea: use gitea to refresh hooks and keys
Gitea now provides this functionality as an admin command.
Is significantly faster, especially on slow disks.

(cherry picked from commit c854b8570285ac4c14282a5efa0f8334a520ac8d)
2021-08-21 12:24:40 +09:00
Robert Scott 1c8ff5cfc7 ffmpeg-full: enable basic tests
(cherry picked from commit 4b658eda801752204f8be29a8f8db343d12572dc)
2021-08-21 02:46:00 +00:00
Robert Scott 7361aaeb5e ffmpeg: enable basic tests
(cherry picked from commit 649f0ed1a88f6e4cf00705b1cb2f1fbdf1fb780c)
2021-08-21 02:46:00 +00:00
Luke Granger-Brown 84b0bedef2
Merge pull request #135022 from NixOS/backport-134363-to-release-21.05
[Backport release-21.05] warzone2100: 4.1.1 -> 4.1.3
2021-08-21 03:33:49 +01:00
Francesco Gazzetta 9e28807d03 warzone2100: 4.1.1 -> 4.1.3
(cherry picked from commit 4b5f0bfa393e45e9f9c2704d000e07dc689b4e51)
2021-08-21 00:24:37 +00:00
github-actions[bot] 124ccc3fcd
Merge staging-next-21.05 into staging-21.05 2021-08-21 00:03:23 +00:00
github-actions[bot] ee693ed5f1
Merge release-21.05 into staging-next-21.05 2021-08-21 00:02:49 +00:00
Anderson Torres f5c2a9a8de
Merge pull request #134844 from NixOS/backport-134591-to-release-21.05
[Backport release-21.05] palemoon: 29.3.0 -> 29.4.0.1
2021-08-20 19:33:38 -03:00
Maximilian Bosch b86db7692f
Merge pull request #134933 from Ma27/backport-mautrix-telegram
[21.05] mautrix telegram: 0.10.0 -> 0.10.1
2021-08-21 00:06:56 +02:00
Jason R. McNeil 698d69b2f5 mysql80: fix build on darwin
sw_vers is called during build since 8.0.26

- 83b87ae7f8

Fixes #132288

(cherry picked from commit 5c452f15af7d11a1609f25ac14b42b82d0185a37)
2021-08-20 13:59:15 -07:00
github-actions[bot] 90fe936535
Merge staging-next-21.05 into staging-21.05 2021-08-20 18:02:52 +00:00
github-actions[bot] 45315a0f53
Merge release-21.05 into staging-next-21.05 2021-08-20 18:02:19 +00:00
Maximilian Bosch 1dc32d71d5
Merge pull request #134947 from NixOS/backport-134692-to-release-21.05
[Backport release-21.05] Kernels 2021-08-18
2021-08-20 18:50:37 +02:00
Wael Nasreddine 46bb19ea0f
Merge pull request #134859 from kalbasit/update-onlykey-cli
[Backport release-21.05] onlykey-cli: 1.2.2 -> 1.2.5
2021-08-20 09:15:30 -07:00
Kim Lindberger 64f5c7c6fd
Merge pull request #134799 from NixOS/backport-132475-to-release-21.05
[Backport release-21.05] discourseAllPlugins: init discourse-ldap-auth
2021-08-20 18:06:54 +02:00
TredwellGit 68a87a1d8e linux_latest-libre: 18210 -> 18239
(cherry picked from commit 4512ae304413d1fd26f329bd1c8b9dcd208d32b2)
2021-08-20 12:12:15 +00:00
TredwellGit d91ef03f45 linux-rt_5_10: 5.10.56-rt48 -> 5.10.56-rt49
(cherry picked from commit 10472677e1acd74e25b4e582dcbe66b618f9a5b4)
2021-08-20 12:12:15 +00:00
TredwellGit 552f2172c6 linux: 5.4.139 -> 5.4.142
(cherry picked from commit 0055f787369b73a59e99d34ace503bb263c92f98)
2021-08-20 12:12:14 +00:00
TredwellGit 6953c465cc linux: 5.13.11 -> 5.13.12
(cherry picked from commit 7ff40c8d9ec1eeb1d7846aef866d2f162bf375a0)
2021-08-20 12:12:14 +00:00
TredwellGit 0c0320e4b9 linux: 5.10.57 -> 5.10.60
(cherry picked from commit ab311a8b253460aaae8a0096545df80b9b65cafc)
2021-08-20 12:12:13 +00:00
TredwellGit 4f323dd3cb linux: 4.19.202 -> 4.19.204
(cherry picked from commit b7a564432b9b941caf4646ebde1f5c88db4bfc7a)
2021-08-20 12:12:13 +00:00
TredwellGit 637741d8e1 linux: 4.14.243 -> 4.14.244
(cherry picked from commit 2b71c4caac5acec35d51ee5de59b65f9a8e217b2)
2021-08-20 12:12:13 +00:00
github-actions[bot] 4027eff0c6
Merge staging-next-21.05 into staging-21.05 2021-08-20 12:03:28 +00:00
github-actions[bot] 3961e9ebfa
Merge release-21.05 into staging-next-21.05 2021-08-20 12:02:35 +00:00
Pavol Rusnak bd21f646da
Merge pull request #133371 from prusnak/electron-21.05
[21.05] Update electron_{11,12}
2021-08-20 13:50:50 +02:00
Maximilian Bosch 05e5b69ac8
mautrix-telegram: override mautrix to version 0.10.4
This is needed since 0.10.1 of mautrix-telegram, but it'd be a breaking
change of mautrix, which can be used for any kind of matrix client, so I
don't really want to break it.
2021-08-20 11:17:04 +02:00
Maximilian Bosch e1042038ac
mautrix-telegram: 2021-08-12 -> 0.10.1
ChangeLog: https://github.com/mautrix/telegram/releases/tag/v0.10.1
(cherry picked from commit dd39ec87f41db66ae4b9cb68e40cea811f863ebc)
2021-08-20 11:10:53 +02:00