From e8b6c2ff8f5685d9fc3f7cf09f2614112bc6c69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Mar 2023 10:13:21 -0800 Subject: [PATCH] ntfy: pin SQLAlchemy at 1.4.46 --- pkgs/tools/misc/ntfy/default.nix | 18 ++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 3e10f1817386..fcf45ae493e6 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, python +, python39 , fetchFromGitHub , fetchpatch , withXmpp ? !stdenv.isDarwin @@ -12,7 +12,21 @@ }: let - ntfy-webpush = python.pkgs.callPackage ./webpush.nix { }; + python = python39.override { + packageOverrides = self: super: { + ntfy-webpush = self.callPackage ./webpush.nix { }; + + # databases, on which slack-sdk depends, is incompatible with SQLAlchemy 2.0 + sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { + version = "1.4.46"; + src = self.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + }); + }; + }; in python.pkgs.buildPythonApplication rec { pname = "ntfy"; version = "2.7.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4190117b38a8..3080a48a1ee2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10395,7 +10395,7 @@ with pkgs; # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; - ntfy = callPackage ../tools/misc/ntfy { python = python39; }; + ntfy = callPackage ../tools/misc/ntfy { }; ntfy-sh = callPackage ../tools/misc/ntfy-sh { };