Merge pull request #249159 from ionutnechita/local/yandex-browser-update-2023Q3

yandex-browser: 23.7.1.1215-1 -> 23.9.1.962-1

authored by Weijia Wang and committed by GitHub 60ffc2aa b644d97b

+41 -8
+37 -8
pkgs/applications/networking/browsers/yandex-browser/default.nix
··· 47 47 , at-spi2-atk 48 48 , at-spi2-core 49 49 , libqt5pas 50 + , qt6 51 + , vivaldi-ffmpeg-codecs 52 + , edition ? "stable" 50 53 }: 51 54 52 - stdenv.mkDerivation rec { 53 - pname = "yandex-browser"; 54 - version = "23.7.1.1148-1"; 55 + let 56 + version = { 57 + corporate = "23.9.1.1016-1"; 58 + beta = "23.9.1.1028-1"; 59 + stable = "23.9.1.962-1"; 60 + }.${edition}; 61 + 62 + hash = { 63 + corporate = "sha256-A/MjphA6vefDzPmShpPbgjDTl4WnCiZWuHofy1Djrzc="; 64 + beta = "sha256-vnz1weMwR3V/mBNzrJ0iqnA/aifYTCucW+9kyy/0SnA="; 65 + stable = "sha256-VrDqFLvK7RdnV6Yt1DILu7mV1WFcilOH5+VKlCdpXjc="; 66 + }.${edition}; 67 + 68 + app = { 69 + corporate = ""; 70 + beta = "-beta"; 71 + stable = ""; 72 + }.${edition}; 73 + 74 + in stdenv.mkDerivation rec { 75 + pname = "yandex-browser-${edition}"; 76 + inherit version; 55 77 56 78 src = fetchurl { 57 - url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; 58 - sha256 = "sha256-SJbuT2MnsXcqOSk4xCUokseDotjbWgAnvwnfNPF9zi4="; 79 + url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}/${pname}_${version}_amd64.deb"; 80 + inherit hash; 59 81 }; 60 82 61 83 nativeBuildInputs = [ 62 84 autoPatchelfHook 85 + qt6.wrapQtAppsHook 63 86 wrapGAppsHook 64 87 ]; 65 88 ··· 108 131 pango 109 132 stdenv.cc.cc.lib 110 133 libqt5pas 134 + qt6.qtbase 111 135 ]; 112 136 113 137 unpackPhase = '' ··· 118 142 119 143 installPhase = '' 120 144 cp $TMP/ya/{usr/share,opt} $out/ -R 121 - substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/ 122 - ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser 123 - ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser-beta 145 + cp $out/share/applications/yandex-browser${app}.desktop $out/share/applications/${pname}.desktop || true 146 + rm -f $out/share/applications/yandex-browser.desktop 147 + substituteInPlace $out/share/applications/${pname}.desktop --replace /usr/ $out/ 148 + substituteInPlace $out/share/menu/yandex-browser${app}.menu --replace /opt/ $out/opt/ 149 + substituteInPlace $out/share/gnome-control-center/default-apps/yandex-browser${app}.xml --replace /opt/ $out/opt/ 150 + ln -sf ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so $out/opt/yandex/browser${app}/libffmpeg.so 151 + ln -sf $out/opt/yandex/browser${app}/yandex-browser${app} $out/bin/${pname} 124 152 ''; 125 153 126 154 runtimeDependencies = map lib.getLib [ 127 155 libpulseaudio 128 156 curl 129 157 systemd 158 + vivaldi-ffmpeg-codecs 130 159 ] ++ buildInputs; 131 160 132 161 meta = with lib; {
+4
pkgs/top-level/all-packages.nix
··· 41538 41538 41539 41539 yandex-browser = callPackage ../applications/networking/browsers/yandex-browser { }; 41540 41540 41541 + yandex-browser-beta = yandex-browser.override { edition = "beta"; }; 41542 + 41543 + yandex-browser-corporate = yandex-browser.override { edition = "corporate"; }; 41544 + 41541 41545 yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; 41542 41546 41543 41547 yara = callPackage ../tools/security/yara { };