From 63b73234029df4e31d9a4c0788ce59847422e0eb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 26 May 2016 18:51:25 +0200 Subject: [PATCH 1/7] Remove bittornado Package is broken. Won't work with wxPython30, and wheel produced with buildPythonPackage cannot be installed either. --- .../networking/p2p/bit-tornado/default.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/tools/networking/p2p/bit-tornado/default.nix diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix deleted file mode 100644 index 92458b3d145..00000000000 --- a/pkgs/tools/networking/p2p/bit-tornado/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv,fetchurl,python, wxPython, makeWrapper }: -stdenv.mkDerivation { - name = "bit-tornado-0.3.18"; - - src = fetchurl { - url = http://download2.bittornado.com/download/BitTornado-0.3.18.tar.gz; - sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr"; - }; - - buildInputs = [ python wxPython makeWrapper ]; - - buildPhase = '' ''; - installPhase = '' - python setup.py install --prefix=$out ; - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" - done - ''; - - meta = { - description = "Bittorrent client with IPv6 support"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5143e4a319d..52e4f97e4c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -933,8 +933,6 @@ in inherit (strategoPackages016) strategoxt sdf; }; - bittornado = callPackage ../tools/networking/p2p/bit-tornado { }; - blueman = callPackage ../tools/bluetooth/blueman { inherit (gnome3) dconf gsettings_desktop_schemas; withPulseAudio = config.pulseaudio or true; From 9597ca718b1612f0a1f0ec0c00b02b55f7a3775e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 May 2016 21:25:48 +0200 Subject: [PATCH 2/7] pythonPackages.wxPython{28,30} : use buildPythonPackage --- .../python-modules/wxPython/2.8.nix | 41 +++++++++++++++++-- .../python-modules/wxPython/3.0.nix | 38 +++++++++++++++-- .../python-modules/wxPython/generic.nix | 31 -------------- pkgs/top-level/python-packages.nix | 6 +-- 4 files changed, 73 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/wxPython/generic.nix diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix index f0a45242415..12027f54ff8 100644 --- a/pkgs/development/python-modules/wxPython/2.8.nix +++ b/pkgs/development/python-modules/wxPython/2.8.nix @@ -1,6 +1,39 @@ -{ callPackage, ... } @ args: +{ fetchurl +, lib +, pythonPackages +, openglSupport ? true +, libX11 +, wxGTK +, pkgconfig +}: -callPackage ./generic.nix (args // rec { +assert wxGTK.unicode; + +with pythonPackages; + +buildPythonPackage rec { + name = "wxPython-${version}"; version = "2.8.12.1"; - sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; -}) + + disabled = isPy3k || isPyPy; + doCheck = false; + + src = fetchurl { + url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; + sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; + }; + + propagatedBuildInputs = [ pkgconfig wxGTK (wxGTK.gtk) libX11 ] ++ lib.optional openglSupport pyopengl; + preConfigure = "cd wxPython"; + + NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; + + buildPhase = ""; + + installPhase = '' + ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + wrapPythonPrograms + ''; + + passthru = { inherit wxGTK openglSupport; }; +} diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 6892d7e8729..7c225a95f2a 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -1,9 +1,39 @@ -{ callPackage, ... } @ args: +{ fetchurl +, lib +, pythonPackages +, openglSupport ? true +, libX11 +, wxGTK +, pkgconfig +}: -callPackage ./generic.nix (args // rec { +assert wxGTK.unicode; +with pythonPackages; + +buildPythonPackage rec { + name = "wxPython-${version}"; version = "3.0.2.0"; - sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm"; + disabled = isPy3k || isPyPy; + doCheck = false; -}) + src = fetchurl { + url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; + sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm"; + }; + + propagatedBuildInputs = [ pkgconfig wxGTK (wxGTK.gtk) libX11 ] ++ lib.optional openglSupport pyopengl; + preConfigure = "cd wxPython"; + + NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; + + buildPhase = ""; + + installPhase = '' + ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + wrapPythonPrograms + ''; + + passthru = { inherit wxGTK openglSupport; }; +} diff --git a/pkgs/development/python-modules/wxPython/generic.nix b/pkgs/development/python-modules/wxPython/generic.nix deleted file mode 100644 index 16c7c126318..00000000000 --- a/pkgs/development/python-modules/wxPython/generic.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, isPy3k, isPyPy, wxGTK, openglSupport ? true, pyopengl -, version, sha256, wrapPython, setuptools, libX11, ... -}: - -assert wxGTK.unicode; - -stdenv.mkDerivation rec { - name = "wxPython-${version}"; - inherit version; - - disabled = isPy3k || isPyPy; - doCheck = false; - - src = fetchurl { - url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - inherit sha256; - }; - - pythonPath = [ python setuptools ]; - buildInputs = [ python setuptools pkgconfig wxGTK (wxGTK.gtk) wrapPython libX11 ] ++ stdenv.lib.optional openglSupport pyopengl; - preConfigure = "cd wxPython"; - - NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; - - installPhase = '' - ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out - wrapPythonPrograms - ''; - - passthru = { inherit wxGTK openglSupport; }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2406df879b8..ac5f14ce7a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23339,13 +23339,11 @@ in modules // { wxPython = self.wxPython28; - wxPython28 = import ../development/python-modules/wxPython/2.8.nix { - inherit callPackage; + wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix { wxGTK = pkgs.wxGTK28; }; - wxPython30 = import ../development/python-modules/wxPython/3.0.nix { - inherit callPackage; + wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxGTK = pkgs.wxGTK30; }; From f1ff46231b16d96ada61508f4a77593b73fbdcac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 May 2016 21:26:15 +0200 Subject: [PATCH 3/7] pythonPackages.wxPython: 2.8 -> 3.0 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac5f14ce7a9..a77928fecf5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23337,7 +23337,7 @@ in modules // { }; }; - wxPython = self.wxPython28; + wxPython = self.wxPython30; wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix { wxGTK = pkgs.wxGTK28; From d3714e34457fbd8a0c0eb7a927a0b1947f9ecce3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 May 2016 21:27:29 +0200 Subject: [PATCH 4/7] wxPython: remove from top-level --- pkgs/top-level/all-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e4f97e4c1..0d4f7ffcda8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6519,7 +6519,9 @@ in yodl = callPackage ../development/tools/misc/yodl { }; - winpdb = callPackage ../development/tools/winpdb { }; + winpdb = callPackage ../development/tools/winpdb { + inherit (pythonPackages) wxPython; + }; grabserial = callPackage ../development/tools/grabserial { }; @@ -9686,9 +9688,6 @@ in twisted = pythonPackages.twisted; - wxPython = pythonPackages.wxPython; - wxPython28 = pythonPackages.wxPython28; - yolk = callPackage ../development/python-modules/yolk {}; ZopeInterface = pythonPackages.zope_interface; @@ -12528,7 +12527,7 @@ in gksu = callPackage ../applications/misc/gksu { }; gnuradio = callPackage ../applications/misc/gnuradio { - inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl; + inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl wxPython; fftw = fftwFloat; }; @@ -14324,7 +14323,7 @@ in torch-repl = lib.setName "torch-repl" torchPackages.trepl; torchat = callPackage ../applications/networking/instant-messengers/torchat { - wrapPython = pythonPackages.wrapPython; + inherit (pythonPackages) wrapPython wxPython; }; tortoisehg = callPackage ../applications/version-management/tortoisehg { }; From 650fe83eb054982e399d783323b766258d313b9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 May 2016 21:27:54 +0200 Subject: [PATCH 5/7] pythonPackags.plover: mark as broken --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a77928fecf5..ea6857681f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12955,6 +12955,7 @@ in modules // { description = "OpenSteno Plover stenography software"; maintainers = with maintainers; [ twey kovirobi ]; license = licenses.gpl2; + broken = true; }; src = pkgs.fetchurl { @@ -12962,7 +12963,8 @@ in modules // { sha256 = "1jja37nhiypdx1z6cazp8ffsf0z3yqmpdbprpdzf668lcb422rl0"; }; - propagatedBuildInputs = with self; [ wxPython30 pyserial hidapi xlib appdirs pkgs.wmctrl mock ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ wxPython pyserial hidapi xlib appdirs pkgs.wmctrl mock ]; }; pygal = buildPythonPackage rec { From 218869e6952eb18316e218476cb7896c5f44aa8f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 May 2016 21:28:12 +0200 Subject: [PATCH 6/7] pythonPackages.runsnakerun: use current wxPython --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea6857681f1..afff567aed2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19948,7 +19948,7 @@ in modules // { sha256 = "61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef"; }; - propagatedBuildInputs = [ self.squaremap self.wxPython28 ]; + propagatedBuildInputs = with self; [ squaremap wxPython ]; meta = { description = "GUI Viewer for Python profiling runs"; From 253634c4acb7f29cae84065a4ba70f2bf0ccf582 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 May 2016 21:37:09 +0200 Subject: [PATCH 7/7] pythonPackages.wxPython28: remove package --- .../python-modules/wxPython/2.8.nix | 39 ------------------- pkgs/top-level/python-packages.nix | 4 -- 2 files changed, 43 deletions(-) delete mode 100644 pkgs/development/python-modules/wxPython/2.8.nix diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix deleted file mode 100644 index 12027f54ff8..00000000000 --- a/pkgs/development/python-modules/wxPython/2.8.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ fetchurl -, lib -, pythonPackages -, openglSupport ? true -, libX11 -, wxGTK -, pkgconfig -}: - -assert wxGTK.unicode; - -with pythonPackages; - -buildPythonPackage rec { - name = "wxPython-${version}"; - version = "2.8.12.1"; - - disabled = isPy3k || isPyPy; - doCheck = false; - - src = fetchurl { - url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; - }; - - propagatedBuildInputs = [ pkgconfig wxGTK (wxGTK.gtk) libX11 ] ++ lib.optional openglSupport pyopengl; - preConfigure = "cd wxPython"; - - NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; - - buildPhase = ""; - - installPhase = '' - ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out - wrapPythonPrograms - ''; - - passthru = { inherit wxGTK openglSupport; }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index afff567aed2..b9be307ce22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23341,10 +23341,6 @@ in modules // { wxPython = self.wxPython30; - wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix { - wxGTK = pkgs.wxGTK28; - }; - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxGTK = pkgs.wxGTK30; };