From 6ac488f2a0305c0f548f83fdcbf3378ce9d76331 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sat, 30 Apr 2016 18:25:03 +0800 Subject: [PATCH 1/5] all-packages.nix: some space cleanup --- pkgs/top-level/all-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ab7940fe723..603e537a5e2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6465,13 +6465,13 @@ in beecrypt = callPackage ../development/libraries/beecrypt { }; beignet = callPackage ../development/libraries/beignet { - inherit (llvmPackages) clang-unwrapped; - inherit (xlibs) libX11; - inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; - inherit (python3Packages) python; - inherit (purePackages) gl; - }; - + inherit (llvmPackages) clang-unwrapped; + inherit (xlibs) libX11; + inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; + inherit (python3Packages) python; + inherit (purePackages) gl; + }; + belle-sip = callPackage ../development/libraries/belle-sip { }; bobcat = callPackage ../development/libraries/bobcat { }; From 60e8d9dfabc6721dfc7a1af4a24bf001390f351d Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sat, 30 Apr 2016 17:11:00 +0800 Subject: [PATCH 2/5] casperjs: refactor a bit --- pkgs/development/tools/casperjs/default.nix | 48 +++++++++++---------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index bd63a0e68eeb..5b4b8cc752d9 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -1,40 +1,42 @@ -{ stdenv, fetchgit, python, phantomjs }: +{ stdenv, fetchFromGitHub, phantomjs, python, nodePackages }: -stdenv.mkDerivation rec { - name = "casperjs-1.0.0-RC5"; +let version = "1.0.0-RC5"; - src = fetchgit { - url = "git://github.com/n1k0/casperjs.git"; - rev = "refs/tags/1.0.0-RC5"; - sha256 = "e7fd6b94b4b304416159196208dea7f6e8841a667df102eb378a698a92f0f2c7"; +in stdenv.mkDerivation rec { + + name = "casperjs-${version}"; + + src = fetchFromGitHub { + owner = "casperjs"; + repo = "casperjs"; + rev = version; + sha256 = "10b25jmh9zmlp77h0p3n9d6bnl3wn4iv3h3qnsrgijfszxyh0wgw"; }; + buildInputs = [ phantomjs python nodePackages.eslint ]; + patchPhase = '' substituteInPlace bin/casperjs --replace "/usr/bin/env python" "${python}/bin/python" \ --replace "'phantomjs'" "'${phantomjs}/bin/phantomjs'" ''; + dontBuild = true; + installPhase = '' - mkdir -p $out/share/casperjs $out/bin - cp -a . $out/share/casperjs/. - ln -s $out/share/casperjs/bin/casperjs $out/bin + mv $PWD $out ''; meta = { - description = "Navigation scripting & testing utility for PhantomJS"; + + description = '' + Navigation scripting & testing utility for PhantomJS and SlimerJS + ''; + longDescription = '' - CasperJS is a navigation scripting & testing utility for PhantomJS. - It eases the process of defining a full navigation scenario and provides useful high-level - functions, methods & syntaxic sugar for doing common tasks such as: - - defining & ordering navigation steps - - filling forms - - clicking links - - capturing screenshots of a page (or an area) - - making assertions on remote DOM - - logging & events - - downloading base64 encoded resources, even binary ones - - catching errors and react accordingly - - writing functional test suites, exporting results as JUnit XML (xUnit) + CasperJS is a navigation scripting & testing utility for PhantomJS and + SlimerJS (still experimental). It eases the process of defining a full + navigation scenario and provides useful high-level functions, methods & + syntactic sugar for doing common tasks. ''; homepage = http://casperjs.org; From 52ec8e2ce4bb4c7cff40571258b148650039b1f9 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sat, 30 Apr 2016 17:11:23 +0800 Subject: [PATCH 3/5] casperjs: update to 1.1.1 --- pkgs/development/tools/casperjs/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index 5b4b8cc752d9..021bbac8b7ce 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, phantomjs, python, nodePackages }: -let version = "1.0.0-RC5"; +let version = "1.1.1"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { owner = "casperjs"; repo = "casperjs"; rev = version; - sha256 = "10b25jmh9zmlp77h0p3n9d6bnl3wn4iv3h3qnsrgijfszxyh0wgw"; + sha256 = "187prrm728xpn0nx9kxfxa4fwd7w25z78nsxfk6a6kl7c5656jpz"; }; buildInputs = [ phantomjs python nodePackages.eslint ]; @@ -22,6 +22,9 @@ in stdenv.mkDerivation rec { dontBuild = true; + doCheck = true; + checkTarget = "test"; + installPhase = '' mv $PWD $out ''; From bb7e3c67537668e1b83006f8236545231ed0c6f0 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sat, 30 Apr 2016 17:13:00 +0800 Subject: [PATCH 4/5] casperjs: update to phantomjs2 --- pkgs/development/tools/casperjs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index 021bbac8b7ce..387a367b3279 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, phantomjs, python, nodePackages }: +{ stdenv, fetchFromGitHub, phantomjs2, python, nodePackages }: let version = "1.1.1"; @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { sha256 = "187prrm728xpn0nx9kxfxa4fwd7w25z78nsxfk6a6kl7c5656jpz"; }; - buildInputs = [ phantomjs python nodePackages.eslint ]; + buildInputs = [ phantomjs2 python nodePackages.eslint ]; patchPhase = '' substituteInPlace bin/casperjs --replace "/usr/bin/env python" "${python}/bin/python" \ - --replace "'phantomjs'" "'${phantomjs}/bin/phantomjs'" + --replace "'phantomjs'" "'${phantomjs2}/bin/phantomjs'" ''; dontBuild = true; From d950d6b786b90d84d460aedbdb76fbb664419057 Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sat, 30 Apr 2016 18:25:52 +0800 Subject: [PATCH 5/5] casperjs: test needs fontconfig --- pkgs/development/tools/casperjs/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index 387a367b3279..a4b9f23c5eb9 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, phantomjs2, python, nodePackages }: +{ stdenv, fetchFromGitHub, fontsConf, phantomjs2, python, nodePackages }: let version = "1.1.1"; @@ -23,7 +23,11 @@ in stdenv.mkDerivation rec { dontBuild = true; doCheck = true; - checkTarget = "test"; + checkPhase = '' + export FONTCONFIG_FILE=${fontsConf} + make test + ''; + installPhase = '' mv $PWD $out diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 603e537a5e2e..7fea61dbf7d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5811,7 +5811,9 @@ in inherit rustc; }; - casperjs = callPackage ../development/tools/casperjs { }; + casperjs = callPackage ../development/tools/casperjs { + inherit (texFunctions) fontsConf; + }; cbrowser = callPackage ../development/tools/misc/cbrowser { };