diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-06 04:11:23 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-06 04:11:23 +0200 |
| commit | 9548028a22f3fbc44a450d5ccedaa722479a23ec (patch) | |
| tree | 4e405124ab321c69cd9997348fc4fec54540c1a2 /pkgs/applications/networking/browsers/chromium/upstream-info.nix | |
| parent | c08e4b9102f1b1bd7cd23cc84c61292f1f45aa7e (diff) | |
| parent | da82aff2b05c684cc8239627b54a30002281e35b (diff) | |
| download | nixpkgs-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar nixpkgs-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.gz nixpkgs-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.bz2 nixpkgs-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.lz nixpkgs-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.xz nixpkgs-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.zst nixpkgs-9548028a22f3fbc44a450d5ccedaa722479a23ec.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/os-specific/linux/cpupower/default.nix
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/upstream-info.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 3fe73c8669c..7b39eb755ef 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; - sha256bin64 = "18833sqqfssjvcmf6v7wj9h9gsc07wr09cms5c0k7f8v9dqysc7r"; - version = "64.0.3282.119"; + sha256 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl"; + sha256bin64 = "0i1g0hv2vji8jx9c973x8nr1ynzsvqjaqcncxj77x6vj9wp0v41p"; + version = "64.0.3282.140"; }; dev = { - sha256 = "04vrcsvlanjljah3pbgfz49ygwr9i6zymr1a09kldrnykv770c5l"; - sha256bin64 = "016s8lh94i0m3zyld32vzqfw1c0s97sa143dyww7x26b2mp93lcc"; - version = "65.0.3322.3"; + sha256 = "1b3gyj55xyqsb439szisfn8c4mnpws3pfzrndrl5kgdd239qrfqz"; + sha256bin64 = "1hmkinzn4gpikjfd8c9j30px3i0x6y8dddn9pyvjzsk6dzfcvknz"; + version = "65.0.3325.31"; }; stable = { - sha256 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; - sha256bin64 = "18a61myi3wlrk9zr7jjad1zi8k0ls9cnl2nyhjibjlwiz3npwbm5"; - version = "64.0.3282.119"; + sha256 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl"; + sha256bin64 = "1zsgcnilip9rxbs51xvnchp87gh4fmgxzrcf9dhfrnldhji17ikj"; + version = "64.0.3282.140"; }; } |