summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* asterisk: Create symlinks for each config individually•••This commit refactors the way how configuration files are deployed to the `/etc/asterisk` directory. The current solution builds a Nix derivation containing all config files and symlinks it to `/etc/asterisk`. The problem with that approach is that it is not possible to provide additional configuration that should not be written to the Nix store, i.e. files containing credentials. The proposed solution changes the creation of configuration files so that each configuration file gets symlinked to `/etc/asterisk` individually so that it becomes possible to provide additional config files to `/etc/asterisk` as well. (cherry picked from commit ce220610f741ba209a02d7655fb3425f3e5a3358) origin/backport-149323-to-release-21.11Lara2022-05-021-43/+11
* Merge pull request #171012 from NixOS/backport-167665-to-release-21.11•••[Backport release-21.11] `pkgs._type = "pkgs"`Robert Hensing2022-05-021-0/+15
|\
| * pkgs: Add _type = "pkgs"•••(cherry picked from commit ad1e2500efd0aa49b0dc7427bf69d4879f3b0ff5) Robert Hensing2022-04-301-0/+15
* | Merge pull request #171158 from risicle/ris-redis-6.2.7-r21.11•••[21.11] redis: 6.2.6 -> 6.2.7Mario Rodas2022-05-011-2/+2
|\ \
| * | redis: 6.2.6 -> 6.2.7Robert Scott2022-05-011-2/+2
* | | Merge pull request #171150 from pborzenkov/21.11-calibre-web-0.6.18•••[21.11] calibre-web: 0.6.17 -> 0.6.18Robert Scott2022-05-013-7/+59
|\ \ \
| * | | calibre-web: 0.6.17 -> 0.6.18•••Closes #160637 (cherry picked from commit 6f012370db8b7aea5e3154bb38cec435bb625207) Pavel Borzenkov2022-05-011-7/+10
| * | | python3Packages.advocate: init at 1.0.0•••(cherry picked from commit 00d630efa187fc09418230c34049b20f00594c20) Pavel Borzenkov2022-05-012-0/+47
| * | | calibre-web: relax Flask, Flask-Login and lxml requirements•••(cherry picked from commit 7db7864871845b83af9cc8564a6f1180d2b52542) Pavel Borzenkov2022-05-011-1/+3
| |/ /
* | | Merge pull request #170999 from lostnet/backport-170393-to-release-21.11•••[Backport release-21.11] couchdb3: 3.2.1 -> 3.2.2Guillaume Girol2022-05-012-6/+12
|\ \ \
| * | | couchdb3: 3.2.1 -> 3.2.2•••(cherry picked from commit 14fca0ca6ff878cb3c071fe5c233b5fd5ad8d13b) Will2022-04-292-6/+12
* | | | imagemagick: 7.1.0-31 -> 7.1.0-32•••(cherry picked from commit ab3a25bc8cd068d6f8d592e1828db0a39418365c) Kerstin Humm2022-05-011-2/+2
| |/ / |/| |
* | | colima: backport from unstable (#156768)•••* lima: 0.7.3 -> 0.7.4 https://github.com/lima-vm/lima/releases/tag/v0.7.4 (cherry picked from commit 70307e16745959c52fc6889ae546f1e4887e16ee) * lima: 0.7.4 -> 0.8.0 https://github.com/lima-vm/lima/releases/tag/v0.8.0 (cherry picked from commit 435043c9240398c7868470a0e9665e2f7303f702) * colima: init at 0.2.2 `colima` is a very easy usable replacement for Docker Desktop on MacOS. Signed-off-by: Andreas Schmid <service@aaschmid.de> (cherry picked from commit c4dbe8fe65a04a282585811665caec1361e5fe51) * colima: update vendorSha256 (cherry picked from commit 17b3ec07e0e6294f0691c395ac5f1630c4ab4a54) * colima: 0.2.2 -> 0.3.1 Signed-off-by: Andreas Schmid <service@aaschmid.de> (cherry picked from commit c1d77e4dd1c05cfd7efe6b0ecff001514e48c867) * colima: 0.3.1 -> 0.3.2 Signed-off-by: Andreas Schmid <service@aaschmid.de> (cherry picked from commit d8062c345d08c7c3545bf11141faad5eeb2caf66) Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com> Co-authored-by: Andreas Schmid <service@aaschmid.de>Wael Nasreddine2022-05-013-3/+47
* | | Merge pull request #171049 from risicle/ris-qemu-CVE-2021-4206-r21.11•••[21.11] qemu: add patches for CVE-2021-4206 & CVE-2021-4207Robert Scott2022-04-301-0/+10
|\ \ \ | |_|/ |/| |
| * | qemu: add patches for CVE-2021-4206 & CVE-2021-4207Robert Scott2022-04-301-0/+10
* | | Merge pull request #170862 from NixOS/backport-170760-to-release-21.11•••[Backport release-21.11] Linux kernels 2022-04-27Maximilian Bosch2022-04-307-14/+14
|\ \ \
| * | | linux: 5.4.190 -> 5.4.191•••(cherry picked from commit 156229222ead25832517fc723571949b81c7ea5c) Maximilian Bosch2022-04-291-2/+2
| * | | linux: 5.17.4 -> 5.17.5•••(cherry picked from commit 0b6256c1b83cfd3ed4691318adb771eed30b2ae4) Maximilian Bosch2022-04-291-2/+2
| * | | linux: 5.15.35 -> 5.15.36•••(cherry picked from commit fd748205fac8960c7b10d6c1ab1fcd6b394e8d89) Maximilian Bosch2022-04-291-2/+2
| * | | linux: 5.10.112 -> 5.10.113•••(cherry picked from commit f1ad14384b81237c1e63bc21b89644e3f3f68fb7) Maximilian Bosch2022-04-291-2/+2
| * | | linux: 4.9.311 -> 4.9.312•••(cherry picked from commit cd8c3a2b1e2012b652867f71ceaf5899ae727d62) Maximilian Bosch2022-04-291-2/+2
| * | | linux: 4.19.239 -> 4.19.240•••(cherry picked from commit f708ee02bd30bd436149e4b84e2792cb9cdb6bf6) Maximilian Bosch2022-04-291-2/+2
| * | | linux: 4.14.276 -> 4.14.277•••(cherry picked from commit 2cd2c891f927122ad38fcb4d0905d62c49a6ef9e) Maximilian Bosch2022-04-291-2/+2
* | | | Merge pull request #170998 from NixOS/backport-170701-to-release-21.11•••[Backport release-21.11] element-{web,desktop}: 1.10.10 -> 1.10.11Maximilian Bosch2022-04-302-4/+5
|\ \ \ \
| * | | | element-{web,desktop}: 1.10.10 -> 1.10.11•••(cherry picked from commit b57cd37794da4e2256ad381ed417f58ce122d9f2) Sumner Evans2022-04-302-4/+5
* | | | | Merge pull request #170806 from NixOS/backport-170798-to-release-21.11•••[Backport release-21.11] ungoogled-chromium: 100.0.4896.127 -> 101.0.4951.41Michael Weiss2022-04-302-19/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ungoogled-chromium: 100.0.4896.127 -> 101.0.4951.41•••(cherry picked from commit 3084d18e448d2fa6fae43053119c1ef43068b0dc) Michael Weiss2022-04-282-19/+9
* | | | | Merge pull request #170949 from NixOS/backport-170778-to-release-21.11Martin Weinelt2022-04-301-1/+17
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | cifs-utils: fix information disclosure in logger•••https://github.com/piastry/cifs-utils/commit/8acc963a2e7e9d63fe1f2e7f73f5a03f83d9c379 Fixes: CVE-2022-29869 (cherry picked from commit e121ca2c8f2caec2c02d1983a16374db1920f663) Martin Weinelt2022-04-291-0/+6
| * | | | cifs-utils: patch buffer-overflow in ip param handling•••https://www.openwall.com/lists/oss-security/2022/04/27/5 https://bugzilla.suse.com/show_bug.cgi?id=1197216 https://github.com/piastry/cifs-utils/pull/7 Fixes: CVE-2022-27239 (cherry picked from commit cb3fa089ea0cc9bca856453839f11fa5d773ee80) Martin Weinelt2022-04-291-1/+11
|/ / / /
* | | / geekbench: init at 4.4.4•••(cherry picked from commit 929a48cd8c0aa0747aba899492579c48a6be6dd6) davidak2022-04-292-1/+44
| |_|/ |/| |
* | | knot: 3.1.7 -> 3.1.8•••https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.8 (cherry picked from commit 871065de22fc362f1bf9b2eda59a5b26dc06b483) Vladimír Čunát2022-04-291-2/+2
* | | Merge pull request #170900 from blitz/docker-glibc-issue•••[21.11] docker: 2.10.9 -> 20.10.14 (for glibc 2.34 compatiblity!)maxine [they]2022-04-291-12/+22
|\ \ \
| * | | docker: 20.10.13 -> 20.10.14•••https://docs.docker.com/engine/release-notes/#201014 (cherry picked from commit ae79018c44e9023602a619a4179a8ce30c72b48b) Maxine Aubrey2022-04-291-4/+4
| * | | docker: add a patch to fix Docker buildkit when using ZFS graph driver.•••The patch incorporates changes merged into the upstream in this PR: https://github.com/moby/moby/pull/43136 (cherry picked from commit 3d25f046b39158959e64444da2483ea2b30aad3b) Tomek Mańko2022-04-291-1/+11
| * | | docker: 20.10.12 -> 20.10.13•••https://docs.docker.com/engine/release-notes/#201013 (cherry picked from commit b73b40386565750226659adfa4b3d55a1ef99c92) Maxine Aubrey2022-04-291-11/+11
| * | | docker_20_10: 20.10.9 -> 20.10.12•••(cherry picked from commit 18d0fe9b696633d58bf6dbc1a6c750a72cabcf27) Danielle Lancashire2022-04-291-6/+6
| | |/ | |/|
* | | squashfs-tools-ng: 1.1.3 -> 1.1.4•••(cherry picked from commit 6c031ea098ccbc17146c9ffd3fe0da3b0a07aacb) Alyssa Ross2022-04-291-2/+2
* | | signal-desktop: 5.37.0 -> 5.38.0•••(cherry picked from commit 038cb5a97db356c6152bd6d294270fcbc3cd8c40) teutat3s2022-04-291-2/+2
* | | webkitgtk: 2.36.0 → 2.36.1•••https://webkitgtk.org/2022/04/21/webkitgtk2.36.1-released.html (cherry picked from commit 0df77cad7b9a162d803775c95aa1e78aaa4566e9) Jan Tojnar2022-04-291-2/+2
|/ /
* | Merge pull request #170759 from NixOS/backport-169937-to-release-21.11•••[Backport release-21.11] Linux kernels 2022-04-20Maximilian Bosch2022-04-2913-70/+67
|\ \ | |/ |/|
| * linux-testing-bcachefs: mark as broken for now•••(cherry picked from commit 654471e600f442c4ce1de5e9dcd29d595cf8b22e) Maximilian Bosch2022-04-281-0/+1
| * linux/hardened/5.4: fix build•••(cherry picked from commit c381ab775ad99dd3b7b673961c8cdc26bcc85727) Maximilian Bosch2022-04-281-1/+4
| * linux/hardened/4.19: fix build•••(cherry picked from commit 90c22150c05dfdadebb89aaafcac656cd44dee9b) Maximilian Bosch2022-04-281-1/+4
| * linux/hardened/4.14: fix build•••(cherry picked from commit ddf613299d6ddde7ec41415919f378df330e0639) Maximilian Bosch2022-04-281-1/+5
| * linux_5_16: drop•••(cherry picked from commit 5580ef0c6369d433687a52835dd39c54d658eb43) Maximilian Bosch2022-04-282-26/+3
| * linux/hardened/patches/5.4: 5.4.182-hardened1 -> 5.4.190-hardened1•••(cherry picked from commit bd45f28ba1634df6636c4787e2c6e240b4659dd3) Maximilian Bosch2022-04-281-5/+5
| * linux/hardened/patches/5.15: 5.15.26-hardened1 -> 5.15.35-hardened1•••(cherry picked from commit 875b52ae4e37804d5084b8553d1cb9efcb213a1e) Maximilian Bosch2022-04-281-5/+5
| * linux/hardened/patches/5.10: 5.10.103-hardened1 -> 5.10.112-hardened1•••(cherry picked from commit 63c0e3bbf7134b788d2a4b971822d5062466f729) Maximilian Bosch2022-04-281-5/+5
| * linux/hardened/patches/4.19: 4.19.232-hardened1 -> 4.19.239-hardened1•••(cherry picked from commit 206e53cc46fb78cf54f1454616b9a2bcc3fe0cf5) Maximilian Bosch2022-04-281-5/+5