diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-21 19:49:05 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-21 19:49:05 -0700 |
| commit | 7507aed4e17fa6dd69626ae477c4f8d0ebe1eada (patch) | |
| tree | a7fdc2d4921da9dd615f9f4a01a61e9f8111c294 /pkgs/servers | |
| parent | 901fb5e64e9fba64a408ffa8849a19e1cc9ab586 (diff) | |
| parent | 422e6e54495a30a8e77a64f80cb795cefc445b21 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/tools/rust/cargo-expand/default.nix pkgs/tools/misc/blflash/default.nix
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/calibre-web/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 32868886af2af..240aae229deb4 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -21,7 +21,8 @@ python3.pkgs.buildPythonApplication rec { --replace "singledispatch>=3.4.0.0,<3.5.0.0" "" \ --replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \ --replace "unidecode>=0.04.19,<1.2.0" "unidecode>=0.04.19" \ - --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" + --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ + --replace "Babel>=1.3, <2.9" "Babel>=1.3, <=2.9" ''; patches = [ |