diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-06-29 21:06:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-06-29 21:06:39 +0200 |
| commit | 2059bf9e39bef62e9386291e1041371bdd8036ab (patch) | |
| tree | bf1b386b12bb4ab6d7ddeb417021ebad9ddb9d15 /pkgs/top-level/python-packages.nix | |
| parent | 18d78e2e48f07c45a97c6c03198b0aa3ed3ce2a4 (diff) | |
| parent | 2f4001f41a44c49970112b7885eae00fdff16eb5 (diff) | |
| download | nixlib-2059bf9e39bef62e9386291e1041371bdd8036ab.tar nixlib-2059bf9e39bef62e9386291e1041371bdd8036ab.tar.gz nixlib-2059bf9e39bef62e9386291e1041371bdd8036ab.tar.bz2 nixlib-2059bf9e39bef62e9386291e1041371bdd8036ab.tar.lz nixlib-2059bf9e39bef62e9386291e1041371bdd8036ab.tar.xz nixlib-2059bf9e39bef62e9386291e1041371bdd8036ab.tar.zst nixlib-2059bf9e39bef62e9386291e1041371bdd8036ab.zip | |
Merge older staging with added firefox-related updates
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e46770624282..6b4cd429a007 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -150,7 +150,6 @@ in { setuptools = toPythonModule (callPackage ../development/python-modules/setuptools { }); vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { - pythonPackages = self; boost = pkgs.boost160; }; @@ -366,7 +365,7 @@ in { pydocstyle = callPackage ../development/python-modules/pydocstyle { }; - pyexiv2 = disabledIf isPy3k (callPackage ../development/python-modules/pyexiv2 {}); + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; @@ -6920,7 +6919,7 @@ in { keyring = callPackage ../development/python-modules/keyring { }; - keyutils = callPackage ../development/python-modules/keyutils { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; kiwisolver = callPackage ../development/python-modules/kiwisolver { }; @@ -11257,7 +11256,7 @@ in { pyls-isort = callPackage ../development/python-modules/pyls-isort {}; pyudev = callPackage ../development/python-modules/pyudev { - inherit (pkgs) fetchurl systemd; + inherit (pkgs) systemd; }; pynmea2 = callPackage ../development/python-modules/pynmea2 {}; |