diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-17 19:35:29 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-17 20:30:51 +0300 |
| commit | 3e5bf44aabca6c429bc953da51edf5b7b56c72ef (patch) | |
| tree | 4454a74ea0c1116f56e09a4fb1be3fa8b193df98 /pkgs/development/python-modules/sip | |
| parent | 1c5399626a4e5a32269fce7ed15dff8f32558b54 (diff) | |
| download | nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.gz nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.bz2 nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.lz nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.xz nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.zst nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.zip | |
sip: 4.14.7 -> 4.18.1, drop unused old version
Diffstat (limited to 'pkgs/development/python-modules/sip')
| -rw-r--r-- | pkgs/development/python-modules/sip/4.16.nix | 28 | ||||
| -rw-r--r-- | pkgs/development/python-modules/sip/default.nix | 9 |
2 files changed, 3 insertions, 34 deletions
diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix deleted file mode 100644 index 2861816885f3..000000000000 --- a/pkgs/development/python-modules/sip/4.16.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, python, isPyPy }: - -if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "sip-4.16.6"; - - src = fetchurl { - url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "0lj5f581dkwswlwpg7lbicqf940dvrp8vjbkhmyywd99ynxb4zcc"; - }; - - configurePhase = '' - ${python.executable} ./configure.py \ - -d $out/lib/${python.libPrefix}/site-packages \ - -b $out/bin -e $out/include - ''; - - buildInputs = [ python ]; - - passthru.pythonPath = []; - - meta = with stdenv.lib; { - description = "Creates C++ bindings for Python modules"; - homepage = "http://www.riverbankcomputing.co.uk/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 sander urkud ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 6c455b3bb1bd..cbee1867cf63 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,17 +1,14 @@ { stdenv, fetchurl, python, isPyPy }: if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "sip-4.14.7"; # kde410.pykde4 doesn't build with 4.15 + name = "sip-4.18.1"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "1dv1sdwfmnq481v80k2951amzs9s87d4qhk0hpwrhb1sllh92rh5"; + sha256 = "1452zy3g0qv4fpd9c0y4gq437kn0xf7bbfniibv5n43zpwnpmklv"; }; - configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' - # prevent sip from complaining about python not being built as a framework - sed -i -e 1564,1565d siputils.py - '' + '' + configurePhase = '' ${python.executable} ./configure.py \ -d $out/lib/${python.libPrefix}/site-packages \ -b $out/bin -e $out/include |