about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-10-21 11:01:36 +0200
committerGitHub <noreply@github.com>2018-10-21 11:01:36 +0200
commita4c0cdd466a2681c03678ac807e84235e8d3886e (patch)
tree4b23ef7141bd141abbecadde49c5f790c787f34d /pkgs/top-level
parentdc6e4f9b379f36b87df0e8fa2ec19b391bccd0d5 (diff)
parentf9e7e3887baedcdb730efab7402952d00d133eb8 (diff)
downloadnixlib-a4c0cdd466a2681c03678ac807e84235e8d3886e.tar
nixlib-a4c0cdd466a2681c03678ac807e84235e8d3886e.tar.gz
nixlib-a4c0cdd466a2681c03678ac807e84235e8d3886e.tar.bz2
nixlib-a4c0cdd466a2681c03678ac807e84235e8d3886e.tar.lz
nixlib-a4c0cdd466a2681c03678ac807e84235e8d3886e.tar.xz
nixlib-a4c0cdd466a2681c03678ac807e84235e8d3886e.tar.zst
nixlib-a4c0cdd466a2681c03678ac807e84235e8d3886e.zip
Merge pull request #46564 from jluttine/nikola-8.0.0
pythonPackages.Nikola: 7.8.15 -> 8.0.1
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/python-packages.nix25
1 files changed, 3 insertions, 22 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c495cdabdee..9c4b6f56f1e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -258,6 +258,8 @@ in {
 
   breathe = callPackage ../development/python-modules/breathe { };
 
+  brotli = callPackage ../development/python-modules/brotli { };
+
   browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { };
 
   browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {});
@@ -9315,28 +9317,7 @@ EOF
     };
   };
 
-  Logbook = buildPythonPackage rec {
-    name = "Logbook-${version}";
-    version = "1.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/L/Logbook/${name}.tar.gz";
-      sha256 = "0whqbx5p0zkf7gmb5ssnsnhm4kn4drd4x7fbhdi8dnxklqajbnl7";
-    };
-
-    buildInputs = [ self.pytest ] ++ optionals (!isPy3k) [ self.mock ];
-
-    checkPhase = ''
-      find tests -name \*.pyc -delete
-      py.test tests
-    '';
-
-    meta = {
-      homepage = https://pythonhosted.org/Logbook/;
-      description = "A logging replacement for Python";
-      license = licenses.bsd3;
-    };
-  };
+  Logbook = callPackage ../development/python-modules/Logbook { };
 
   libversion = callPackage ../development/python-modules/libversion {
     inherit (pkgs) libversion;