diff options
author | Samuel Leathers <disasm@gmail.com> | 2017-11-07 13:17:02 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-07 13:17:02 -0500 |
commit | 3641da1ef181bea715e071e666b858b776e586d7 (patch) | |
tree | 1fe566f775a0198b7ae25808ae2aa161e82d77d8 /pkgs/top-level | |
parent | 6c27c7e695bd073ecc983a3e6cc0852f62c1bf0f (diff) | |
parent | f07ae8902d09b8ebaf7d3c4d15081dc9edf2550d (diff) | |
download | nixlib-3641da1ef181bea715e071e666b858b776e586d7.tar nixlib-3641da1ef181bea715e071e666b858b776e586d7.tar.gz nixlib-3641da1ef181bea715e071e666b858b776e586d7.tar.bz2 nixlib-3641da1ef181bea715e071e666b858b776e586d7.tar.lz nixlib-3641da1ef181bea715e071e666b858b776e586d7.tar.xz nixlib-3641da1ef181bea715e071e666b858b776e586d7.tar.zst nixlib-3641da1ef181bea715e071e666b858b776e586d7.zip |
Merge pull request #31114 from jraygauthier/jrg/python_selenium_update
selenium: 2.52.0 -> 3.6.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 31 |
2 files changed, 3 insertions, 30 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a738d18b64c4..97aed40e0b19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1080,6 +1080,8 @@ with pkgs; go-dependency-manager = callPackage ../development/tools/gdm { }; + geckodriver = callPackage ../development/tools/geckodriver { }; + geekbench = callPackage ../tools/misc/geekbench { }; gencfsm = callPackage ../tools/security/gencfsm { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d278f5f4f9a..b393e4e9131e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18037,36 +18037,7 @@ in { seaborn = callPackage ../development/python-modules/seaborn { }; - selenium = buildPythonPackage rec { - name = "selenium-2.52.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/selenium/${name}.tar.gz"; - sha256 = "0971rd9b8kb97xp9fvrwzvxr8vqfdjc020cs75n787ya82km01c2"; - }; - - buildInputs = with self; [pkgs.xorg.libX11]; - - # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some - # absolute paths. Replaced by relative path so it is found when used in nix. - x_ignore_nofocus = - pkgs.fetchFromGitHub { - owner = "SeleniumHQ"; - repo = "selenium"; - rev = "selenium-2.52.0"; - sha256 = "1n58akim9np2jy22jfgichq1ckvm8gglqi2hn3syphh0jjqq6cfx"; - }; - - patchPhase = '' - cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11.out}/lib/libX11.so.6" - gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o - gcc -shared \ - -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ - -o x_ignore_nofocus.so \ - x_ignore_nofocus.o - cp -v x_ignore_nofocus.so py/selenium/webdriver/firefox/${if pkgs.stdenv.is64bit then "amd64" else "x86"}/ - ''; - }; + selenium = callPackage ../development/python-modules/selenium { }; serpy = callPackage ../development/python-modules/serpy { }; |