diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-05-27 16:59:16 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-05-29 22:16:07 +0200 |
| commit | 872860e6de8e460fb11a79c46b8092bdcff35da8 (patch) | |
| tree | 350d024112c4a27198abb0aa8eb737f81e39db10 /pkgs/development/interpreters | |
| parent | db3b440150f61ec8dcc5a9ecc30dc54c7dd275b9 (diff) | |
| parent | 8d54dc6d13ac3b42e45d95a2cfb971e7c01ad39c (diff) | |
| download | nixlib-872860e6de8e460fb11a79c46b8092bdcff35da8.tar nixlib-872860e6de8e460fb11a79c46b8092bdcff35da8.tar.gz nixlib-872860e6de8e460fb11a79c46b8092bdcff35da8.tar.bz2 nixlib-872860e6de8e460fb11a79c46b8092bdcff35da8.tar.lz nixlib-872860e6de8e460fb11a79c46b8092bdcff35da8.tar.xz nixlib-872860e6de8e460fb11a79c46b8092bdcff35da8.tar.zst nixlib-872860e6de8e460fb11a79c46b8092bdcff35da8.zip | |
Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
Diffstat (limited to 'pkgs/development/interpreters')
5 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index eeadc3c8cc7f..9b7fcf14b572 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -84,6 +84,8 @@ let ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} + + paxmark E $out/bin/python${majorVersion} ''; passthru = { diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index d744fa9672f1..f9f68b9323e1 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + + paxmark E $out/bin/python${majorVersion} ''; passthru = { diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index d5402c5cb033..c8d4b69b4309 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -54,6 +54,8 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + + paxmark E $out/bin/python${majorVersion} ''; passthru = { diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index 3f484426a106..fc4546bc09e2 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -28,7 +28,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522 + preCheck = '' + rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 + + paxmark m shell/js17 + paxmark mr jsapi-tests/jsapi-tests + ''; meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index d4af39ea16bd..6fc4bcb9dea8 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -28,7 +28,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522 + + preCheck = '' + rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 + + paxmark mr shell/js + paxmark mr jsapi-tests/jsapi-tests + ''; meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; |