Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f2878422ca1d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1736798a8724
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 6, 2017

  1. vivaldi: 1.6.689.34-1 -> 1.8.770.56-1 

    Add $out/opt/vivaldi/lib to RPATH so that libffmpeg.so distributed
with Vivaldi can be found. Otherwise launching Vivaldi fails.

(cherry picked from commit 9747994)
    @romildo @joachifm
    romildo authored and joachifm committed May 6, 2017
    Copy the full SHA
    fac4593 View commit details

  2. vivaldi: 1.8.770.56-1 -> 1.9.818.44-1 (#25345) 

    (cherry picked from commit f87e4c9)
    @romildo @joachifm
    romildo authored and joachifm committed May 6, 2017
    Copy the full SHA
    6149cd8 View commit details

  3. google-chrome: 57.0.2987.133 -> 58.0.3029.96 

    stable: 57.0.2987.133 -> 58.0.3029.96
beta: 58.0.3029.68 -> 59.0.3071.36
dev: 59.0.3067.0 -> 60.0.3088.3
(cherry picked from commit 4a593e4)
    @benley @joachifm
    benley authored and joachifm committed May 6, 2017
    Copy the full SHA
    1736798 View commit details
Showing with 15 additions and 14 deletions.
  1. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  2. +6 −5 pkgs/applications/networking/browsers/vivaldi/default.nix
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "1q9iqmq5amzfw03jiw18g1w285b6x2qckn8gc60r5m3xx1hbivv2";
sha256bin64 = "1ddhhcydcwwc2pkwm4c8rlr60968zy5vda410g4bwx0v5q7p22q9";
version = "58.0.3029.68";
sha256 = "16m7q5xfbzf1j9figilis56m1ls68v0i4zm9vp0rg64n8xny2qhw";
sha256bin64 = "0wzzmsyp0qvbvbb8g1gjzc572c1gnn442kx3rkvcmdfakjamq93s";
version = "59.0.3071.36";
};
dev = {
sha256 = "0zvnj9n2p057fxx7n4d1qc0nw34qhlsvrx20fwigq96blamckvd8";
sha256bin64 = "1s1r3h7x49bp64lzzphm4jcg7g68l0x7mr3airj3hqii58dvndm0";
version = "59.0.3067.0";
sha256 = "07zw8a4af0f1cqlbgm5v2rbj0bzkc02im8s8ylfhya51lgwa0ypl";
sha256bin64 = "1djamdiywfg4fjll6nbk3fdhd5dc5h1mq5d56m1avf1yx4vyk807";
version = "60.0.3088.3";
};
stable = {
sha256 = "1xwchazqqx0cs9rd15r80kw6p918zp9libx34qlcj8p5lxq1f0bh";
sha256bin64 = "0ggn5rljch36sx0i37qzp6ldcy3ibdj0z9217lqzjq3r7ixsfqja";
version = "57.0.2987.133";
sha256 = "10ai9bzw6b5p6ak2fd90pg8jlk79ahiz21gzm2fx12xmsdxgsf2x";
sha256bin64 = "06k6h93jff9slrmhl3bblq3kskxdp1357jqrzajg2zl23ja47f8m";
version = "58.0.3029.96";
};
}
11 changes: 6 additions & 5 deletions pkgs/applications/networking/browsers/vivaldi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,16 +10,16 @@
}:

let
version = "1.6";
build = "689.34-1";
version = "1.9";
build = "818.44-1";
fullVersion = "stable_${version}.${build}";

info = if stdenv.is64bit then {
arch = "amd64";
sha256 = "0wn98nzlhppmm3g797kiqr9bxxff8l7l110f1w1fnfl93d325hrm";
sha256 = "0apkwgd98ld5k77nplzmk67nz6mb5pi8jyrnkp96m93mr41b08bq";
} else {
arch = "i386";
sha256 = "0agybibfwk5n1gxi8g4rbvvmlq5963df5arz4fyi4a1hcayllaz0";
sha256 = "0xyf0z1cnzmb3pv6rgsbd7jdjf1v137priz4kkymr8jgmpq0mmfx ";
};

in stdenv.mkDerivation rec {
@@ -47,7 +47,8 @@ in stdenv.mkDerivation rec {

libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.is64bit)
(":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
(":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs)
+ ":$out/opt/vivaldi/lib";

buildPhase = ''
echo "Patching Vivaldi binaries"