diff options
| author | Song Wenwu <iyzsong@gmail.com> | 2014-01-08 16:06:08 +0800 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2014-01-11 20:07:28 +0100 |
| commit | 98d2f7ea454fa09adfd16ac54bb90bd72eb9025c (patch) | |
| tree | 44e569d13f2d0878ca954dad9f52791f4a3bdfd1 /pkgs/top-level | |
| parent | 7ec465a5ccc3e34647b597e83d69b02cba50967c (diff) | |
| download | nixlib-98d2f7ea454fa09adfd16ac54bb90bd72eb9025c.tar nixlib-98d2f7ea454fa09adfd16ac54bb90bd72eb9025c.tar.gz nixlib-98d2f7ea454fa09adfd16ac54bb90bd72eb9025c.tar.bz2 nixlib-98d2f7ea454fa09adfd16ac54bb90bd72eb9025c.tar.lz nixlib-98d2f7ea454fa09adfd16ac54bb90bd72eb9025c.tar.xz nixlib-98d2f7ea454fa09adfd16ac54bb90bd72eb9025c.tar.zst nixlib-98d2f7ea454fa09adfd16ac54bb90bd72eb9025c.zip | |
sip: update to 4.15.4 and add python3 support
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6b00604239e..8c74a04f9b6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6189,7 +6189,7 @@ let rhpl = callPackage ../development/python-modules/rhpl { }; - sip = callPackage ../development/python-modules/python-sip { }; + sip = callPackage ../development/python-modules/sip { }; pyqt4 = callPackage ../development/python-modules/pyqt { stdenv = if stdenv.isDarwin diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf8d970dfd0e..a9c678498762 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -121,6 +121,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python buildPythonPackage pygobject pycairo; }; + sip = import ../development/python-modules/sip { + inherit (pkgs) stdenv fetchurl; + inherit python; + }; + # packages defined here aafigure = buildPythonPackage rec { |