alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/top-level
History
Rok Garbas 32dca6d3b2 pythonPackages.qscintilla: dont build on py3 and pypy 
because qscintilla is not a standard python package ``buildPythonPackage`` is
not used and ``disabled`` does do anything.

diff --git a/pkgs/top-level/python-packages.nix
b/pkgs/top-level/python-packages.nix index 93d40c3..925ceb0 100644 ---
a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix
@@ -11823,35 +11823,36 @@ let }; };

-  qscintilla = pkgs.stdenv.mkDerivation rec {
-    # TODO: Qt5 support
-    name = "qscintilla-${version}";
-    version = pkgs.qscintilla.version;
-    disabled = isPy3k || isPyPy;
-
-    src = pkgs.qscintilla.src;
-
-    buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
-
-    preConfigure = ''
-      mkdir -p $out
-      lndir ${pkgs.pyqt4} $out
-      cd Python
-      ${python.executable} ./configure-old.py \
-          --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
-          --apidir $out/api/${python.libPrefix} \
-          -n ${pkgs.qscintilla}/include \
-          -o ${pkgs.qscintilla}/lib \
-          --sipdir $out/share/sip
-    '';
+  qscintilla = if isPy3k || isPyPy
+    then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"
+    else pkgs.stdenv.mkDerivation rec {
+      # TODO: Qt5 support
+      name = "qscintilla-${version}";
+      version = pkgs.qscintilla.version;
+
+      src = pkgs.qscintilla.src;
+
+      buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
+
+      preConfigure = ''
+        mkdir -p $out
+        lndir ${pkgs.pyqt4} $out
+        cd Python
+        ${python.executable} ./configure-old.py \
+            --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
+            --apidir $out/api/${python.libPrefix} \
+            -n ${pkgs.qscintilla}/include \
+            -o ${pkgs.qscintilla}/lib \
+            --sipdir $out/share/sip
+      '';

-    meta = with stdenv.lib; {
-      description = "A Python binding to QScintilla, Qt based text editing control";
-      license = licenses.lgpl21Plus;
-      maintainers = [ "abcz2.uprola@gmail.com" ];
-      platforms = platforms.linux;
+      meta = with stdenv.lib; {
+        description = "A Python binding to QScintilla, Qt based text editing control";
+        license = licenses.lgpl21Plus;
+        maintainers = [ "abcz2.uprola@gmail.com" ];
+        platforms = platforms.linux;
+      };
     };
-  };

   qserve = buildPythonPackage rec {
2015-08-29 21:22:29 +02:00
..
all-packages.nix goPackages: Use parallel instead of forking in bash 2015-08-29 11:51:26 -07:00
dotnet-packages.nix Fixed some descriptions 2015-06-29 16:20:58 +02:00
emacs-packages.nix emacs-evil: 20141020 -> 1.2.3 2015-08-23 10:26:23 -05:00
go-packages.nix goPackages: update various Prometheus dependencies 2015-08-29 00:19:16 -07:00
guile-2-test.nix
haskell-packages.nix Switch ghcjs to ghc 7.10.2. 2015-08-07 15:13:14 +02:00
lua-packages.nix Merge pull request #9132 from makefu/awesome-vicious-luaPackage 2015-08-07 12:36:07 +03:00
make-tarball.nix Nixpkgs channel: Remove channel-name 2015-08-05 17:37:05 +02:00
node-packages-generated.nix
node-packages.json
node-packages.nix
perl-packages.nix Merge branch 'master.upstream' into staging.upstream 2015-08-14 13:22:00 -07:00
php-packages.nix apcu: init at 4.0.7 2015-08-09 16:15:22 +02:00
platforms.nix platforms.nix: Remove IntegratorCP and Versatile 2015-06-30 10:33:25 +03:00
pure-packages.nix Fairly complete set of packages for Pure 2015-05-26 17:51:07 +10:00
python-packages.nix pythonPackages.qscintilla: dont build on py3 and pypy 2015-08-29 21:22:29 +02:00
release-cross.nix Disable system_tarball_pc and fix eval 2015-07-22 12:27:15 +02:00
release-lib.nix release-lib.nix: set inHydra anyways, it might be useful some day 2015-07-17 15:33:49 +02:00
release-python.nix
release-small.nix Remove aterm28 from release-small, it's broken 2015-05-13 11:52:10 +02:00
release.nix Add "haskellPackages" binaries to the unstable channel. 2015-05-29 11:25:26 +02:00
rust-packages.nix rustRegistry: 2015-07-07 -> 2015-08-03 2015-08-03 13:34:30 +02:00