Merge pull request #169872 from armeenm/remove-phantomjs2

phantomjs2: remove
main
davidak 2 years ago committed by GitHub
commit 4aae058c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      pkgs/development/node-packages/default.nix
  2. 117
      pkgs/development/tools/phantomjs2/default.nix
  3. 13
      pkgs/development/tools/phantomjs2/system-qtbase.patch
  4. 4
      pkgs/development/web/remarkjs/default.nix
  5. 6
      pkgs/tools/misc/youtube-dl/default.nix
  6. 5
      pkgs/tools/misc/yt-dlp/default.nix
  7. 2
      pkgs/top-level/aliases.nix
  8. 2
      pkgs/top-level/all-packages.nix
  9. 2
      pkgs/top-level/python-packages.nix

@ -111,10 +111,6 @@ let
meta.broken = since "10";
};
jshint = super.jshint.override {
buildInputs = [ pkgs.phantomjs2 ];
};
dat = super.dat.override {
buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ];
meta.broken = since "12";

@ -1,117 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg
, libpng, perl, python2, ruby, sqlite, qtwebkit, qmake, qtbase
, darwin, writeScriptBin, cups, makeWrapper
}:
let
fakeClang = writeScriptBin "clang" ''
#!${stdenv.shell}
if [[ "$@" == *.c ]]; then
exec "${stdenv.cc}/bin/clang" "$@"
else
exec "${stdenv.cc}/bin/clang++" "$@"
fi
'';
in stdenv.mkDerivation rec {
pname = "phantomjs";
version = "2.1.1";
src = fetchFromGitHub {
owner = "ariya";
repo = "phantomjs";
rev = version;
sha256 = "1zsbpk1sgh9a16f1a5nx3qvk77ibjn812wqkxqck8n6fia85m5iq";
};
nativeBuildInputs = [ qmake makeWrapper ];
buildInputs = [
bison flex fontconfig freetype gperf icu openssl
libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AGL ApplicationServices AppKit Cocoa OpenGL
darwin.libobjc fakeClang cups
]);
patches = [
(fetchpatch {
url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-hardening.patch";
sha256 = "1qs1r76w90qgpw742i7lf0y3b7m9zh5wxcbrhrak6mq1kqaphqb5";
})
(fetchpatch {
url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt-components.patch";
sha256 = "1fw2q59aqcks3abvwkqg9903yif6aivdsznc0h6frhhjvpp19vsb";
})
(fetchpatch {
url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-evaluateJavaScript.patch";
sha256 = "1avig9cfny8kv3s4mf3mdzvf3xlzgyh351yzwc4bkpnjvzv4fmq6";
})
(fetchpatch {
url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-no-websecurity.patch";
sha256 = "1nykqpxa7lcf9iarz5lywgg3v3b1h19iwvjdg4kgq0ai6idhcab8";
})
(fetchpatch {
url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-print.patch";
sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw";
})
(fetchpatch {
url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/unlock-qt.patch";
sha256 = "13bwz4iw17d6hq5pwkbpcckqyw7fhc6648lvs26m39pp31zwyp03";
})
./system-qtbase.patch
];
postPatch = ''
patchShebangs .
substituteInPlace src/phantomjs.pro \
--replace "QT_MINOR_VERSION, 5" "QT_MINOR_VERSION, 9"
'';
# Avoids error in webpage.cpp:80:89:
# invalid suffix on literal; C++11 requires a space between litend identifier
NIX_CFLAGS_COMPILE = "-Wno-reserved-user-defined-literal";
__impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
dontWrapQtApps = true;
installPhase = ''
mkdir -p $out/share/doc/phantomjs
cp -a bin $out
cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs
'' + lib.optionalString stdenv.isDarwin ''
install_name_tool -change \
${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \
/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \
-change \
${darwin.configd}/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration \
/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration \
$out/bin/phantomjs
'' + ''
wrapProgram $out/bin/phantomjs \
--set QT_QPA_PLATFORM offscreen \
--prefix PATH : ${lib.makeBinPath [ qtbase ]}
'';
meta = with lib; {
description = "Headless WebKit with JavaScript API";
longDescription = ''
PhantomJS2 is a headless WebKit with JavaScript API.
It has fast and native support for various web standards:
DOM handling, CSS selector, JSON, Canvas, and SVG.
PhantomJS is an optimal solution for:
- Headless Website Testing
- Screen Capture
- Page Automation
- Network Monitoring
'';
homepage = "https://phantomjs.org/";
license = licenses.bsd3;
maintainers = [ maintainers.aflatter ];
platforms = platforms.darwin ++ platforms.linux;
};
}

