summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* punes: unstable-2021-04-25 -> unstable-2021-06-05•••(cherry picked from commit 1a55fd200a1d443fcf64c3f7982cc198ac36404c) origin/backport-127061-to-release-21.05OPNA26082021-06-161-3/+3
* sidplayfp: 2.1.1 -> 2.2.0•••(cherry picked from commit db95a98866ee2e8e60e466965193a01ebecaa3ca) OPNA26082021-06-161-2/+9
* libsidplayfp: 2.1.1 -> 2.2.0•••(cherry picked from commit a6e9ec25fc29a4f309750e6d95088d6a723730c6) OPNA26082021-06-161-16/+9
* ptcollab: 0.4.0 -> 0.4.1•••(cherry picked from commit 7b3c26031b767b1d0bf7c908a112a77a80ec9914) OPNA26082021-06-161-8/+4
* Merge pull request #127076 from NixOS/backport-127044-to-release-21.05Martin Weinelt2021-06-161-3/+5
|\
| * knot-dns: add passthru.tests•••I hope I got the conventions right (found in doc/stdenv/meta.chapter.md) (cherry picked from commit cf0b179b5ea78ff8fd34763c48da4323739fa5fb) Vladimír Čunát2021-06-161-1/+3
| * knot-dns: 3.0.6 -> 3.0.7•••Fixes various bugs and introduces a few requested features. https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.7 (cherry picked from commit 28dd3b6177dae61005cfdaebac405e8dbf70b2dc) Vladimír Čunát2021-06-161-2/+2
|/
* Merge pull request #125567 from risicle/ris-python-websockets-CVE-2018-100051...•••[21.05] python3Packages.websockets: add patch for CVE-2021-33880Robert Schütz2021-06-161-0/+10
|\
| * python3Packages.websockets: add patch for CVE-2021-33880•••this is a reintroduction of CVE-2018-1000518 which i had been calling CVE-2018-1000518-redux before it got its own CVE assigned (cherry picked from commit aba83e7f878d6c48e781a3934a79f98b072bb659) (yes, a forward cherry-pick because i fully expected the websockets 9.1 to make it into 21.05) Robert Scott2021-06-091-0/+10
* | Merge pull request #126933 from NixOS/backport-126924-to-release-21.05•••[Backport release-21.05] chromium: 91.0.4472.101 -> 91.0.4472.106Michael Weiss2021-06-161-6/+6
|\ \
| * | chromium: 91.0.4472.101 -> 91.0.4472.106•••https://chromereleases.googleblog.com/2021/06/stable-channel-update-for-desktop_14.html (cherry picked from commit 8540133fb7db4ad988ea2844c429b8b547dde370) Michael Weiss2021-06-151-6/+6
* | | Merge pull request #127016 from mweinelt/21.05/solanumMartin Weinelt2021-06-163-19/+11
|\ \ \
| * | | solanum: clarify license to be gpl2 or later•••(cherry picked from commit 2441e82399ad349bac570cbbe72cfe1b3158cc59) Martin Weinelt2021-06-161-1/+1
| * | | nixos/solanum: implement reload and allow config changes•••Reload only works with a static configuration path as there is no way to pass the dynamically generated config path to a running solanum instance, therefore we symlink the configuration to /etc/solanum/ircd.conf. But that will prevent reloads of the ircd, because the systemd unit wouldn't change when the configuration changes. That is why we add the actual location of the config file to restartTriggers and enable reloadIfChanged, so changes will not restart, but reload on changes. (cherry picked from commit 60c62214f5a3c7db6aa30d8a8e02c863b6abcf0a) Martin Weinelt2021-06-161-2/+10
| * | | solanum: remove obsolete BANDB settings/patches•••(cherry picked from commit 8eb5701aaf0eb7ad842a67f09e2f80826ac1ce80) lassulus2021-06-163-16/+0
* | | | Merge pull request #125967 from NixOS/backport-125953-to-release-21.05•••[Backport release-21.05] matrix-appservice-discord: increase test timeoutMaximilian Bosch2021-06-162-2/+2
|\ \ \ \
| * | | | matrix-appservice-discord: increase test timeout•••Hydra and my local machine are sometimes hitting the default timeout. See https://hydra.nixos.org/build/138032455/nixlog/8/tail (cherry picked from commit 92f62de6f1ee9c9e31a8432ad222e79deef2ad87) origin/backport-125953-to-release-21.05pacien2021-06-061-1/+2
| * | | | maintainers/teams: remove pacien from the matrix team•••I prefer to focus only on the individual packages which I know. (cherry picked from commit b24cc395ccf892827585d32246b4902bd9379113) pacien2021-06-061-1/+0
* | | | | Merge pull request #127055 from NixOS/backport-126607-to-release-21.05•••[Backport release-21.05] matrix-synapse: 1.35.1 -> 1.36.0Maximilian Bosch2021-06-161-2/+2
|\ \ \ \ \
| * | | | | matrix-synapse: 1.35.1 -> 1.36.0•••(cherry picked from commit 3acb9eb23f4e7f8557fd1bf5b0fad98568a1ceac) Sumner Evans2021-06-161-2/+2
* | | | | | Merge pull request #125407 from dxops/patch-2•••[21.05] php/generic: Allow to extend PHP_INI_SCAN_DIRKim Lindberger2021-06-161-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow to extend PHP_INI_SCAN_DIR•••Fixes #109383 Master 9fb4d19c2ec8d86439457e4cc10bc12becdc7268 Serhii Zhuravel2021-06-161-3/+3
|/ / / / /
* | | | | [Backport release-21.05] texlive: allow substitutes for texlive packages (#12...•••* texlive: allow substitutes for texlive packages (cherry picked from commit 0f1e7e09b56cc8d98c5d02b87dd2626be9456d9c) (cherry picked from commit 54cd3b840d4043322da7cfefd3a7d8ee80d68bc4) Co-authored-by: Vincenzo Mantova <xworld21@users.sf.net>github-actions[bot]2021-06-161-2/+2
* | | | | Merge pull request #127014 from NixOS/backport-126969-to-release-21.05•••[Backport release-21.05] discourse: 2.7.0 -> 2.7.4Kim Lindberger2021-06-163-5/+5
|\ \ \ \ \
| * | | | | discourse: 2.7.0 -> 2.7.4•••(cherry picked from commit f7fb0d20a624c4d7fa12ba8a6e6d551655106a29) talyz2021-06-153-5/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #127023 from NixOS/backport-126988-to-release-21.05•••[Backport release-21.05] mautrix-whatsapp: unstable-2021-06-15 -> 0.1.7Maximilian Bosch2021-06-161-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | mautrix-whatsapp: unstable-2021-06-15 -> 0.1.7•••ChangeLog: https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.7 Not a functional change as I already included all the fixes in my previous bump, but I think it's better to use a stable tag by default to build :) (cherry picked from commit 6e4ce705350a2adf5a14bc2a9a830d87f03c1ee5) Maximilian Bosch2021-06-161-3/+3
|/ / / /
* | | | Merge pull request #127009 from NixOS/backport-125890-to-release-21.05Martin Weinelt2021-06-163-0/+144
|\ \ \ \
| * | | | mfc9140cdncupswrapper: init at 1.1.4-0•••(cherry picked from commit 76f168a4f1005c3b0afb99a511b808f56e68db54) Martin Weinelt2021-06-152-0/+69
| * | | | mfc9140cdnlpr: init at 1.1.2-1•••(cherry picked from commit f52c8862c9b1fc524bd1401185944de6274db43b) Martin Weinelt2021-06-152-0/+75
* | | | | Merge pull request #127011 from NixOS/backport-125011-to-release-21.05•••[Backport release-21.05] solanum: fix MOTDMartin Weinelt2021-06-162-0/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | solanum: fix MOTD•••Previously this defaulted to the default MOTD in the solanum source tree, and I don't want my friends to laugh at me. Includes a patch to the tests to ensure that the MOTD is actually set. This replicates the fix done in #109705 (solanum is a fork of charybdis, so they share fundamental logic for this). Signed-off-by: Christine Dodrill <me@christine.website> (cherry picked from commit b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8) Christine Dodrill2021-06-152-0/+12
|/ / / /
* | | | Merge pull request #126370 from NixOS/backport-126245-to-release-21.05•••[Backport release-21.05] matrix-appservice-irc: 0.26.0 -> 0.26.1Martin Weinelt2021-06-152-206/+359
|\ \ \ \
| * | | | matrix-appservice-irc: 0.26.0 -> 0.26.1•••(cherry picked from commit 6a18a9a2c517c7e9a8a1b3490502ad54583bbf62) piegames2021-06-092-206/+359
* | | | | Merge pull request #126986 from NixOS/backport-126922-to-release-21.05•••[Backport release-21.05] nixos/ssh: Add an example of verbatim keysRobert Hensing2021-06-151-1/+15
|\ \ \ \ \
| * | | | | nixos/ssh: Document authorizedKeysFiles properly•••(cherry picked from commit dab747106e20268e6d3a7c1a758185bc75507bef) Robert Hensing2021-06-151-1/+11
| * | | | | nixos/ssh: Add an example of verbatim keys•••This confused someone on SO. (cherry picked from commit 8352cc9a23a5fea11d467a5b8341b24cd162c62a) Robert Hensing2021-06-151-0/+4
* | | | | | Merge pull request #126974 from NixOS/backport-126966-to-release-21.05•••[Backport release-21.05] mautrix-whatsapp: 0.1.6 -> unstable-2021-06-15Maximilian Bosch2021-06-151-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | mautrix-whatsapp: 0.1.6 -> unstable-2021-06-15•••On `master` there are a few more bugfixes. Most notably, each message sent by me was marked as "not sent" by WhatsApp for the last four days until you hit a "Resend" in WhatsApp. As the update to the latest `master` has solved the issue and being able to correctly send messages is one of the core features of this package, I decided to update the package in `nixpkgs` as well. (cherry picked from commit 5c7156faf1c766166d663a68e666678992ca2b2a) Maximilian Bosch2021-06-151-4/+4
* | | | | | Merge pull request #126757 from cmm/backport-clangd-wrapper-fix•••clang-tools: fix clangdJörg Thalheim2021-06-151-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | clang-tools: fix clangd•••Whatever change has necessitated https://github.com/NixOS/nixpkgs/pull/122044, it also broke clangd -- <clang-wrapper>/resource-root/include is no longer automagically searched for includes, which kills pretty much any indexing since that directory contains vital stuff like stddef.h etc. Fix by appending the directory to CPATH & CPLUS_INCLUDE_PATH in the clangd wrapper. (cherry picked from commit 8e06a39574aeb6500ad233e3b529e0e43fb80788) Michael Livshin2021-06-131-2/+2
* | | | | | Merge pull request #126700 from symphorien/ttrss-tumblr-gdpr-stable•••[21.05] tt-rss-plugin-tumblr-gdpr: 2.1 -> 2.2Guillaume Girol2021-06-151-4/+7
|\ \ \ \ \ \
| * | | | | | tt-rss-plugin-tumblr-gdpr: 2.1 -> 2.2•••fixes adding a new feed to ttrss. the release only contains the fix, so it's low risk. It's not a backport because the plugin has become unnecessary so we are simply removing it from unstable. Guillaume Girol2021-06-121-4/+7
* | | | | | | Merge pull request #126605 from NixOS/backport-125311-to-release-21.05•••[Backport release-21.05] pipewire: 0.3.27 -> 0.3.30Domen Kožar2021-06-154-23/+86
|\ \ \ \ \ \ \
| * | | | | | | pipewire: 0.3.27 -> 0.3.30•••(cherry picked from commit c702cc43213dce2573adb924ab9c67522616aea6) Jan Solanti2021-06-114-23/+86
* | | | | | | | Merge pull request #126959 from NixOS/backport-126380-to-release-21.05•••[Backport release-21.05] gitlab: Make sure the FOSS version isn't identified as EEKim Lindberger2021-06-152-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | gitlab: Make sure the FOSS version isn't identified as EE•••(cherry picked from commit 8f16b1629155ad0022bb7830739081532d1bae50) talyz2021-06-152-1/+3
* | | | | | | | | Merge pull request #126951 from NixOS/backport-126741-to-release-21.05•••[Backport release-21.05] sogo: 5.0.1 -> 5.1.1ajs1242021-06-152-6/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | sope: 5.0.1 -> 5.1.1•••(cherry picked from commit 2e10f973b51c970b6b2aa3f59f8f9501abff80e2) Thomas Gerbet2021-06-151-2/+2
| * | | | | | | | sogo: 5.0.1 -> 5.1.1•••Fixes CVE-2021-33054. https://github.com/inverse-inc/sogo/blob/SOGo-5.1.1/CHANGELOG.md (cherry picked from commit f528b1e43ee53751cd09207d13a300e93daf02cc) Thomas Gerbet2021-06-151-4/+6
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 03:09:00 +0000