summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* signal-desktop: 5.37.0 -> 5.38.0•••(cherry picked from commit 038cb5a97db356c6152bd6d294270fcbc3cd8c40) origin/backport-167769-to-release-21.11teutat3s2022-04-101-2/+2
* Merge pull request #165358 from NixOS/backport-163216-to-release-21.11•••[Backport release-21.11] boost: unbreak build for 1.65 and 1.66Artturi2022-04-101-0/+7
|\
| * Update pkgs/development/libraries/boost/generic.nix•••(cherry picked from commit 45adfd577c2fd36e0723968e9e9a448326f2698a) origin/backport-163216-to-release-21.11Sandro2022-03-231-4/+4
| * Format pkgs/development/libraries/boost/generic.nix•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit 53434214801652d93448605dbfefc4bef88d7b33) Markus Wamser2022-03-231-2/+2
| * boost: suppress GCC warnings on older versions•••(cherry picked from commit c742a5c5375494e85d733c2dd692946998b93479) Markus S. Wamser2022-03-231-0/+7
* | Merge pull request #167829 from NixOS/backport-167258-to-release-21.11•••[Backport release-21.11] curlie: 1.6.7 -> 1.6.9Mario Rodas2022-04-101-4/+11
|\ \
| * | curlie: set and test version•••(cherry picked from commit b3af29aa16c88d12bc0f6bfc8bda7600fbd1df7a) Terje Larsen2022-04-081-1/+8
| * | curlie: 1.6.7 -> 1.6.9•••(cherry picked from commit a440e3ec9148634d381d00a07dc4fcb48aaf3acd) Terje Larsen2022-04-081-3/+3
* | | Merge pull request #155853 from domenkozar/cachix-agent-21.11•••[Backport 21.11] Cachix AgentJanne Heß2022-04-102-0/+58
|\ \ \
| * | | Update nixos/modules/services/system/cachix-agent/default.nix•••Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> (cherry picked from commit 91cc0cf63bc9959f9cdcc60ab15cf2eae6d870b1) Signed-off-by: Domen Kožar <domen@dev.si> Domen Kožar2022-01-201-1/+1
| * | | nixos: add cachix-agent service•••(cherry picked from commit 42994be64b12ed7713aaf6f50ae550f999057833) Signed-off-by: Domen Kožar <domen@dev.si> Domen Kožar2022-01-202-0/+58
* | | | Merge pull request #167920 from NixOS/backport-166298-to-release-21.11Martin Weinelt2022-04-101-2/+2
|\ \ \ \
| * | | | webkitgtk: 2.34.6 → 2.36.0•••https://webkitgtk.org/2022/03/21/webkitgtk2.36.0-released.html (cherry picked from commit 7dfc1de13d05a72ba03412c29458ecbb1158b155) Jan Tojnar2022-04-081-2/+2
* | | | | Merge pull request #168056 from NixOS/backport-167921-to-release-21.11Martin Weinelt2022-04-091-3/+3
|\ \ \ \ \
| * | | | | tor-browser-bundle-bin: 11.0.9 -> 11.0.10•••(cherry picked from commit d7c3643e6e1e242a4e692b51d43a80f0c7b3a1e3) Nicolas Benes2022-04-091-3/+3
|/ / / / /
* | | | | Merge #167647: staging-next: 21.11 iteration 9 - 2022-04-07Vladimír Čunát2022-04-0930-214/+231
|\ \ \ \ \
| * | | | | python39Packages.argh: fix tests•••(cherry picked from commit c3928d527cc4927e24430a495a803666e74055a7) Robert Schütz2022-04-091-12/+20
| * | | | | python3Packages.seaborn: disable flaky testsMartin Weinelt2022-04-091-0/+8
| * | | | | python3Packages.graphviz: disable tests on darwin•••(cherry picked from commit 1a1f78dc02aeb7be459737d2a9e7e879b42392d0) Ben Siraphob2022-04-091-0/+4
| * | | | | python3Packages.httplib2: disable failing test on darwin•••(cherry picked from commit b9ed8525d90f648e5954d052b0ab38052963e4f6) Malo Bourgon2022-04-091-1/+3
| * | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-04-093-37/+44
| |\| | | |
| * | | | | Merge #166923: knot-dns: 3.1.6 -> 3.1.7•••...into staging-next-21.11 Vladimír Čunát2022-04-081-2/+2
| |\ \ \ \ \
| | * | | | | knot-dns: 3.1.6 -> 3.1.7•••This version primarily fixes incomplete implementation of the Offline KSK signing mode in the IXFR and DDNS processing. https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.7 (cherry picked from commit 2a5a99c5863d73155040c1492874268375aff658) Vladimír Čunát2022-04-021-2/+2
| * | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-04-086-38/+56
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | cpython: remove upstreamed patch•••This patch has been merged in python 3.9.7. https://github.com/python/cpython/commit/4b55837e7c747e0f3bd2df1b5c8996ce86c6f60a (cherry picked from commit 925bbece2f8dbfb93e2d53eef7aff30ad29df1cb) Ryan Burns2022-04-072-88/+0
| * | | | | | Merge branch 'staging-21.11' into staging-next-21.11Vladimír Čunát2022-04-0724-111/+194
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge #164727: nodejs: Fix setup-hook addNodePath quoting•••...into staging-21.11 Vladimír Čunát2022-04-071-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | nodejs: Fix setup-hook addNodePath quoting•••The argument to addNodePath previously wasn't being quoted, leading to problems when the argument contains characters interpreted specially by bash (cherry picked from commit e975c5650174f472bad14e946cdb34e5e1ea6874) origin/backport-163694-to-release-21.11Silvan Mosberger2022-03-181-1/+1
| | * | | | | | | Merge #167643: zlib: fix cross-compilation (into staging-21.11)Vladimír Čunát2022-04-072-0/+28
| | |\ \ \ \ \ \ \
| | | * | | | | | | zlib: fix cross-compilation not producing shared libraries•••Apply patch that already has been applied upstream: - https://github.com/madler/zlib/pull/607 - https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d (cherry picked from commit f091c0e80dd2b8b4323fec041068c77b1a5c48f2) origin/backport-167395-to-staging-21.11Rick van Schijndel2022-04-072-0/+28
| | * | | | | | | | Merge #166955: libarchive: 3.5.2 -> 3.5.3 (into staging-21.11)Vladimír Čunát2022-04-071-2/+9
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | libarchive: 3.5.2 -> 3.5.3Robert Scott2022-04-021-2/+2
| | | * | | | | | | | libarchive: add some reverse dependencies to passthru.tests•••(cherry picked from commit cdf5bfff4bd756b522391970823c96493107eae3) Robert Scott2022-04-021-0/+7
| | * | | | | | | | | Merge #164862: libopenmpt: 0.5.11 -> 0.5.17 (into staging-21.11)Vladimír Čunát2022-04-071-13/+3
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | libopenmpt: 0.5.11 -> 0.5.17OPNA26082022-03-191-13/+3
| | * | | | | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-04-079-424/+443
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-04-079-424/+443
| |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-04-063-8/+29
| | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-04-063-8/+29
| |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-04-053-10/+10
| | | | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-04-053-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-04-047-51/+57
| | | | | |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-04-047-51/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-04-0312-41/+54
| | | | | | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | / / / / / / / | | | | | | | |/ / / / / / / | | | | | | |/| | | | | | |
| * | | | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-04-0312-41/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-04-024-4/+35
| | | | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-04-024-4/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-04-0118-13402/+782
| | | | | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-04-0118-13402/+782
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-3113-30/+57
| | | | | | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |