From 3f828fea6ef1d4197e8ce451d9d53f6d71d0d6a3 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 18 Aug 2021 03:35:43 +0200 Subject: [PATCH 1/5] palemoon: 29.3.0 -> 29.4.0 (cherry picked from commit aa08cc4290ceb23e21a3d40168e719c9e9dd99e4) --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 1b7f92ebacf..5e74b4602bf 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -52,14 +52,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.3.0"; + version = "29.4.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1q0w1ffmdfk22df4p2ks4n55zmz44ir8fbcdn5a5h4ihy73nf6xp"; + sha256 = "0hm96n73d446hx4mfsav24mlm6l7fa0dx7br2s1kqcabswh8rk5g"; fetchSubmodules = true; }; From 80505d1a073309b8448ca173940818e5b17cfea1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 19 Aug 2021 16:48:55 +0200 Subject: [PATCH 2/5] palemoon: 29.4.0 -> 29.4.0.1 (cherry picked from commit 1875fba4c4fefdc0f283c53d42c817a969133679) --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 5e74b4602bf..ede34e10a72 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -52,14 +52,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.0"; + version = "29.4.0.1"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "0hm96n73d446hx4mfsav24mlm6l7fa0dx7br2s1kqcabswh8rk5g"; + sha256 = "1qzsryhlxvh9xx9j7s4dmxv575z13wdx8iigj8r0pdmg5kx6rpkb"; fetchSubmodules = true; }; From cd84b8ad8b2f64f6ccf1f27b910bcdd274585fb0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Aug 2021 23:24:30 +0200 Subject: [PATCH 3/5] mautrix-telegram: 0.10.0 -> unstable-2021-08-12 (cherry picked from commit 682f35087a1baef814620cfcb9e99b068a5cd65f) --- pkgs/servers/mautrix-telegram/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 74280f048ce..dce4ad4117d 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -13,19 +13,21 @@ let in buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.9.0"; - disabled = pythonOlder "3.7"; + version = "unstable-2021-08-12"; + disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "v${version}"; - sha256 = "1543ljjl3jg3ayid7ifi4bamqh4gq85pmlbs3m8i7phjbbm7g9dn"; + rev = "ec64c83cb01791525a39f937f3b847368021dce8"; + sha256 = "0rg4f4abdddhhf1xpz74y4468dv3mnm7k8nj161r1xszrk9f2n76"; }; patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; postPatch = '' sed -i -e '/alembic>/d' requirements.txt + substituteInPlace requirements.txt \ + --replace "telethon>=1.22,<1.23" "telethon" ''; propagatedBuildInputs = [ From e1042038ac15ad7cf447fa1ed23a3746ee5d8331 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 Aug 2021 14:25:56 +0200 Subject: [PATCH 4/5] mautrix-telegram: 2021-08-12 -> 0.10.1 ChangeLog: https://github.com/mautrix/telegram/releases/tag/v0.10.1 (cherry picked from commit dd39ec87f41db66ae4b9cb68e40cea811f863ebc) --- pkgs/servers/mautrix-telegram/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index dce4ad4117d..c236bdba61e 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -13,14 +13,14 @@ let in buildPythonPackage rec { pname = "mautrix-telegram"; - version = "unstable-2021-08-12"; + version = "0.10.1"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "ec64c83cb01791525a39f937f3b847368021dce8"; - sha256 = "0rg4f4abdddhhf1xpz74y4468dv3mnm7k8nj161r1xszrk9f2n76"; + rev = "v${version}"; + sha256 = "sha256-1Dmc7WRlT2ivGkdrGDC1b44DE0ovQKfUR0gDiQE4h5c="; }; patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; From 05e5b69ac8d423c1501bcc96126e533bf5d96a89 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 20 Aug 2021 11:17:04 +0200 Subject: [PATCH 5/5] mautrix-telegram: override mautrix to version 0.10.4 This is needed since 0.10.1 of mautrix-telegram, but it'd be a breaking change of mautrix, which can be used for any kind of matrix client, so I don't really want to break it. --- pkgs/servers/mautrix-telegram/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index c236bdba61e..eba429e8cce 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -2,16 +2,26 @@ , withE2BE ? true }: -with python3.pkgs; - let + python = python3.override { + packageOverrides = self: super: { + mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { + version = "0.10.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ffbc4e29eb56089539b408f8e4c12a5d5a5d11d7fe7d40f8c6279784c618b869"; + }; + }); + }; + }; + # officially supported database drivers - dbDrivers = [ + dbDrivers = with python.pkgs; [ psycopg2 # sqlite driver is already shipped with python by default ]; -in buildPythonPackage rec { +in with python.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; version = "0.10.1"; disabled = python.pythonOlder "3.7";