diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-09-28 04:11:31 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-10-06 07:24:32 +0200 |
commit | b159458c34314c1cb46da42b9aa071ce9a61268a (patch) | |
tree | 7e79e179135f11be0a35316642663d322b542004 /pkgs/applications/networking/browsers/chromium/source | |
parent | 5b80f24b9d287b3c4eff5d336665bf5da8b9b75e (diff) | |
download | nixpkgs-b159458c34314c1cb46da42b9aa071ce9a61268a.tar nixpkgs-b159458c34314c1cb46da42b9aa071ce9a61268a.tar.gz nixpkgs-b159458c34314c1cb46da42b9aa071ce9a61268a.tar.bz2 nixpkgs-b159458c34314c1cb46da42b9aa071ce9a61268a.tar.lz nixpkgs-b159458c34314c1cb46da42b9aa071ce9a61268a.tar.xz nixpkgs-b159458c34314c1cb46da42b9aa071ce9a61268a.tar.zst nixpkgs-b159458c34314c1cb46da42b9aa071ce9a61268a.zip |
chromium: Update all channels to latest versions.
With this commit, the following new upstream versions are introduced: stable: 37.0.2062.94 -> 37.0.2062.120 beta: 38.0.2125.24 -> 38.0.2125.101 dev: 39.0.2138.3 -> 39.0.2171.7 All channels built fine on my machine and were tested against a few sites. The missing_alg_import.patch now is no longer needed for version 39, so we're not applying it there anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/source')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/source/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/source/sources.nix | 24 |
2 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 91c6ada5138..5494b370817 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = [ ./sandbox_userns_36.patch ./missing_alg_import.patch ]; + patches = let + onPre39 = optional (versionOlder version "39.0.0.0"); + in [ ./sandbox_userns_36.patch ] ++ onPre39 ./missing_alg_import.patch; postPatch = '' sed -i -r \ diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 27ba9420f43..e85369f763b 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "39.0.2138.3"; - sha256 = "0adkzv4ydrg02prcacqx3gk8v0ivvs57qisf220wzzicgpzklm26"; - sha256bin32 = "0rskbr55nhvpmmw6bl90iv2lr0f2chra3r5c92j3ica307y12f2q"; - sha256bin64 = "0gdyyaxiaq50jpwhvai6d67ypgjxqn8kp9fqix6nbwj4fnmdfcjx"; + version = "39.0.2171.7"; + sha256 = "1wxi601zsi10jw7ypa4i0a2g5hd3hqrb5pqkkry1pgbdimw69sb8"; + sha256bin32 = "11isyislr5mbbhwk625b347xyyp1x3xgws844sjbbcx83gf0ij7y"; + sha256bin64 = "16b0yzlm8j7kx8pc6fhzwiizl7zrzxmfal40q45848715jyln8hf"; }; beta = { - version = "38.0.2125.24"; - sha256 = "07v4vk7sc54d2hzgfms0b71cc7z6h85v9d39j110kzk0w1bpk3gy"; - sha256bin32 = "0l26ci7sqi755cm017qmbcqk74rqja5c08cbzf5v4chsa773qn0m"; - sha256bin64 = "1ibx40ijjj8z0smpzh5v6y611c57qm5raldk48h5dd1flqbgz0nr"; + version = "38.0.2125.101"; + sha256 = "12hrl7i0xrjdwz8yaap5jhc6bzn29pk6dcz96743n6j7mcckac6k"; + sha256bin32 = "178nffl5pgqajg7vxxisycl79vnyv1iqqz04riywgj88mw7mjwpg"; + sha256bin64 = "0akwvnl987w8wli4h4k2x8xnpkzk9n8hn9wbp1lw87ch08sr7zfm"; }; stable = { - version = "37.0.2062.94"; - sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j"; - sha256bin32 = "0vszphfz4mnw08yc6bid4g6q2w4f5smvfhlzyb2vvv65ndr64b8k"; - sha256bin64 = "0h4fb7v0b1w9d47iy6fk5g0fpzgczps7nzmknyk7vx68ybi39ssw"; + version = "37.0.2062.120"; + sha256 = "1yvf1hzza5cdsa67dg302ifcwb759r8sf2z21p9q9wyanrc3f1xk"; + sha256bin32 = "07zwf5yn3ig8x9ysjdpm7w1fh4rcyxzfsnqvxmabc0bkrv2r1hg7"; + sha256bin64 = "02qc5qq5v9k55c5bxmndjh1xl6j1qaxk7k4r8mm0k5nxxyqih1p2"; }; } |