From 99ea773d66f5f4e84da640a62b4ceaac3d30e75f Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Fri, 11 Oct 2024 11:10:51 +0200 Subject: [PATCH 1/3] percona83: vendor upstream packages Upstream nixpkgs now ships percona84 and has removed the percona83 packages. This change is necessary to make the tests eval again. Part of PL-132970, roles will get updated in a consecutive PR. --- pkgs/overlay.nix | 18 ++- pkgs/percona-xtrabackup/{ => 2_4}/2_4.nix | 0 pkgs/percona-xtrabackup/{ => 2_4}/COPYING.md | 0 pkgs/percona-xtrabackup/{ => 2_4}/generic.nix | 0 pkgs/percona-xtrabackup/8_3/COPYING.md | 3 + pkgs/percona-xtrabackup/8_3/abi-check.patch | 18 +++ pkgs/percona-xtrabackup/8_3/default.nix | 6 + pkgs/percona-xtrabackup/8_3/generic.nix | 59 +++++++++ pkgs/percona-xtrabackup/8_3/innovation.nix | 15 +++ pkgs/percona-xtrabackup/8_3/lts.nix | 17 +++ pkgs/percona/8.3.nix | 112 ++++++++++++++++++ pkgs/percona/COPYING.md | 5 + 12 files changed, 248 insertions(+), 5 deletions(-) rename pkgs/percona-xtrabackup/{ => 2_4}/2_4.nix (100%) rename pkgs/percona-xtrabackup/{ => 2_4}/COPYING.md (100%) rename pkgs/percona-xtrabackup/{ => 2_4}/generic.nix (100%) create mode 100644 pkgs/percona-xtrabackup/8_3/COPYING.md create mode 100644 pkgs/percona-xtrabackup/8_3/abi-check.patch create mode 100644 pkgs/percona-xtrabackup/8_3/default.nix create mode 100644 pkgs/percona-xtrabackup/8_3/generic.nix create mode 100644 pkgs/percona-xtrabackup/8_3/innovation.nix create mode 100644 pkgs/percona-xtrabackup/8_3/lts.nix create mode 100644 pkgs/percona/8.3.nix create mode 100644 pkgs/percona/COPYING.md diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index ec5435db1..cb129266a 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -377,17 +377,25 @@ builtins.mapAttrs (_: patchPhps phpLogPermissionPatch) { openssl = self.openssl_1_1; }; - percona80 = super.percona-server_8_0; - + percona80 = self.percona-server_8_0; + # EOL, but we vendor it throughout the 24.05 release cycle + percona83 = self.callPackage ./percona/8.3.nix { + inherit (self.darwin) cctools developer_cmds DarwinTools; + inherit (self.darwin.apple_sdk.frameworks) CoreServices; + # newer versions cause linking failures against `libabsl_spinlock_wait` + protobuf = self.protobuf_21; + }; # assertion notifies us about the need to vendor the old innovation releases - percona83 = assert self.percona-server_innovation.mysqlVersion == "8.3"; self.percona-server_innovation; + percona84 = assert super.percona-server_innovation.mysqlVersion == "8.4"; super.percona-server_8_4; - percona-xtrabackup_2_4 = super.callPackage ./percona-xtrabackup/2_4.nix { + percona-xtrabackup_2_4 = super.callPackage ./percona-xtrabackup/2_4/2_4.nix { boost = self.boost159; openssl = self.openssl_1_1; }; + # EOL, but we vendor it throughout the 24.05 release cycle + percona-xtrabackup_8_3 = self.callPackage ./percona-xtrabackup/8_3/innovation.nix { }; + percona-xtrabackup_8_4 = super.percona-xtrabackup_8_4; - percona-xtrabackup_8_3 = assert self.percona-xtrabackup_innovation.mysqlVersion == "8.3"; self.percona-xtrabackup_innovation; # Has been renamed upstream, backy-extract still wants to use it. pkgconfig = super.pkg-config; diff --git a/pkgs/percona-xtrabackup/2_4.nix b/pkgs/percona-xtrabackup/2_4/2_4.nix similarity index 100% rename from pkgs/percona-xtrabackup/2_4.nix rename to pkgs/percona-xtrabackup/2_4/2_4.nix diff --git a/pkgs/percona-xtrabackup/COPYING.md b/pkgs/percona-xtrabackup/2_4/COPYING.md similarity index 100% rename from pkgs/percona-xtrabackup/COPYING.md rename to pkgs/percona-xtrabackup/2_4/COPYING.md diff --git a/pkgs/percona-xtrabackup/generic.nix b/pkgs/percona-xtrabackup/2_4/generic.nix similarity index 100% rename from pkgs/percona-xtrabackup/generic.nix rename to pkgs/percona-xtrabackup/2_4/generic.nix diff --git a/pkgs/percona-xtrabackup/8_3/COPYING.md b/pkgs/percona-xtrabackup/8_3/COPYING.md new file mode 100644 index 000000000..8b84d9f3c --- /dev/null +++ b/pkgs/percona-xtrabackup/8_3/COPYING.md @@ -0,0 +1,3 @@ +The files in this directory are based on [MIT-licensed](https://github.com/NixOS/nixpkgs/blob/b77eabd1a282aa08b1759739c0a4b1b19318f088/COPYING) work done by other Nixpkgs/NixOS contributors, taken from revision b77eabd1a282aa08b1759739c0a4b1b19318f088 in the [nixpkgs](https://github.com/NixOS/nixpkgs/) repository under the path [pkgs/tools/backup/percona-xtrabackup](https://github.com/NixOS/nixpkgs/blob/b77eabd1a282aa08b1759739c0a4b1b19318f088/pkgs/tools/backup/percona-xtrabackup). + +The modifications made are licensed under the MIT License as well. diff --git a/pkgs/percona-xtrabackup/8_3/abi-check.patch b/pkgs/percona-xtrabackup/8_3/abi-check.patch new file mode 100644 index 000000000..53442ef5b --- /dev/null +++ b/pkgs/percona-xtrabackup/8_3/abi-check.patch @@ -0,0 +1,18 @@ +MySQL ABI check assumes that with -nostdinc any standard #include terminates +preprocessing, but we do not provide that: +https://github.com/NixOS/nixpkgs/issues/44530 + +"#error" does not terminate preprocessing, so we #include a non-existent file instead. + +--- a/cmake/do_abi_check.cmake ++++ b/cmake/do_abi_check.cmake +@@ -68,1 +68,1 @@ FOREACH(file ${ABI_HEADERS}) +- -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${ABI_SOURCE_DIR}/include ++ -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${ABI_SOURCE_DIR}/include/nostdinc -I${ABI_SOURCE_DIR}/include +@@ -74,1 +74,1 @@ FOREACH(file ${ABI_HEADERS}) +- COMMAND ${WSL_EXECUTABLE} sed -e "/^# /d" ++ COMMAND ${WSL_EXECUTABLE} sed -e "/^# /d" -e "/^#include <-nostdinc>$/d" +--- /dev/null ++++ b/include/nostdinc/stdint.h +@@ -0,0 +1,1 @@ ++#include <-nostdinc> diff --git a/pkgs/percona-xtrabackup/8_3/default.nix b/pkgs/percona-xtrabackup/8_3/default.nix new file mode 100644 index 000000000..f3466dc9f --- /dev/null +++ b/pkgs/percona-xtrabackup/8_3/default.nix @@ -0,0 +1,6 @@ +pkgs: { + percona-xtrabackup_lts = pkgs.callPackage ./lts.nix { + boost = pkgs.boost177; + }; + percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { }; +} diff --git a/pkgs/percona-xtrabackup/8_3/generic.nix b/pkgs/percona-xtrabackup/8_3/generic.nix new file mode 100644 index 000000000..6a6906cba --- /dev/null +++ b/pkgs/percona-xtrabackup/8_3/generic.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config +, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4 +, ncurses, numactl, openssl, procps, protobuf, valgrind, xxd, zlib +, perlPackages +, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "percona-xtrabackup"; + inherit version; + + src = fetchFromGitHub { + owner = "percona"; + repo = "percona-xtrabackup"; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; + inherit hash fetchSubmodules; + }; + + nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; + + buildInputs = [ + (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4 + ncurses numactl openssl procps protobuf valgrind xxd zlib + ] ++ (with perlPackages; [ perl DBI DBDmysql ]); + + patches = extraPatches; + + cmakeFlags = [ + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DBUILD_CONFIG=xtrabackup_release" + "-DINSTALL_MYSQLTESTDIR=OFF" + "-DWITH_BOOST=system" + "-DWITH_CURL=system" + "-DWITH_EDITLINE=system" + "-DWITH_LIBEVENT=system" + "-DWITH_LZ4=system" + "-DWITH_PROTOBUF=system" + "-DWITH_SASL=system" + "-DWITH_SSL=system" + "-DWITH_ZLIB=system" + "-DWITH_VALGRIND=ON" + "-DWITH_MAN_PAGES=OFF" + ]; + + postInstall = '' + wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB + rm -r "$out"/lib/plugin/debug + '' + extraPostInstall; + + passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version; + + meta = with lib; { + description = "Non-blocking backup tool for MySQL"; + homepage = "http://www.percona.com/software/percona-xtrabackup"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ]; + }; +}) diff --git a/pkgs/percona-xtrabackup/8_3/innovation.nix b/pkgs/percona-xtrabackup/8_3/innovation.nix new file mode 100644 index 000000000..003df8aa6 --- /dev/null +++ b/pkgs/percona-xtrabackup/8_3/innovation.nix @@ -0,0 +1,15 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "8.3.0-1"; + hash = "sha256-qZM2AFhpwrN0BR+DdozYn7s2I+c1tWpD5QvppTEfGEY="; + + # includes https://github.com/Percona-Lab/libkmip.git + fetchSubmodules = true; + + extraPatches = [ + ]; + + extraPostInstall = '' + ''; +}) diff --git a/pkgs/percona-xtrabackup/8_3/lts.nix b/pkgs/percona-xtrabackup/8_3/lts.nix new file mode 100644 index 000000000..fbb4c045d --- /dev/null +++ b/pkgs/percona-xtrabackup/8_3/lts.nix @@ -0,0 +1,17 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "8.0.35-30"; + hash = "sha256-yagqBKU057Gk5pEyT2R3c5DtxNG/+TSPenFgbxUiHPo="; + + # includes https://github.com/Percona-Lab/libkmip.git + fetchSubmodules = true; + + extraPatches = [ + ./abi-check.patch + ]; + + extraPostInstall = '' + rm -r "$out"/docs + ''; +}) diff --git a/pkgs/percona/8.3.nix b/pkgs/percona/8.3.nix new file mode 100644 index 000000000..d19c17554 --- /dev/null +++ b/pkgs/percona/8.3.nix @@ -0,0 +1,112 @@ +{ lib, stdenv, fetchurl, bison, cmake, pkg-config +, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2 +, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests +, systemd +# Percona-specific deps +, coreutils, cyrus_sasl, gnumake, openldap +# optional: different malloc implementations +, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools +}: + +assert !(withJemalloc && withTcmalloc); + + +stdenv.mkDerivation (finalAttrs: { + pname = "percona-server_innovation"; + version = "8.3.0-1"; + + src = fetchurl { + url = "https://downloads.percona.com/downloads/percona-distribution-mysql-ps/percona-distribution-mysql-ps-${builtins.head (lib.strings.split "-" finalAttrs.version)}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; + hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg"; + }; + + nativeBuildInputs = [ bison cmake pkg-config ] + ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + + patches = [ + ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ]; + + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + # The rocksdb setup script is called with `env -i` and cannot find anything in PATH. + patchShebangs storage/rocksdb/get_rocksdb_files.sh + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE" + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" + ''; + + buildInputs = [ + boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + zstd libfido2 openldap perl cyrus_sasl + ] ++ lib.optionals stdenv.isLinux [ + numactl libtirpc systemd + ] ++ lib.optionals stdenv.isDarwin [ + cctools CoreServices developer_cmds DarwinTools + ] + ++ lib.optional (stdenv.isLinux && withJemalloc) jemalloc + ++ lib.optional (stdenv.isLinux && withTcmalloc) gperftools; + + outputs = [ "out" "static" ]; + + cmakeFlags = [ + # Percona-specific flags. + "-DPORTABLE=1" + "-DWITH_LDAP=system" + "-DROCKSDB_DISABLE_AVX2=1" + "-DROCKSDB_DISABLE_MARCH_NATIVE=1" + + # Flags taken from mysql package. + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + + + ] ++ lib.optionals stdenv.isLinux [ + "-DWITH_SYSTEMD=1" + "-DWITH_SYSTEMD_DEBUG=1" + ] + ++ lib.optional (stdenv.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" + ++ lib.optional (stdenv.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; + + postInstall = '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ''; + + passthru = { + client = finalAttrs.finalPackage; + connector-c = finalAttrs.finalPackage; + server = finalAttrs.finalPackage; + mysqlVersion = lib.versions.majorMinor finalAttrs.version; + tests = nixosTests.mysql.percona-server_innovation; + }; + + + meta = with lib; { + homepage = "https://www.percona.com/software/mysql-database/percona-server"; + description = '' + A free, fully compatible, enhanced, open source drop-in replacement for + MySQL® that provides superior performance, scalability and instrumentation. + ''; + license = licenses.gpl2; + maintainers = teams.flyingcircus.members; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/percona/COPYING.md b/pkgs/percona/COPYING.md new file mode 100644 index 000000000..897cfdd70 --- /dev/null +++ b/pkgs/percona/COPYING.md @@ -0,0 +1,5 @@ +The files in this directory are based on [MIT-licensed](https://github.com/NixOS/nixpkgs/blob/b77eabd1a282aa08b1759739c0a4b1b19318f088/COPYING) work done by other Nixpkgs/NixOS contributors. + +Percona 8.3 filese are taken from revision b77eabd1a282aa08b1759739c0a4b1b19318f088 in the [nixpkgs](https://github.com/NixOS/nixpkgs/) repository under the path [pkgs/servers/sql/percona-server](https://github.com/NixOS/nixpkgs/blob/b77eabd1a282aa08b1759739c0a4b1b19318f088/pkgs/servers/sql/percona-server). + +The modifications made are licensed under the MIT License as well. From 74c1c4eb4f2521b2fbe353a1e2e41adc91550981 Mon Sep 17 00:00:00 2001 From: os Date: Tue, 22 Oct 2024 13:44:17 +0200 Subject: [PATCH 2/3] Update nixpkgs (2024-10-22) Pull upstream NixOS changes, security fixes and package updates: - chromium: 129.0.6668.70 -> 129.0.6668.100 (CVE-2024-9602, CVE-2024-9603, CVE-2024-7025, CVE-2024-9369 CVE-2024-9370) - element-web: 1.11.79 -> 1.11.81 - firefox: 130.0.1 -> 131.0.3 (CVE-2024-9680, - github-runner: 2.319.1 -> 2.320.0 - gitlab: 17.2.8 -> 17.2.9 (CVE-2024-9164, CVE-2024-8970, CVE-2024-8977, CVE-2024-9631 CVE-2024-6530, CVE-2024-9623, CVE-2024-5005, CVE-2024-9596) - gitlab-container-registry: 4.9.0 -> 4.10.0 - grafana: 10.4.9 -> 10.4.10 - keycloak: 24.0.5 -> 25.0.6 - keycloak: enable hostname:v1 feature by default - matrix-synapse: 1.116.0 -> 1.117.0 - nginxMainline: 1.27.1 -> 1.27.2 - percona80: 8.0.36-28 -> 8.0.37-29 - percona-server_innovation: 8.3.0-1 -> 8.4.0-1 - percona84: init at 8.4.0-1 - percona-xtrabackup_8_0: 8.0.35-30 -> 8.0.35-31 - percona-xtrabackup_innovation: 8.3.0-1 -> 8.4.0-1 - zoneminder: 1.36.33 -> 1.36.34 --- flake.lock | 6 +-- release/package-versions.json | 98 +++++++++++++++++------------------ release/versions.json | 4 +- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 4af30f2ab..8d4bd9415 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728026046, - "narHash": "sha256-MhQxvqWpKzf0mhCZI0z72z2vbWD14NAnAlwvMV74bvY=", + "lastModified": 1729510358, + "narHash": "sha256-LRQk0y4OqyXZ8t3S9343ga0r59PHZXfwWG+XZTjsqQI=", "owner": "flyingcircusio", "repo": "nixpkgs", - "rev": "1a4ac073de5f6c533f3929c97994125a60d68a29", + "rev": "f4f7b96b213014c55cc2a54c4cdb771c244a7308", "type": "github" }, "original": { diff --git a/release/package-versions.json b/release/package-versions.json index 8a3c55a99..0d5788367 100644 --- a/release/package-versions.json +++ b/release/package-versions.json @@ -70,14 +70,14 @@ "version": "18.2.4" }, "chromedriver": { - "name": "chromedriver-129.0.6668.70", + "name": "chromedriver-129.0.6668.91", "pname": "chromedriver", - "version": "129.0.6668.70" + "version": "129.0.6668.91" }, "chromium": { - "name": "chromium-129.0.6668.70", + "name": "chromium-129.0.6668.100", "pname": "chromium", - "version": "129.0.6668.70" + "version": "129.0.6668.100" }, "cifs-utils": { "name": "cifs-utils-7.0", @@ -155,9 +155,9 @@ "version": "2.3.21.1" }, "element-web": { - "name": "element-web-1.11.79", + "name": "element-web-1.11.81", "pname": "element-web", - "version": "1.11.79" + "version": "1.11.81" }, "erlang": { "name": "erlang-25.3.2.12", @@ -190,9 +190,9 @@ "version": "7.17.16" }, "firefox": { - "name": "firefox-130.0.1", + "name": "firefox-131.0.3", "pname": "firefox", - "version": "130.0.1" + "version": "131.0.3" }, "gcc": { "name": "gcc-wrapper-13.2.0", @@ -220,9 +220,9 @@ "version": "2.44.1" }, "gitaly": { - "name": "gitaly-17.2.8", + "name": "gitaly-17.2.9", "pname": "gitaly", - "version": "17.2.8" + "version": "17.2.9" }, "github-runner": { "name": "github-runner-2.319.1", @@ -230,24 +230,24 @@ "version": "2.319.1" }, "gitlab": { - "name": "gitlab-17.2.8", + "name": "gitlab-17.2.9", "pname": "gitlab", - "version": "17.2.8" + "version": "17.2.9" }, "gitlab-container-registry": { - "name": "gitlab-container-registry-4.9.0", + "name": "gitlab-container-registry-4.10.0", "pname": "gitlab-container-registry", - "version": "4.9.0" + "version": "4.10.0" }, "gitlab-ee": { - "name": "gitlab-ee-17.2.8", + "name": "gitlab-ee-17.2.9", "pname": "gitlab-ee", - "version": "17.2.8" + "version": "17.2.9" }, "gitlab-pages": { - "name": "gitlab-pages-17.2.8", + "name": "gitlab-pages-17.2.9", "pname": "gitlab-pages", - "version": "17.2.8" + "version": "17.2.9" }, "gitlab-runner": { "name": "gitlab-runner-17.1.0", @@ -255,9 +255,9 @@ "version": "17.1.0" }, "gitlab-workhorse": { - "name": "gitlab-workhorse-17.2.8", + "name": "gitlab-workhorse-17.2.9", "pname": "gitlab-workhorse", - "version": "17.2.8" + "version": "17.2.9" }, "glibc": { "name": "glibc-2.39-52", @@ -290,9 +290,9 @@ "version": "1.22.6" }, "grafana": { - "name": "grafana-10.4.9", + "name": "grafana-10.4.10", "pname": "grafana", - "version": "10.4.9" + "version": "10.4.10" }, "grub2": { "name": "grub-2.12", @@ -395,9 +395,9 @@ "version": "1.31.0+k3s1" }, "keycloak": { - "name": "keycloak-24.0.5", + "name": "keycloak-25.0.6", "pname": "keycloak", - "version": "24.0.5" + "version": "25.0.6" }, "kubernetes-helm": { "name": "kubernetes-helm-3.15.0", @@ -510,9 +510,9 @@ "version": "5.1.1" }, "matrix-synapse": { - "name": "matrix-synapse-wrapped-1.116.0", + "name": "matrix-synapse-wrapped-1.117.0", "pname": "matrix-synapse-wrapped", - "version": "1.116.0" + "version": "1.117.0" }, "mcpp": { "name": "mcpp-2.7.2.1", @@ -565,9 +565,9 @@ "version": "1.26.2" }, "nginxMainline": { - "name": "nginx-1.27.1", + "name": "nginx-1.27.2", "pname": "nginx", - "version": "1.27.1" + "version": "1.27.2" }, "nginxStable": { "name": "nginx-1.26.2", @@ -675,29 +675,29 @@ "version": "10.43" }, "percona": { - "name": "percona-server_lts-8.0.36-28", - "pname": "percona-server_lts", - "version": "8.0.36-28" + "name": "percona-server-8.0.37-29", + "pname": "percona-server", + "version": "8.0.37-29" }, "percona-server": { - "name": "percona-server_lts-8.0.36-28", - "pname": "percona-server_lts", - "version": "8.0.36-28" + "name": "percona-server-8.0.37-29", + "pname": "percona-server", + "version": "8.0.37-29" }, "percona-server_innovation": { - "name": "percona-server_innovation-8.3.0-1", - "pname": "percona-server_innovation", - "version": "8.3.0-1" + "name": "percona-server-8.4.0-1", + "pname": "percona-server", + "version": "8.4.0-1" }, "percona-server_lts": { - "name": "percona-server_lts-8.0.36-28", - "pname": "percona-server_lts", - "version": "8.0.36-28" + "name": "percona-server-8.0.37-29", + "pname": "percona-server", + "version": "8.0.37-29" }, "percona-xtrabackup_8_0": { - "name": "percona-xtrabackup-8.0.35-30", + "name": "percona-xtrabackup-8.0.35-31", "pname": "percona-xtrabackup", - "version": "8.0.35-30" + "version": "8.0.35-31" }, "percona-xtrabackup_8_3": { "name": "percona-xtrabackup-8.3.0-1", @@ -705,14 +705,14 @@ "version": "8.3.0-1" }, "percona-xtrabackup_innovation": { - "name": "percona-xtrabackup-8.3.0-1", + "name": "percona-xtrabackup-8.4.0-1", "pname": "percona-xtrabackup", - "version": "8.3.0-1" + "version": "8.4.0-1" }, "percona-xtrabackup_lts": { - "name": "percona-xtrabackup-8.0.35-30", + "name": "percona-xtrabackup-8.0.35-31", "pname": "percona-xtrabackup", - "version": "8.0.35-30" + "version": "8.0.35-31" }, "percona57": { "name": "percona-5.7.42-45", @@ -720,9 +720,9 @@ "version": "5.7.42-45" }, "percona80": { - "name": "percona-server_lts-8.0.36-28", - "pname": "percona-server_lts", - "version": "8.0.36-28" + "name": "percona-server-8.0.37-29", + "pname": "percona-server", + "version": "8.0.37-29" }, "percona83": { "name": "percona-server_innovation-8.3.0-1", diff --git a/release/versions.json b/release/versions.json index 19c5504c5..b44035270 100644 --- a/release/versions.json +++ b/release/versions.json @@ -8,9 +8,9 @@ "url": "https://gitlab.flyingcircus.io/flyingcircus/nixos-mailserver.git/" }, "nixpkgs": { - "hash": "sha256-MhQxvqWpKzf0mhCZI0z72z2vbWD14NAnAlwvMV74bvY=", + "hash": "sha256-LRQk0y4OqyXZ8t3S9343ga0r59PHZXfwWG+XZTjsqQI=", "owner": "flyingcircusio", "repo": "nixpkgs", - "rev": "1a4ac073de5f6c533f3929c97994125a60d68a29" + "rev": "f4f7b96b213014c55cc2a54c4cdb771c244a7308" } } From 7f2151885a6892842196b92508566875e57392bf Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Tue, 22 Oct 2024 21:20:45 +0200 Subject: [PATCH 3/3] zoneminder: add to important packages --- release/important_packages.json | 1 + 1 file changed, 1 insertion(+) diff --git a/release/important_packages.json b/release/important_packages.json index 8a5e2aab8..ca6128a4b 100644 --- a/release/important_packages.json +++ b/release/important_packages.json @@ -229,6 +229,7 @@ "xz", "zip", "zlib", + "zoneminder", "zsh", "zstd" ]