summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-10-23 08:57:37 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2016-10-23 08:57:37 +0200
commitea50c1255a5532359fa5de2f220f1600966f7805 (patch)
treeb2972abb95bb1b2996c812c8bae3280eb620e545
parent3b9d7260a35e94a95591499158c031f269d18998 (diff)
downloadnixpkgs-ea50c1255a5532359fa5de2f220f1600966f7805.tar
nixpkgs-ea50c1255a5532359fa5de2f220f1600966f7805.tar.gz
nixpkgs-ea50c1255a5532359fa5de2f220f1600966f7805.tar.bz2
nixpkgs-ea50c1255a5532359fa5de2f220f1600966f7805.tar.lz
nixpkgs-ea50c1255a5532359fa5de2f220f1600966f7805.tar.xz
nixpkgs-ea50c1255a5532359fa5de2f220f1600966f7805.tar.zst
nixpkgs-ea50c1255a5532359fa5de2f220f1600966f7805.zip
zk-shell: fix evaluation
-rw-r--r--pkgs/applications/misc/zk-shell/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix
index 9f090e60823..9a0635e47ea 100644
--- a/pkgs/applications/misc/zk-shell/default.nix
+++ b/pkgs/applications/misc/zk-shell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
 buildPythonApplication rec {
   version = "1.0.0";
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   };
 
   propagatedBuildInputs = (with pythonPackages; [
-    ansi kazoo nose six tabulate twitter readline
+    ansi kazoo nose six tabulate twitter
   ]);
 
   #requires a running zookeeper, don't know how to fix that for the moment
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 761b191a3a5..4b968a3bcca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17400,9 +17400,7 @@ in
 
   zimg = callPackage ../development/libraries/zimg { };
 
-  zk-shell = callPackage ../applications/misc/zk-shell {
-    inherit (pythonPackages) buildPythonApplication;
-  };
+  zk-shell = callPackage ../applications/misc/zk-shell { };
 
   zuki-themes = callPackage ../misc/themes/zuki { };