public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit staging+systemd into closure-size

Browse Source 
Many non-conflict problems weren't (fully) resolved in this commit yet.
This commit is contained in:
Vladimír Čunát
2015-10-03 13:33:13 +02:00
parent d6dd3b8bd1 33373d939a
commit 5227fb1dd5
6304 changed files with 708456 additions and 130039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/selenium/chromedriver/default.nix
View File

@@ -7,10 +7,12 @@
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "chromedriver_linux64";
product = "chromedriver_linux64";
name = "${product}-2.14";
version = "2.14";
src = fetchurl {
url = "http://chromedriver.storage.googleapis.com/2.14/${name}.zip";
url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip";
sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin";
};

10
pkgs/development/tools/selenium/server/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xlibs
{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg
, chromedriver, chromeSupport ? true }:
with stdenv.lib;
@@ -10,11 +10,11 @@ let
in stdenv.mkDerivation rec {
name = "selenium-server-standalone-${version}";
version = "2.44.0";
version = "2.45.0";
src = fetchurl {
url = "http://selenium-release.storage.googleapis.com/2.44/selenium-server-standalone-2.44.0.jar";
sha256 = "1n53pyrxpmfh9lvr68d1l9rsiw7qr36farirpl3ivkyvnpm5iwm5";
url = "http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar";
sha256 = "0yvmmngqff3k5si1js8v87nx3whlsx7q4p78v6ybqhsbv6idywhi";
};
unpackPhase = "true";
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
${jdk}/bin/jar xf $src launchers/launcher-linux-amd64
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xlibs.libX11}/lib" \
--set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \
launchers/launcher-linux-${arch}
${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}
'';