From ae4fe67cd3dd5a28913278a4d687c8a1e66d77ef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 3 May 2018 13:16:55 +0200 Subject: [PATCH 1/3] open-pdf-presenter: remove --- .../misc/open-pdf-presenter/default.nix | 22 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/applications/misc/open-pdf-presenter/default.nix diff --git a/pkgs/applications/misc/open-pdf-presenter/default.nix b/pkgs/applications/misc/open-pdf-presenter/default.nix deleted file mode 100644 index 0f40a236c587..000000000000 --- a/pkgs/applications/misc/open-pdf-presenter/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, pythonPackages }: - -stdenv.mkDerivation rec { - name = "open-pdf-presenter-git-2014-09-23"; - - src = fetchFromGitHub { - owner = "olabini"; - repo = "open-pdf-presenter"; - rev = "f14930871b60b6ba50298c27377605e0a5fdf124"; - sha256 = "1lfqb60zmjmsvzpbz29m8yxlzs2fscingyk8jvisng1y921726rr"; - }; - - buildInputs = [ cmake qt4 pythonPackages.poppler-qt4 ]; - - meta = { - homepage = https://github.com/olabini/open-pdf-presenter; - description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c4e2e09a84..b33cca60b986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4139,8 +4139,6 @@ with pkgs; update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; - open-pdf-presenter = callPackage ../applications/misc/open-pdf-presenter { }; - openvswitch = callPackage ../os-specific/linux/openvswitch { }; optipng = callPackage ../tools/graphics/optipng { From 3ae3c0c093ce4c7b29fb07003290822d6d73a9da Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 3 May 2018 13:17:26 +0200 Subject: [PATCH 2/3] =?UTF-8?q?python2.pkgs.popler=E2=80=94qt4:=20remove?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/python-packages.nix | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7a70a66c651..ca0ee1195cc6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3882,36 +3882,6 @@ in { pomegranate = callPackage ../development/python-modules/pomegranate { }; - poppler-qt4 = buildPythonPackage rec { - name = "poppler-qt4-${version}"; - version = "0.18.1"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-poppler-qt4/" + - "python-poppler-qt4-${version}.tar.gz"; - sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c"; - }; - - propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; - - preBuild = "${python}/bin/${python.executable} setup.py build_ext" + - " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/"; - - NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4.dev}/include/poppler/"; - - meta = { - description = "A Python binding to Poppler-Qt4"; - longDescription = '' - A Python binding to Poppler-Qt4 that aims for completeness - and for being actively maintained. - ''; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ sepi ]; - platforms = platforms.all; - }; - }; - poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; From dc25f36cf9472bde660500c951bbe3f433675d58 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 3 May 2018 13:17:50 +0200 Subject: [PATCH 3/3] poppler_qt4: remove --- pkgs/development/libraries/poppler/qt4.nix | 44 ---------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 46 deletions(-) delete mode 100644 pkgs/development/libraries/poppler/qt4.nix diff --git a/pkgs/development/libraries/poppler/qt4.nix b/pkgs/development/libraries/poppler/qt4.nix deleted file mode 100644 index c82a543413e2..000000000000 --- a/pkgs/development/libraries/poppler/qt4.nix +++ /dev/null @@ -1,44 +0,0 @@ -# TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883) -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty -, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg -, poppler_data, qt4 -}: - -let - # Last version supporting QT4 - version = "0.61.1"; -in -stdenv.mkDerivation rec { - name = "poppler-qt4-${version}"; - - src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; - }; - - outputs = [ "out" "dev" ]; - - buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty; - - propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ]; - - nativeBuildInputs = [ cmake ninja pkgconfig ]; - - cmakeFlags = [ - "-DENABLE_XPDF_HEADERS=on" - "-DENABLE_UTILS=off" - ]; - - meta = with lib; { - homepage = https://poppler.freedesktop.org/; - description = "A PDF rendering library"; - - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - - license = licenses.gpl2; - platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b33cca60b986..b131f9711ea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11029,8 +11029,6 @@ with pkgs; suffix = "min"; }; - poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { }; - poppler_utils = poppler.override { suffix = "utils"; utils = true; }; popt = callPackage ../development/libraries/popt { };