summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-03-13 12:23:22 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-03-13 12:23:22 +0100
commitc6834ab5276c81d80d22b7b172fe92783f537123 (patch)
treefb4e1c35c44d443cbef82c8b76b55fc049e6985b /pkgs
parent443b25992f9c80af3c0e0f9d629f2c902d1c4619 (diff)
parenta62f100ec37506ee9a310f4aee59db73d7dcc507 (diff)
downloadnixlib-c6834ab5276c81d80d22b7b172fe92783f537123.tar
nixlib-c6834ab5276c81d80d22b7b172fe92783f537123.tar.gz
nixlib-c6834ab5276c81d80d22b7b172fe92783f537123.tar.bz2
nixlib-c6834ab5276c81d80d22b7b172fe92783f537123.tar.lz
nixlib-c6834ab5276c81d80d22b7b172fe92783f537123.tar.xz
nixlib-c6834ab5276c81d80d22b7b172fe92783f537123.tar.zst
nixlib-c6834ab5276c81d80d22b7b172fe92783f537123.zip
Merge pull request #13821 (update chromium)
This is just a minor upgrade, even though the commit message says it's
to major version 50. However, the CVEs listed there are for real, see
the following announcement:

http://googlechromereleases.blogspot.de/2016/03/stable-channel-update_8.html

The summary of updated packages:

stable: 49.0.2623.75 -> 49.0.2623.87
beta:   49.0.2623.75 -> 50.0.2661.26
dev:    50.0.2661.11 -> 50.0.2661.18

I've also added two commits, fixing the chdir() in the updater and
shutting up Python precompilation errors during the preBuild phase.

Tested on my Hydra at:

https://headcounter.org/hydra/eval/312166
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/source/sources.nix18
-rwxr-xr-xpkgs/applications/networking/browsers/chromium/update.sh1
3 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 237dfd17ac71..c63f57f934d4 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -183,7 +183,7 @@ let
 
     configurePhase = ''
       # Precompile .pyc files to prevent race conditions during build
-      python -m compileall -q -f . || : # ignore errors
+      python -m compileall -q -f . > /dev/null 2>&1 || : # ignore errors
 
       # This is to ensure expansion of $out.
       libExecPath="${libExecPath}"
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index ffec5c8b8073..c42488e9e1e4 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   beta = {
-    sha256 = "1xc2npbc829nxria1j37kxyy95jkalkkphxgv24if0ibn62lrzd4";
-    sha256bin64 = "1arm15g3vmm3zlvcql3qylw1fhrn5ddzl2v8mkpb3a251m425dsi";
-    version = "49.0.2623.75";
+    sha256 = "1lgpjnjhy3idha5b6wp31kdk6knic96dmajyrgn1701q3mq81g1i";
+    sha256bin64 = "1yb3rk38zfgjzka0aim1xc4r0qaz2qkwaq06mjifpkszmfffhyd0";
+    version = "50.0.2661.26";
   };
   dev = {
-    sha256 = "04j0nyz20gi7vf1javbw06wrqpkfw6vg024i3wkgx42hzd6hjgw4";
-    sha256bin64 = "12ff4q615rwakgpr9v84p55maasqb4vg61s89vgxrlsgqrmkahg4";
-    version = "50.0.2661.11";
+    sha256 = "0z9m1mv6pv43y3ccd0nzqg5f9q8qxc8mlmy9y3dc9kqpvmqggnvp";
+    sha256bin64 = "0khsxci970vclfg24b7m8w1jqfkv5rzswgwa62b4r7jzrglx1azj";
+    version = "50.0.2661.18";
   };
   stable = {
-    sha256 = "1xc2npbc829nxria1j37kxyy95jkalkkphxgv24if0ibn62lrzd4";
-    sha256bin64 = "01qi5jmlmdpy6icc4y51bn5a063mxrnkncg3pbmbl4r02vqca5jh";
-    version = "49.0.2623.75";
+    sha256 = "0kbph3l964bh7cb9yf8nydjaxa20yf8ls5a2vzsj8phz7n20z3f9";
+    sha256bin64 = "1k6nhccdqzzzicwi07nldqfsdlic65i2xfyb7dbasbbg9zl3s9yw";
+    version = "49.0.2623.87";
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
index 05cc671d31ce..14f3dc6bd9d3 100755
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -1,3 +1,4 @@
 #!/bin/sh -e
+cd "$(dirname "$0")"
 sp="$(nix-build -Q --no-out-link source/update.nix -A update)"
 cat "$sp" > source/sources.nix