summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* haskellPackages: regenerate package set based on current config•••This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh (cherry picked from commit bbac1b393a0511c3709a2070f9b88d6fba4dfb50) origin/backport-150635-to-release-21.11John Ericson2021-12-161-4/+0
* haskellPackages.{github,nix-thunk}: Fix•••(cherry picked from commit eef30d9132c9dbd68d88999264b3e4bcdd42ae4d) John Ericson2021-12-162-8/+10
* Merge pull request #150865 from LeSuisse/21.11-vault-1.8.6•••[21.11] vault{,bin}: 1.8.4 -> 1.8.6Thiago Kenji Okada2021-12-153-9/+9
|\
| * [21.11] vault{,bin}: 1.8.4 -> 1.8.6•••https://github.com/hashicorp/vault/releases/tag/v1.8.5 https://github.com/hashicorp/vault/releases/tag/v1.8.6 Thomas Gerbet2021-12-153-9/+9
* | Merge pull request #150892 from NixOS/backport-150874-to-release-21.11•••[Backport release-21.11] ungoogled-chromium: 96.0.4664.93 -> 96.0.4664.110Thiago Kenji Okada2021-12-151-5/+5
|\ \
| * | ungoogled-chromium: 96.0.4664.93 -> 96.0.4664.110•••(cherry picked from commit af2536fe77d0bbc4c714a3c6acb299e5a54f3317) Michael Weiss2021-12-151-5/+5
* | | Merge pull request #150909 from NixOS/backport-150872-to-release-21.11•••[Backport release-21.11] bitwarden: 1.29.1 -> 1.30.0Thiago Kenji Okada2021-12-151-2/+2
|\ \ \
| * | | bitwarden: 1.29.1 -> 1.30.0•••(cherry picked from commit 77b099d8f64180211e78429e18b19b5ffc9e884a) Sebastian Sellmeier2021-12-151-2/+2
* | | | Remove myself from maintainers (#150900)•••Done with `sed -i -E '/^\s+jtojnar\s*$/d;s/ @?jtojnar//g' (rg ' jtojnar|^\s+jtojnar\s*$' -l -g '!maintainers/maintainer-list.nix')`. (Always check the `rg` result beforehand to avoid corruption.)Jan Tojnar2021-12-1595-96/+91
|/ / /
* | | Merge #150890: phpExtensions: skip performance sensitive tests•••...into release-21.11 Vladimír Čunát2021-12-151-1/+5
|\ \ \ | |/ / |/| |
| * | phpExtensions: skip performance sensitive tests•••(cherry picked from commit 0af523ae779642cfd078316d82e808020367e496) Konrad Borowski2021-12-151-1/+5
| |/
* | Merge pull request #150875 from NixOS/backport-150756-to-release-21.11•••[Backport release-21.11] signal-desktop: 5.25.1 -> 5.26.0Michael Weiss2021-12-151-2/+2
|\ \ | |/ |/|
| * signal-desktop: 5.25.1 -> 5.26.0•••(cherry picked from commit f2027d7f7fb3756361c3a0ffc45307fed9de072f) origin/backport-150756-to-release-21.11Michael Weiss2021-12-151-2/+2
|/
* Merge pull request #150781 from NixOS/backport-149787-to-release-21.11•••[Backport release-21.11] python38Packages.cpyparsing: 2.4.7.1.0.0 -> 2.4.7.1.1.0Ryan Mulligan2021-12-151-3/+3
|\
| * python38Packages.cpyparsing: 2.4.7.1.0.0 -> 2.4.7.1.1.0•••(cherry picked from commit cf04dbd55842221bf85f22cc0b75f741c4a7bbcf) R. Ryantm2021-12-141-3/+3
* | Merge pull request #150857 from NixOS/backport-150065-to-release-21.11•••[Backport release-21.11] nixos-rebuild: switch to tmpDir during rebuildsThiago Kenji Okada2021-12-151-1/+3
|\ \
| * | nixos-rebuild: switch to tmpDir during rebuilds•••This is a workaround for issue #144811 until this issue is either fixed on nix itself. (cherry picked from commit f88bd76fcd132e3f525a84bea976cac08a545afd) Thiago Kenji Okada2021-12-151-1/+3
* | | Merge pull request #150773 from NixOS/backport-150742-to-release-21.11•••[Backport release-21.11] xorg.xorgserver: apply CVE patchesThiago Kenji Okada2021-12-151-0/+19
|\ \ \ | |/ / |/| |
| * | xorg.xorgserver: apply CVE patches•••(cherry picked from commit 7101e3e5806329e8fbb511bd25e9bdce091b095b) Vladimír Čunát2021-12-141-0/+19
* | | Merge pull request #150848 from thiagokokada/backport-149661-to-release-21.11•••[Backport release-21.11] firefox-bin: 94.0.2 -> 95.0Thiago Kenji Okada2021-12-151-393/+393
|\ \ \
| * | | firefox-bin: 94.0.2 -> 95.0•••(cherry picked from commit e0da0b7c6a1142798215e69a93b6eaa2514d6c03) Bernardo Meurer2021-12-151-393/+393
* | | | Merge pull request #150845 from NixOS/backport-150816-to-release-21.11•••[Backport release-21.11] palemoon: 29.4.2.1 -> 29.4.3Thiago Kenji Okada2021-12-151-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | palemoon: 29.4.2.1 -> 29.4.3•••(cherry picked from commit 8e84252247d2d1d9c48638e833ff89261f8f5e0e) origin/backport-150816-to-release-21.11R. Ryantm2021-12-151-2/+2
|/ / /
* | | youtrack: 2021.1.13597 -> 2021.4.35970•••Log4j vulnerability fix, move to JDK 17. (cherry picked from commit 3b6a6505f1b1a8630cc2c6758ecb96c29d534089) Nikolay Amiantov2021-12-151-5/+5
* | | Merge pull request #150821 from NixOS/backport-150817-to-release-21.11Martin Weinelt2021-12-151-2/+2
|\ \ \
| * | | openssl_3_0: 3.0.0 -> 3.0.1•••(cherry picked from commit 35a11522bac95ea20e47d93be3ec5c36b46b1590) Martin Weinelt2021-12-151-2/+2
|/ / /
* | | Merge pull request #149640 from NixOS/backport-149524-to-release-21.11•••[Backport release-21.11] psi-plus: 1.5.1576 -> 1.5.1582Bobby Rong2021-12-151-2/+2
|\ \ \
| * | | psi-plus: 1.5.1576 -> 1.5.1582•••(cherry picked from commit 913a1014a4aaa6682bf863b56d54c5f01b0e23f9) R. Ryantm2021-12-081-2/+2
* | | | ocamlPackages.pa_ounit: remove at 113.00.00•••(cherry picked from commit 0f503310e4d6529fb82e29f5c5eaa669120dab61) Vincent Laporte2021-12-152-26/+0
* | | | ocamlPackages.pa_bench: remove at 113.00.00•••This is a legacy package for OCaml ≤ 4.02 (cherry picked from commit 0a63a4bb878759f928a4495a26fc5eebedeb8790) Vincent Laporte2021-12-152-25/+0
* | | | Merge pull request #150782 from NixOS/backport-150660-to-release-21.11•••[Backport release-21.11] kotlin{-native}: 1.6.0 → 1.6.10Kevin Cox2021-12-142-6/+6
|\ \ \ \
| * | | | kotlin{-native}: 1.6.0 → 1.6.10•••(cherry picked from commit 00d0e5543778de9692a19cb2e1ccc98d546eb981) Subhrajyoti Sen2021-12-142-6/+6
| | |_|/ | |/| |
* | | | Merge pull request #150780 from NixOS/backport-150777-to-release-21.11•••[Backport release-21.11] emacs: Use string replacement for gvfs tramp detection rather than a patchadisbladis2021-12-154-26/+10
|\ \ \ \ | |/ / / |/| | |
| * | | emacs: Use string replacement for gvfs tramp detection rather than a patch•••The patches are unwieldy to manage, especially with the automated packaging flows in the Emacs overlay. (cherry picked from commit 4b89ac58bba54a071fdd65ec96ca9d4d45494797) origin/backport-150777-to-release-21.11adisbladis2021-12-143-12/+10
| * | | emacs: Remove unused gvfs patch•••(cherry picked from commit 21961650ea68c2f0e653bd6a1575c1514b256b47) adisbladis2021-12-141-14/+0
|/ / /
* | | Merge pull request #150720 from NixOS/backport-148860-to-release-21.11•••[Backport release-21.11] runc: 1.0.2 -> 1.0.3adisbladis2021-12-151-2/+2
|\ \ \ | |_|/ |/| |
| * | runc: 1.0.2 -> 1.0.3•••https://github.com/opencontainers/runc/releases/tag/v1.0.3 (cherry picked from commit db70d35c839e1cd4c1e59e6a1db3cb91c88c0632) origin/backport-148860-to-release-21.11zowoq2021-12-141-2/+2
* | | Merge pull request #150758 from wamserma/fix-calibre-cve•••[21.11] calibre: fix CVE-2021-44686 (security)Thiago Kenji Okada2021-12-141-0/+7
|\ \ \
| * | | [21.11] calibre: fix CVE-2021-44686 (security)Markus S. Wamser2021-12-141-0/+7
* | | | Merge pull request #150608 from collares/backport-148236-to-release-21.11•••[Backport release-21.11] emacsPackages.orgPackages: deprecatedadisbladis2021-12-156-47/+13
|\ \ \ \
| * | | | emacsPackages.orgPackages: deprecated•••org elpa is deprecated and moved into gnu elpa and nongnu elpa. link: nix-community/emacs-overlay#191 (cherry picked from commit 932ab304f0b8e3241c1311b9b731d3d330291715) Vonfry2021-12-136-47/+13
* | | | | Merge pull request #150740 from NixOS/backport-150736-to-release-21.11•••[Backport release-21.11] gping: add NixOS support patchThiago Kenji Okada2021-12-141-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | gping: add NixOS support patch•••This backport a patch made to add NixOS as a supported Operating System fixing the wrong rendering issues I faced during test. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> (cherry picked from commit 4516cecba0c039cdf76bca0bb83fea80e49f0a96) Otavio Salvador2021-12-141-0/+8
| | |/ / | |/| |
* | | | Merge pull request #150735 from NixOS/backport-150715-to-release-21.11•••[Backport release-21.11] chromium: 96.0.4664.93 -> 96.0.4664.110Michael Weiss2021-12-141-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | chromium: 96.0.4664.93 -> 96.0.4664.110•••https://chromereleases.googleblog.com/2021/12/stable-channel-update-for-desktop_13.html This update includes 5 security fixes. Google is aware of reports that an exploit for CVE-2021-4102 exists in the wild. CVEs: CVE-2021-4098 CVE-2021-4099 CVE-2021-4100 CVE-2021-4101 CVE-2021-4102 (cherry picked from commit 9528f0d87e3134b8ce272161a9315c0569149e1b) origin/backport-150715-to-release-21.11Michael Weiss2021-12-141-3/+3
|/ / /
* | | Merge pull request #150650 from NixOS/backport-150610-to-release-21.11•••[Backport release-21.11] apache-jena: 4.2.0 -> 4.3.1; apache-jena-fuseki: 4.2.0 -> 4.3.17c6f434c2021-12-142-6/+6
|\ \ \
| * | | apache-jena: 4.2.0 -> 4.3.1; apache-jena-fuseki: 4.2.0 -> 4.3.1•••Fixes CVE-2021-44228. See #150288. (cherry picked from commit d2d9d4c862b37eb85358d9bc8c1b869e131cd341) origin/backport-150610-to-release-21.11Joerie de Gram2021-12-142-6/+6
* | | | Merge pull request #150653 from NixOS/backport-150553-to-release-21.11•••[Backport release-21.11] keycloak: 15.0.2 -> 15.1.0Kim Lindberger2021-12-141-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | keycloak: 15.0.2 -> 15.1.0•••(cherry picked from commit b94a1f842a267892ddbeab454ff9615424074abe) talyz2021-12-141-2/+2
|/ / /
* | | Merge pull request #150619 from NixOS/backport-149946-to-release-21.11•••[Backport release-21.11] latte-dock: 0.10.0 -> 0.10.4Bobby Rong2021-12-141-2/+2
|\ \ \