diff options
Diffstat (limited to 'pkgs/applications/networking')
25 files changed, 49 insertions, 372 deletions
diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 08385de1bff2c..b9a0b49bab2ba 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.16"; + version = "13.5"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-+8jur2Fc+fhrWO9xyaSuwzUZnLLhTP/uz15+EX6E7K4="; + hash = "sha256-Wz1gYK1CqfK4aa7K2PR8wKx7VcvALquYKA2vetUAdeU="; }; }; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 8a67dc1774641..fcd3b82f50922 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.1.1"; + version = "33.2.0"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-0i0hXC6mC1SY2V6ANMXHS4LZ/HZk8FUsSDQfQUE14IM="; + hash = "sha256-h6ohLm9I6esvVa9bek/j2s/jiIcEOwjd8/dCyUvqyLw="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-RnBlCxIsWxm6BbtAS0YKHtix93N6t9jihFItqhtLhRU="; + hash = "sha256-To/41og5hxFL6efJhNfRNJw/fOXZA5Le16DZsSJrXfc="; }; }; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 508946278f923..f19da4505789b 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.16"; + version = "13.5"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-gSV2G9U0fh+PAe/vCInIjssBFk0ciiD6h0rpZUxVzs0="; + hash = "sha256-npqrGyCwqMeZ8JssR/EpvDClkLQ3K0xEfE19fHn+GDs="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-Lh9rHrqX+eeQ47Z8e9ChRH8qWeDwSbyR5TnNfwHAb9M="; + hash = "sha256-qeXLBFhcCPDWRuCZiLL1wOY6BRWsk0h36jWe5U6eCJ8="; }; }; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index aeac7254ef017..b3f3dd21b9e17 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.15"; + version = "0.11.16"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-tfJ9LTPu8B6xlIkAKmbl2d2GLY9p4VcOQGOC5TTx9Cs="; + hash = "sha256-i/wEgUK4NxFonZXJKuhLHBgCXQ25A/UDyavhJdjuJ+M="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix deleted file mode 100644 index def8bfb515200..0000000000000 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib -, callPackage - -, fetchFromGitLab - -, appstream -, gobject-introspection -, meson -, ninja -, pkg-config -, wrapGAppsHook3 - -, glib -, glib-networking -, gtk3 -, libhandy -, listparser ? callPackage ./listparser.nix { } -, webkitgtk -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "gnome-feeds"; - version = "0.16.2"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = "gfeeds"; - rev = version; - sha256 = "sha256-66dwVR9owg050aHCHJek7jYnT+/yyCKo4AaUE0hCqBA="; - }; - - format = "other"; - - nativeBuildInputs = [ - appstream - glib # for glib-compile-schemas - gobject-introspection - meson - ninja - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - glib-networking - gtk3 - libhandy - webkitgtk - ]; - - propagatedBuildInputs = with python3.pkgs; [ - beautifulsoup4 - python-dateutil - feedparser - html5lib - listparser - lxml - pillow - pygments - pygobject3 - readability-lxml - pytz - requests - ]; - - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - passthru = { - inherit listparser; - }; - - meta = with lib; { - description = "RSS/Atom feed reader for GNOME"; - mainProgram = "gfeeds"; - homepage = "https://gitlab.gnome.org/World/gfeeds"; - license = licenses.gpl3Plus; - maintainers = [ - maintainers.pbogdan - ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix deleted file mode 100644 index 7dd2f752598fa..0000000000000 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, python3 -, fetchPypi -}: - -python3.pkgs.buildPythonPackage rec { - pname = "listparser"; - version = "0.18"; - - src = fetchPypi { - inherit pname version; - sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b"; - }; - - propagatedBuildInputs = with python3.pkgs; [ - requests - six - ]; - - checkPhase = '' - ${python3.interpreter} lptest.py - ''; - - meta = with lib; { - description = "Parser for subscription lists"; - homepage = "https://github.com/kurtmckee/listparser"; - license = licenses.lgpl3Plus; - maintainers = [ - maintainers.pbogdan - ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 398a3457df9b9..681ba5cc59c98 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://alfaview.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang hexchen ]; + maintainers = with maintainers; [ hexchen ]; mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ec8bcb5a8d8eb..7c0d9c7b1e5a2 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let if stdenv.isLinux then { stable = "0.0.56"; ptb = "0.0.90"; - canary = "0.0.422"; + canary = "0.0.431"; development = "0.0.19"; } else { stable = "0.0.307"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-MTC079WTN0Vw57aLro1WkHRL09IKYjnUsfBAMiiHjI0="; + hash = "sha256-59Sv3U3osfk+QoXgorpqK7CU0nJBdpFOMkoGRgHN3v8="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index b3b722e67529b..4dfc4b97494af 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.68"; + "version" = "1.11.69"; "hashes" = { - "desktopSrcHash" = "sha256-L3rto0V0RIf5ILWYGFnuGpwciwc55rR2+Zqj/azuWlo="; + "desktopSrcHash" = "sha256-sSEWnvWZ6sfrHL3mqbq3T90At131C1W7N72Hb/BHKCk="; "desktopYarnHash" = "0awz1dscksx4zvp99p08mdl2h6i7gbwjddanl3bhxkysxqdnwqb1"; - "webSrcHash" = "sha256-IRgEV4H0fYo0ijLWF8ICdewqencgTJlqstzsGzlJI0k="; - "webYarnHash" = "092m0bhc3pp9dpaz6kri3hi723kqq1pbja4vf2xbxyx4x4yf0vlz"; + "webSrcHash" = "sha256-oFSaKtig1z3jepLpwJW4i5VskMBhKUIbPsCfLQuCgMY="; + "webYarnHash" = "1rzq05dnkwjglira52wllsl5nqw1g8whvamjfxzgvp0nyby46nha"; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index f982124cb8436..8621aaf1b3eab 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.13.0-beta.1"; + version = "7.14.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-DvYRvIA+rg4RKXbqWjWj7oFnfLboEiMeP7HgGYkRBDM="; + hash = "sha256-SC7CCqylPkc/qmlSYlXJcVWGi1+hvRQ9qBGR6wqo6sk="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 09485b3d7f1d8..c4f59cd3dd557 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.12.0"; + version = "7.13.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-k8Dp3MiWRNpWEGqYtt5o8FtL3fJ9AkIm+hjvW8r6qG0="; + hash = "sha256-lwo5O8UAjjMuaeM8J804oN+y72uYZBL+eP/NwpnD4H0="; } diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 34bf49304cb65..2f71df5cef5ac 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -122,7 +122,7 @@ buildNpmPackage rec { homepage = "https://threema.ch"; license = licenses.agpl3Only; mainProgram = "threema"; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index f4eef4684bebe..f6145678d38f1 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.11"; + version = "2.6.12"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Ibf9UULQ0NQ6+oVvLVxUsSSaQ4ilxLehBPZhkrzILQ="; + hash = "sha256-mEpeuopMzZhWOAikEP7Er8xcgNkGbCTkJJYrQr7GrBQ="; }; - cargoHash = "sha256-GK9P+IytkfhfogvPLuYF9+ngs2vr6Quv+v+Rai2cgx8="; + cargoHash = "sha256-U9L4SrYTAUcQ9/2f8tD7jxByVQS9P6OXpra6QvbhNNg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index fe3ee483ae57f..b31ae22fd33b1 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.3.2"; + version = "4.3.3"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-4fMd490+4ZiRVvTATp9L9hOdpq1Qwk9pH8EFfkz8N8Y="; + hash = "sha256-VYfbbOoziVvaEBxGptCen8COD8p2/4rDsUTasysQXtg="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 78aa173867692..3e09dbc9b8786 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -30,7 +30,7 @@ appimageTools.wrapType2 rec { changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; license = licenses.gpl3Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; mainProgram = "tutanota-desktop"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 7bed268a477cc..7e35c4b22fb5e 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.15.6"; + version = "1.15.7"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-4P/0fwHofsRjZcLuFdkUKxWIp/9P5yXA2ED/zqTGd94="; + hash = "sha256-vv6hrvfD1T+eH/Bi1ID0yoxB4747Q+nMvklT49uaX38="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix index 811a0d747fa76..275ef729016f4 100644 --- a/pkgs/applications/networking/newsreaders/raven-reader/default.nix +++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -31,7 +31,7 @@ appimageTools.wrapType2 { mainProgram = "raven-reader"; homepage = "https://ravenreader.app/"; license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index cfc10c3f7466f..2d9028bcc9790 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -17,7 +17,7 @@ , libevent , libgee , libnatpmp -, libtransmission +, libtransmission_3 , libutp , miniupnpc , openssl @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { libevent libgee libnatpmp - libtransmission + libtransmission_3 libutp miniupnpc openssl diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix deleted file mode 100644 index 39c160c771d8b..0000000000000 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchurl -, cmake -, pkg-config -, openssl -, curl -, libevent -, inotify-tools -, systemd -, zlib -, pcre -, libb64 -, libutp -, miniupnpc -, dht -, libnatpmp -, libiconv - # Build options -, enableGTK3 ? false -, gtk3 -, xorg -, wrapGAppsHook3 -, enableQt ? false -, qt5 -, nixosTests -, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, enableDaemon ? true -, enableCli ? true -, installLib ? false -, apparmorRulesFromClosure -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "transmission"; - version = "3.00"; - - src = fetchFromGitHub { - owner = "transmission"; - repo = "transmission"; - rev = finalAttrs.version; - sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z"; - fetchSubmodules = true; - }; - - patches = [ - # fix build with openssl 3.0 - ./transmission-3.00-openssl-3.patch - ]; - - outputs = [ "out" "apparmor" ]; - - cmakeFlags = - let - mkFlag = opt: if opt then "ON" else "OFF"; - in - [ - "-DENABLE_MAC=OFF" # requires xcodebuild - "-DENABLE_GTK=${mkFlag enableGTK3}" - "-DENABLE_QT=${mkFlag enableQt}" - "-DENABLE_DAEMON=${mkFlag enableDaemon}" - "-DENABLE_CLI=${mkFlag enableCli}" - "-DINSTALL_LIB=${mkFlag installLib}" - ]; - - nativeBuildInputs = [ - pkg-config - cmake - ] - ++ lib.optionals enableGTK3 [ wrapGAppsHook3 ] - ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] - ; - - buildInputs = [ - openssl - curl - libevent - zlib - pcre - libb64 - libutp - miniupnpc - dht - libnatpmp - ] - ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] - ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ] - ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; - - postInstall = '' - mkdir $apparmor - cat >$apparmor/bin.transmission-daemon <<EOF - include <tunables/global> - $out/bin/transmission-daemon { - include <abstractions/base> - include <abstractions/nameservice> - include <abstractions/ssl_certs> - include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([ - curl libevent openssl pcre zlib libnatpmp miniupnpc - ] ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] - )}" - r @{PROC}/sys/kernel/random/uuid, - r @{PROC}/sys/vm/overcommit_memory, - r @{PROC}/@{pid}/environ, - r @{PROC}/@{pid}/mounts, - rwk /tmp/tr_session_id_*, - - r $out/share/transmission/web/**, - - include <local/bin.transmission-daemon> - } - EOF - ''; - - passthru.tests = { - apparmor = nixosTests.transmission; # starts the service with apparmor enabled - smoke-test = nixosTests.bittorrent; - }; - - meta = { - description = "Fast, easy and free BitTorrent client"; - mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; - longDescription = '' - Transmission is a BitTorrent client which features a simple interface - on top of a cross-platform back-end. - Feature spotlight: - * Uses fewer resources than other clients - * Native Mac, GTK and Qt GUI clients - * Daemon ideal for servers, embedded systems, and headless use - * All these can be remote controlled by Web and Terminal clients - * Bluetack (PeerGuardian) blocklists with automatic updates - * Full encryption, DHT, and PEX support - ''; - homepage = "http://www.transmissionbt.com/"; - license = lib.licenses.gpl2Plus; # parts are under MIT - maintainers = with lib.maintainers; [ astsmtl ]; - platforms = lib.platforms.unix; - }; - -}) diff --git a/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch b/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch deleted file mode 100644 index f288298cbf3d4..0000000000000 --- a/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sun, 15 May 2022 10:54:38 -0400 -Subject: [PATCH] openssl: load "legacy" provider for RC4 - ---- - libtransmission/crypto-utils-openssl.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c -index 45fd71913..14d680654 100644 ---- a/libtransmission/crypto-utils-openssl.c -+++ b/libtransmission/crypto-utils-openssl.c -@@ -20,6 +20,9 @@ - #include <openssl/rand.h> - #include <openssl/ssl.h> - #include <openssl/x509.h> -+#if OPENSSL_VERSION_MAJOR >= 3 -+#include <openssl/provider.h> -+#endif - - #include "transmission.h" - #include "crypto-utils.h" -@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle) - - tr_rc4_ctx_t tr_rc4_new(void) - { -+#if OPENSSL_VERSION_MAJOR >= 3 -+ OSSL_PROVIDER_load(NULL, "default"); -+ OSSL_PROVIDER_load(NULL, "legacy"); -+#endif - EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new(); - - if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1))) --- -2.35.1 - diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index e480ab5f67b1c..7a79c986ca300 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { meta = with lib; { description = "Linux command-line client for ProtonVPN"; homepage = "https://github.com/protonvpn/linux-cli"; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "protonvpn-cli"; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 19081bd138631..38b196cb6c3d2 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -98,6 +98,6 @@ buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "protonvpn-app"; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/protonvpn-gui/legacy.nix b/pkgs/applications/networking/protonvpn-gui/legacy.nix index 32828b5590f67..a749b2875affb 100644 --- a/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ b/pkgs/applications/networking/protonvpn-gui/legacy.nix @@ -71,7 +71,7 @@ buildPythonApplication rec { meta = with lib; { description = "Official ProtonVPN Linux app"; homepage = "https://github.com/ProtonVPN/linux-app"; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; license = licenses.gpl3Plus; mainProgram = "protonvpn"; platforms = platforms.linux; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 9422223ae03af..edebb68591937 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,6 @@ , makeWrapper , xdg-utils , dbus -, qtbase -, qtwebengine -, qtx11extras -, qtquickcontrols2 -, qtgraphicaleffects , getconf , glibc , libXrandr @@ -23,13 +18,15 @@ , coreutils , wrapQtAppsHook , icu63 +, nss +, minizip }: mkDerivation rec { pname = "teamviewer"; # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime outputs = [ "out" "dev" ]; - version = "15.49.2"; + version = "15.54.3"; src = let @@ -38,11 +35,11 @@ mkDerivation rec { { x86_64-linux = fetchurl { url = "${base_url}/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-Ag41RQD4lp4Sxuz6wZwiFzVxUalV+M3Zwa2Cug4iNSM="; + hash = "sha256-41zVX2svomcRKu2ow1A/EeKojBIpABO4o2EZxappzgo="; }; aarch64-linux = fetchurl { url = "${base_url}/teamviewer_${version}_arm64.deb"; - sha256 = "sha256-JGSmFq4q8TQJVIrS6qQxIxZPNKgor+pFetextLJPHtg="; + hash = "sha256-wuQYWeYgXW54/5dpiGzJxZ9JZDlUgFgCKq8Z4xV2HlI="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -52,7 +49,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; - buildInputs = [ qtbase qtwebengine qtx11extras qtquickcontrols2 qtgraphicaleffects icu63 ]; + buildInputs = [ minizip icu63 nss ]; installPhase = '' mkdir -p $out/share/teamviewer $out/bin $out/share/applications @@ -60,27 +57,10 @@ mkDerivation rec { rm -R \ $out/share/teamviewer/logfiles \ $out/share/teamviewer/config \ - $out/share/teamviewer/tv_bin/xdg-utils \ $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,tv-delayed-start.sh} - # Teamviewer packages its own qt library files. - # Most of them can be replaced by nixpkgs libraries, but the following need to be used beginning at version 15.35.7 - # because teamviewer will not start without them, either stalling at startup or even segfaulting. In the logfiles, some missing qt libraries - # can be observed, although they are present from nixpkgs. AutoPatchelfHook will automatically choose the included libraries, if present. - # See https://github.com/NixOS/nixpkgs/pull/202024 - - # delete all library files except "qt" folder - find $out/share/teamviewer/tv_bin/RTlib -depth -maxdepth 1 ! -type d -execdir rm -rf {} + - - # remove all other folders except "qml" and "plugins" from the qml directory - find $out/share/teamviewer/tv_bin/RTlib/qt -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "qml" -o -name "plugins" \) -execdir rm -rf {} + - - # keep "QtQuick" and "QtQuick.2" directory - find $out/share/teamviewer/tv_bin/RTlib/qt/qml -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "QtQuick" -o -name "QtQuick.2" \) -execdir rm -rf {} + - - # delete all folders except "platforms" from the plugins directory - # it contains libqxcb.so from qtbase which seems to be incompatible with our nixpkgs version - find $out/share/teamviewer/tv_bin/RTlib/qt/plugins -depth -maxdepth 1 -mindepth 1 -type d ! -name "platforms" -execdir rm -rf {} + + # Teamviewer packages its own qt library files. So do not use nixpkgs qt files. These will cause issues + # See https://github.com/NixOS/nixpkgs/issues/321333 ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin @@ -94,11 +74,11 @@ mkDerivation rec { install -d "$out/share/dbus-1/services" install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.service" "$out/share/dbus-1/services" substituteInPlace "$out/share/dbus-1/services/com.teamviewer.TeamViewer.service" \ - --replace '/opt/teamviewer/tv_bin/TeamViewer' \ + --replace-fail '/opt/teamviewer/tv_bin/TeamViewer' \ "$out/share/teamviewer/tv_bin/TeamViewer" install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.Desktop.service" "$out/share/dbus-1/services" substituteInPlace "$out/share/dbus-1/services/com.teamviewer.TeamViewer.Desktop.service" \ - --replace '/opt/teamviewer/tv_bin/TeamViewer_Desktop' \ + --replace-fail '/opt/teamviewer/tv_bin/TeamViewer_Desktop' \ "$out/share/teamviewer/tv_bin/TeamViewer_Desktop" install -d "$out/share/dbus-1/system.d" diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index 5bb826e77d0a8..d6f2f2ef04476 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-2mGPbH74a9d1uhRGMSEfrzCnwjgdgbopu20K9/g6wg0="; + hash = "sha256-quy1maeC1ebVzMvN+JzKf8AmMbipju9vvdTU03SyNnc="; }; - vendorHash = "sha256-Iedd8WsJPAVQexRqDSLAmv7MAWc4IFQXHk6XpnStMps="; + vendorHash = "sha256-lGjJLqEGBFd2aYm82xrDfLK90Mcrhb7bMtXSNZpp/bM="; subPackages = [ "cmd/trayscale" ]; |