summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge #60201: neo.map: fix URL•••Current URL is no longer available. (cherry picked from commit 6e100ae88f1096ec8c3dbc72e2b2e587c3a08d64) origin/nixos-18.09-smallorigin/nixos-18.09gitlab.intr/nixos-18.09-smallgitlab.intr/nixos-18.09samsonan-it2019-05-191-1/+2
* Merge pull request #61637 from c0bw3b/sec/1809/mds•••[18.09] spectre-meltdown-checker: 0.39 -> 0.41Renaud2019-05-171-2/+2
|\
| * spectre-meltdown-checker: 0.40 -> 0.41•••https://github.com/speed47/spectre-meltdown-checker/releases/tag/v0.41 (cherry picked from commit f5b400b875f42a6fbf01564534e74063ec53d7a9) Will Dietz2019-05-171-2/+2
| * spectre-meltdown-checker: 0.39 -> 0.40•••Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spectre-meltdown-checker/versions (cherry picked from commit 4ca9524e987d2396c9a7aa4b44c205c7346bd2a6) R. RyanTM2019-05-171-2/+2
|/
* Merge pull request #61551 from risicle/ris-leptonica-fix-18.09-backport•••[r18.09] leptonica: patch multiple CVEsRenaud2019-05-162-7/+127
|\
| * leptonica: patch multiple CVEs•••this should fix CVE-2018-3836, CVE-2018-7186, CVE-2018-7247 & CVE-2018-7440 a fix for CVE-2018-7441 & CVE-2018-7442 is *not* included as its patches are very wide-ranging also enable tests to give confidence that I'm not completely butchering the code (cherry-picked from commit 0861ad591a96ad7246335c9cb35f51126874ea12) Robert Scott2019-05-152-7/+127
|/
* linux: 4.9.174 -> 4.9.175Tim Steinbach2019-05-111-2/+2
* linux: 4.19.41 -> 4.19.42Tim Steinbach2019-05-111-2/+2
* linux: 4.14.117 -> 4.14.118Tim Steinbach2019-05-111-2/+2
* Merge pull request #55442 from jacereda/fix-nvenc-licensing•••ffmpeg-full: nvenc doesn't imply nonfree licensingRenaud2019-05-102-4/+3
|\
| * nv-codec-headers: fix licenseJorge Acereda2019-05-101-1/+1
| * nvenc: remove obsolete nvidia-video-sdkJorge Acereda2019-05-091-3/+2
| * ffmpeg-full: nvenc doesn't imply nonfree licensingJorge Acereda2019-02-081-1/+1
* | linux: 4.9.173 -> 4.9.174Tim Steinbach2019-05-081-2/+2
* | linux: 4.19.40 -> 4.19.41Tim Steinbach2019-05-081-2/+2
* | linux: 4.14.116 -> 4.14.117Tim Steinbach2019-05-081-2/+2
* | linux: 4.19.39 -> 4.19.40Tim Steinbach2019-05-051-2/+2
* | Merge pull request #60882 from etu/1809-php-upgrades•••[18.09] php: 7.1.27 -> 7.1.29, 7.2.16 -> 7.2.18Elis Hirwing2019-05-051-4/+4
|\ \
| * | php72: 7.2.17 -> 7.2.18•••Changelog: https://www.php.net/ChangeLog-7.php#7.2.18 (cherry picked from commit 6f3625a1c6f30a19788dbd3c444dadc1d295eb74) Elis Hirwing2019-05-031-2/+2
| * | php72: 7.2.16 -> 7.2.17•••security release, see announcement: https://www.php.net/archive/2019.php#id2019-04-04-2 (cherry picked from commit 76394e36ec367b8d75cb1b4352687e3692ab2854) Will Dietz2019-05-031-2/+2
| * | php71: 7.1.28 -> 7.1.29•••Changelog: https://www.php.net/ChangeLog-7.php#7.1.29 (cherry picked from commit 2a0125c0cefc4ee6204a844e7d71bab6727063d9) Elis Hirwing2019-05-031-2/+2
| * | php71: 7.1.27 -> 7.1.28•••security release: https://www.php.net/archive/2019.php#id2019-04-04-3 (cherry picked from commit b8446dcc57e0fb4d2eae3becd9c51ad77bcba0de) Will Dietz2019-05-031-2/+2
* | | linux: 4.9.172 -> 4.9.173•••(cherry picked from commit 5ee553b2800bc78fb826d291c6d993f3d8052f48) Tim Steinbach2019-05-041-2/+2
* | | linux: 4.19.38 -> 4.19.39•••(cherry picked from commit 7d0a77cd3618df6c873c769a6a4bcd2698c6b625) Tim Steinbach2019-05-041-2/+2
* | | linux: 4.14.115 -> 4.14.116•••(cherry picked from commit a03324e9baadde07c5f0063a4c6c065416865c85) Tim Steinbach2019-05-041-2/+2
* | | pinentry: update patch url•••I verified the hash did NOT change as suggested in #60699. (cherry picked from commit 0b9c477719e23606417a73f3522dd2186715d04b) Vladimír Čunát2019-05-041-1/+2
|/ /
* | texlive: provide bin.texlive on Darwin too•••texlive attribute was accidentally added in attrset wrapped with stdenv.lib.optionalAttrs (!stdenv.isDarwin) Fixes: dbc2c1c4b8 ('texlive: add missing perl dependencies for latexindent') (cherry picked from commit b6d0bdf5136031b49d174e638e7d0bdc8c5e5a12) Dmitry Kalinkin2019-05-031-26/+27
* | texlive: add missing perl dependencies for latexindent•••(cherry picked from commit dbc2c1c4b8e4d82a3c8ef3ef5fe76d84ac07766d) cc #59537 Dmitry Kalinkin2019-05-031-1/+27
* | linux: 4.14.114 -> 4.14.115•••(cherry picked from commit 5d03bfd653b28bf0a8b39d45420e60da6d91fbe0) Tim Steinbach2019-05-021-2/+2
* | linux: 4.19.37 -> 4.19.38•••(cherry picked from commit e0bf73dbde74e66167bd9ccf385a1fbc228c4036) Tim Steinbach2019-05-021-2/+2
* | linux: 4.9.171 -> 4.9.172•••(cherry picked from commit 9d7638371fbc59fc916c32a5d8e9308dace29e6a) Tim Steinbach2019-05-021-2/+2
* | Merge pull request #60673 from c0bw3b/backport/1809/thinprovtools•••[18.09] thin-provisioning-tools: fix patch urlRenaud2019-05-021-1/+1
|\ \
| * | thin-provisioning-tools: fix patch url•••Void Linux changed its github organization from "voidlinux" to "void-linux" See: https://voidlinux.org/news/2018/06/GitHub-Organisation-is-moving.html (cherry picked from commit 898f34a059d843d0421cc7d7670d19ff77867496) Mario Rodas2019-05-011-1/+1
|/ /
* | Merge pull request #60342 from andir/18.09/bind•••[18.09] bind: 9.12.3-P4 -> 9.12.4-P1Samuel Dionne-Riel2019-04-271-3/+13
|\ \
| * | bind: apply atomics to refcount patch•••Upstream added a commit [1] right after the release that fixes the aarch64 atomic operation linker issue we have been seeing [2]. [1] https://gitlab.isc.org/isc-projects/bind9/commit/d72f436b7d7c697b262968c48c2d7643069ab17f [2] https://github.com/NixOS/nixpkgs/issues/60301#issue-437896459 (cherry picked from commit 37dd347cd31c9eeecf991bc062c00ca6f8b9dee4) Andreas Rammhold2019-04-271-1/+11
| * | bind: 9.12.3-P4 -> 9.12.4-P1•••https://www.openwall.com/lists/oss-security/2019/04/25/1 CVE-2018-5743, CVE-2019-6467, and CVE-2019-6468 (cherry picked from commit f0f081d3b485f350134bef994fb9dbb0490bad09) Will Dietz2019-04-271-2/+2
|/ /
* | linux: Remove i2c-oops patch•••(cherry picked from commit c08aa32c906efe746fc1ffb2bdb0c5b9464d4a51) Tim Steinbach2019-04-272-16/+0
* | linux: 4.9.170 -> 4.9.171•••(cherry picked from commit 8d98033d99d5a8affcc7f3bc64afa8984ee0aa73) Tim Steinbach2019-04-272-3/+2
* | linux: 4.4.178 -> 4.4.179•••(cherry picked from commit 3d829058a146e54bea8ba520fe45807dc38d41c4) Tim Steinbach2019-04-271-2/+2
* | linux: 4.19.36 -> 4.19.37•••(cherry picked from commit d43faab5ef32bdf55fe4b7bb17bc72240289602e) Tim Steinbach2019-04-272-3/+2
* | linux: 4.14.113 -> 4.14.114•••(cherry picked from commit ae7baea76f2b905b96250c979122971105025d01) Tim Steinbach2019-04-272-3/+2
* | Fix kernel oops on boot due to bug in i2c driver.•••https://github.com/NixOS/nixpkgs/issues/60126 https://lkml.org/lkml/2019/4/24/1123 The patch should be removed in the next round of stable releases because the fix should be included. (cherry picked from commit 1e8a0805890fbb1cce1aa751296c82342b0cae7e) (cherry picked from commit a9c40eef1f9a9824c706e1e38c02be5c054453ec) Ambroz Bizjak2019-04-253-0/+19
* | Merge pull request #60074 from flokli/18.09/gitlab-11.9.8•••[18.09] gitlab: 11.9.1 -> 11.9.8Florian Klink2019-04-238-14/+50
|\ \
| * | gitlab-ce: 11.9.1 -> 11.9.8•••(cherry picked from commit 04b5eb10c0858aba289129de3c830d552b6c3db7) Florian Klink2019-04-234-6/+24
| * | gitlab-ee: 11.9.1 -> 11.9.8•••(cherry picked from commit 33423e52c6b24fb244751f47fba44690777f1c4a) Florian Klink2019-04-234-6/+24
| * | gitlab-workhorse: 8.3.1 -> 8.3.3•••(cherry picked from commit 74eb807f83335c5f095dcc44e15ba2664e5221e9) Florian Klink2019-04-231-2/+2
|/ /
* | Merge pull request #59839 from dotlambda/dovecot-CVE-2019-10691•••[18.09] dovecot: fix CVE-2019-10691Silvan Mosberger2019-04-221-0/+5
|\ \
| * | dovecot: fix CVE-2019-10691•••https://dovecot.org/pipermail/dovecot-news/2019-April/000406.html Robert Schütz2019-04-181-0/+5
* | | linux: 4.9.169 -> 4.9.170•••(cherry picked from commit 24867c60e4f8b813bfb7d5a5a20d529ed695cdc2) Tim Steinbach2019-04-201-2/+2
* | | linux: 4.19.35 -> 4.19.36•••(cherry picked from commit d5bbae83089c6978234fc3be96b33c6b1b6ab973) Tim Steinbach2019-04-201-2/+2