public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/development/tools/rust/cargo-expand/default.nix
 pkgs/tools/misc/blflash/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-21 19:49:05 -07:00
parent 901fb5e64e 422e6e5449
commit 7507aed4e1
18 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/servers/calibre-web/default.nix
View File

@@ -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 = [