diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /pkgs/applications/networking/browsers | |
parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'pkgs/applications/networking/browsers')
3 files changed, 26 insertions, 24 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 07606fb20f542..c74ddffb4b5af 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -9,6 +9,15 @@ rec { sha512 = "30ced2fff818858267eaab23974f6962c5d39433ce8e26507589535fc9348f00cf5e45b90997dfb6e2361b70900547fdb0e70d741127cc6705089ea585ea2296"; }; + # This patch could be applied anywhere (just rebuild, no effect) + extraPatches = lib.optionals stdenv.isAarch64 [ + (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1791275 + name = "no-sysctl-aarch64.patch"; + url = "https://hg.mozilla.org/mozilla-central/raw-rev/0efaf5a00aaceeed679885e4cd393bd9a5fcd0ff"; + hash = "sha256-wS/KufeLFxCexQalGGNg8+vnQhzDiL79OLt8FtL/JJ8="; + }) + ]; + meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4f10e76d0e4f4..87911ced5499e 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -100,9 +100,7 @@ buildPythonApplication { dontWrapGApps = true; dontWrapQtApps = true; - preConfigure = '' - a2x -f manpage doc/qutebrowser.1.asciidoc - '' + lib.optionalString isQt6 '' + preConfigure = lib.optionalString isQt6 '' python scripts/asciidoc2html.py ''; @@ -114,25 +112,20 @@ buildPythonApplication { sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; - postInstall = '' - install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" - install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ - "$out/share/applications/org.qutebrowser.qutebrowser.desktop" - - # Install icons - for i in 16 24 32 48 64 128 256 512; do - install -Dm644 "${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser-''${i}x''${i}.png" \ - "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png" - done - install -Dm644 ${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser.svg \ - "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" + installPhase = '' + runHook preInstall - # Install scripts - sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh - ${lib.optionalString isQt6 "rm -rf scripts/{testbrowser,dev}"} - install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) - install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* + make -f misc/Makefile \ + PYTHON=${python3}/bin/python3 \ + PREFIX=. \ + DESTDIR="$out" \ + DATAROOTDIR=/share \ + install + runHook postInstall + ''; + + postInstall = '' # Patch python scripts buildPythonPath "$out $propagatedBuildInputs" scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/) @@ -156,10 +149,10 @@ buildPythonApplication { ''; meta = with lib; { - homepage = "https://github.com/The-Compiler/qutebrowser"; + homepage = "https://github.com/qutebrowser/qutebrowser"; description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ]; platforms = if enableWideVine then [ "x86_64-linux" ] else backendPackage.meta.platforms; + maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda nrdxp ]; }; } diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index bc64ac840d20c..d9374cf65d1e9 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "22.1.3.907-1"; + version = "22.9.1.1110-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-7dbFqNzZP2CyseK0xD9zcvecIuueZfMy5KgN8gRRLEk="; + sha256 = "sha256-u6pY7AmXgnkSVuko+PUyhDqY72i+UHv7qmePbu2wAf0="; }; nativeBuildInputs = [ |