summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wallabag: 2.5.4 -> 2.6.6•••https://github.com/wallabag/wallabag/releases/tag/2.6.0 https://github.com/wallabag/wallabag/releases/tag/2.6.1 https://github.com/wallabag/wallabag/releases/tag/2.6.2 https://github.com/wallabag/wallabag/releases/tag/2.6.3 https://github.com/wallabag/wallabag/releases/tag/2.6.4 https://github.com/wallabag/wallabag/releases/tag/2.6.5 https://github.com/wallabag/wallabag/releases/tag/2.6.6 Dropped the swiftmailer patch, because wallabag migrated to symfony mailer. https://github.com/advisories/GHSA-p8gp-899c-jvq9 https://github.com/advisories/GHSA-gjvc-55fw-v6vq https://github.com/wallabag/wallabag/pull/6924 Fixes: CVE-2023-4454, CVE-2023-4455 (cherry picked from commit 0f9a86c000df68e6a36e511283f1def4dd5cc360) origin/backport-238828-to-release-23.05Martin Weinelt2023-09-091-15/+3
* Merge pull request #254169 from angerman/backport-253939-to-release-23.05•••[Backport release-23.05] Add ucrt64 mingw toolchain.John Ericson2023-09-0919-32/+40
|\
| * nixpkgs/systems: Add ucrt64 as MinGW libc•••The Minimalist Gnu for Windows distribution comes with support for the traditional msvcrt libc, as well as ucrt64 libc. The latter being the newer universal compiler runtime. We follow the msys2 environment naming convention[1]: | name | toolchain | arch | libc | libc++ | |------------|-----------|---------|--------|-----------| | mingw32 | gcc | i686 | msvcrt | libstdc++ | | mingw64 | gcc | x86_64 | msvcrt | libstdc++ | | ucrt64 | gcc | x86_64 | ucrt | libstdc++ | | clang32 | llvm | i686 | ucrt | libc++ | | clang64 | llvm | x86_64 | ucrt | libc++ | | clangarm64 | llvm | aarch64 | ucrt | libc++ | For now nixpkgs only supports the first three with this commit. -- [1]: https://www.msys2.org/docs/environments/ (cherry picked from commit 1e0561d78a3d3cd84bac45ab474af82e32802120) Moritz Angermann2023-09-093-0/+8
| * treewide: replace libc == "msvcrt" with isMinGW•••msvcrt is only one of the libcs in MinGW. We therefore replace explictly testing for msvcrt with the isMinGW predicate. This lays the foundation for ucrt64 support. (cherry picked from commit a81e3dcd759ffb44348186bdc3751af9ea2f1005) Moritz Angermann2023-09-0917-32/+32
* | nixosTests.gitlab: Add git to systemPackagesYaya2023-09-091-0/+2
* | nixos/gitlab: use git 2.41 for gitlab 16.3Yureka2023-09-091-8/+22
* | Revert "Revert "nixos/gitlab: Add a warning message""•••This reverts commit a751da22b52f21482279689a4f4c0779032ea2e1. Yureka2023-09-091-0/+5
* | Revert "Revert "gitlab-container-registry: 3.79.0 -> 3.82.0""•••This reverts commit d28a29c62ddf116bfd2ae4d161608787ddae1055. Yureka2023-09-091-3/+3
* | Revert "Revert "gitlab: 16.1.4 -> 16.3.1""•••This reverts commit d706cbb43735abfb7cc038f7bc2ea9f53589aba1. Yureka2023-09-0913-460/+593
* | Merge pull request #253903 from risicle/ris-nomad-1.4.12-r23.05•••[23.05] nomad_1_4: 1.4.6 -> 1.4.12, nomad_1_2, nomad_1_3: mark knownVulnerabilities CVE-2023-3072 & CVE-2023-3300Thomas Gerbet2023-09-091-4/+12
|\ \
| * | nomad_1_2, nomad_1_3: mark knownVulnerabilities CVE-2023-3072 & CVE-2023-3300Robert Scott2023-09-071-1/+9
| * | nomad_1_4: 1.4.6 -> 1.4.12•••(cherry picked from commit c1db61decda8332a63cb75430960f76813e24a63) Robert Scott2023-09-071-3/+3
* | | Merge pull request #254185 from NixOS/backport-254106-to-release-23.05•••[Backport release-23.05] openssl_1_1: apply patch for CVE-2023-4807Pierre Bourdon2023-09-092-0/+47
|\ \ \ | |_|/ |/| |
| * | openssl_1_1: apply patch for CVE-2023-4807•••see also https://www.openssl.org/news/secadv/20230908.txt (cherry picked from commit e3b940ced6de07210abf7356bfd7945d4658995f) Sophie Tauchert2023-09-092-0/+47
|/ /
* | Merge pull request #254105 from NixOS/backport-252557-to-release-23.05•••[Backport release-23.05] redisinsight: init at 2.30.0Pierre Bourdon2023-09-093-0/+162
|\ \
| * | redisinsight: init at 2.30.0•••(cherry picked from commit 5942921df7465ff7610f92ae64322d08a759b930) Gabriel Simmer2023-09-082-0/+156
| * | maintainers: add gmemstr•••(cherry picked from commit b88f54c7bace57cfc31d8fd8408c045a92f77019) Gabriel Simmer2023-09-081-0/+6
|/ /
* | Merge pull request #254005 from ShamrockLee/backport-apptainer-update•••[Backport to 23.05] apptainer: 1.1.7 -> 1.1.9, singularity-ce: 3.11.1 -> 3.11.4Weijia Wang2023-09-081-5/+5
|\ \
| * | singularity-ce: 3.11.1 -> 3.11.4•••(cherry picked from commit 6a6c30dfc11e7c0d6eee912f1382e5d447e6db09) Gaetan Lepage2023-09-071-3/+3
| * | apptainer: 1.2.2 -> 1.1.9•••Avoid behavioral changes on the stable channel. Yueh-Shun Li2023-09-071-3/+3
| * | apptainer: 1.1.7 -> 1.2.2•••(cherry picked from commit a2e3cf7ef3f878ba2e19c778460343d4d3df8187) Gaetan Lepage2023-09-071-3/+3
* | | Merge pull request #254054 from NixOS/backport-224415-to-release-23.05Artturi2023-09-081-1/+1
|\ \ \
| * | | androidenv.buildApp: fix after callPackage switch•••builtins.functionArgs doesn't work with (callPackage composeAndroidPackages { .. }) (cherry picked from commit 5cedb097a0a07c36125e274404b67ed9c51d88b0) Someone Serge2023-09-081-1/+1
|/ / /
* | | Merge pull request #254024 from NixOS/backport-248208-to-release-23.05•••[Backport release-23.05] dotnet-sdk: 6.0.412 -> 6.0.413, dotnet-sdk_7: 7.0.306 -> 7.0.400Weijia Wang2023-09-082-275/+275
|\ \ \
| * | | dotnet-sdk_7: 7.0.306 -> 7.0.400•••(cherry picked from commit d2d7504a4a88191da105f89726e96adb880fe620) mdarocha2023-09-081-141/+141
| * | | dotnet-sdk: 6.0.412 -> 6.0.413•••(cherry picked from commit 71c971b0f1eafaf0c428a5138c8192d0cf87a94f) mdarocha2023-09-081-134/+134
|/ / /
* | | Merge pull request #254002 from NixOS/backport-253959-to-release-23.05•••[Backport release-23.05] poetry2nix: mark poetry insecureadisbladis2023-09-081-0/+26
|\ \ \
| * | | poetry2nix: mark poetry insecure•••(cherry picked from commit 7b6bc2521bc539c3a4ff479c0ec4ab902eee8594) origin/backport-253959-to-release-23.05Robert Schütz2023-09-081-0/+26
|/ / /
* | | Merge pull request #253853 from teutat3s/backport-1password-gui•••[Backport release-23.05] _1password-gui: 8.10.7 -> 8.10.9, _1password-gui-beta: 8.10.7-11 -> 8.10.12-10Weijia Wang2023-09-071-10/+11
|\ \ \ | |_|/ |/| |
| * | _1password-gui: 8.10.7 -> 8.10.9, _1password-gui-beta: 8.10.7-11 -> 8.10.12-10•••Manual backport of PRs: #248555 #243127 #240144 teutat3s2023-09-071-10/+11
* | | Merge pull request #253785 from NixOS/backport-253640-to-release-23.05Artturi2023-09-071-2/+2
|\ \ \ | |/ / |/| |
| * | grapejuice: 7.14.4 -> 7.20.11•••(cherry picked from commit 9872083570f2f6c35302284896b4235fa043500d) heyimnova2023-09-071-2/+2
* | | Merge pull request #253770 from NixOS/backport-252024-to-release-23.05•••[Backport release-23.05] elixir_1_15: 1.15.4 -> 1.15.5Weijia Wang2023-09-071-2/+2
|\ \ \
| * | | elixir_1_15: 1.15.4 -> 1.15.5•••(cherry picked from commit fa5c7c1916d2fd8796f4b86d6d19d5676bb22119) meppu2023-09-071-2/+2
* | | | Merge pull request #253812 from NixOS/backport-253559-to-release-23.05•••[Backport release-23.05] bpftrace: 0.18.0 -> 0.18.1Weijia Wang2023-09-071-11/+5
|\ \ \ \
| * | | | bpftrace: 0.18.0 -> 0.18.1•••Changelog: https://github.com/iovisor/bpftrace/releases/tag/v0.18.1 Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> (cherry picked from commit 9f1f6ff46ff45665e48bc924b0261a069b02b2ae) Muhammad Falak R Wani2023-09-071-10/+4
| * | | | bpftrace: add mfrw as maintainer•••Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> (cherry picked from commit 2b278a35db0e6057020e1f001e048f455ff93525) Muhammad Falak R Wani2023-09-071-1/+1
|/ / / /
* | | | Merge pull request #253795 from FliegendeWurst/23.05-trilium-0.60•••[23.05] trilium-desktop: 0.59.4 -> 0.60.4Weijia Wang2023-09-072-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | trilium-desktop: 0.60.3 -> 0.60.4•••(cherry picked from commit a7d4f895ffd716770296808a727cc62889c5c454) R. Ryantm2023-09-072-5/+5
| * | | trilium-desktop: 0.59.4 -> 0.60.3•••(cherry picked from commit a6cad64413ff37c07491a2a6997e647dce6cf282) Elian Doran2023-09-072-5/+5
|/ / /
* | | Merge pull request #253774 from NixOS/backport-250064-to-release-23.05Artturi2023-09-071-21/+31
|\ \ \ | |/ / |/| |
| * | grapejuice: use upstream installation script•••https://gitlab.com/brinkervii/grapejuice/-/blob/master/src/grapejuice_packaging/builders/linux_package_builder.py (cherry picked from commit b33de2708f7edfaac2f6d9c3fea72912fe17b9ec) Artturin2023-09-071-28/+28
| * | grapejuice: 7.8.3 -> 7.14.4•••Update Grapejuice for easy release channel changing (mainly zintegration). Changelogs: https://gitlab.com/brinkervii/grapejuice/-/tags Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> (cherry picked from commit dc340b88601fa927baa84bfc3854134a1c3ad639) TheNexusAvenger2023-09-071-2/+12
|/ /
* | Merge pull request #242293 from euank/backport-k3s-1-26•••k3s_1_26: 1.26.4+k3s1 -> 1.26.6+k3s1 Weijia Wang2023-09-076-168/+80
|\ \
| * | k3s_1_26: 1.26.5+k3s1 -> 1.26.6+k3s1•••(cherry picked from commit f4079a45d31bac551b5853ad6f229e27f99a3ad6) Euan Kemp2023-07-211-4/+4
| * | k3s_1_26: 1.26.4+k3s1 -> 1.26.5+k3s1•••This also allowed us to drop 'multicallContainerd' as a variable since 1.27 and 1.26 both use it now. See https://github.com/k3s-io/k3s/issues/7475 for context. Euan Kemp2023-07-085-159/+26
| * | k3s: update builder for multicall containerd•••This is a partial cherry-pick of b671c2774dc8bfb617f9b76ad4b007828984cce2, for just the changes that apply to 1.26 Euan Kemp2023-07-081-9/+26
| * | k3s: Fix overrideZhaofeng Li2023-07-082-27/+29
| * | k3s: name builder less confusingly•••Per PR feedback Euan Kemp2023-07-082-4/+9
| * | k3s: add "1_26" builder which can be used for 1_27 too•••This is meant to make it easier to maintain multiple versions of the package without having to copy+paste folders every time. We can still copy+paste if the builders diverge enough to warrant it. Euan Kemp2023-07-083-32/+53