diff options
Diffstat (limited to 'pkgs/applications/networking')
6 files changed, 46 insertions, 21 deletions
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index ce2392ab4edca..a3f5b32369730 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, fetchzip, python3 -, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking +{ stdenv, lib, fetchurl, fetchzip, fetchFromGitHub, python3 +, wrapQtAppsHook, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true @@ -7,35 +7,56 @@ , backend ? "webengine" , pipewireSupport ? stdenv.isLinux , pipewire_0_2 -}: +, qtwayland +, mkDerivationWith ? null +, qtbase ? null +, qtwebengine ? null +, wrapGAppsHook ? null +}: let + isQt6 = mkDerivationWith == null; -assert withMediaPlayback -> gst_all_1 != null; - -let python3Packages = python3.pkgs; pdfjs = let version = "2.14.305"; in - fetchzip rec { + fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; hash = "sha256-E7t+0AUndrgi4zfJth0w28RmWLqLyXMUCnueNf/gNi4="; stripRoot = false; }; backendPackage = - if backend == "webengine" then python3Packages.pyqtwebengine else + if backend == "webengine" then if isQt6 then python3Packages.pyqt6-webengine else python3Packages.pyqtwebengine else if backend == "webkit" then python3Packages.pyqt5_with_qtwebkit else throw '' Unknown qutebrowser backend "${backend}". Valid choices are qtwebengine (recommended) or qtwebkit. ''; -in mkDerivationWith python3Packages.buildPythonApplication rec { + buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication; + pname = "qutebrowser"; - version = "2.5.2"; + version = if isQt6 then "unstable-2022-09-16" else "2.5.2"; +in + +assert withMediaPlayback -> gst_all_1 != null; +assert isQt6 -> backend != "webkit"; + +buildPythonApplication { + inherit pname version; + + src = if isQt6 then + # comes from qt6-v2 branch of upstream + # https://github.com/qutebrowser/qutebrowser/issues/7202 + fetchFromGitHub { + owner = "qutebrowser"; + repo = "qutebrowser"; + rev = "5e11e6c7d413cf5c77056ba871a545aae1cfd66a"; + sha256 = "sha256-5HNzPO07lUQe/Q3Nb4JiS9kb9GMQ5/FqM5029vLNNWo="; + } # the release tarballs are different from the git checkout! - src = fetchurl { + else fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg="; }; @@ -66,6 +87,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { adblock ] ++ lib.optional (pythonOlder "3.9") importlib-resources + ++ lib.optional stdenv.isLinux qtwayland ); patches = [ @@ -94,14 +116,15 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { # Install icons for i in 16 24 32 48 64 128 256 512; do - install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \ + install -Dm644 "qutebrowser/icons/qutebrowser-''${i}x''${i}.png" \ "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png" done - install -Dm644 icons/qutebrowser.svg \ + install -Dm644 ${if isQt6 then "qutebrowser/" else ""}icons/qutebrowser.svg \ "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" # Install scripts sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh + ${if isQt6 then "rm -rf scripts/{testbrowser,dev}" else ""} install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 1d799c9fe9fdd..3fd45f3e9c28d 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.3.9"; + version = "3.4.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-BDanFiLhucNE4uvUxKDXAK1W755VfNytQ3gXuLIKfSE="; + sha256 = "sha256-bAfND84mbJulv0IO6JF2c+ZbwKeND8AVAJHmdMmhZ/s="; }; - vendorSha256 = "sha256-303+LE3n3lltuCf+Pc7S+qHdsjQDt9IAu9Kd4sUaiYI="; + vendorSha256 = "sha256-S4p56/OZpufpi71aueYTvPcM4LoZWyAhcAzUUUrUw4Q="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 23914a6a9fe82..c3c6355cd0cfc 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mrTtg60LZpRONrEhX53EhSYpfdfGMvPK4WhTHeAKsoQ="; + sha256 = "sha256-8dCmORfTMFHSyc9FOpL01ywxGcH3uolzD2aOtyy191Q="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index aa5b0fcc4b063..48f2f2e1fe0f1 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -96,7 +96,7 @@ gcc12Stdenv.mkDerivation rec { meta = with lib; { description = "Open Source File Synchronization & Backup Software"; homepage = "https://freefilesync.org"; - license = licenses.gpl3Only; + license = [ licenses.gpl3Only licenses.openssl licenses.curl licenses.libssh2 ]; maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index a7c7c30206fba..6a5f898348cf2 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-FjRrAswoE1yuDoR42U3ppzvEvFN6K/VBdQ0w99wXPtM="; + sha256 = "sha256-kXpGaGp9OWdDa1q3hx7nrD1ZeKH5CKlTgZbyuNZ05/8="; }; buildInputs = [ diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 70cb96ed1364f..1772f611ea484 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -30,6 +30,8 @@ python.pkgs.buildPythonApplication rec { sha256 = "sha256-GHvJlm5DVt3IVJnqJu8YobNNqbjdPd08s4DCdQQRQds="; }; + format = "other"; + dontBuild = true; doCheck = false; # disabled because it requires a ccnet environment |