Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

7 files changed, 0 insertions, 231 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix b/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
deleted file mode 100644
index 1ad2d0123828..000000000000
--- a/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libxml2, libxslt, python3, qt4 }:
-
-# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
-let
-  pythonEnv = python3.withPackages (ps: with ps; [ sphinx ]);
-in
-stdenv.mkDerivation rec {
-  pname = "pyside-apiextractor";
-  version = "0.10.10";
-
-  src = fetchFromGitHub {
-    owner = "PySide";
-    repo = "Apiextractor";
-    rev = version;
-    hash = "sha256-YH8aYyzv59xiIglZbdNgOPnmEQwNE2GmotAFFfFdMlg=";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  preConfigure = ''
-    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
-  '';
-
-  nativeBuildInputs = [ cmake pythonEnv ];
-  buildInputs = [ qt4 libxml2 libxslt ];
-
-  meta = with lib; {
-    description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
-    license = licenses.gpl2;
-    homepage = "http://www.pyside.org/docs/apiextractor/";
-    maintainers = [ ];
-    platforms = platforms.all;
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/default.nix b/nixpkgs/pkgs/development/python-modules/pyside/default.nix
deleted file mode 100644
index 82cc62f2c708..000000000000
--- a/nixpkgs/pkgs/development/python-modules/pyside/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, fetchFromGitHub, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa, libGL }:
-
-buildPythonPackage rec {
-  pname = "pyside";
-  version = "1.2.4";
-  format = "other";
-
-  src = fetchFromGitHub {
-    owner = "PySide";
-    repo = "PySide";
-    rev = version;
-    hash = "sha256-14XbihJRMk9WaeK6NUBV/4OMFZF8EBIJgEJEaCU8Ecg=";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  preConfigure = ''
-    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
-  '';
-
-  nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
-
-  buildInputs = [ mesa libGL ];
-
-  makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ];
-
-  dontWrapQtApps = true;
-
-  meta = {
-    description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
-    license = lib.licenses.lgpl21;
-    homepage = "http://www.pyside.org";
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch b/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch
deleted file mode 100644
index 440e94508c57..000000000000
--- a/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Shiboken-1.2.4.org/tests/libsample/simplefile.cpp	2017-08-26 09:06:27.216859143 +0100
-+++ Shiboken-1.2.4/tests/libsample/simplefile.cpp	2017-08-26 09:05:40.037029652 +0100
-@@ -90,13 +90,13 @@
- SimpleFile::exists() const
- {
-     std::ifstream ifile(p->m_filename);
--    return ifile;
-+    return (bool)ifile;
- }
- 
- bool
- SimpleFile::exists(const char* filename)
- {
-     std::ifstream ifile(filename);
--    return ifile;
-+    return (bool)ifile;
- }
- 
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix b/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
deleted file mode 100644
index 3d47ccd58f2b..000000000000
--- a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pysideApiextractor, python3, qt4 }:
-
-# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
-let
-  pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
-in stdenv.mkDerivation rec {
-  pname = "pyside-generatorrunner";
-  version = "0.6.16";
-
-  src = fetchFromGitHub {
-    owner = "PySide";
-    repo = "Generatorrunner";
-    rev = version;
-    hash = "sha256-JAghKY033RTD5b2elitzVQbbN3PMmT3BHwpqx8N5EYg=";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  preConfigure = ''
-    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
-  '';
-
-  nativeBuildInputs = [ cmake pythonEnv ];
-  buildInputs = [ pysideApiextractor qt4 ];
-
-  meta = with lib; {
-    description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
-    license = licenses.gpl2;
-    homepage = "http://www.pyside.org/docs/generatorrunner/";
-    maintainers = [ ];
-    platforms = platforms.all;
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix b/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
deleted file mode 100644
index 9bad569806a6..000000000000
--- a/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ lib, fetchFromGitHub, buildPythonPackage
-, cmake
-, fetchurl
-, isPy3k
-, libxml2
-, libxslt
-, pkg-config
-, pysideApiextractor
-, pysideGeneratorrunner
-, python
-, pythonAtLeast
-, qt4
-, sphinx
-}:
-
-buildPythonPackage rec {
-  pname = "pyside-shiboken";
-  version = "1.2.4";
-  format = "other";
-
-  src = fetchFromGitHub {
-    owner = "PySide";
-    repo = "Shiboken";
-    rev = version;
-    sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v";
-  };
-
-  nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ];
-
-  buildInputs = [ python libxml2 libxslt ];
-
-  outputs = [ "out" "dev" ];
-
-  preConfigure = ''
-    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
-    echo "preConfigure: Fixing shiboken_generator install target."
-    substituteInPlace generator/CMakeLists.txt --replace \
-      \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
-  '';
-
-  patches = [
-    # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
-    ./gcc6.patch
-    (lib.optional (pythonAtLeast "3.5") ./shiboken_py35.patch)
-    (fetchurl {
-      # https://github.com/pyside/Shiboken/pull/90
-      name = "fix-build-with-python-3.9.patch";
-      url = "https://github.com/pyside/Shiboken/commit/d1c901d4c0af581003553865360ba964cda041e8.patch";
-      sha256 = "1f7slz8n8rps5r67hz3hi4rr82igc3l166shfy6647ivsb2fnxwy";
-    })
-  ];
-
-  cmakeFlags = lib.optionals isPy3k [
-    "-DUSE_PYTHON3=TRUE"
-    "-DPYTHON3_INCLUDE_DIR=${lib.getDev python}/include/${python.libPrefix}"
-    "-DPYTHON3_LIBRARY=${lib.getLib python}/lib"
-  ];
-
-  meta = with lib; {
-    description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
-    license = licenses.gpl2;
-    homepage = "http://www.pyside.org/";
-    maintainers = [ ];
-    platforms = platforms.all;
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch b/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch
deleted file mode 100644
index fb095cf991cf..000000000000
--- a/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake
---- a/cmake/Modules/FindPython3Libs.cmake
-+++ b/cmake/Modules/FindPython3Libs.cmake
-@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks)
- # Search for the python framework on Apple.
- # CMAKE_FIND_FRAMEWORKS(Python)
- 
--FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0)
-+FOREACH(_CURRENT_VERSION 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-   IF(_CURRENT_VERSION GREATER 3.1)
-       SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
-   ELSE()
diff --git a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix b/nixpkgs/pkgs/development/python-modules/pyside/tools.nix
deleted file mode 100644
index cc52a0502f28..000000000000
--- a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, cmake, qt4, pyside, pysideShiboken }:
-
-buildPythonPackage rec {
-  pname = "pyside-tools";
-  version = "0.2.15";
-  format = "other";
-
-  src = fetchFromGitHub {
-    owner = "PySide";
-    repo = "Tools";
-    rev = version;
-    sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  preConfigure = ''
-    cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
-  '';
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ qt4 ];
-
-  propagatedBuildInputs = [ pyside pysideShiboken ];
-
-  meta = with lib; {
-    description = "Development tools (pyside-uic/rcc/lupdate) for PySide, the LGPL-licensed Python bindings for the Qt framework";
-    license = licenses.gpl2;
-    homepage = "https://wiki.qt.io/PySide";
-    maintainers = [ ];
-    platforms = platforms.all;
-  };
-}