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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-01 18:31:04 +00:00
committed by GitHub
parent f602c10ea7 eca8c09a50
commit 7044cd0c9d
113 changed files with 881 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+5 -10
View File
@@ -1119,16 +1119,7 @@ in {
cachelib = callPackage ../development/python-modules/cachelib { };
cachetools = let
cachetools' = callPackage ../development/python-modules/cachetools { };
cachetools_2 = cachetools'.overridePythonAttrs (oldAttrs: rec {
version = "3.1.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf";
};
});
in if isPy3k then cachetools' else cachetools_2;
cachetools = callPackage ../development/python-modules/cachetools { };
cachy = callPackage ../development/python-modules/cachy { };
@@ -4652,6 +4643,8 @@ in {
panel = callPackage ../development/python-modules/panel { };
panflute = callPackage ../development/python-modules/panflute { };
papermill = callPackage ../development/python-modules/papermill { };
openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { };
@@ -5571,6 +5564,8 @@ in {
pylibmc = callPackage ../development/python-modules/pylibmc { };
pylink-square = callPackage ../development/python-modules/pylink-square { };
pylint-celery = callPackage ../development/python-modules/pylint-celery { };
pylint-django = callPackage ../development/python-modules/pylint-django { };