summary refs log tree commit diff
diff options
context:
space:
mode:
authorYegor Timoshenko <yegortimoshenko@riseup.net>2018-05-23 01:55:50 +0300
committerGitHub <noreply@github.com>2018-05-23 01:55:50 +0300
commit9530d717253575b471d8136eee42f721b0c21bdb (patch)
tree8c859721afca02a3de7d23621f29c95e0e2e2e5e
parent3203c12bec21ca3b1e1a0b9a728374a385e399c0 (diff)
parent9e5c5d95a83f7c990552de32a4d77a167f4d30f4 (diff)
downloadnixpkgs-9530d717253575b471d8136eee42f721b0c21bdb.tar
nixpkgs-9530d717253575b471d8136eee42f721b0c21bdb.tar.gz
nixpkgs-9530d717253575b471d8136eee42f721b0c21bdb.tar.bz2
nixpkgs-9530d717253575b471d8136eee42f721b0c21bdb.tar.lz
nixpkgs-9530d717253575b471d8136eee42f721b0c21bdb.tar.xz
nixpkgs-9530d717253575b471d8136eee42f721b0c21bdb.tar.zst
nixpkgs-9530d717253575b471d8136eee42f721b0c21bdb.zip
Merge pull request #40944 from dotlambda/python-udiskie-throw
pythonPackages.udiskie: replace alias by throw
-rw-r--r--pkgs/applications/misc/udiskie/default.nix1
-rw-r--r--pkgs/top-level/python-packages.nix4
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 8c6dfe24772..f3dc92605f3 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -5,7 +5,6 @@
 , docopt
 , pygobject3
 , pyyaml
-, ...
 }:
 
 buildPythonApplication rec {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00daeacf7ed..b695372fe96 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16352,8 +16352,8 @@ EOF
     };
   };
 
-  # For backwards compatibility. Please use nixpkgs.udiskie instead.
-  udiskie = toPythonModule (pkgs.udiskie.override { pythonPackages = self; });
+  # added 2018-05-23, can be removed once 18.09 is branched off
+  udiskie = throw "pythonPackages.udiskie has been replaced by udiskie";
 
   # Should be bumped along with EFL!
   pythonefl = buildPythonPackage rec {