From e42a58a6e9af3855ec83df3ead44bcabce38da4c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 19 Sep 2022 21:51:17 +0200 Subject: [PATCH 01/15] mariadb_108: 10.8.4 -> 10.8.5 https://mariadb.com/kb/en/mariadb-1085-release-notes/ (cherry picked from commit d563e5c1e0a8cb6ecf40243f17e0bca433911c43) --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 5aba0c2d0bd9..2147caef94c5 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -258,7 +258,7 @@ in { }; mariadb_108 = mariadbPackage { # Supported until 2023-05 - version = "10.8.4"; - hash = "sha256-ZexgyjZYjs0RzYw/wM414dYDAp4SN4z4i6qGX9CJEWY="; + version = "10.8.5"; + hash = "sha256-z37TjDYTTNgYP93WTLPlD1ROgmS6dCAlXbEpcJfgjos="; }; } From 465771ac3b9e77c5b5688ebe34386b1a275381d9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 19 Sep 2022 21:53:30 +0200 Subject: [PATCH 02/15] mariadb_107: 10.7.5 -> 10.7.6 https://mariadb.com/kb/en/mariadb-1076-release-notes/ (cherry picked from commit 0f1042dec114f587a44f4eb59cc04794e1143215) --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 2147caef94c5..4ecae0bfd0a0 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -253,8 +253,8 @@ in { }; mariadb_107 = mariadbPackage { # Supported until 2023-02. TODO: remove ahead of 22.11 release. - version = "10.7.5"; - hash = "sha256-f/OkzNoe7S8aZBO4DE7WjMqRFzD1Aaaf1/STo0oJVLo="; + version = "10.7.6"; + hash = "sha256-erX7pDmQV33BdPG5a9NAszN8G9Rv48NmIgsJ0siNLqA="; }; mariadb_108 = mariadbPackage { # Supported until 2023-05 From 9cf2fb373cd93c64e4ccd34365d9f1cd78fb42e6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 19 Sep 2022 21:54:56 +0200 Subject: [PATCH 03/15] mariadb_106: 10.6.9 -> 10.6.10 https://mariadb.com/kb/en/mariadb-10610-release-notes/ (cherry picked from commit 1b8755548c5c77ef4cd8246eb0fffaee7f61aa9c) --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 4ecae0bfd0a0..375a4bea9260 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -248,8 +248,8 @@ in { }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.9"; - hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw="; + version = "10.6.10"; + hash = "sha256-atn6hvDIXI7q+tJkNUnV/13ShyAClk51R1LekYY6o7c="; }; mariadb_107 = mariadbPackage { # Supported until 2023-02. TODO: remove ahead of 22.11 release. From 13da002eef06d4ec54e9c9b2b7d3b7307986a0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Jun 2022 04:35:11 +0000 Subject: [PATCH 04/15] bind: 9.18.3 -> 9.18.4 https://downloads.isc.org/isc/bind9/9.18.4/doc/arm/html/notes.html (cherry picked from commit 2847e6e6915915af8d5c3407e82425e4c9ef09cd) --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 7b56061a4aa8..d2923ee23345 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.3"; + version = "9.18.4"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CtjadzvZPLoO9mzIGZlpjr35w+UfrtXlyMHrdcrSrm8="; + sha256 = "sha256-8neuUBWaAMMA65JqnF1RlTA4qTa9gkLWkT37bqxCdh0="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From abba4c1b5e8d5ddba588df6dde8a1c083d77ee9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Jul 2022 14:30:51 +0000 Subject: [PATCH 05/15] bind: 9.18.4 -> 9.18.5 (cherry picked from commit 79d65a8851703f2111df9ea95632c68e7ac6dab4) --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index d2923ee23345..eadc26404906 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.4"; + version = "9.18.5"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8neuUBWaAMMA65JqnF1RlTA4qTa9gkLWkT37bqxCdh0="; + sha256 = "sha256-DO4HjXTwvcTsN0Q1Amsl3niS8mVAoYsioC73KKEdyuc="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From c584e8abdb4257d08ab1b3f39f6ac8ffac476531 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Aug 2022 00:40:32 +0000 Subject: [PATCH 06/15] bind: 9.18.5 -> 9.18.6 (cherry picked from commit 89d680fa2b71b418c7578e8a60168c00e3c20395) --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index eadc26404906..26f17451e0d9 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.5"; + version = "9.18.6"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DO4HjXTwvcTsN0Q1Amsl3niS8mVAoYsioC73KKEdyuc="; + sha256 = "sha256-1DoP7QPHdNFoXSA1mCGMC3d0qI/MOQoBcHENX+t/v/E="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From be25f297763459945740e784576528d1e6fb9076 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Sep 2022 05:13:52 +0000 Subject: [PATCH 07/15] bind: 9.18.6 -> 9.18.7 (cherry picked from commit a6fe6e968b1384e14c3d00db0e0eb257bc9fb1fd) --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 26f17451e0d9..697796590c7d 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.6"; + version = "9.18.7"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1DoP7QPHdNFoXSA1mCGMC3d0qI/MOQoBcHENX+t/v/E="; + sha256 = "sha256-nirPFpj0nXCtEv+6057GcWp9pSTp69mEKcfHC6EmKYE="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From 08540c1a9e1bd9be19cecaeb6d08e57755b1c1f2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 27 Sep 2022 12:25:09 +0800 Subject: [PATCH 08/15] pantheon.gala: Fix multitasking view allocation assertions (cherry picked from commit 1c66e614500d53185711f283ca43fb8fc2afae0f) --- pkgs/desktops/pantheon/desktop/gala/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index acb4e7838570..6c7713098822 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -53,6 +53,13 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/gala/commit/e0095415cdbfc369e6482e84b8aaffc6a04cafe7.patch"; sha256 = "sha256-n/BJPIrUaCQtBgDotOLq/bCAAccdbL6OwciXY115HsM="; }) + + # MultitaskingView: fix allocation assertions + # https://github.com/elementary/gala/pull/1463 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/23c7edeb0ee9b0ff0aa48c1d19fbd1739df7af78.patch"; + sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI="; + }) ]; nativeBuildInputs = [ From 38e441d51aeab98d11ce756b48136d59f75a0791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 27 Sep 2022 14:46:35 +0100 Subject: [PATCH 09/15] cachix: 0.8.1 -> 1.0.1 --- .../haskell-modules/configuration-common.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 22a4cca451d0..bb3a8e19357c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2562,15 +2562,30 @@ self: super: { shower = doJailbreak (dontCheck super.shower); cachix = overrideCabal (drv: { - version = "0.8.1"; + version = "1.0.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v0.8.1"; - sha256 = "sha256-s9JoWsDUVGWhPWLNsvrYK7OlcPZhLO63fo4gN/r4uwU="; + rev = "v1.0.1"; + sha256 = "sha256-ImI1EOZCJ9f6avS+0MY+ITYwrIzvy2B0hPfeKCdCZxo="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; - }) super.cachix; + postPatch = '' + sed -i 's/1.0.0/1.0.1/' cachix.cabal + sed -i '/import Protolude/a import Data.List (isSuffixOf)' src/Cachix/Client/WatchStore.hs + sed -ir 's/[(]toS)/(option, toS)/' src/Cachix/Client/OptionsParser.hs + ''; + }) (addBuildDepends [super.extra super.lukko] super.cachix); + cachix-api = overrideCabal (drv: { + version = "1.0.1"; + src = pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + rev = "v1.0.1"; + sha256 = "sha256-ImI1EOZCJ9f6avS+0MY+ITYwrIzvy2B0hPfeKCdCZxo="; + }; + postUnpack = "sourceRoot=$sourceRoot/cachix-api"; + }) (addBuildDepend super.deriving-aeson super.cachix-api); # The shipped Setup.hs file is broken. csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv; From 251c1b9b5ded3214ff2f1950b6430ba0cc2107d8 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 27 Sep 2022 09:46:46 +0200 Subject: [PATCH 10/15] irrlichtmt: 1.9.0mt7 -> 1.9.0mt8 (cherry picked from commit 7a84b04cedd9bb072f544aac3f9445b174f560e1) --- pkgs/development/libraries/irrlichtmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix index 5865b876207a..e5d5941745d5 100644 --- a/pkgs/development/libraries/irrlichtmt/default.nix +++ b/pkgs/development/libraries/irrlichtmt/default.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { pname = "irrlichtmt"; - version = "1.9.0mt7"; + version = "1.9.0mt8"; src = fetchFromGitHub { owner = "minetest"; repo = "irrlicht"; rev = version; - sha256 = "sha256-Eu7zW3mXl7GPRmLnKjt/dPoZ64HPYulI7MO1dJfj+10="; + sha256 = "sha256-bwpALhBk16KugYqKuN57M3t5Ba7rdyrYWn/iBoi8hpg="; }; nativeBuildInputs = [ From 0858520bb30ae4dccb9d61c88f41261e77048ed0 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 27 Sep 2022 09:47:21 +0200 Subject: [PATCH 11/15] minetest: 5.6.0 -> 5.6.1 (cherry picked from commit aee300a6b58daca255efda95ec40989cbf9a0d44) --- pkgs/games/minetest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 4bc2e24329ea..e851e0af3ab4 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -132,9 +132,9 @@ let }; v5 = { - version = "5.6.0"; - sha256 = "sha256-wcbYcVHs4L0etOwUBjKvzsmZtnpOxpFgLV8nx3UfJQI="; - dataSha256 = "sha256-TVaDHYstFEuT0nBExwLE1PtM1CZh71t9CRxC9rEYTd4="; + version = "5.6.1"; + sha256 = "sha256-1mUmtM09jqJhD2RcLCAjaI+JkqP52QYH3KLkY5MZ860="; + dataSha256 = "sha256-Ye8MihrOqjSoy+vNr/CM/C/sNXdexe08dxrmoMxsG/A="; }; mkClient = version: generic (version // { buildClient = true; buildServer = false; }); From 0b627ad0ee0390be9b49a46e6d446e5ce1e3b305 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 27 Sep 2022 09:47:40 +0200 Subject: [PATCH 12/15] minetest: add fgaz to maintainers (cherry picked from commit 2819931e413b241fce9ef43647cc30a7a12f813e) --- pkgs/games/minetest/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index e851e0af3ab4..2e8f36a4c43a 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -123,7 +123,7 @@ let description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pyrolagus fpletz ]; + maintainers = with maintainers; [ pyrolagus fpletz fgaz ]; # never built on Hydra # https://hydra.nixos.org/job/nixpkgs/trunk/minetestclient_4.x86_64-darwin # https://hydra.nixos.org/job/nixpkgs/trunk/minetestserver_4.x86_64-darwin From d20156aa17afc857b92649d6e29f6b3fef89a399 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 27 Sep 2022 09:48:24 +0200 Subject: [PATCH 13/15] minetest: update outdated broken expression (cherry picked from commit 8c6f0187661ca49579f46d4642b8f3a82ef575fa) --- pkgs/games/minetest/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 2e8f36a4c43a..9778bf5e1cdc 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -124,10 +124,8 @@ let license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pyrolagus fpletz fgaz ]; - # never built on Hydra - # https://hydra.nixos.org/job/nixpkgs/trunk/minetestclient_4.x86_64-darwin - # https://hydra.nixos.org/job/nixpkgs/trunk/minetestserver_4.x86_64-darwin - broken = (lib.versionOlder version "5.0.0") && stdenv.isDarwin; + # https://github.com/NixOS/nixpkgs/pull/186160#issuecomment-1212635918 + broken = stdenv.isDarwin; }; }; From 653a8e02ddba69cd9f3854bdd85d268acfb13c55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Sep 2022 17:26:53 +0200 Subject: [PATCH 14/15] matrix-synapse: 1.67.0 -> 1.68.0 https://github.com/matrix-org/synapse/releases/tag/v1.68.0 Uses poetry-core to build the package. Drops setuptools-rust from runtime dependencies, because they are checked at startup, which breaks because we do a clear separation of concerns. Fixes a misconception about the tests, that were until now always run against the source module. This breaks with the introduction of the rust components, because they're not available in the source module. Adds missing pre and post hooks to checkPhase. (cherry picked from commit 326b8f7d8f0619cf48b5a5db18270e10b91b623c) --- pkgs/servers/matrix-synapse/default.nix | 35 ++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 699c2e083b28..bb970bb959f4 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, openssl +{ lib, stdenv, python3, openssl, rustPlatform , enableSystemd ? stdenv.isLinux, nixosTests , enableRedis ? true , callPackage @@ -11,13 +11,35 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.67.0"; + version = "1.68.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY="; + hash = "sha256-jQcprvKEbLuLWth0aWeh5mi/v8z83GIrjCsm3JdJcUM="; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-k8iAYRgFCuv6QYAUW5kSEwFSEXVNAEGpPya7biS1Vlo="; + }; + + postPatch = '' + # Remove setuptools_rust from runtime dependencies + # https://github.com/matrix-org/synapse/blob/v1.68.0/pyproject.toml#L177-L185 + sed -i '/^setuptools_rust =/d' pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + rustPlatform.cargoSetupHook + setuptools-rust + ] ++ (with rustPlatform.rust; [ + cargo + rustc + ]); + buildInputs = [ openssl ]; propagatedBuildInputs = [ @@ -63,7 +85,14 @@ buildPythonApplication rec { doCheck = !stdenv.isDarwin; checkPhase = '' + runHook preCheck + + # remove src module, so tests use the installed module instead + rm -rf ./synapse + PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests + + runHook postCheck ''; passthru.tests = { inherit (nixosTests) matrix-synapse; }; From e008387065ea29619ba1898bf0ffb9f358cbd52e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 19:58:32 +0000 Subject: [PATCH 15/15] python310Packages.matrix-common: 1.2.1 -> 1.3.0 (cherry picked from commit 5acccf3677b9f3df5ccb27b80399915c838d41ed) --- pkgs/development/python-modules/matrix-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index 324b3a2df06c..0637ad549e92 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "matrix_common"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qZ3PAqa9lbJKWmGzVIiKKskr8rS4OccnuN2dos36OFM="; + sha256 = "sha256-YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E="; }; propagatedBuildInputs = [ attrs ];