summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* vscodium: 1.63.2 -> 1.64.0•••(cherry picked from commit 6d982a2c888543dac4328b7d5d1c3267f91f95ce) origin/backport-158200-to-release-21.11Bobby Rong2022-02-071-5/+5
* vscode: 1.63.2 -> 1.64.0•••(cherry picked from commit 0c618de480eba1e34372b58f7ef5276d3efcfad3) Bobby Rong2022-02-072-7/+7
* Merge pull request #158383 from NixOS/backport-155927-to-release-21.11•••[Backport release-21.11] seafile-server: 8.0.7 -> 8.0.8Luke Granger-Brown2022-02-071-4/+8
|\
| * seafile-server: add passthru.tests•••(cherry picked from commit adad47dfc2a0b58c52dbee9131b7e6b2e6441ec0) Robert Schütz2022-02-061-1/+5
| * seafile-server: 8.0.7 -> 8.0.8•••(cherry picked from commit e4041ec226ffd754b5b236debda5bede623a0264) Greizgh2022-02-061-3/+3
* | Merge pull request #158385 from NixOS/backport-157336-to-release-21.11•••[Backport release-21.11] lib: Improve library docsBen Siraphob2022-02-062-53/+72
|\ \ | |/ |/|
| * lib.sources: Improve docs•••Change comment type so than nixdoc picks them up into Nixpkgs manual. Also improve phrasing a bit and move stuff around so that it is formatted better. (cherry picked from commit 1e1396aafccff9378b8f3d0c686e277c226398cf) Jan Tojnar2022-02-061-48/+67
| * lib.trivial: Change comment type before concat function•••C-style comment was being picked up by nixdoc as a documentation comment for the function. (cherry picked from commit 2f012d93ed89c63dd0af602ef109f4276a343167) Jan Tojnar2022-02-061-5/+5
|/
* Merge #157461: smarty3: 3.1.39 -> 3.1.44 (into release-21.11)Vladimír Čunát2022-02-061-2/+2
|\
| * smarty3: 3.1.39 -> 3.1.44•••Fixes CVE-2021-29454. https://github.com/smarty-php/smarty/blob/v3.1.44/CHANGELOG.md (cherry picked from commit 61833e4db0f6ccc6e5170d47453196dffe464a37) Thomas Gerbet2022-01-311-2/+2
* | Merge pull request #158267 from jonringer/jonringer-release-CODEOWNER•••CODEOWNERS: add jonringer for all backport PRsRobert Hensing2022-02-061-0/+3
|\ \
| * | CODEOWNERS: add jonringer for all backport PRsJonathan Ringer2022-02-051-0/+3
* | | Merge pull request #158362 from NixOS/backport-158360-to-release-21.11•••[Backport release-21.11] firejail: 0.9.66 -> 0.9.687c6f434c2022-02-064-66/+15
|\ \ \
| * | | firejail: 0.9.66 -> 0.9.68•••Fixes #153430 (cherry picked from commit 36b1dedddd1b63d83129856ea52f0208f99c672c) origin/backport-158360-to-release-21.11Zane van Iperen2022-02-064-66/+15
|/ / /
* | | collectd-data: we only need collectd.src - not collectd.out•••(cherry picked from commit b087d2c4989591357966b6226bd552716dbb85b1) Peter Hoeg2022-02-061-5/+5
* | | gocyclo: 2015-02-08 -> 0.4.0 (#158009)•••We're pulling from a random fork, so switch to the actual upstream. Also change to use buildGoModule instead of buildGoPackage. (cherry picked from commit b8f6ce151a2882309a11b48f29158fea12e44da5) Co-authored-by: Zane van Iperen <zane@zanevaniperen.com> Co-Authored-By: Martin <stackshadow@evilbrain.de>github-actions[bot]2022-02-061-13/+10
* | | Merge pull request #158305 from adisbladis/types-typed-ast-backport•••[backport release-21.11] python39Packages.types-typed-ast: init 1.5.1adisbladis2022-02-062-0/+31
|\ \ \
| * | | python3Packages.types-typed-ast: 1.5.0 -> 1.5.1•••(cherry picked from commit 187396f80ff089937f90bc3c326a16e7273a076b) Fabian Affolter2022-02-061-3/+6
| * | | python39Packages.types-typed-ast: 1.4.4 -> 1.5.0•••(cherry picked from commit 8bd7e5c1624ef006786aa763892778c027d25266) Sandro Jäckel2022-02-061-3/+3
| * | | python39Packages.types-typed-ast: init 1.4.4•••Co-authored-by: @jnetod @veehaitch @nbraud (cherry picked from commit 5f2f409a2649da5b011ae8e490fe023657384bcb) superherointj2022-02-062-0/+28
* | | | Merge pull request #158071 from NixOS/backport-158050-to-release-21.11•••[Backport release-21.11] graphicsmagick: fix use of delegates in conversionsRobert Scott2022-02-051-2/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | graphicsmagick: add passthru regression test for issue #157920•••use a pdf from the documentation of `graphviz` as it's already a dependency (cherry picked from commit e379b45caaff2a70be6aff85b0e3e4e6fdbd2490) Robert Scott2022-02-041-1/+14
| * | | graphicsmagick: fix use of delegates in conversions•••fixes #157920. nuking the references in `magick_config.h` also nuked the references to the package's own `delegates.mgk`, needed for determining which external tools to use for handling of e.g. pdf files. (cherry picked from commit 2eb5c569a8b09295b043fbface64dc335a991052) Robert Scott2022-02-041-1/+1
* | | | Merge pull request #157885 from pacien/21.11-mercurial-5.9.3-patch-6d2ddea0721a•••[21.11] mercurial: backport fix for compat with 6.1Luke Granger-Brown2022-02-051-0/+7
|\ \ \ \
| * | | | mercurial: backport fix for compat with 6.1•••Backported from mercurial 6.0.2 (commit hg#6d2ddea0721a). See https://www.mercurial-scm.org/pipermail/mercurial-packaging/2022-February/000325.html pacien2022-02-021-0/+7
* | | | | Merge pull request #158155 from NixOS/backport-157744-to-release-21.11•••[Backport release-21.11] qtwebengine: 5.15.7 -> 5.15.8Michele Guerini Rocco2022-02-051-2/+2
|\ \ \ \ \
| * | | | | qtwebengine: 5.15.7 -> 5.15.8•••(cherry picked from commit 00f80f36d2822c5426bd3e15cb14598159269429) rnhmjoj2022-02-041-2/+2
* | | | | | limesurvey: 3.23.7+201006 -> 3.27.33+220125•••(cherry picked from commit 53be4bd13cb8f25ab93a92d1373ad66178e9aec6) Rok Garbas2022-02-041-7/+2
* | | | | | Merge pull request #158160 from NixOS/backport-157878-to-release-21.11•••[Backport release-21.11] chromium: 97.0.4692.99 -> 98.0.4758.80Michael Weiss2022-02-041-10/+10
|\ \ \ \ \ \
| * | | | | | chromium: 97.0.4692.99 -> 98.0.4758.80•••https://chromereleases.googleblog.com/2022/02/stable-channel-update-for-desktop.html This update includes 27 security fixes. CVEs: CVE-2022-0452 CVE-2022-0453 CVE-2022-0454 CVE-2022-0455 CVE-2022-0456 CVE-2022-0457 CVE-2022-0458 CVE-2022-0459 CVE-2022-0460 CVE-2022-0461 CVE-2022-0462 CVE-2022-0463 CVE-2022-0464 CVE-2022-0465 CVE-2022-0466 CVE-2022-0467 CVE-2022-0468 CVE-2022-0469 CVE-2022-0470 (cherry picked from commit b904f5803176261e8873fbcfd4622b125a363cc6) origin/backport-157878-to-release-21.11Michael Weiss2022-02-041-10/+10
* | | | | | | Merge pull request #158122 from NixOS/backport-157982-to-release-21.11•••[Backport release-21.11] Linux kernels 2022-02-03Maximilian Bosch2022-02-047-37/+37
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | linux/hardened/patches/5.4: 5.4.173-hardened1 -> 5.4.176-hardened1•••(cherry picked from commit eaa576d02886569b6d1ba89e96c4b173247e0fe9) TredwellGit2022-02-041-5/+5
| * | | | | | linux/hardened/patches/5.15: 5.15.16-hardened1 -> 5.15.19-hardened1•••(cherry picked from commit 3e23004d64886cb1a4926ccaa93ee9a6b779a125) TredwellGit2022-02-041-5/+5
| * | | | | | linux/hardened/patches/5.10: 5.10.93-hardened1 -> 5.10.96-hardened1•••(cherry picked from commit f529fa4f4e2eed3555e503c410129c1467757507) TredwellGit2022-02-041-5/+5
| * | | | | | linux/hardened/patches/4.19: 4.19.225-hardened1 -> 4.19.227-hardened1•••(cherry picked from commit 84bf08c27e982b1506ee1c80daf67e2a0fe91240) TredwellGit2022-02-041-5/+5
| * | | | | | linux/hardened/patches/4.14: 4.14.262-hardened1 -> 4.14.264-hardened1•••(cherry picked from commit 665abd52577c5ab15490c362e5065a2583bc6c69) TredwellGit2022-02-041-5/+5
| * | | | | | linux_latest-libre: 18517 -> 18587•••(cherry picked from commit 35f965fc61fb4188855c6e3f2aecbde8047858e1) TredwellGit2022-02-041-2/+2
| * | | | | | linux: 5.4.175 -> 5.4.176•••(cherry picked from commit 4ee1c3ad902e5141eb59f325af6a1f2732d1862d) TredwellGit2022-02-041-2/+2
| * | | | | | linux: 5.16.4 -> 5.16.5•••(cherry picked from commit 5aeb99768b2a1f0538ff1f6a21994746be0fc73b) TredwellGit2022-02-041-2/+2
| * | | | | | linux: 5.15.18 -> 5.15.19•••(cherry picked from commit af5cda7f793a37d19736af1e731dcb7ea0d583d1) TredwellGit2022-02-041-2/+2
| * | | | | | linux: 5.10.95 -> 5.10.96•••(cherry picked from commit a752a2371a8fbead1be437d28fc92423a35c36d0) TredwellGit2022-02-041-2/+2
| * | | | | | linux: 4.4.301 -> 4.4.302•••(cherry picked from commit 4e53ba1b1b91f2d8f766d98917ccb2d4ef99f9d1) TredwellGit2022-02-041-2/+2
* | | | | | | Merge pull request #158036 from primeos/chromium-backport•••[21.11] Prepare for backporting Chromium M98Michael Weiss2022-02-045-25/+64
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | chromiumDev: 99.0.4844.11 -> 99.0.4844.16•••(cherry picked from commit 47f0427d1523f7fe2ebb7430fe5809451e59d1b3) Michael Weiss2022-02-031-3/+3
| * | | | | | chromiumBeta: 98.0.4758.74 -> 98.0.4758.80•••(cherry picked from commit 87711ba56b6b74c5bbc2b6f4bbbaa48ea07e0d25) Michael Weiss2022-02-031-3/+3
| * | | | | | chromiumDev: 99.0.4840.0 -> 99.0.4844.11•••(cherry picked from commit eb78072935d69921f7c6482ee05d1aebfb378739) Michael Weiss2022-02-031-3/+3
| * | | | | | chromiumBeta: 98.0.4758.66 -> 98.0.4758.74•••(cherry picked from commit b0b0ffd4662c75d2e94b7382901faa782d0e7acc) Michael Weiss2022-02-032-10/+3
| * | | | | | chromiumDev: Fix the configuration phase•••This fixes: -------------------------------------------------------------------------------- configuring ERROR at //ui/gtk/BUILD.gn:17:1: Assertion failed. assert(use_gio, "GIO is required for building with GTK") ^----- GIO is required for building with GTK See //content/shell/BUILD.gn:308:15: which caused the file to be included. deps += [ "//ui/gtk" ] ^--------- -------------------------------------------------------------------------------- But there's still another build issue(s) left: -------------------------------------------------------------------------------- [25491/48383] ACTION //components/url_formatter/spoof_checks/top_domains:generate_top_domain_list_variables_file(//build/toolchain/linux/unbundle:default)d_tmp/browser_command.mojom-webui.jsab_page_third_party.mojom-webui.js FAILED: gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc python3 ../../build/gn_run_binary.py make_top_domain_list_variables ../../components/url_formatter/spoof_checks/top_domains/domains.list top500_domains gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc make_top_domain_list_variables failed with exit code -4 ninja: build stopped: subcommand failed. -------------------------------------------------------------------------------- (cherry picked from commit e8b241cdbad6f7c0af4115c0d733874b02f5c54f) Michael Weiss2022-02-031-1/+1
| * | | | | | chromium: get-commit-message.py: Improve the parsing•••The latest announcement uses the following structure: "Google is aware the exploits for CVE-2021-37975 and CVE-2021-37976 exist in the wild." (https://chromereleases.googleblog.com/2021/09/stable-channel-update-for-desktop_30.html) (cherry picked from commit d0ed7ee0b040ba45609028663d6d2c686fee7820) Michael Weiss2022-02-031-1/+1
| * | | | | | chromiumDev: 99.0.4818.0 -> 99.0.4840.0•••(cherry picked from commit 9970f3d56e3f25c2426036f3e186d08ab6c59350) Michael Weiss2022-02-031-6/+6