@ -1,13 +0,0 @@
--- a/build.py
+++ b/build.py
@@ -80,9 +80,9 @@
def qmakePath():
exe = "qmake"
if platform.system() == "Windows":
exe += ".exe"
- return os.path.abspath("src/qt/qtbase/bin/" + exe)
+ return os.path.abspath("@qtbase@" + exe)
# returns paths for 3rd party libraries (Windows only)
def findThirdPartyDeps():
include_dirs = []

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, nodejs, phantomjs2, pkgs }:
{ stdenv, lib, fetchFromGitHub, nodejs, pkgs }:
with lib;
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-zhHuW4pBqXQEBlSxuyvHKh+ftyIdcqpYgIZZHArUtns=";
};
buildInputs = [ nodejs phantomjs2 ] ++ (with nodePackages; [
buildInputs = [ nodejs ] ++ (with nodePackages; [
marked
browserify
uglify-js

@ -1,5 +1,5 @@
{ lib, fetchurl, fetchpatch, buildPythonPackage
, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc
# Pandoc is required to build the package's man page. Release tarballs contain a
# formatted man page already, though, it will still be installed. We keep the
# manpage argument in place in case someone wants to use this derivation to
@ -8,7 +8,6 @@
, generateManPage ? false
, ffmpegSupport ? true
, rtmpSupport ? true
, phantomjsSupport ? false
, hlsEncryptedSupport ? true
, installShellFiles, makeWrapper }:
@ -52,8 +51,7 @@ buildPythonPackage rec {
packagesToBinPath =
[ atomicparsley ]
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional rtmpSupport rtmpdump
++ lib.optional phantomjsSupport phantomjs2;
++ lib.optional rtmpSupport rtmpdump;
in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];
setupPyBuildFlags = [

@ -5,7 +5,6 @@
, certifi
, ffmpeg
, rtmpdump
, phantomjs2
, atomicparsley
, pycryptodomex
, websockets
@ -13,7 +12,6 @@
, atomicparsleySupport ? true
, ffmpegSupport ? true
, rtmpSupport ? true
, phantomjsSupport ? false
, withAlias ? false # Provides bin/youtube-dl for backcompat
}:
@ -41,8 +39,7 @@ buildPythonPackage rec {
packagesToBinPath = []
++ lib.optional atomicparsleySupport atomicparsley
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional rtmpSupport rtmpdump
++ lib.optional phantomjsSupport phantomjs2;
++ lib.optional rtmpSupport rtmpdump;
in lib.optionalString (packagesToBinPath != [])
[ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];

@ -941,8 +941,8 @@ mapAliases ({
pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22
pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22
phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20
phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22
philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26
# Obsolete PHP version aliases
php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03
php73Packages = php73; # Added 2021-06-03

@ -15933,8 +15933,6 @@ with pkgs;
pgcli = pkgs.python3Packages.pgcli;
phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { };
picotool = callPackage ../development/tools/picotool { };
pmccabe = callPackage ../development/tools/misc/pmccabe { };

@ -11194,7 +11194,6 @@ in {
youtube-dl-light = callPackage ../tools/misc/youtube-dl {
ffmpegSupport = false;
phantomjsSupport = false;
};
yoyo-migrations = callPackage ../development/python-modules/yoyo-migrations { };
@ -11204,7 +11203,6 @@ in {
yt-dlp-light = callPackage ../tools/misc/yt-dlp {
atomicparsleySupport = false;
ffmpegSupport = false;
phantomjsSupport = false;
rtmpSupport = false;
};

Loading…
Cancel
Save