summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fish: add changelog url•••(cherry picked from commit 9d7aa349df459d0b00dd31e5c5cc8420312e630e) origin/backport-278159-to-release-23.11Adam Stephens2024-01-021-0/+1
* fish: add adamcstephens as maintainer•••(cherry picked from commit e0cfeb8a137721e3560145968f0184827d40100f) Adam Stephens2024-01-021-1/+1
* fish: 3.6.4 -> 3.7.0•••(cherry picked from commit fe9849404a8e7f6db136d8a620ce505a7fac5889) Adam Stephens2024-01-021-2/+2
* Merge pull request #278282 from NixOS/backport-278025-to-release-23.11•••[Backport release-23.11] fzf: 0.44.1 -> 0.45.0Nick Cao2024-01-021-3/+3
|\
| * fzf: 0.44.1 -> 0.45.0•••Diff: https://github.com/junegunn/fzf/compare/0.44.1...0.45.0 Changelog: https://github.com/junegunn/fzf/blob/0.45.0/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> (cherry picked from commit 709a88aa440570f203b0622b2d990109b3d227e5) Muhammad Falak R Wani2024-01-021-3/+3
* | Merge pull request #278290 from NixOS/backport-277670-to-release-23.11•••[Backport release-23.11] obs-studio-plugins.obs-replay-source: 1.6.12 -> 1.6.13Nick Cao2024-01-021-2/+2
|\ \
| * | obs-studio-plugins.obs-replay-source: 1.6.12 -> 1.6.13•••(cherry picked from commit db8669d39a652508269ea4395ea768bc81785218) R. Ryantm2024-01-021-2/+2
* | | Merge pull request #278283 from NixOS/backport-278077-to-release-23.11•••[Backport release-23.11] liferea: 1.15.4 -> 1.15.5Nick Cao2024-01-021-2/+2
|\ \ \
| * | | liferea: 1.15.4 -> 1.15.5•••(cherry picked from commit a6ce88437643d102b7541aab85fe6f75c74eaae4) R. Ryantm2024-01-021-2/+2
| | |/ | |/|
* | | Merge pull request #278251 from NixOS/backport-273872-to-release-23.11•••[Backport release-23.11] microsoft-edge: 119.0.2151.72 -> 120.0.2210.61Nick Cao2024-01-022-17/+10
|\ \ \
| * | | microsoft-edge: 119.0.2151.72 -> 120.0.2210.77•••(cherry picked from commit c2e9041e80e747a332f4233acc6d69034d3410b0) Rhys Davies2024-01-022-17/+10
* | | | Merge pull request #278259 from NixOS/backport-276957-to-release-23.11•••[Backport release-23.11] cjson: 1.7.16 -> 1.7.17Nick Cao2024-01-021-2/+2
|\ \ \ \
| * | | | cjson: 1.7.16 -> 1.7.17•••(cherry picked from commit 1f82cc66f052bf64f7b218dd1c82f3c0934d06bc) R. Ryantm2024-01-021-2/+2
| |/ / /
* | | | Merge pull request #278210 from mfrw/backport-274656-to-release-23.11•••[Backport release-23.11] tailscale: 1.54.0 -> 1.56.1Nick Cao2024-01-021-3/+3
|\ \ \ \
| * | | | tailscale: 1.56.0 -> 1.56.1•••Diff: https://github.com/tailscale/tailscale/compare/v1.56.0...v1.56.1 Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> (cherry picked from commit 7a59ba289445c7915d1ba88c80780e0f94a6eceb) Muhammad Falak R Wani2024-01-021-2/+2
| * | | | tailscale: 1.54.1 -> 1.56.0•••(cherry picked from commit 102500d2bae0b6a7af1affa8a42d8fb12d5b3702) Ashish SHUKLA2024-01-021-3/+3
| * | | | tailscale: 1.54.0 -> 1.54.1•••Diff: https://github.com/tailscale/tailscale/compare/v1.54.0...v1.54.1 Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> (cherry picked from commit 32538c96b9fb987c4fb1346cac9836441b68f952) Muhammad Falak R Wani2024-01-021-2/+2
| |/ / /
* | | | Merge pull request #278167 from NixOS/backport-271584-to-release-23.11•••[Backport release-23.11] cmus: fix feature detection on darwinNick Cao2024-01-021-1/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | cmus: fix feature detection on darwin•••(cherry picked from commit 78018ef67e20c0fb142ad044258949ee59c52371) Emily Trau2024-01-011-1/+11
* | | | sftpgo: 2.5.5 -> 2.5.6•••(cherry picked from commit 1ea12ff9f3241809abf006fb7d56b0f732e9b9e0) R. Ryantm2024-01-021-3/+3
| |_|/ |/| |
* | | Merge pull request #277629 from NixOS/backport-277382-to-release-23.11•••[Backport release-23.11] nixos/nextcloud: fix nginx routing to store and nix appsMaximilian Bosch2024-01-021-23/+53
|\ \ \
| * | | nixos/nextcloud: fix nginx routing to store and nix apps•••Closes #277206 The bug mentioned above was a symptom of the issue fixed here: when opening the `forms` app which is installed via `extraApps` (or the app store) the site wouldn't work because `.mjs` files had the wrong Content-Type. The actual problem got fixed already[1], however this config was not used for stuff from `/nix-apps` & `/store-apps` which had their own location section with only a `root ;` statement. In fact, this setup isn't strictly supported by Nextcloud upstream[2], so to fix this for good, I decided to follow the upstream suggestion for app directories outside the server root, i.e. linking them back into the store path. This means that the module generates a new derivation now with * `services.nextcloud.package` linked into it via `lndir`. * under `nix-apps` is a symlink to the link farm containing all apps from `services.nextcloud.extraApps`. * under `store-apps` is a symlink to `/var/lib/nextcloud/store-apps`. Since this is only used in the NixOS module that also configures this location for imperatively installed apps, this seems an OK thing to do. Successfully tested the change on a productive Nextcloud 28.0.1 with several apps installed via `extraApps` (`forms`, `cospend`, `maps`, `user_saml` and a few more). [1] 292c74c7a92efe45cfdfc091fb48d8c575346a95 [2] https://docs.nextcloud.com/server/28/admin_manual/apps_management.html#using-custom-app-directories (cherry picked from commit bae5e6516269cc804974ef2d5f494d46f7a012c1) Maximilian Bosch2023-12-291-23/+53
* | | | Merge pull request #278271 from NixOS/backport-270314-to-release-23.11•••[Backport release-23.11] php81Extensions.apcu: 5.1.22 -> 5.1.23Pol Dellaiera2024-01-021-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | php81Extensions.apcu: 5.1.22 -> 5.1.23•••(cherry picked from commit ea4836f69ae2b8ba1b1980aa7f9584e9f30a234b) R. Ryantm2024-01-021-2/+2
|/ / /
* | | Merge pull request #278192 from NixOS/backport-274007-to-release-23.11•••[Backport release-23.11] davinci-resolve: Remove addressRyan Lahfa2024-01-021-1/+0
|\ \ \
| * | | davinci-resolve: Remove address•••Let's not include people's addresses in the repo. (cherry picked from commit ab382f47ef1ba99449bf6e07a31108e22871fa63) Eelco Dolstra2024-01-021-1/+0
|/ / /
* | | Merge pull request #277634 from NixOS/backport-277327-to-release-23.11•••[Backport release-23.11] build-support/emacs: refactoradisbladis2024-01-024-73/+70
|\ \ \ | |_|/ |/| |
| * | build-support/emacs: refactor•••- Remove superflous `let` with `defaultMeta` These can just be assigned to meta directly instead. - Hoist internal intermediate derivation - Remove top-level `with lib` - Inherit `lib`/`builtins` into scopes (cherry picked from commit 3618d1d24705a820c2348af7ed8ebafc670afc86) adisbladis2023-12-304-73/+70
| |/
* | Merge pull request #278153 from NixOS/backport-272629-to-release-23.11•••[Backport release-23.11] nats-server: 2.10.4 -> 2.10.7Yorick2024-01-011-3/+3
|\ \
| * | nats-server: 2.10.4 -> 2.10.7•••(cherry picked from commit 7e7276752443954870c4ff158f3cf3755781edcc) Raghav Sood2024-01-011-3/+3
|/ /
* | Merge pull request #278062 from NixOS/backport-277638-to-release-23.11•••[Backport release-23.11] lbzip2: apply implicit function definition patch; fix darwin7c6f434c2024-01-011-1/+12
|\ \
| * | lbzip2: apply implicit function definition patch; fix darwin•••https://github.com/kjn/lbzip2/pull/33 (cherry picked from commit eb2b02456ec19e26e5b21dc71729f9bbda2b73db) annalee2024-01-011-1/+12
* | | Merge pull request #278086 from NixOS/backport-277007-to-release-23.11•••[Backport release-23.11] wasmer: 4.2.1 -> 4.2.5Nick Cao2024-01-012-6/+6
|\ \ \
| * | | wasmer: add nickcao to maintainers•••(cherry picked from commit cd791f62321f3df3ad0b93393ea636f5175d96ff) Nick Cao2024-01-011-1/+1
| * | | wasmer: 4.2.1 -> 4.2.5•••Diff: https://github.com/wasmerio/wasmer/compare/refs/tags/v4.2.1...v4.2.5 (cherry picked from commit 58f6aba98bf51ad194a4d4c34fdcfcbad3d84272) Nick Cao2024-01-012-5/+5
|/ / /
* | | Merge pull request #277941 from NixOS/backport-274746-to-release-23.11•••[Backport release-23.11] jj: init at 1.9.2Nick Cao2024-01-011-0/+73
|\ \ \
| * | | jj: init at 1.9.2•••(cherry picked from commit 418296e34e61d4f5bd7492d5988b5ab9da0875a5) Paul Meyer2023-12-311-0/+73
* | | | Merge pull request #277964 from matthiasbeyer/backport-277873-to-release-23.11•••[release-23.11]: fava: 1.26.2 -> 1.26.4Nick Cao2024-01-011-2/+2
|\ \ \ \
| * | | | fava: 1.26.3 -> 1.26.4•••Signed-off-by: Matthias Beyer <mail@beyermatthias.de> (cherry picked from commit 2e382a29eb84ddf5c2661bf05ae737ed2bbfe5f6) Signed-off-by: Matthias Beyer <mail@beyermatthias.de> Matthias Beyer2023-12-311-2/+2
| * | | | fava: 1.26.2 -> 1.26.3•••https://github.com/beancount/fava/releases/tag/v1.26.3 (cherry picked from commit ea54d77bc8e8a79490240693b2eca4cc82ede7a6) Signed-off-by: Matthias Beyer <mail@beyermatthias.de> kilianar2023-12-311-2/+2
* | | | | Merge pull request #277965 from matthiasbeyer/backport-277303-to-release-23.11•••[release 23.11]: cargo-llvm-cov: 0.5.37 -> 0.6.0Nick Cao2024-01-011-4/+4
|\ \ \ \ \
| * | | | | cargo-llvm-cov: 0.5.39 -> 0.6.0•••Signed-off-by: Matthias Beyer <mail@beyermatthias.de> (cherry picked from commit dfb204b5dd966c9077f583c9327f15fe48d73e1f) Signed-off-by: Matthias Beyer <mail@beyermatthias.de> Matthias Beyer2023-12-311-4/+4
| * | | | | cargo-llvm-cov: 0.5.38 -> 0.5.39•••Signed-off-by: Matthias Beyer <mail@beyermatthias.de> (cherry picked from commit c4da1f410c7969b80a23195f2cba509fc847f961) Signed-off-by: Matthias Beyer <mail@beyermatthias.de> Matthias Beyer2023-12-311-4/+4
| * | | | | cargo-llvm-cov: 0.5.37 -> 0.5.38•••Signed-off-by: Matthias Beyer <mail@beyermatthias.de> (cherry picked from commit ea210cb88ed95113b53dcc034252f8f41773383b) Signed-off-by: Matthias Beyer <mail@beyermatthias.de> Matthias Beyer2023-12-311-4/+4
| |/ / / /
* | | | | Merge pull request #277760 from risicle/ris-squid-CVEs-2023-r23.11•••[23.11] squid: add patches for several CVEsRobert Scott2024-01-011-1/+41
|\ \ \ \ \
| * | | | | squid: add patches for several CVEs•••CVE-2023-46847 CVE-2023-50269 CVE-2023-49285 CVE-2023-46848 CVE-2023-46724 CVE-2023-46846 also explicitly name those CVEs we know aren't addressed in this version. there are still some issues mentioned in https://megamansec.github.io/Squid-Security-Audit/ that are un-numbered (or mis-numbered) where the status is unclear. Robert Scott2023-12-301-1/+41
* | | | | | Merge pull request #278041 from NixOS/backport-278011-to-release-23.11•••[Backport release-23.11] miniaudicle: 1.5.0.7 -> 1.5.2.0Nick Cao2024-01-011-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | miniaudicle: 1.5.0.7 -> 1.5.2.0•••(cherry picked from commit 39d7ec88547ede647be2d96337e7d1d7fd5488f9) R. Ryantm2024-01-011-2/+2
* | | | | | Merge pull request #277886 from NixOS/backport-277761-to-release-23.11•••[Backport release-23.11] renode-unstable: init at 1.14.0+20231229gita76dac0ae, renode: init at 1.14.0Thiago Kenji Okada2024-01-012-0/+119
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | renode-unstable: init at 1.14.0+20231229gita76dac0ae•••Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> (cherry picked from commit db4f3f38315b4b953d58a47440901a1ff10bc318) Otavio Salvador2023-12-311-0/+16