summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-branchless: 0.7.1 -> 0.8.0•••Diff: https://github.com/arxanas/git-branchless/compare/v0.7.1...0.8.0 (cherry picked from commit f48708863d78eda447e62bfc9b4fa642d95a4037) origin/backport-252079-to-release-23.05Muhammad Falak R Wani2023-09-071-3/+4
* 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
* | Merge pull request #252285 from NixOS/backport-241992-to-release-23.05•••[Backport release-23.05] beeper: init at 3.71.16Weijia Wang2023-09-072-1/+62
|\ \
| * | beeper: init at 3.71.16•••(cherry picked from commit f88c7b0f71c04228854c7593e53cf8eac87f1342) origin/backport-241992-to-release-23.05Joshua Campbell2023-08-302-1/+62
* | | Merge pull request #253700 from NixOS/backport-253684-to-release-23.05•••[Backport release-23.05] brave: 1.57.57 -> 1.57.62Weijia Wang2023-09-061-2/+2
|\ \ \
| * | | brave: 1.57.57 -> 1.57.62•••https://community.brave.com/t/release-channel-1-57-62/504669 (cherry picked from commit c67e2e16063be48808af207f8f405990d7a1f528) Sean Buckley2023-09-061-2/+2
|/ / /
* | | Merge pull request #253675 from NixOS/backport-251266-to-release-23.05•••[Backport release-23.05] _1password: 2.19.0 -> 2.20.0Weijia Wang2023-09-061-5/+5
|\ \ \
| * | | _1password: 2.19.0 -> 2.20.0•••Changelog: https://app-updates.agilebits.com/product_history/CLI2#v2200001 (cherry picked from commit f63ab76dc919750b442f93d7b9394b2e121880c7) Mario Rodas2023-09-061-5/+5
* | | | Merge pull request #253658 from toyo-chi/backport-trackma-23.05•••[23.05] backport trackma: 0.8.5 -> 0.8.6Weijia Wang2023-09-061-6/+7
|\ \ \ \
| * | | | trackma: 0.8.5 -> 0.8.6•••Switch to pyproject: https://aur.archlinux.org/packages/trackma-git#comment-902732 https://github.com/z411/trackma/pull/653 (cherry picked from commit fdd91716e4a1d37e390bd63aade812700fa2db2b) toaru yousei2023-09-071-4/+5
| * | | | trackma: switch to pydbus for MPRIS tracker•••Trackma uses pydbus since v0.8.5: https://github.com/z411/trackma/releases/tag/v0.8.5 https://github.com/z411/trackma/pull/529 (cherry picked from commit ca34abab702c7f95e1fdbca1338cc691d6edf340) toaru yousei2023-09-071-2/+2
* | | | | Merge pull request #253652 from NixOS/backport-253187-to-release-23.05•••[Backport release-23.05] imhex: 1.29.0 -> 1.30.1Weijia Wang2023-09-061-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | imhex: 1.29.0 -> 1.30.1•••(cherry picked from commit 3727f2536df52d2cc758b11d90452b657a432a13) kashw22023-09-061-2/+2
* | | | | Merge pull request #253673 from NixOS/backport-244697-to-release-23.05•••[Backport release-23.05] _1password: fix aarch64 hashWeijia Wang2023-09-061-1/+1
|\ \ \ \ \
| * | | | | _1password: fix aarch64 hash•••(cherry picked from commit a823067e2e0dece9b986891fa6e4364e7daafab1) Yureka2023-09-061-1/+1
|/ / / / /
* | | | | Merge pull request #253649 from NixOS/backport-242147-to-release-23.05•••[Backport release-23.05] _1password: 2.18.0 -> 2.19.0Weijia Wang2023-09-061-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | _1password: 2.18.0 -> 2.19.0•••Changelog: https://app-updates.agilebits.com/product_history/CLI2#v2190004 (cherry picked from commit 8020974e2116d9037045a6415f9fa3e77f1fdfb1) Mario Rodas2023-09-061-5/+5
* | | | | Merge pull request #253642 from NixOS/backport-233317-to-release-23.05•••[Backport release-23.05] imhex: 1.27.1 -> 1.29.0Weijia Wang2023-09-061-10/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | imhex: 1.27.1 -> 1.29.0•••(cherry picked from commit 64820b8b87af5ee68f4caf2b3f8af9582a23fdb6) StarrFox2023-09-061-10/+8
* | | | | Merge pull request #253002 from risicle/ris-metabase-0.46.7-r23.05•••[23.05] metabase: 0.46.4 -> 0.46.7Weijia Wang2023-09-061-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | metabase: 0.46.6.1 -> 0.46.7•••Fixes CVE-2023-37470. Changelogs: https://github.com/metabase/metabase/releases/tag/v0.46.7 https://github.com/metabase/metabase/releases/tag/v0.46.6.4 https://github.com/metabase/metabase/releases/tag/v0.46.6.3 https://github.com/metabase/metabase/releases/tag/v0.46.6.2 (cherry picked from commit c2cd085fec1f649189491c8dffc1c30e00cd9b39) Thomas Gerbet2023-09-021-2/+2
| * | | | metabase: 0.46.6 -> 0.46.6.1•••This fixes a security vulnerability reported: in http://web.archive.org/web/20230721121824/https://www.metabase.com/blog/security-advisory (web archive URL given that the vendor URL has no marker.) A CVE number exist but has not been released. (cherry picked from commit 4fc66686f318f7eacf0c1cfd95e75ed15e312123) Raito Bezarius2023-09-021-2/+2
| * | | | metabase: 0.46.5 -> 0.46.6•••(cherry picked from commit 66043ec2cb4547279fc8ed39916ceefaef727ec4) R. Ryantm2023-09-021-2/+2
| * | | | metabase: 0.46.4 -> 0.46.5•••(cherry picked from commit c96da3b8ce46f4b440c22bb718e0c8c0a9943d73) R. Ryantm2023-09-021-2/+2
* | | | | Revert "gitlab: 16.1.4 -> 16.3.1"•••This reverts commit 47cbec13c0f04d07bcfd15b422960aae6af5401d. Yureka2023-09-0613-593/+460
* | | | | Revert "gitlab-container-registry: 3.79.0 -> 3.82.0"•••This reverts commit 24ae85497f8b2b2e921e2029bbf84d8036de0841. Yureka2023-09-061-3/+3
* | | | | Revert "nixos/gitlab: Add a warning message"•••This reverts commit 9dd2c8974f140895790c7b5dc3dd046c8bd1d1f5. Yureka2023-09-061-5/+0
* | | | | Merge pull request #253620 from NixOS/backport-253584-to-release-23.05•••[Backport release-23.05] vencord: 1.4.5 -> 1.4.6Weijia Wang2023-09-062-24/+5
|\ \ \ \ \
| * | | | | vencord: 1.4.5 -> 1.4.6•••Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit 42c980d37e8ede6b45d09d36311f1f990fe49414) Sefa Eyeoglu2023-09-062-24/+5
* | | | | | Merge pull request #253513 from NixOS/backport-253512-to-release-23.05•••[Backport release-23.05] mastodon: 4.1.6 -> 4.1.7Kerstin2023-09-062-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | mastodon: 4.1.6 -> 4.1.7•••(cherry picked from commit fbd2c21ff03b75ff828c3caffa15d0fe73b46fcd) origin/backport-253512-to-release-23.05Sandro Jäckel2023-09-052-3/+3
* | | | | | Merge pull request #253586 from NixOS/backport-243950-to-release-23.05•••[Backport release-23.05] glfw-wayland-minecraft: init at unstable-2023-06-01Nick Cao2023-09-062-0/+56
|\ \ \ \ \ \
| * | | | | | glfw-wayland-minecraft: init at unstable-2023-06-01•••Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit c59dad9a74e37d27be4b028e3ef008be5b5a8ca1) origin/backport-243950-to-release-23.05Sefa Eyeoglu2023-09-062-0/+56
* | | | | | | Merge pull request #253607 from NixOS/backport-247566-to-release-23.05•••[Backport release-23.05] linuxPackages_testing.perf: fix patchShebangArtturi2023-09-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | linuxPackages_testing.perf: fix patchShebang•••Without the change `perf` build fails as: $ nix build --no-link -f. linuxPackages_testing.perf -L build flags: SHELL=/nix/store/p6dlr3skfhxpyphipg2bqnj52999banh-bash-5.2-p15/bin/bash prefix=\$\(out\) WERROR=0 ASCIIDOC8=1 O=\$\(buildRoot\) CC=/nix/store/bxic6j2whyg3z4h2x3xjyqgp7fl83bnp-gcc-wrapper-12.3.0/bin/cc HOSTCC=/nix/store/bxic6j2whyg3z4h2x3xjyqgp7fl83bnp-gcc-wrapper-12.3.0/bin/cc HOSTLD=/nix/store/kcp78dk7h5gcs7d4qss7rbz3skxhzdnn-binutils-wrapper-2.40/bin/ld ARCH=x86_64 NO_GTK2=1 BUILD: Doing 'make -j16' parallel build HOSTCC fixdep.o HOSTLD fixdep-in.o LINK fixdep make[1]: ./check-headers.sh: No such file or directory make[1]: *** [Makefile.perf:241: sub-make] Error 127 make: *** [Makefile:70: all] Error 2 This started happening because upstream linux commit https://github.com/torvalds/linux/commit/d6748385098a8333a0e1c7e2d77119c919776728 changed shebang from /bin/sh to /bin/bash. Let's retroactively switch all `perf` releases to shell interpreter from store. (cherry picked from commit 0768fe799a7999f2d9cd19ec8707db2d5bec93ac) Sergei Trofimovich2023-09-061-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #253583 from NixOS/backport-250418-to-release-23.05•••[Backport release-23.05] vencord: 1.3.4 -> 1.4.5Weijia Wang2023-09-064-137/+93
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | vencord: 1.3.4 -> 1.4.5•••Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit cc8283b5c4d5b038f3cbd27d40259157bc13f06d) Sefa Eyeoglu2023-09-064-137/+93
* | | | | | | Merge #252113: mariadb*: patch-level updates•••...into release-23.05 Vladimír Čunát2023-09-061-10/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |