figsoda
dcdd69dcdc
Merge pull request #143212 from NixOS/backport-132008-to-release-21.05
...
[Backport release-21.05] multimc: don't re-distribute package
2021-10-27 15:20:58 -04:00
Tristan Gosselin-Hane
28188b0b42
multimc: don't re-distribute package
...
Fixes NixOS#131983
(cherry picked from commit 8dfddb341ebaf718904722692dbbcd1d5d9d5e12)
2021-10-27 19:06:27 +00:00
Tristan Gosselin-Hane
27db642c65
multimc: change license to asl20
...
(cherry picked from commit 9a8f5b712fa5beb86659dd1f2d0a830c16f4cfc9)
2021-10-27 19:06:26 +00:00
Divam Narula
ce5e240b2b
ghcjs: Enable on darwin ( #139067 )
...
(cherry picked from commit d032f60c37ebdae3afd9a24212497ec8725ee4fb)
2021-10-27 15:52:48 +00:00
(cdep)illabout
4ecfdc7f46
haskell.compiler.ghcjs: mark hydraPlatforms as none because output is too large
...
(cherry picked from commit 3389aab889719081e240ce169ec5bc0d5ccd60d0)
2021-10-27 15:52:48 +00:00
Maximilian Bosch
de6f737cbd
Merge pull request #143054 from Ma27/php-backport
...
[21.05] php: 7.4.24 -> 7.4.25, 8.0.11 -> 8.0.12, fix CVE-2021-21703
2021-10-27 12:51:11 +02:00
Artturi
ddee258d88
Merge pull request #142927 from NixOS/backport-124486-to-release-21.05
...
[Backport release-21.05] nixos/boot: properly override the kernel in boot.kernelPatches
2021-10-27 04:53:51 +03:00
Maximilian Bosch
1b8d9c1854
php80: 8.0.11 -> 8.0.12, fix CVE-2021-21703
...
Details: https://nvd.nist.gov/vuln/detail/CVE-2021-21703
ChangeLog: https://www.php.net/ChangeLog-8.php#8.0.12
(cherry picked from commit ab5c10c42a95de2192f270ea13ba05e149e8cead)
2021-10-26 23:42:53 +02:00
Maximilian Bosch
a17528c284
php74: 7.4.24 -> 7.4.25, fix CVE-2021-21703
...
Details: https://nvd.nist.gov/vuln/detail/CVE-2021-21703
ChangeLog: https://www.php.net/ChangeLog-7.php#7.4.25
(cherry picked from commit af404d852f39b18257024d8010192d74829c0917)
2021-10-26 23:42:27 +02:00
oxalica
5ebb1dca9b
flameshot: fix desktop Exec path and autostart directory location
...
(cherry picked from commit ccb84b735be81e6e7f4360c9d3eb4b9fe512c8d5)
2021-10-26 22:37:34 +02:00
Kerstin Humm
c99f062210
imagemagick6: 6.9.12-19 -> 6.9.12-26
...
(cherry picked from commit 8705d0826fdc6675941a4d56b2a7935f13167348)
2021-10-26 20:00:51 +02:00
Ben Siraphob
dc07d8b6cc
Merge pull request #141021 from risicle/ris-vyper-0.3.0-r21.05
...
[21.05] python3Packages.vyper: 0.2.11 -> 0.3.0
2021-10-26 11:52:35 -05:00
Timothy DeHerrera
e5eb3a7a63
Merge pull request #142985 from NixOS/backport-122445-to-release-21.05
...
[Backport release-21.05] freeswitch: 1.10.5 > 1.10.6
2021-10-26 09:31:26 -06:00
misuzu
ad861506ba
freeeswitch: enable strictDeps
...
(cherry picked from commit ef32c9e3b83c544e554c242a067770d456b3bac5)
2021-10-26 12:11:33 +00:00
misuzu
0833ed32f3
freeeswitch: move perl, which and yasm to nativeBuildInputs
...
(cherry picked from commit 85fb843759ce02989474643789fb3535e07821d4)
2021-10-26 12:11:33 +00:00
misuzu
9a7d06d4ab
freeswitch: 1.10.5 > 1.10.6
...
(cherry picked from commit a7b56e41d4c69604e13272ace374025ca0d31b64)
2021-10-26 12:11:32 +00:00
Dominik Xaver Hörl
f2281f6186
nixos/boot: properly override the kernel in boot.kernelPatches
...
Previously the code took the kernelPatches of the final derivation, which
might or might not be what was passed to the derivation in the original call.
The previous behaviour caused various hacks to become neccessary to avoid duplicates in kernelPatches.
(cherry picked from commit 436f61c878e3992b3d980168a5532416dd5be504)
2021-10-26 07:46:54 +00:00
Sebastian
3b1789322f
nixos/bookstack: fix error message output ( #142722 )
2021-10-24 18:16:54 +08:00
Maciej Krüger
95eed9b64e
Merge pull request #142692 from NixOS/backport-142691-to-release-21.05
2021-10-23 23:27:41 +02:00
zowoq
fa8441ba44
yt-dlp: 2021.10.10 -> 2021.10.22
...
https://github.com/yt-dlp/yt-dlp/releases/tag/2021.10.22
(cherry picked from commit 38b81820eeef14344b9e805d91c5c9f8c854b5db)
2021-10-23 21:23:21 +00:00
Maximilian Bosch
ea8a8b9c52
Merge pull request #142426 from NixOS/backport-142342-to-release-21.05
...
[Backport release-21.05] Kernels 2021-10-20
2021-10-23 13:32:15 +02:00
Artturi
07819d494d
Merge pull request #142636 from NixOS/backport-139004-to-release-21.05
2021-10-23 08:13:23 +03:00
Atemu
3c07a4fe8e
lutris: propagate important meta attrs to FHSEnv wrapper
...
Closes https://github.com/NixOS/nixpkgs/pull/81107
(cherry picked from commit 1fc860b9ede1dfa95a7eefdc34e890e822006d4f)
2021-10-23 04:20:50 +00:00
Ryan Mulligan
605dc2af25
Merge pull request #142615 from NixOS/backport-142607-to-release-21.05
...
[Backport release-21.05] discourse: Fix the public directory path reported by Discourse
2021-10-22 20:18:00 -07:00
talyz
23e841c5b7
discourse: Fix the public directory path reported by Discourse
...
Change the path to the public directory reported by Discourse
to its real path instead of the symlink in the store, since
the store path won't be matched by any nginx rules.
Fixes #142528 .
(cherry picked from commit 1fb77e822b87b0ca729c007e63166c7d2d38e947)
2021-10-22 23:29:50 +00:00
Artturi
c3eedc900f
Merge pull request #142572 from NixOS/backport-140343-to-release-21.05
2021-10-23 02:14:12 +03:00
Artturin
0719766dee
cfdyndns: fix startAt by setting it to *:0/5 instead of 5 minutes
...
5 minutes is invalid for startAt
(cherry picked from commit 2e4938eb6a7d594aa3884e903ac40270c5af2258)
2021-10-22 13:57:59 +00:00
Vincent Laporte
b0274abf85
tamarin-prover: 1.6.0 → 1.6.1
...
(cherry picked from commit 05838a1632cab4f0371356666ed57f0be01575a9)
2021-10-22 08:13:56 +02:00
Maximilian Bosch
55e93ae9eb
Merge pull request #142335 from NixOS/backport-141382-to-release-21.05
...
[Backport release-21.05] matrix-synapse: 1.44.0 -> 1.45.1
2021-10-20 23:47:04 +02:00
TredwellGit
775fb6d1a8
linux/hardened/patches/5.4: 5.4.152-hardened1 -> 5.4.154-hardened1
...
(cherry picked from commit 75dbbe37be75baf6096e7fee61bd26a44743832c)
2021-10-20 21:44:05 +00:00
TredwellGit
9e26201347
linux/hardened/patches/5.14: 5.14.11-hardened1 -> 5.14.13-hardened1
...
(cherry picked from commit cf9f5f74dd76829a8e403e0324f04595462011a9)
2021-10-20 21:44:04 +00:00
TredwellGit
6592fdf573
linux/hardened/patches/5.10: 5.10.72-hardened1 -> 5.10.74-hardened1
...
(cherry picked from commit e94db0f89c15e28cd5aff93dc55466d06f7c85cd)
2021-10-20 21:44:03 +00:00
TredwellGit
015f1c52a6
linux/hardened/patches/4.19: 4.19.210-hardened1 -> 4.19.212-hardened1
...
(cherry picked from commit a33fc5384bb5e5d7debd7fa6faee3667957f0138)
2021-10-20 21:44:02 +00:00
TredwellGit
8c2bb7c9c7
linux/hardened/patches/4.14: 4.14.250-hardened1 -> 4.14.251-hardened1
...
(cherry picked from commit cf0d47c50527d9712942ed2beed680cd8256f0fc)
2021-10-20 21:44:01 +00:00
TredwellGit
ff19141e7f
linux: 5.4.154 -> 5.4.155
...
(cherry picked from commit 25ef63bb788e4cb73e78aa4e3fe76a16c6853538)
2021-10-20 21:44:00 +00:00
TredwellGit
0c2ae8ea8f
linux: 5.14.13 -> 5.14.14
...
(cherry picked from commit a96f1a866ac14b157ae3e9d9119d7e54c8d9eef1)
2021-10-20 21:43:59 +00:00
TredwellGit
3cf2064cb4
linux: 5.10.74 -> 5.10.75
...
(cherry picked from commit a3edfb9ee541b2125ff5a479da1d4a8f9b4b7323)
2021-10-20 21:43:57 +00:00
TredwellGit
6670573707
linux: 4.19.212 -> 4.19.213
...
(cherry picked from commit e4f4df78faf814f6bb010f0cf57407545dee69c6)
2021-10-20 21:43:56 +00:00
TredwellGit
bde6dc5c3a
linux: 4.14.251 -> 4.14.252
...
(cherry picked from commit c4d7df2b7bd79afd6766e954789d3c92881d3b3e)
2021-10-20 21:43:55 +00:00
Maximilian Bosch
6ea1791344
matrix-synapse: 1.45.0 -> 1.45.1
...
ChangeLog: https://github.com/matrix-org/synapse/releases/tag/v1.45.1
(cherry picked from commit b25c2fbed9aa9d9942af615e48c9c4d2bf400265)
2021-10-20 22:09:37 +02:00
Michael Weiss
70904d4a99
Merge pull request #142252 from primeos/chromium-backport
...
[21.05] chromium: 94.0.4606.81 -> 95.0.4638.54
2021-10-20 21:37:24 +02:00
Patrick Hilhorst
c1dd303d5d
Merge pull request #142376 from NixOS/backport-142347-to-release-21.05
2021-10-20 19:06:34 +02:00
Maximilian Bosch
7f52606b19
Merge pull request #142142 from NixOS/backport-142000-to-release-21.05
...
[Backport release-21.05] Kernels 2021-10-17
2021-10-20 18:36:35 +02:00
nixpkgs-upkeep-bot
00dab64943
vscodium: 1.61.1 -> 1.61.2
...
(cherry picked from commit 214721f8c50d3368fcc67086e121775c47ad16db)
2021-10-20 15:10:12 +00:00
maxine [they]
f46390a873
Merge pull request #142329 from NixOS/backport-142271-to-release-21.05
2021-10-20 15:31:02 +02:00
maxine [they]
b49f3cefb1
Merge pull request #142356 from mayflower/backport-containerd
2021-10-20 15:30:27 +02:00
Danielle Lancashire
d48b10a82d
containerd: 1.5.5 -> 1.5.7
...
(cherry picked from commit aabceb8539b694e8711b8632c18f21396aa6f34e)
2021-10-20 15:08:39 +02:00
R. RyanTM
a34c5e29ec
containerd: 1.5.4 -> 1.5.5
...
(cherry picked from commit b58b4a85c418a6821f8557d6a2c19f7a2262fc0d)
2021-10-20 15:08:35 +02:00
Sumner Evans
3cf9eece52
matrix-synapse: 1.44.0 -> 1.45.0
...
(cherry picked from commit cd5ff4fe245a7c1dfb574c6022185bcdcd909912)
2021-10-20 11:02:02 +00:00
nixpkgs-upkeep-bot
2e1350b2ee
vscode: 1.61.1 -> 1.61.2
...
(cherry picked from commit b7428350b95e97f82de9b01df60855f7d2022738)
2021-10-20 10:25:41 +00:00