summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* sane-airscan: 0.99.24 -> 0.99.26•••(cherry picked from commit 19120ab49753fb29feb5a49a20398f7d39a96ea4) origin/backport-125096-to-release-21.05Sebastian Sellmeier2021-06-011-2/+2
* Merge pull request #125230 from NixOS/backport-124603-to-release-21.05•••[Backport release-21.05] php.buildPecl: Add checkPhaseRobert Scott2021-06-012-1/+2
|\
| * php.buildPecl: Add checkPhase•••Also update phpPackages' to use NO_INTERACTION (cherry picked from commit 3a66432f2616484c880b6daea2393bf1e9425a33) Marco Sirabella2021-06-012-1/+2
* | Merge pull request #125269 from NixOS/backport-125245-to-release-21.05•••[Backport release-21.05] warzone2100: fix buildMichele Guerini Rocco2021-06-011-2/+2
|\ \
| * | warzone2100: fix build•••I'm not sure how the build broke[1] or how it worked before, but the problem is zip is being used in place of p7zip, which obviously fail as the flags have different meanings. [1]: https://hydra.nixos.org/build/143354937 (cherry picked from commit 302d6b1b8b94f2082f9937d04e27c2aaefb93aa2) rnhmjoj2021-06-011-2/+2
* | | Merge pull request #125126 from NixOS/backport-125111-to-release-21.05•••[Backport release-21.05] lua5_4: 5.4.2 -> 5.4.3Robert Scott2021-06-011-2/+2
|\ \ \
| * | | lua5_4: 5.4.2 -> 5.4.3•••(cherry picked from commit 490970ae8b34107aa5e092629271ac7739407478) Janne Heß2021-05-311-2/+2
* | | | Merge pull request #125249 from NixOS/backport-124995-to-release-21.05•••[Backport release-21.05] ijq: 0.2.3 → 0.3.4Robert Scott2021-06-011-3/+3
|\ \ \ \
| * | | | ijq: 0.2.3 → 0.3.4•••https://github.com/gpanders/ijq/compare/v0.2.3...v0.3.4 (cherry picked from commit 691a876749de1029f150b3ff7e23cf92403510a4) Jan Tojnar2021-06-011-3/+3
* | | | | Merge pull request #125248 from NixOS/backport-124986-to-release-21.05•••[Backport release-21.05] libccd: fix pkgconfig file pathsRobert Scott2021-06-011-1/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | libccd: fix pkgconfig file paths•••libccd has the common bug of assuming CMAKE_INSTALL_*DIR is relative. I have submitted the fix upstream, but don't have much hope of getting it merged because there have been no updates since 2018. (cherry picked from commit 3d2092ab58fe83e89a3162728e9d4b733295b561) Ben Wolsieffer2021-06-011-1/+10
| |/ / /
* | | | Merge pull request #125247 from NixOS/backport-124996-to-release-21.05•••[Backport release-21.05] schismtracker: 20200412 -> 20210525Robert Scott2021-06-011-6/+11
|\ \ \ \ | |/ / / |/| | |
| * | | schismtracker: 20200412 -> 20210525•••(cherry picked from commit 20b1b6e68ba4db1b39ac49280c0d83e811a5c19a) origin/backport-124996-to-release-21.05Pavol Rusnak2021-06-011-6/+11
|/ / /
* | | Merge pull request #125229 from NixOS/backport-125225-to-release-21.05•••[Backport release-21.05] changelog: fix typoFabian Affolter2021-06-011-1/+1
|\ \ \
| * | | changelog: fix typo•••(cherry picked from commit 8217ea50000728c55fe8b21454ca2572743d8302) Sandro2021-06-011-1/+1
* | | | Merge pull request #125164 from NixOS/backport-125160-to-release-21.05•••[Backport release-21.05] delve: disable source fortify at runtimeRobert Scott2021-06-011-1/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update pkgs/development/tools/delve/default.nix•••Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> (cherry picked from commit c9927ba895f17ae58dfe8dc736a9ba8508e623ee) origin/backport-125160-to-release-21.05Jörg Thalheim2021-06-011-1/+1
| * | | delve: disable source fortify at runtime•••(cherry picked from commit b48e56c74634757b4f85e06377dd4f89c85d9a26) Jörg Thalheim2021-06-011-1/+11
* | | | Merge pull request #125226 from NixOS/backport-124892-to-release-21.05•••[Backport release-21.05] yara: 4.0.5 -> 4.1.1Robert Scott2021-06-011-16/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | yara: add enableStatic mode•••useful because tests can be enabled in this mode (cherry picked from commit 8cda1cc59e7cd01ce2ff18bc78f6b7a0e7faed19) Robert Scott2021-06-011-0/+4
| * | | yara: 4.0.5 -> 4.1.1•••(cherry picked from commit 2d7f554229393ddb0441dd31e37db7ad7b48dab0) Robert Scott2021-06-011-16/+2
* | | | Merge #125185: zstd: patch test flakiness on i686Vladimír Čunát2021-06-011-2/+8
|\ \ \ \
| * | | | zstd: patch test flakiness on i686•••https://hydra.nixos.org/build/143933617/nixlog/246/tail The last attempt I see on 21.05 has failed: https://hydra.nixos.org/build/144447049#tabs-buildsteps Vladimír Čunát2021-06-011-2/+8
* | | | | Merge branch 'discord-backport' into release-21.05Shea Levy2021-06-012-9/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | discord: fix runtime linking•••(cherry picked from commit c5bed409b29dfbf467a71fab9679cf189ccfa428) Jonathan Ringer2021-06-011-3/+3
| * | | | discord: 0.0.14 -> 0.0.15•••(cherry picked from commit 501e54080dfc82c41011d371677a7390eab61586) wearemnr2021-06-011-6/+6
* | | | | Merge pull request #124818 from NixOS/backport-124200-to-release-21.05Sandro2021-06-013-0/+7
|\ \ \ \ \
| * | | | | mx-puppet-discord: set pname•••(cherry picked from commit 166aabe0c7ccd972ea3be092ab900d3a637216ef) Pacman992021-05-291-0/+3
| * | | | | matrix-appservice-slack: set pname•••(cherry picked from commit a811e7385c6a4dd8eeb871f994939ff99260fa75) Pacman992021-05-291-0/+2
| * | | | | matrix-appservice-irc: set pname•••(cherry picked from commit 41e46599ea2b6b947e14ccb3f1d38326bced3585) Pacman992021-05-291-0/+2
* | | | | | haskellPackages.webify: unbreak, jailbreak, as patches are not upstreamable atm•••(cherry picked from commit b401b432099d174dadd26a4c00f5afb62d7c2e01) Kerstin Humm2021-06-013-11/+4
* | | | | | haskellPackages.hakyll: unbreak, jailbreak, patch for pandoc version•••(cherry picked from commit 8f33bb975daf526d916035413b67fcc939f09c5c) Kerstin Humm2021-06-013-3/+17
| |/ / / / |/| | | |
* | | | | Merge pull request #125173 from NixOS/backport-125158-to-release-21.05•••[Backport release-21.05] radare2: 5.2.1 -> 5.3.0Jörg Thalheim2021-06-011-16/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | radare2: 5.2.1 -> 5.3.0•••(cherry picked from commit bfaa9f175bdfd9a5106021ae1906a35f429e283f) Jörg Thalheim2021-06-011-16/+2
* | | | | Merge pull request #124595 from mohe2015/backport-124347-21.05Sandro2021-06-013-10/+7
|\ \ \ \ \
| * | | | | step-ca: use latest buildGoModule•••(cherry picked from commit acf134771c79171ce183aa85aec162e03763bc30) David Guibert2021-05-291-1/+0
| * | | | | step-cli: 0.15.3-22 -> 0.15.16•••(cherry picked from commit 1270b7977172de534ec12236b8a7a62904a8f317) David Guibert2021-05-291-6/+4
| * | | | | step-ca: 0.15.11 -> 0.15.15•••(cherry picked from commit f9eedc34577b5484307e30efa81c6f0521427919) David Guibert2021-05-291-3/+3
* | | | | | Merge pull request #125175 from NixOS/backport-125174-to-release-21.05•••[Backport release-21.05] nginx: fix link to discussion explaining why "with" is not usedJörg Thalheim2021-06-011-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | nginx: fix link to discussion explaining why "with" is not used•••This is because we are in a huge "rec" that takes precedence for symbols in its scope, despite the more nested "with". (cherry picked from commit 7ee8945a120da5b10fa0eac9fc59b92531ac8552) Vincent Bernat2021-06-011-3/+3
|/ / / / /
* | | | | Merge pull request #125055 from NixOS/backport-124544-to-release-21.05•••[Backport release-21.05] vmTools: update current lts versions of ubuntu/debianJörg Thalheim2021-06-011-90/+49
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | vmTools: update current maintained debian versions•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit eb0034927d08e2c63675b6a90a9219472356fd38) Jörg Thalheim2021-05-311-23/+21
| * | | | vmTools: update current lts versions of ubuntu•••(cherry picked from commit e71c4f4628d0b5cce28f1a23c0c41eaffb6b1fd2) Jörg Thalheim2021-05-311-67/+28
* | | | | nixos/release-notes: move non-highlights to other mentions•••(cherry picked from commit 9a3e8699976bd673f9f4eee64e254ccb7a1fadce) 21.05Jonathan Ringer2021-05-311-99/+98
* | | | | nixos/release-notes: Initial grooming of release notes•••(cherry picked from commit f15d286aaca6f7bd9f246c72978992ea8bb73e63) Jonathan Ringer2021-05-311-2/+71
* | | | | nixos/doc/releases: update stable release info to 21.05•••(cherry picked from commit 545ba18df2ca2077d6c1a69e02648ad88dd5d968) Jonathan Ringer2021-05-312-9/+9
* | | | | Merge pull request #125134 from NixOS/backport-124950-to-release-21.05•••[Backport release-21.05] nixos/acme: don't use --reuse-keyMartin Weinelt2021-06-012-1/+11
|\ \ \ \ \
| * | | | | nixos/acme: don't use --reuse-key•••Reusing the same private/public key on renewal has two issues: - some providers don't accept to sign the same public key again (Buypass Go SSL) - keeping the same private key forever partly defeats the purpose of renewing the certificate often Therefore, let's remove this option. People wanting to keep the same key can set extraLegoRenewFlags to `[ --reuse-key ]` to keep the previous behavior. Alternatively, we could put this as an option whose default value is true. (cherry picked from commit 632c8e1d54e299f656aa677f25552e1127f12849) Vincent Bernat2021-05-312-1/+11
|/ / / / /
* | | | | Merge pull request #124341 from NixOS/staging-next-21.05•••[21.05] Staging nextJonathan Ringer2021-05-3122-77/+144
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge remote-tracking branch 'origin/release-21.05' into staging-next-21.05Jonathan Ringer2021-05-31138-2438/+1682
| |\ \ \ \ | |/ / / / |/| | | |